From 6cac7466aee29106723d94d7c06de3685c9fdb0a Mon Sep 17 00:00:00 2001
From: Neuron <liziyuan123456@yeah.net>
Date: Sat, 7 Dec 2019 00:51:04 +0100
Subject: [PATCH] release 3.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

targetSdkVersion升至API 28
迁移至AndroidX
增加国际化支持
---
 app/build.gradle                              |  19 +--
 app/src/main/AndroidManifest.xml              |   1 -
 app/src/main/java/photoTimeFix/CoreK.kt       | 112 +++++++++++-------
 app/src/main/java/photoTimeFix/Fragment1.kt   |   4 +-
 app/src/main/java/photoTimeFix/Fragment2.kt   |  10 +-
 .../main/java/photoTimeFix/MainActivity.kt    |  50 +++++++-
 .../main/java/photoTimeFix/PagerAdapter.kt    |   6 +-
 .../java/tech/lincaiqi/PhotoTimeFix/Core.java |  10 +-
 app/src/main/res/layout/activity_main.xml     |  18 +--
 app/src/main/res/values-de/strings.xml        |  57 +++++++++
 app/src/main/res/values-zh-rCN/strings.xml    |  57 +++++++++
 app/src/main/res/values-zh/strings.xml        |  57 +++++++++
 app/src/main/res/values/strings.xml           |  79 ++++++++----
 build.gradle                                  |   6 +-
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 proguard-rules.pro                            |   1 +
 16 files changed, 380 insertions(+), 111 deletions(-)
 create mode 100644 app/src/main/res/values-de/strings.xml
 create mode 100644 app/src/main/res/values-zh-rCN/strings.xml
 create mode 100644 app/src/main/res/values-zh/strings.xml
 create mode 100644 proguard-rules.pro

diff --git a/app/build.gradle b/app/build.gradle
index b535cbd..f2fdebe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,14 +11,14 @@ android {
             storePassword KEY_PASSWORD
         }
     }
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         applicationId "tech.lincaiqi.PhotoTimeFix"
         minSdkVersion 19
         //noinspection ExpiredTargetSdkVersion
-        targetSdkVersion 21
-        versionCode 12
-        versionName '3.3'
+        targetSdkVersion 28
+        versionCode 13
+        versionName '3.4'
         resConfigs "zh", "zh-rCN"
     }
     buildTypes {
@@ -40,13 +40,14 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.11'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50'
     implementation 'org.jetbrains.anko:anko-common:0.10.8'
-    implementation 'com.android.support:customtabs:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    def libsuVersion = '2.2.0'
+    implementation 'androidx.browser:browser:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    def libsuVersion = '2.5.0'
     implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
     /* Optional: For including a prebuild busybox */
     implementation "com.github.topjohnwu.libsu:busybox:${libsuVersion}"
-    implementation "com.android.support:exifinterface:28.0.0"
+    implementation 'androidx.exifinterface:exifinterface:1.1.0'
+    implementation "androidx.versionedparcelable:versionedparcelable:1.1.0"
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e95ae83..cd533a4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,6 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
-        android:name="com.topjohnwu.superuser.ContainerApp"
         android:allowBackup="false"
         android:icon="@drawable/icon"
         android:label="@string/app_name"
diff --git a/app/src/main/java/photoTimeFix/CoreK.kt b/app/src/main/java/photoTimeFix/CoreK.kt
index 0f2ae38..1a1eee3 100644
--- a/app/src/main/java/photoTimeFix/CoreK.kt
+++ b/app/src/main/java/photoTimeFix/CoreK.kt
@@ -13,12 +13,12 @@ import android.net.Uri
 import android.os.Environment
 import android.os.Looper
 import android.provider.MediaStore
-import android.support.customtabs.CustomTabsIntent
-import android.support.design.widget.AppBarLayout
-import android.support.media.ExifInterface
-import android.support.v4.app.Fragment
-import android.support.v4.content.ContextCompat
-import android.support.v7.app.AlertDialog
+import androidx.browser.customtabs.CustomTabsIntent
+import com.google.android.material.appbar.AppBarLayout
+import androidx.exifinterface.media.ExifInterface
+import androidx.fragment.app.Fragment
+import androidx.core.content.ContextCompat
+import androidx.appcompat.app.AlertDialog
 import android.text.InputType
 import android.util.Log
 import android.view.LayoutInflater
@@ -45,7 +45,7 @@ class CoreK(private var context: Context, private var editor: SharedPreferences.
     fun initFragment(preferences: SharedPreferences, editor: SharedPreferences.Editor, chooseBtn: Button, radioGroup: RadioGroup, fragment: Fragment, isFolder : Boolean) {
         radioGroup.check(preferences.getInt("mode", R.id.radioButton))
         chooseBtn.setOnClickListener {
-            if (isFolder) context.longToast("由于系统限制(其实是我懒)，请选择文件夹内任意一张图片")
+            if (isFolder) context.longToast(context.getString(R.string.systemLimit))
             chooseFile(fragment)
         }
         radioGroup.setOnCheckedChangeListener { _, i ->
@@ -67,10 +67,10 @@ class CoreK(private var context: Context, private var editor: SharedPreferences.
             webView.addJavascriptInterface(this, "openGit")
             builder.setView(webView)
         } catch (e: Exception) {
-            builder.setMessage("加载WebView错误，已停止显示帮助窗口。\n该错误并不影响正常功能运行，且开发者仅在模拟器上遇到过，如果出现此对话框请与开发者联系。")
+            builder.setMessage(context.getString(R.string.webviewError))
             e.printStackTrace()
         }
-        builder.setPositiveButton("确定", null)
+        builder.setPositiveButton(context.getString(R.string.OK), null)
         builder.show()
     }
 
@@ -96,7 +96,7 @@ class CoreK(private var context: Context, private var editor: SharedPreferences.
             intent.data = Uri.parse("coolmarket://u/$user")
             context.startActivity(intent)
         } catch (e: Exception) {
-            context.longToast("未安装酷安")
+            context.longToast(context.getString(R.string.notInstallCoolapk))
             e.printStackTrace()
         }
 
@@ -182,7 +182,7 @@ class CoreK(private var context: Context, private var editor: SharedPreferences.
         val file = File(path)
         val paths: Array<String?>
         if (!file.exists()) {
-            context.toast("文件或目录不存在")
+            context.toast(context.getString(R.string.fileNotExistence))
             return
         }
         if (file.isFile) {
@@ -196,7 +196,7 @@ class CoreK(private var context: Context, private var editor: SharedPreferences.
         }
         Log.d("path", paths.toString())
         MediaScannerConnection.scanFile(context, paths, null) { _, _ -> }
-        context.toast("完成")
+        context.toast(R.string.finish)
     }
 
     @JavascriptInterface
@@ -204,9 +204,9 @@ class CoreK(private var context: Context, private var editor: SharedPreferences.
         val et = EditText(context)
         et.inputType = InputType.TYPE_CLASS_NUMBER
         var input: Int
-        AlertDialog.Builder(context).setTitle("设置延时")
+        AlertDialog.Builder(context).setTitle(R.string.setDelay)
                 .setView(et)
-                .setPositiveButton("确定") { _, _ ->
+                .setPositiveButton(R.string.OK) { _, _ ->
                     input = et.text.toString().toInt()
                     editor.putInt("delay", input)
                     editor.apply()
@@ -246,13 +246,13 @@ class CoreK(private var context: Context, private var editor: SharedPreferences.
         val defaultComponentName = ComponentName(activity!!.baseContext,"photoTimeFix.MainActivity")
         val newComponentName = ComponentName(activity!!.baseContext,"photoTimeFix.newIcon")
         val packageManager = activity!!.packageManager
-        AlertDialog.Builder(context).setTitle("切换图标")
-                .setMessage("确定以使用新版，取消使用旧版")
-                .setPositiveButton("确定") { _, _ ->
+        AlertDialog.Builder(context).setTitle(R.string.switchIcon)
+                .setMessage(R.string.okToUseNew)
+                .setPositiveButton(R.string.OK) { _, _ ->
                     packageManager.setComponentEnabledSetting(defaultComponentName,PackageManager.COMPONENT_ENABLED_STATE_DISABLED,PackageManager.DONT_KILL_APP)
                     packageManager.setComponentEnabledSetting(newComponentName,PackageManager.COMPONENT_ENABLED_STATE_ENABLED,PackageManager.DONT_KILL_APP)
                 }
-                .setNegativeButton("取消") {_, _ ->
+                .setNegativeButton(R.string.cancel) {_, _ ->
                     packageManager.setComponentEnabledSetting(newComponentName,PackageManager.COMPONENT_ENABLED_STATE_DISABLED,PackageManager.DONT_KILL_APP)
                     packageManager.setComponentEnabledSetting(defaultComponentName,PackageManager.COMPONENT_ENABLED_STATE_ENABLED,PackageManager.DONT_KILL_APP)
                 }
@@ -262,9 +262,9 @@ class CoreK(private var context: Context, private var editor: SharedPreferences.
     fun test(){
         val tV = TextView(context)
         tV.setBackgroundColor(Color.parseColor("#efefef"))
-        tV.text = "正在运行兼容性测试..."
+        tV.text = context.getString(R.string.runningTest)
         val ad = AlertDialog.Builder(context)
-                .setTitle("兼容性测试")
+                .setTitle(R.string.test)
                 .setView(tV)
                 .setCancelable(false)
                 .show()
@@ -273,55 +273,55 @@ class CoreK(private var context: Context, private var editor: SharedPreferences.
 
     private fun runTest(tv : TextView, ad : AlertDialog) {
         TV=tv
-        printTest("\n正在创建测试文件(/sdcard/CompatibilityTestFile)...")
+        printTest(R.string.creatingFile)
         val file = File(Environment.getExternalStorageDirectory().path,"CompatibilityTestFile")
         try {
             file.createNewFile()
         } catch (e : Exception) {
             e.printStackTrace()
-            printTest("失败\n$e")
+            printTest(context.getString(R.string.fault) + e)
             return
         }
-        printTest("成功")
-        printTest("\n开始执行 模式一：Java 可用性检查...")
+        printTest(R.string.success)
+        printTest(R.string.startMode1)
         val sdf = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
-        val targetTime = sdf.parse("2002-07-19 05:21:00").time
+        val targetTime = sdf.parse("2004-09-04 05:21:00").time
         if (file.setLastModified(targetTime)) {
-            printTest("\n命令执行成功...检查执行结果\n")
+            printTest(R.string.checkResult)
             val dateResult : String = sdf.format(Date(file.lastModified()))
             printTest(dateResult)
-            if (dateResult == "2002-07-19 05:21:00") printTest("\n检查完毕...模式一：Java 完全可用")
-            else printTest("\n系统返回执行成功却未生效")
-            file.setLastModified(sdf.parse("2002-09-28 00:00:00").time)
-        } else printTest("\n命令执行失败,模式一：Java 不可用，请与作者联系以获得帮助")
-        printTest("\n开始执行 模式二：Shell 可用性检查...正在检查root权限")
+            if (dateResult == "2002-07-19 05:21:00") printTest(R.string.checkMode1Finish)
+            else printTest(R.string.returnButCannotUse)
+            file.setLastModified(sdf.parse("2004-09-04 00:00:00").time)
+        } else printTest(R.string.checkMode1Fault)
+        printTest(R.string.startCheckMode2)
         if (Shell.rootAccess()) {
-            printTest("\n已获取root权限...检查touch命令\ntouch --help\n")
+            printTest(R.string.checkTouch)
             val result : Shell.Result = Shell.su("touch --help").exec()
             printTest(result.out.toString())
             if (result.isSuccess) {
-                printTest("\n发现touch命令...检查可用性\ntouch /sdcard/CompatibilityTestFile -t 200207190521\n")
-                val result2 : Shell.Result = Shell.su("touch /sdcard/CompatibilityTestFile -t 200207190521").exec()
+                printTest(R.string.findTouch)
+                val result2 : Shell.Result = Shell.su("touch /sdcard/CompatibilityTestFile -t 200409040521").exec()
                 printTest(result2.out.toString())
                 if (result2.isSuccess) {
-                    printTest("\n命令执行成功...检查执行结果\n")
+                    printTest(R.string.checkResult)
                     val dateResult : String = sdf.format(Date(file.lastModified()))
                     printTest(dateResult)
-                    if (dateResult == "2002-07-19 05:21:00") printTest("\n检查完毕...模式二：Shell 完全可用")
-                    else printTest("\n系统返回执行成功却未生效")
-                } else printTest("\n命令执行失败，请与作者联系以获得帮助")
-            } else printTest("\ntouch命令不存在，请自行安装Busybox或与作者联系以获得帮助")
-        } else printTest("获取root权限失败，模式二：Shell 不可用")
-        printTest("\n正在清理测试文件(/sdcard/CompatibilityTestFile)...")
+                    if (dateResult == "2004-09-04 05:21:00") printTest(R.string.checkMode2Finish)
+                    else printTest(R.string.returnButCannotUse)
+                } else printTest(R.string.checkMode2Fault)
+            } else printTest(R.string.cannotFindTouch)
+        } else printTest(R.string.getRootFault)
+        printTest(R.string.cleaning)
         try {
             file.delete()
         } catch (e : Exception) {
             e.printStackTrace()
-            printTest("失败\n$e")
+            printTest(context.getString(R.string.fault) + e)
             return
         }
         activity!!.runOnUiThread {
-            tv.text = tv.text.toString() + "完成"
+            tv.text = tv.text.toString() + context.getString(R.string.finish)
             ad.setCancelable(true)
         }
     }
@@ -332,14 +332,36 @@ class CoreK(private var context: Context, private var editor: SharedPreferences.
         }
     }
 
+    private fun println (){
+        printTest("\n")
+    }
+
+    private fun printTest(int : Int) {
+        val string = context.getString(int)
+        var newString : String=""
+        for ((index,char) in string.withIndex()) {
+            if (char=='\\'&&string[index+1]=='n') {
+                printTest(newString)
+                newString=""
+                println()
+            } else{
+                if (char=='n'&&newString == "") {
+                } else {
+                    newString += char;
+                }
+            }
+        }
+        printTest(newString)
+    }
+
     fun experimentalFunction() {
         val view = LayoutInflater.from(context).inflate(R.layout.experimental_function, null)
         val switch: Switch = view.findViewById(R.id.switch1)
         switch.isChecked = sharedPreferences!!.getBoolean("useEXIF",false)
         view.findViewById<Button>(R.id.switchIconButton).setOnClickListener { switchIcon() }
-        AlertDialog.Builder(context).setTitle("实验性功能")
+        AlertDialog.Builder(context).setTitle(R.string.experimentalFunction)
                 .setView(view)
-                .setPositiveButton("确定") {_,_->
+                .setPositiveButton(R.string.okToUseNew) {_,_->
                     editor.putBoolean("useEXIF",switch.isChecked)
                     editor.apply()
                 }.show()
diff --git a/app/src/main/java/photoTimeFix/Fragment1.kt b/app/src/main/java/photoTimeFix/Fragment1.kt
index 9d710c4..2a1ee20 100644
--- a/app/src/main/java/photoTimeFix/Fragment1.kt
+++ b/app/src/main/java/photoTimeFix/Fragment1.kt
@@ -5,7 +5,7 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.os.Environment
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -68,7 +68,7 @@ class Fragment1 : Fragment() {
             locateTv.setText(path)
             editor.putString("locate", path)
             editor.apply()
-        } else context!!.longToast("选择出错，请手动填写路径并联系开发者")
+        } else context!!.longToast(getString(R.string.selectError))
     }
 
     override fun setUserVisibleHint(isVisibleToUser: Boolean) {
diff --git a/app/src/main/java/photoTimeFix/Fragment2.kt b/app/src/main/java/photoTimeFix/Fragment2.kt
index 1754a75..07ddc41 100644
--- a/app/src/main/java/photoTimeFix/Fragment2.kt
+++ b/app/src/main/java/photoTimeFix/Fragment2.kt
@@ -7,7 +7,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.text.Editable
 import android.text.TextWatcher
 import android.util.Log
@@ -114,11 +114,11 @@ class Fragment2 : Fragment() {
             val returnEXIF = coreK.readEXIF(locateTv.text.toString())
             val builder = AlertDialog.Builder(context)
             builder.setMessage(returnEXIF.strings.joinToString(separator = "\n"))
-            if (returnEXIF.dateExist) builder.setPositiveButton("使用EXIF时间") { _, _ ->
+            if (returnEXIF.dateExist) builder.setPositiveButton(getString(R.string.usingEXIF)) { _, _ ->
                 choseDateEdit.setText(returnEXIF.dateString)
             }
-            else builder.setPositiveButton("确定",null)
-            builder.setNegativeButton("取消",null)
+            else builder.setPositiveButton(getString(R.string.OK),null)
+            builder.setNegativeButton(getString(R.string.cancel),null)
             builder.show()
         }
 
@@ -152,7 +152,7 @@ class Fragment2 : Fragment() {
             editor.putString("locate", path)
             editor.apply()
         } else {
-            context!!.longToast("选择出错，请手动填写路径并联系开发者")
+            context!!.longToast(getString(R.string.selectError))
             freshBtn.isEnabled = false
             exifBtn.isEnabled = false
             startBtn.isEnabled = false
diff --git a/app/src/main/java/photoTimeFix/MainActivity.kt b/app/src/main/java/photoTimeFix/MainActivity.kt
index b2dd712..c0ee71c 100644
--- a/app/src/main/java/photoTimeFix/MainActivity.kt
+++ b/app/src/main/java/photoTimeFix/MainActivity.kt
@@ -1,19 +1,28 @@
 package photoTimeFix
 
+import android.Manifest
 import android.content.ComponentName
 import android.content.Context
+import android.content.DialogInterface
 import android.content.SharedPreferences
+import android.content.pm.PackageManager
 import android.os.Bundle
 import tech.lincaiqi.PhotoTimeFix.R
-import android.support.design.widget.TabLayout
-import android.support.v4.app.Fragment
-import android.support.v7.app.AppCompatActivity
+import com.google.android.material.tabs.TabLayout
+import androidx.fragment.app.Fragment
+import androidx.appcompat.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
+import androidx.appcompat.app.AlertDialog
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 import kotlinx.android.synthetic.main.activity_main.*
+import kotlin.system.exitProcess
 
 class MainActivity : AppCompatActivity() {
 
+    private val MY_PERMISSIONS_REQUEST_READ_CONTACTS : Int = 1
+
     private lateinit var mFragmentList : MutableList<Fragment>
     private lateinit var mTitleList : MutableList<String>
     private lateinit var coreK : CoreK
@@ -21,6 +30,16 @@ class MainActivity : AppCompatActivity() {
     private lateinit var editor : SharedPreferences.Editor
 
     override fun onCreate(savedInstanceState: Bundle?) {
+
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+            if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
+            } else {
+                ActivityCompat.requestPermissions(this,
+                        arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE),
+                        MY_PERMISSIONS_REQUEST_READ_CONTACTS)
+            }
+        }
+
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
         setSupportActionBar(toolbar)
@@ -70,8 +89,8 @@ class MainActivity : AppCompatActivity() {
 
     private  fun initTitle() {
         mTitleList = ArrayList()
-        mTitleList.add("批量操作")
-        mTitleList.add("单文件操作")
+        mTitleList.add(getString(R.string.batchOperation))
+        mTitleList.add(getString(R.string.singleFileOperation))
         mTb.tabMode = TabLayout.MODE_FIXED
         mTb.addTab(mTb.newTab().setText(mTitleList[0]))
         mTb.addTab(mTb.newTab().setText(mTitleList[1]))
@@ -83,4 +102,25 @@ class MainActivity : AppCompatActivity() {
         mFragmentList.add(Fragment2())
     }
 
+    override fun onRequestPermissionsResult(requestCode: Int,
+                                            permissions: Array<String>, grantResults: IntArray) {
+        when (requestCode) {
+            MY_PERMISSIONS_REQUEST_READ_CONTACTS -> {
+                // If request is cancelled, the result arrays are empty.
+                if (!(grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
+                    AlertDialog.Builder(this)
+                            .setTitle(getString(R.string.permissionDenied))
+                            .setMessage(getString(R.string.shouldHavePermission))
+                            .setPositiveButton(getString(R.string.OK)) { _, _ -> exitProcess(0) }
+                            .create()
+                            .show()
+                }
+                return
+            }
+
+            // Add other 'when' lines to check for other
+            // permissions this app might request.
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/photoTimeFix/PagerAdapter.kt b/app/src/main/java/photoTimeFix/PagerAdapter.kt
index 78a9d8b..6afb6ca 100644
--- a/app/src/main/java/photoTimeFix/PagerAdapter.kt
+++ b/app/src/main/java/photoTimeFix/PagerAdapter.kt
@@ -1,8 +1,8 @@
 package photoTimeFix
 
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v4.app.FragmentPagerAdapter
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentPagerAdapter
 
 class PagerAdapter(fm: FragmentManager?, private val fragmentList : List<Fragment>, private val titleLis : List<String>) : FragmentPagerAdapter(fm) {
 
diff --git a/app/src/main/java/tech/lincaiqi/PhotoTimeFix/Core.java b/app/src/main/java/tech/lincaiqi/PhotoTimeFix/Core.java
index 450bc3e..758d238 100644
--- a/app/src/main/java/tech/lincaiqi/PhotoTimeFix/Core.java
+++ b/app/src/main/java/tech/lincaiqi/PhotoTimeFix/Core.java
@@ -27,7 +27,7 @@ public void process(Context context, int startnum, int endnum, String fileString
         File file = new File(fileString);
         //Log.d("EditText", locateTv.getText().toString());
         if (!file.exists()) {
-            Toast.makeText(context, "路径或文件不存在", Toast.LENGTH_LONG).show();
+            Toast.makeText(context, R.string.fileNotExistence, Toast.LENGTH_LONG).show();
             return;
         }
         final File[] files;
@@ -40,7 +40,7 @@ public void process(Context context, int startnum, int endnum, String fileString
         pd.setCancelable(false);
         pd.setCanceledOnTouchOutside(false);
         pd.setMax(files.length);
-        pd.setTitle("进度");
+        pd.setTitle(context.getString(R.string.progress));
         pd.show();
 
         new Thread(() -> {
@@ -53,7 +53,7 @@ public void process(Context context, int startnum, int endnum, String fileString
                 Shell.Config.setFlags(Shell.FLAG_USE_MAGISK_BUSYBOX);
                 //Shell.Config.addInitializers(BusyBoxInstaller.class);
                 if (!Shell.rootAccess()) {
-                    activity.runOnUiThread(()-> Toast.makeText(context,"请检查root权限",Toast.LENGTH_LONG).show());
+                    activity.runOnUiThread(()-> Toast.makeText(context, R.string.checkRoot,Toast.LENGTH_LONG).show());
                     pd.dismiss();
                     return;
                 }
@@ -120,13 +120,13 @@ public void process(Context context, int startnum, int endnum, String fileString
             activity.runOnUiThread(() -> {
                         pd.dismiss();
                         if (!support) {
-                            Toast.makeText(context, "您的系统极有可能不支持此操作，请更换操作模式", Toast.LENGTH_LONG).show();
+                            Toast.makeText(context, R.string.systemNotSupport, Toast.LENGTH_LONG).show();
                         }
                     }
             );
 
             Looper.prepare();
-            Toast.makeText(context, "完成！", Toast.LENGTH_SHORT).show();
+            Toast.makeText(context, R.string.finish, Toast.LENGTH_SHORT).show();
             Looper.loop();
         }).start();
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 664d709..419fe43 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,4 +1,4 @@
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_main"
@@ -9,14 +9,14 @@
 
     <!-- 感谢https://www.jianshu.com/p/06c0ae8d9a96/提供参考 -->
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bars"
         android:layout_width="match_parent"
         android:layout_height="250dp"
         android:fitsSystemWindows="true"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/user_cTL"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -37,7 +37,7 @@
                 app:layout_collapseMode="parallax"
                 app:layout_collapseParallaxMultiplier="0.7" />
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
@@ -46,8 +46,8 @@
                 app:titleMarginTop="15dp"
                 app:popupTheme="@style/AppTheme.PopupOverlay"/>
 
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -55,13 +55,13 @@
         android:orientation="vertical"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
             android:id="@+id/mTb"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             app:tabMode="scrollable" />
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:id="@+id/mVp"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -69,7 +69,7 @@
 
     </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout><!--
+</androidx.coordinatorlayout.widget.CoordinatorLayout><!--
     作者：Code_KZ
     来源：CSDN
     原文：https://blog.csdn.net/c786909486/article/details/65937519
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
new file mode 100644
index 0000000..a6cd38c
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Foto Zeit Fix</string>
+    <string name="about">Hilfe</string>
+    <string name="endLocation">Ende Position</string>
+    <string name="exifSwitch">Verwenden von Exif in dem Stapel</string>
+    <string name="experimentalFunction">Experimentelle Funktion</string>
+    <string name="format">Manuelle Eingabeformat</string>
+    <string name="fresh">Medienbibliothek aktualisieren</string>
+    <string name="imageContent">Ausgewähltes Bild anzeigen</string>
+    <string name="java">Modus 1: Java</string>
+    <string name="nowdatetime">Aktuelles Datum und Uhrzeit</string>
+    <string name="selectDate">Wählen Sie Datum und Uhrzeit</string>
+    <string name="selectFile">Datei aussuchen</string>
+    <string name="selectFolder">Ordner auswählen</string>
+    <string name="shell">Modus 2: Shell</string>
+    <string name="showexif">EXIF anzeigen</string>
+    <string name="start">Start</string>
+    <string name="startLocation">Startpunkt</string>
+    <string name="switchIcon">Symbol umschalten</string>
+    <string name="test">Kompatibilitätstest</string>
+    <string name="OK">OK</string>
+    <string name="batchOperation">Batch-Betrieb</string>
+    <string name="cancel">Abbrechen</string>
+    <string name="cannotFindTouch">\\nTouch-Befehl ist nicht vorhanden. Installieren Sie Busybox selbst oder wenden Sie sich an den Autor, um Hilfe zu erhalten</string>
+    <string name="checkMode1Fault">\\nBefehlsausführung fehlgeschlagen, Modus 1: Java ist nicht verfügbar. Wenden Sie sich an den Autor, um Hilfe zu erhalten</string>
+    <string name="checkMode1Finish">\\nGecheckt … Modus 1: Java ist vollständig verfügbar</string>
+    <string name="checkMode2Fault">\\nBefehlsausführung fehlgeschlagen, Modus 2: Shell ist nicht verfügbar. Wenden Sie sich an den Autor, um Hilfe zu erhalten</string>
+    <string name="checkMode2Finish">\\nGecheckt … Modus 2: Shell ist voll verfügbar</string>
+    <string name="checkResult">\\nBefehl erfolgreich ausgeführt … Ausführungsergebnis prüfen\\n</string>
+    <string name="checkRoot">Bitte überprüfen Sie die Root-Berechtigungen</string>
+    <string name="checkTouch">\\nGewurzelt … überprüfen Sie den Touch-Befehl\\nBerühren Sie —Hilfe\\n</string>
+    <string name="cleaning">\\nBereinigen von Testdateien(/sdcard/CompatibilityTestFile)…</string>
+    <string name="creatingFile">\\nTestdatei erstellen(/sdcard/CompatibilityTestFile)…</string>
+    <string name="fault">Fehlgeschlagen\\n</string>
+    <string name="fileNotExistence">Pfad oder Datei existiert nicht</string>
+    <string name="findTouch">\\nTouch-Befehl suchen … Verfügbarkeit prüfen\\ntouch /sdcard/CompatibilityTestFile -t 200409040521\\n</string>
+    <string name="finish">Fertig</string>
+    <string name="getRootFault">Fehler beim Abrufen der Root-Berechtigungen, Modus 2: Shell ist nicht verfügbar</string>
+    <string name="notInstallCoolapk">CoolApk ist nicht installiert</string>
+    <string name="okToUseNew">Klicken Sie auf OK, um die neue Version zu verwenden, und brechen Sie die alte Version ab</string>
+    <string name="permissionDenied">Speichererlaubnis verweigert</string>
+    <string name="progress">Fortschritt</string>
+    <string name="returnButCannotUse">\\nDas System kehrte zur erfolgreichen Ausführung zurück, wurde jedoch nicht wirksam</string>
+    <string name="runningTest">Kompatibilitätstest wird ausgeführt …</string>
+    <string name="setDelay">Verzögerung einstellen</string>
+    <string name="selectError">Auswahlfehler, bitte geben Sie den Pfad manuell ein und kontaktieren Sie den Entwickler</string>
+    <string name="shouldHavePermission">Die App muss über Speicherberechtigungen verfügen, damit sie ordnungsgemäß funktioniert</string>
+    <string name="singleFileOperation">Einzeldateivorgang</string>
+    <string name="startCheckMode2">\\nAusführungsmodus 2 starten: Shell-Verfügbarkeitsprüfung … Root-Berechtigungen werden überprüft</string>
+    <string name="startMode1">\\nAusführungsmodus 1 starten: Java-Verfügbarkeitsprüfung … Root-Berechtigungen werden überprüft</string>
+    <string name="success">Erfolg</string>
+    <string name="systemLimit">Aufgrund von Systemeinschränkungen (eigentlich bin ich faul), wählen Sie bitte ein Bild im Ordner aus</string>
+    <string name="systemNotSupport">Höchstwahrscheinlich unterstützt Ihr System diesen Vorgang nicht. Ändern Sie den Betriebsmodus</string>
+    <string name="webviewError">Fehler beim Laden von WebView, das Hilfefenster wird nicht mehr angezeigt. \\nDieser Fehler hat keine Auswirkungen auf die normale Funktionsweise und der Entwickler hat ihn nur im Simulator festgestellt. Wenn dieses Dialogfeld angezeigt wird, wenden Sie sich an den Entwickler.</string>
+    <string name="usingEXIF">Verwenden Sie die EXIF-Zeit</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..8a11fe9
--- /dev/null
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">照片时间修复</string>
+    <string name="about">帮助</string>
+    <string name="endLocation">结束位置</string>
+    <string name="exifSwitch">在批处理中使用Exif</string>
+    <string name="experimentalFunction">实验性功能</string>
+    <string name="format">手动输入格式</string>
+    <string name="fresh">刷新媒体库</string>
+    <string name="imageContent">显示选中的图片</string>
+    <string name="java">模式一：Java</string>
+    <string name="nowdatetime">当前日期时间</string>
+    <string name="selectDate">选择日期时间</string>
+    <string name="selectFile">选择文件</string>
+    <string name="selectFolder">选择文件夹</string>
+    <string name="shell">模式二：Shell</string>
+    <string name="showexif">查看EXIF</string>
+    <string name="start">开始</string>
+    <string name="startLocation">起始位置</string>
+    <string name="switchIcon">切换图标</string>
+    <string name="test">兼容性测试</string>
+    <string name="OK">确定</string>
+    <string name="batchOperation">批量操作</string>
+    <string name="cancel">取消</string>
+    <string name="cannotFindTouch">\\ntouch命令不存在，请自行安装Busybox或与作者联系以获得帮助</string>
+    <string name="checkMode1Fault">\\n命令执行失败,模式一：Java 不可用，请与作者联系以获得帮助</string>
+    <string name="checkMode1Finish">\\n检查完毕…模式一：Java 完全可用</string>
+    <string name="checkMode2Fault">\\n命令执行失败，模式二：Shell 不可用，请与作者联系以获得帮助</string>
+    <string name="checkMode2Finish">\\n检查完毕…模式二：Shell 完全可用</string>
+    <string name="checkResult">\\n命令执行成功…检查执行结果\\n</string>
+    <string name="checkRoot">请检查root权限</string>
+    <string name="checkTouch">\\n已获取root权限…检查touch命令\\ntouch —help\\n</string>
+    <string name="cleaning">\\n正在清理测试文件(/sdcard/CompatibilityTestFile)…</string>
+    <string name="creatingFile">\\n正在创建测试文件(/sdcard/CompatibilityTestFile)…</string>
+    <string name="fault">失败\\n</string>
+    <string name="fileNotExistence">路径或文件不存在</string>
+    <string name="findTouch">\\n发现touch命令…检查可用性\\ntouch /sdcard/CompatibilityTestFile -t 200409040521\\n</string>
+    <string name="finish">完成！</string>
+    <string name="getRootFault">获取root权限失败，模式二：Shell 不可用</string>
+    <string name="notInstallCoolapk">未安装酷安</string>
+    <string name="okToUseNew">确定以使用新版，取消使用旧版</string>
+    <string name="permissionDenied">存储权限被拒绝</string>
+    <string name="progress">进度</string>
+    <string name="returnButCannotUse">\\n系统返回执行成功却未生效</string>
+    <string name="runningTest">正在运行兼容性测试…</string>
+    <string name="selectError">选择出错，请手动填写路径并联系开发者</string>
+    <string name="setDelay">设置延时</string>
+    <string name="shouldHavePermission">该应用必须被授予存储权限才能正常工作</string>
+    <string name="singleFileOperation">单文件操作</string>
+    <string name="startCheckMode2">\\n开始执行 模式二：Shell 可用性检查…正在检查root权限</string>
+    <string name="startMode1">\\n开始执行 模式一：Java 可用性检查…</string>
+    <string name="success">成功</string>
+    <string name="systemLimit">由于系统限制(其实是我懒)，请选择文件夹内任意一张图片</string>
+    <string name="systemNotSupport">您的系统极有可能不支持此操作，请更换操作模式</string>
+    <string name="usingEXIF">使用EXIF时间</string>
+    <string name="webviewError">加载WebView错误，已停止显示帮助窗口。\\n该错误并不影响正常功能运行，且开发者仅在模拟器上遇到过，如果出现此对话框请与开发者联系。</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
new file mode 100644
index 0000000..85614c3
--- /dev/null
+++ b/app/src/main/res/values-zh/strings.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">照片時間修復</string>
+    <string name="about">幫助</string>
+    <string name="endLocation">結束位置</string>
+    <string name="exifSwitch">在批處理中使用Exif</string>
+    <string name="experimentalFunction">實驗性功能</string>
+    <string name="format">手動輸入格式</string>
+    <string name="fresh">刷新媒體庫</string>
+    <string name="imageContent">顯示選中的圖片</string>
+    <string name="java">模式一：Java</string>
+    <string name="nowdatetime">當前日期時間</string>
+    <string name="selectDate">選擇日期時間</string>
+    <string name="selectFile">選擇文件</string>
+    <string name="selectFolder">選擇文件夾</string>
+    <string name="shell">模式二：Shell</string>
+    <string name="showexif">查看EXIF</string>
+    <string name="start">開始</string>
+    <string name="startLocation">起始位置</string>
+    <string name="switchIcon">切換圖標</string>
+    <string name="test">兼容性測試</string>
+    <string name="batchOperation">批量操作</string>
+    <string name="singleFileOperation">單文件操作</string>
+    <string name="permissionDenied">存儲權限被拒絕</string>
+    <string name="shouldHavePermission">該應用必須被授予存儲權限才能正常工作</string>
+    <string name="OK">確定</string>
+    <string name="selectError">選擇出錯，請手動填寫路徑並聯繫開發者</string>
+    <string name="usingEXIF">使用EXIF時間</string>
+    <string name="cancel">取消</string>
+    <string name="fileNotExistence">路徑或文件不存在</string>
+    <string name="progress">進度</string>
+    <string name="checkRoot">請檢查root權限</string>
+    <string name="systemNotSupport">您的系統極有可能不支持此操作，請更換操作模式</string>
+    <string name="systemLimit">由於系統限制(其實是我懶)，請選擇文件夾內任意一張圖片</string>
+    <string name="notInstallCoolapk">未安裝酷安</string>
+    <string name="success">成功</string>
+    <string name="cannotFindTouch">\\ntouch命令不存在，請自行安裝Busybox或與作者聯繫以獲得幫助</string>
+    <string name="checkMode1Fault">\\n命令執行失敗,模式一：Java 不可用，請與作者聯繫以獲得幫助</string>
+    <string name="checkMode1Finish">\\n檢查完畢…模式一：Java 完全可用</string>
+    <string name="checkMode2Fault">\\n命令執行失敗，模式二：Shell 不可用，請與作者聯繫以獲得幫助</string>
+    <string name="checkMode2Finish">\\n檢查完畢…模式二：Shell 完全可用</string>
+    <string name="checkResult">\\n命令執行成功…檢查執行結果\\n</string>
+    <string name="checkTouch">\\n已獲取root權限…檢查touch命令\\ntouch —help\\n</string>
+    <string name="cleaning">\\n正在清理測試文件(/sdcard/CompatibilityTestFile)…</string>
+    <string name="creatingFile">\\n正在創建測試文件(/sdcard/CompatibilityTestFile)…</string>
+    <string name="fault">失敗\\n</string>
+    <string name="findTouch">\\n發現touch命令…檢查可用性\\ntouch /sdcard/CompatibilityTestFile -t 200409040521\\n</string>
+    <string name="finish">完成！</string>
+    <string name="getRootFault">獲取root權限失敗，模式二：Shell 不可用</string>
+    <string name="okToUseNew">確定以使用新版，取消使用舊版</string>
+    <string name="returnButCannotUse">\\n系統返回執行成功卻未生效</string>
+    <string name="runningTest">正在運行兼容性測試…</string>
+    <string name="setDelay">設置延時</string>
+    <string name="startCheckMode2">\\n開始執行 模式二：Shell 可用性檢查…正在檢查root權限</string>
+    <string name="startMode1">\\n開始執行 模式一：Java 可用性檢查…正在檢查root權限</string>
+    <string name="webviewError">加載WebView錯誤，已停止顯示幫助窗口。 \\n該錯誤並不影響正常功能運行，且開發者僅在模擬器上遇到過，如果出現此對話框請與開發者聯繫。</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d1f4728..c5b35fb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,24 +1,59 @@
 <resources>
-    <string name="app_name">照片时间修复</string>
-    <string name="selectFolder">选择文件夹</string>
-    <string name="sdcard_dcim_camera">/sdcard/DCIM/Camera</string>
-    <string name="startLocation">起始位置</string>
-    <string name="_0">0</string>
-    <string name="endLocation">结束位置</string>
-    <string name="java">模式一：Java</string>
-    <string name="shell">模式二：Shell</string>
-    <string name="format">手动输入格式</string>
-    <string name="img_yyyymmddhhmm_hhmmss_jpg">IMG_yyyyMMddHHmm_HHmmss.jpg</string>
-    <string name="start">开始</string>
-    <string name="about">帮助</string>
-    <string name="fresh">刷新媒体库</string>
-    <string name="selectFile">选择文件</string>
-    <string name="selectDate">选择日期时间</string>
-    <string name="nowdatetime">当前日期时间</string>
-    <string name="imageContent">show the image selected</string>
-    <string name="showexif">查看EXIF</string>
-    <string name="switchIcon">切换图标</string>
-    <string name="test">兼容性测试</string>
-    <string name="exifSwitch">在批处理中使用Exif</string>
-    <string name="experimentalFunction">实验性功能</string>
+    <string name="app_name">Photo Time Fix</string>
+    <string name="selectFolder">Select folder</string>
+    <string name="sdcard_dcim_camera" translatable="false">/sdcard/DCIM/Camera</string>
+    <string name="startLocation">Starting point</string>
+    <string name="_0" translatable="false">0</string>
+    <string name="java">Mode 1: Java</string>
+    <string name="shell">Mode 2: Shell</string>
+    <string name="format">Manual input format</string>
+    <string name="img_yyyymmddhhmm_hhmmss_jpg" translatable="false">IMG_yyyyMMddHHmm_HHmmss.jpg</string>
+    <string name="start">Start</string>
+    <string name="about">Help</string>
+    <string name="fresh">Refresh Media Library</string>
+    <string name="selectFile">Select file</string>
+    <string name="selectDate">Select date and time</string>
+    <string name="nowdatetime">Current date time</string>
+    <string name="showexif">View EXIF</string>
+    <string name="switchIcon">Toggle icon</string>
+    <string name="test">Compatibility test</string>
+    <string name="exifSwitch">Using Exif in the batch</string>
+    <string name="experimentalFunction">Experimental function</string>
+    <string name="imageContent">Show selected picture</string>
+    <string name="endLocation">End Position</string>
+    <string name="batchOperation">Batch operation</string>
+    <string name="singleFileOperation">Single file operation</string>
+    <string name="permissionDenied">Storage permission denied</string>
+    <string name="shouldHavePermission">The app must be granted storage permissions to work properly</string>
+    <string name="OK">OK</string>
+    <string name="selectError">Selection error, please fill in the path manually and contact the developer</string>
+    <string name="usingEXIF">Use EXIF time</string>
+    <string name="cancel">Cancel</string>
+    <string name="fileNotExistence">Path or file does not exist</string>
+    <string name="progress">progress</string>
+    <string name="checkRoot">Please check root permissions</string>
+    <string name="systemNotSupport">Your system most likely does not support this operation, please change the operation mode</string>
+    <string name="finish">carry out!</string>
+    <string name="systemLimit">Due to system limitations (in fact I am lazy), please select any picture in the folder</string>
+    <string name="webviewError">Error loading WebView, the help window has stopped showing. \\nThis error does not affect the normal functioning, and the developer has only encountered it on the simulator. If this dialog box appears, please contact the developer.</string>
+    <string name="notInstallCoolapk">CoolApk is not installed</string>
+    <string name="setDelay">Set delay</string>
+    <string name="okToUseNew">OK to use the new version, cancel the old version</string>
+    <string name="runningTest">Running compatibility test …</string>
+    <string name="creatingFile">\\nCreating test file(/sdcard/CompatibilityTestFile)…</string>
+    <string name="fault">Failed\\n</string>
+    <string name="success">success</string>
+    <string name="startMode1">\\nStart execution Mode 1: Java availability check … Checking root permissions</string>
+    <string name="checkResult">\\nCommand executed successfully … check execution result\\n</string>
+    <string name="checkMode1Finish">\\nChecked … Mode 1: Java is fully available</string>
+    <string name="returnButCannotUse">\\nThe system returned to execute successfully but did not take effect</string>
+    <string name="checkMode1Fault">\\nCommand execution failed, mode one: Java is not available, please contact the author for help</string>
+    <string name="checkTouch">\\nRooted … check touch command \\ntouch —help\\n</string>
+    <string name="findTouch">\\nFind touch command … check availability\\ntouch /sdcard/CompatibilityTestFile -t 200409040521\\n</string>
+    <string name="checkMode2Finish">\\nChecked … Mode 2: Shell is fully available</string>
+    <string name="checkMode2Fault">\\nCommand execution failed, Mode 2: Shell is unavailable, please contact the author for help</string>
+    <string name="getRootFault">Failed to obtain root permissions, Mode 2: Shell is unavailable</string>
+    <string name="cleaning">\\nCleaning up test files(/sdcard/CompatibilityTestFile)…</string>
+    <string name="cannotFindTouch">\\ntouch command does not exist, please install Busybox yourself or contact the author for help</string>
+    <string name="startCheckMode2">\\nStart execution Mode 2: Shell availability check … Checking root permissions</string>
 </resources>
diff --git a/build.gradle b/build.gradle
index 8d0f86b..0637c9f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,9 +11,9 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.20"
-        classpath "org.jetbrains.kotlin:kotlin-android-extensions:1.3.20"
+        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50"
+        classpath "org.jetbrains.kotlin:kotlin-android-extensions:1.3.50"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3dc9ac5..9f67d3e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jan 17 23:48:34 CST 2019
+#Fri Dec 06 18:07:30 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/proguard-rules.pro b/proguard-rules.pro
new file mode 100644
index 0000000..aebe4c6
--- /dev/null
+++ b/proguard-rules.pro
@@ -0,0 +1 @@
+-keep class com.topjohnwu.*{*;}
\ No newline at end of file