Updater: Remove File MD5, Fix Typo, Enable per app language support a…

…nd Adjust UI (#8) Co-authored-by: YuKongA <[email protected]>
YuKongA · Dec 29, 2023 · 9702d3d · 9702d3d
1 parent 2da2673
commit 9702d3d
Show file tree

Hide file tree

Showing 10 changed files with 159 additions and 158 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -44,6 +44,7 @@ android {
         }
         debug {
             if (keystorePath != null) signingConfig = signingConfigs.getByName("release")
+            applicationIdSuffix = ".debug"
         }
     }
     compileOptions {
@@ -63,6 +64,9 @@ android {
         viewBinding = true
         buildConfig = true
     }
+    androidResources {
+        generateLocaleConfig = true
+    }
     packaging {
         resources {
             excludes += "**"

diff --git a/app/src/main/kotlin/top/yukonga/update/ui/MainActivity.kt b/app/src/main/kotlin/top/yukonga/update/ui/MainActivity.kt
@@ -206,15 +206,15 @@ class MainActivity : AppCompatActivity() {
                 )
 
                 val secondViewTitleArray = arrayOf(
-                    bigVersion, filename, filesize, filemd5, download, changelog, secondInfo
+                    bigVersion, filename, filesize, download, changelog, secondInfo
                 )
 
                 val firstViewContentArray = arrayOf(
                     codenameInfo, systemInfo, codebaseInfo, branchInfo
                 )
 
                 val secondViewContentArray = arrayOf(
-                    bigVersionInfo, filenameInfo, filesizeInfo, filemd5Info, changelogInfo
+                    bigVersionInfo, filenameInfo, filesizeInfo, changelogInfo
                 )
 
                 CoroutineScope(Dispatchers.Default).launch {
@@ -297,7 +297,6 @@ class MainActivity : AppCompatActivity() {
 
                                 filenameInfo.setTextAnimation(recoveryRomInfo.currentRom.filename)
                                 filesizeInfo.setTextAnimation(recoveryRomInfo.currentRom.filesize)
-                                filemd5Info.setTextAnimation(recoveryRomInfo.currentRom.md5)
 
                                 val officialLink = if (recoveryRomInfo.currentRom.md5 == recoveryRomInfo.latestRom?.md5) getString(
                                     R.string.official1_link, recoveryRomInfo.currentRom.version, recoveryRomInfo.latestRom.filename

diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
@@ -16,8 +16,8 @@
             android:id="@+id/topAppBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginEnd="28dp"
+            android:paddingStart="20dp"
+            android:paddingEnd="24dp"
             app:layout_scrollEffect="compress"
             app:layout_scrollFlags="scroll|enterAlways|snap"
             app:menu="@menu/top_app_bar"

diff --git a/app/src/main/res/layout-land/main_content.xml b/app/src/main/res/layout-land/main_content.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -17,8 +17,8 @@
             android:id="@+id/topAppBar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="20dp"
+            android:paddingStart="12dp"
+            android:paddingEnd="16dp"
             app:layout_scrollEffect="compress"
             app:layout_scrollFlags="scroll|enterAlways|snap"
             app:menu="@menu/top_app_bar"

diff --git a/app/src/main/res/layout/main_content.xml b/app/src/main/res/layout/main_content.xml
diff --git a/app/src/main/res/resources.properties b/app/src/main/res/resources.properties
@@ -0,0 +1 @@
+unqualifiedResLocale=en-US
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -13,7 +13,7 @@
     <string name="filesize">文件大小</string>
     <string name="download">下载链接</string>
     <string name="changelog">更新日志</string>
-    <string name="branch">分支</string>
+    <string name="branch">版本分支</string>
     <string name="toast_no_info">未获取到有效信息！</string>
     <string name="toast_copied_to_pasteboard">已复制到剪贴板</string>
     <string name="account">账号</string>
@@ -34,8 +34,7 @@
     <string name="confirm">确定</string>
     <string name="logout_successful">登出成功</string>
     <string name="logout_desc">确定要登出么？</string>
-    <string name="filemd5">文件MD5</string>
     <string name="regions_code">区域代号</string>
-    <string name="login_expired">检测到登录已过期，建议重新登录</string>
+    <string name="login_expired">检测到登录已过期，建议重新登录。</string>
     <string name="global">全球账号</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -13,7 +13,7 @@
     <string name="filesize">檔案大小</string>
     <string name="download">下載連結</string>
     <string name="changelog">更新日誌</string>
-    <string name="branch">分支</string>
+    <string name="branch">版本分支</string>
     <string name="toast_no_info">未取得到有效讯息！</string>
     <string name="toast_copied_to_pasteboard">已複製到剪貼簿</string>
     <string name="account">帳戶</string>
@@ -34,8 +34,7 @@
     <string name="confirm">確定</string>
     <string name="logout_successful">登出成功</string>
     <string name="logout_desc">確定要登出麼？</string>
-    <string name="filemd5">檔案MD5</string>
     <string name="regions_code">區域代號</string>
-    <string name="login_expired">偵測到登陸已過期，建議重新登陸</string>
+    <string name="login_expired">偵測到登陸已過期，建議重新登陸。</string>
     <string name="global">全球帳戶</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -42,9 +42,8 @@
     <string name="logout">Logout</string>
     <string name="confirm">Confirm</string>
     <string name="logout_successful">Logout successful</string>
-    <string name="logout_desc">Are you sure you want to logouy?</string>
-    <string name="filemd5">File MD5</string>
+    <string name="logout_desc">Are you sure you want to logout?</string>
     <string name="regions_code">Regions code</string>
-    <string name="login_expired">Checked that the login has expired. It is recommended to log in again</string>
+    <string name="login_expired">Checked that the login has expired. It is recommended to log in again.</string>
     <string name="global">Global account</string>
 </resources>