From 474ceab4b9e33dcda4fa62ff559bac9119a04193 Mon Sep 17 00:00:00 2001
From: Glenn Carremans <glenn.carremans@appwise.be>
Date: Mon, 11 Sep 2017 10:50:06 +0200
Subject: [PATCH 1/2] - Added English translation and made this default - Added
 Dutch translation

---
 lib/src/main/res/values-nl/strings.xml | 28 ++++++++++++++++++++
 lib/src/main/res/values-zh/strings.xml | 28 ++++++++++++++++++++
 lib/src/main/res/values/strings.xml    | 36 +++++++++++++-------------
 3 files changed, 74 insertions(+), 18 deletions(-)
 create mode 100644 lib/src/main/res/values-nl/strings.xml
 create mode 100644 lib/src/main/res/values-zh/strings.xml

diff --git a/lib/src/main/res/values-nl/strings.xml b/lib/src/main/res/values-nl/strings.xml
new file mode 100644
index 0000000..fd4e905
--- /dev/null
+++ b/lib/src/main/res/values-nl/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="update_lib_network_not_available">Het huidige netwerk is niet beschikbaar</string>
+    <string name="update_lib_default_toast">Is momenteel de nieuwste versie</string>
+
+    <!--DownLoadDialog-->
+    <string name="update_lib_download_cancel">Download geannuleerd</string>
+    <string name="update_lib_download_in_background">Bijwerken op de achtergrond</string>
+    <string name="update_lib_download_finish">Download is compleet</string>
+    <string name="update_lib_download_failed">Download mislukt</string>
+    <string name="update_lib_file_download_format">Downloaden（%1$s/%2$s）</string>
+
+    <!--UpdateDialog-->
+    <string name="update_lib_update_content">Update de inhoud:</string>
+    <string name="update_lib_version_code">Versienummer：</string>
+    <string name="update_lib_update">Update</string>
+    <string name="update_lib_cancel">Annuleren</string>
+    <string name="update_lib_dialog_title">Update</string>
+
+    <!--DownLoadService-->
+    <string name="update_lib_file_download">Bestand downloaden</string>
+    <string name="update_lib_file_downloading">Wordt gedownload...</string>
+
+    <!--fragment_download.xml-->
+    <string name="update_lib_file_download_text">Downloaden</string>
+    <string name="update_lib_stop_download">Stop met downloaden</string>
+    <string name="update_lib_background_download">Achtergrond download</string>
+</resources>
\ No newline at end of file
diff --git a/lib/src/main/res/values-zh/strings.xml b/lib/src/main/res/values-zh/strings.xml
new file mode 100644
index 0000000..c0e2d55
--- /dev/null
+++ b/lib/src/main/res/values-zh/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="update_lib_network_not_available">当前网络不可用</string>
+    <string name="update_lib_default_toast">当前已是最新版本</string>
+
+    <!--DownLoadDialog-->
+    <string name="update_lib_download_cancel">已取消更新</string>
+    <string name="update_lib_download_in_background">正在后台进行更新</string>
+    <string name="update_lib_download_finish">下载完成</string>
+    <string name="update_lib_download_failed">下载失败</string>
+    <string name="update_lib_file_download_format">正在下载（%1$s/%2$s）</string>
+
+    <!--UpdateDialog-->
+    <string name="update_lib_update_content">更新内容:</string>
+    <string name="update_lib_version_code">版本号：</string>
+    <string name="update_lib_update">升级</string>
+    <string name="update_lib_cancel">取消</string>
+    <string name="update_lib_dialog_title">更新提示</string>
+
+    <!--DownLoadService-->
+    <string name="update_lib_file_download">文件下载</string>
+    <string name="update_lib_file_downloading">正在下载中...</string>
+
+    <!--fragment_download.xml-->
+    <string name="update_lib_file_download_text">正在下载</string>
+    <string name="update_lib_stop_download">停止下载</string>
+    <string name="update_lib_background_download">后台下载</string>
+</resources>
diff --git a/lib/src/main/res/values/strings.xml b/lib/src/main/res/values/strings.xml
index eee5b25..7de3340 100644
--- a/lib/src/main/res/values/strings.xml
+++ b/lib/src/main/res/values/strings.xml
@@ -1,28 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="update_lib_network_not_available">当前网络不可用</string>
-    <string name="update_lib_default_toast">当前已是最新版本</string>
+    <string name="update_lib_network_not_available">The current network is not available</string>
+    <string name="update_lib_default_toast">Is currently the latest version</string>
 
     <!--DownLoadDialog-->
-    <string name="update_lib_download_cancel">已取消更新</string>
-    <string name="update_lib_download_in_background">正在后台进行更新</string>
-    <string name="update_lib_download_finish">下载完成</string>
-    <string name="update_lib_download_failed">下载失败</string>
-    <string name="update_lib_file_download_format">正在下载（%1$s/%2$s）</string>
+    <string name="update_lib_download_cancel">Download canceled</string>
+    <string name="update_lib_download_in_background">Is updating in the background</string>
+    <string name="update_lib_download_finish">Download completed</string>
+    <string name="update_lib_download_failed">Download failed</string>
+    <string name="update_lib_file_download_format">Downloading（%1$s/%2$s）</string>
 
     <!--UpdateDialog-->
-    <string name="update_lib_update_content">更新内容:</string>
-    <string name="update_lib_version_code">版本号：</string>
-    <string name="update_lib_update">升级</string>
-    <string name="update_lib_cancel">取消</string>
-    <string name="update_lib_dialog_title">更新提示</string>
+    <string name="update_lib_update_content">Update content:</string>
+    <string name="update_lib_version_code">Version number：</string>
+    <string name="update_lib_update">Update</string>
+    <string name="update_lib_cancel">Cancel</string>
+    <string name="update_lib_dialog_title">Update</string>
 
     <!--DownLoadService-->
-    <string name="update_lib_file_download">文件下载</string>
-    <string name="update_lib_file_downloading">正在下载中...</string>
+    <string name="update_lib_file_download">Download document</string>
+    <string name="update_lib_file_downloading">Is being downloaded...</string>
 
     <!--fragment_download.xml-->
-    <string name="update_lib_file_download_text">正在下载</string>
-    <string name="update_lib_stop_download">停止下载</string>
-    <string name="update_lib_background_download">后台下载</string>
-
+    <string name="update_lib_file_download_text">Downloading</string>
+    <string name="update_lib_stop_download">Stop downloading</string>
+    <string name="update_lib_background_download">Background download</string>
 </resources>

From 6a5e56b45198b886a6940b8377358167317ce201 Mon Sep 17 00:00:00 2001
From: Glenn Carremans <glenn.carremans@appwise.be>
Date: Wed, 13 Sep 2017 14:27:30 +0200
Subject: [PATCH 2/2] Improved for landscape mode

---
 lib/src/main/res/layout/activity_update.xml   |   8 +-
 lib/src/main/res/layout/fragment_download.xml |  33 +++---
 lib/src/main/res/layout/fragment_update.xml   | 103 +++++++++---------
 lib/src/main/res/values-nl/strings.xml        |   8 +-
 lib/src/main/res/values-zh/strings.xml        |   6 +-
 lib/src/main/res/values/strings.xml           |   8 +-
 6 files changed, 84 insertions(+), 82 deletions(-)

diff --git a/lib/src/main/res/layout/activity_update.xml b/lib/src/main/res/layout/activity_update.xml
index f6df1ce..e5656a9 100644
--- a/lib/src/main/res/layout/activity_update.xml
+++ b/lib/src/main/res/layout/activity_update.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:app="http://schemas.android.com/apk/res-auto"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
     <FrameLayout
         android:id="@+id/container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"></FrameLayout>
+        android:layout_height="wrap_content" />
 </FrameLayout>
\ No newline at end of file
diff --git a/lib/src/main/res/layout/fragment_download.xml b/lib/src/main/res/layout/fragment_download.xml
index 7c30329..9aa7e97 100644
--- a/lib/src/main/res/layout/fragment_download.xml
+++ b/lib/src/main/res/layout/fragment_download.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content"
-             android:padding="0dp">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:context="com.kcode.lib.dialog.UpdateActivity">
+
     <LinearLayout
-        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/shape_update_lib_dialog_bg"
-        android:orientation="vertical"
-        android:padding="12dp"
-        tools:context="com.kcode.lib.dialog.UpdateActivity">
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="50dp"
+            android:layout_margin="12dp"
             android:elevation="3dp"
             android:gravity="center|left"
             android:text="@string/update_lib_file_download_text"
             android:textColor="#525252"
-            android:textSize="18sp"/>
+            android:textSize="18sp" />
 
         <ProgressBar
             android:id="@+id/progressBar"
             style="@style/Widget.AppCompat.ProgressBar.Horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"/>
+            android:layout_margin="12dp" />
 
         <LinearLayout
             android:id="@+id/downLayout"
@@ -40,22 +40,23 @@
                 android:id="@+id/btnCancel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="8dp"
-                android:background="@drawable/selector_update_lib_download_dialog_button"
+                android:layout_margin="12dp"
+                android:background="@drawable/selector_update_lib_button"
+                android:padding="6dp"
                 android:text="@string/update_lib_stop_download"
-                style="?android:attr/borderlessButtonStyle"
                 android:textColor="#4a4a4a"
-                android:textSize="16sp"/>
+                android:textSize="16sp" />
 
             <Button
                 android:id="@+id/btnBackground"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/selector_update_lib_download_dialog_button"
-                style="?android:attr/borderlessButtonStyle"
+                android:layout_margin="12dp"
+                android:background="@drawable/selector_update_lib_button"
+                android:padding="6dp"
                 android:text="@string/update_lib_background_download"
                 android:textColor="#4a4a4a"
-                android:textSize="16sp"/>
+                android:textSize="16sp" />
 
         </LinearLayout>
     </LinearLayout>
diff --git a/lib/src/main/res/layout/fragment_update.xml b/lib/src/main/res/layout/fragment_update.xml
index 5bc4530..13c0eaf 100644
--- a/lib/src/main/res/layout/fragment_update.xml
+++ b/lib/src/main/res/layout/fragment_update.xml
@@ -1,67 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:app="http://schemas.android.com/apk/res-auto"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content">
-    <LinearLayout
-        xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:context="com.kcode.lib.dialog.UpdateActivity">
+
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/shape_update_lib_dialog_bg"
-        android:orientation="vertical"
-        tools:context="com.kcode.lib.dialog.UpdateActivity">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:background="@drawable/shape_update_lib_dialog_title_bg"
-            android:elevation="3dp"
-            android:gravity="center"
-            android:text="@string/update_lib_dialog_title"
-            android:textColor="#525252"
-            android:textSize="20sp"/>
-
-        <TextView
-            android:id="@+id/tvContent"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="12dp"
-            android:minLines="10"
-            android:textColor="#4a4a4a"
-            android:textSize="16sp"/>
+        android:background="@drawable/shape_update_lib_dialog_bg">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingBottom="8dp"
-            android:paddingLeft="12dp"
-            android:paddingRight="12dp"
-            android:paddingStart="12dp"
-            android:paddingTop="12dp">
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:background="@drawable/shape_update_lib_dialog_title_bg"
+                android:elevation="3dp"
+                android:gravity="center"
+                android:text="@string/update_lib_dialog_title"
+                android:textColor="#525252"
+                android:textSize="20sp" />
 
-            <Button
-                android:id="@+id/btnCancel"
-                android:layout_width="0dp"
+            <TextView
+                android:id="@+id/tvContent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp"
-                android:layout_weight="1"
-                android:background="@drawable/selector_update_lib_button"
-                android:text="@string/update_lib_cancel"
+                android:layout_margin="12dp"
+                android:minLines="10"
                 android:textColor="#4a4a4a"
-                android:textSize="18sp"/>
+                android:textSize="16sp" />
 
-            <Button
-                android:id="@+id/btnUpdate"
-                android:layout_width="0dp"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp"
-                android:layout_weight="1"
-                android:background="@drawable/selector_update_lib_button"
-                android:text="@string/update_lib_update"
-                android:textColor="#4a4a4a"
-                android:textSize="18sp"/>
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/btnCancel"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="12dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/selector_update_lib_button"
+                    android:text="@string/update_lib_cancel"
+                    android:textColor="#4a4a4a"
+                    android:textSize="18sp" />
+
+                <Button
+                    android:id="@+id/btnUpdate"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="12dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/selector_update_lib_button"
+                    android:text="@string/update_lib_update"
+                    android:textColor="#4a4a4a"
+                    android:textSize="18sp" />
 
+            </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
+    </ScrollView>
 </FrameLayout>
\ No newline at end of file
diff --git a/lib/src/main/res/values-nl/strings.xml b/lib/src/main/res/values-nl/strings.xml
index fd4e905..19eb567 100644
--- a/lib/src/main/res/values-nl/strings.xml
+++ b/lib/src/main/res/values-nl/strings.xml
@@ -11,15 +11,15 @@
     <string name="update_lib_file_download_format">Downloaden（%1$s/%2$s）</string>
 
     <!--UpdateDialog-->
-    <string name="update_lib_update_content">Update de inhoud:</string>
-    <string name="update_lib_version_code">Versienummer：</string>
+    <string name="update_lib_update_content">Release notities&#65306;</string>
+    <string name="update_lib_version_code">Versienummer&#65306;</string>
     <string name="update_lib_update">Update</string>
     <string name="update_lib_cancel">Annuleren</string>
-    <string name="update_lib_dialog_title">Update</string>
+    <string name="update_lib_dialog_title">Update Beschikbaar</string>
 
     <!--DownLoadService-->
     <string name="update_lib_file_download">Bestand downloaden</string>
-    <string name="update_lib_file_downloading">Wordt gedownload...</string>
+    <string name="update_lib_file_downloading">Wordt gedownload&#8230;</string>
 
     <!--fragment_download.xml-->
     <string name="update_lib_file_download_text">Downloaden</string>
diff --git a/lib/src/main/res/values-zh/strings.xml b/lib/src/main/res/values-zh/strings.xml
index c0e2d55..807b785 100644
--- a/lib/src/main/res/values-zh/strings.xml
+++ b/lib/src/main/res/values-zh/strings.xml
@@ -11,15 +11,15 @@
     <string name="update_lib_file_download_format">正在下载（%1$s/%2$s）</string>
 
     <!--UpdateDialog-->
-    <string name="update_lib_update_content">更新内容:</string>
-    <string name="update_lib_version_code">版本号：</string>
+    <string name="update_lib_update_content">更新内容&#65306;</string>
+    <string name="update_lib_version_code">版本号&#65306;</string>
     <string name="update_lib_update">升级</string>
     <string name="update_lib_cancel">取消</string>
     <string name="update_lib_dialog_title">更新提示</string>
 
     <!--DownLoadService-->
     <string name="update_lib_file_download">文件下载</string>
-    <string name="update_lib_file_downloading">正在下载中...</string>
+    <string name="update_lib_file_downloading">正在下载中&#8230;</string>
 
     <!--fragment_download.xml-->
     <string name="update_lib_file_download_text">正在下载</string>
diff --git a/lib/src/main/res/values/strings.xml b/lib/src/main/res/values/strings.xml
index 7de3340..e50662e 100644
--- a/lib/src/main/res/values/strings.xml
+++ b/lib/src/main/res/values/strings.xml
@@ -11,15 +11,15 @@
     <string name="update_lib_file_download_format">Downloading（%1$s/%2$s）</string>
 
     <!--UpdateDialog-->
-    <string name="update_lib_update_content">Update content:</string>
-    <string name="update_lib_version_code">Version number：</string>
+    <string name="update_lib_update_content">Release notes&#65306;</string>
+    <string name="update_lib_version_code">Version number&#65306;</string>
     <string name="update_lib_update">Update</string>
     <string name="update_lib_cancel">Cancel</string>
-    <string name="update_lib_dialog_title">Update</string>
+    <string name="update_lib_dialog_title">Update Available</string>
 
     <!--DownLoadService-->
     <string name="update_lib_file_download">Download document</string>
-    <string name="update_lib_file_downloading">Is being downloaded...</string>
+    <string name="update_lib_file_downloading">Is being downloaded&#8230;</string>
 
     <!--fragment_download.xml-->
     <string name="update_lib_file_download_text">Downloading</string>