From d6d267d7f6b75c6a0a7e35a06b215fb6b6e03c8f Mon Sep 17 00:00:00 2001
From: tehcneko <7764726+tehcneko@users.noreply.github.com>
Date: Mon, 12 Apr 2021 19:52:32 +0800
Subject: [PATCH] [app] Fix version in about dialog (#479)

---
 app/build.gradle.kts                                          | 1 -
 .../java/org/lsposed/manager/ui/activity/MainActivity.java    | 2 ++
 app/src/main/res/layout/dialog_about.xml                      | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e33c5d34..72e29b2b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -55,7 +55,6 @@ android {
         versionCode(verCode)
         versionName(verName)
         resConfigs("en", "zh-rCN", "zh-rTW", "zh-rHK", "ru", "uk", "nl", "ko", "fr", "de", "it", "pt")
-        resValue("string", "versionName", verName)
     }
 
     compileOptions {
diff --git a/app/src/main/java/org/lsposed/manager/ui/activity/MainActivity.java b/app/src/main/java/org/lsposed/manager/ui/activity/MainActivity.java
index 13effaed..20fcb963 100644
--- a/app/src/main/java/org/lsposed/manager/ui/activity/MainActivity.java
+++ b/app/src/main/java/org/lsposed/manager/ui/activity/MainActivity.java
@@ -32,6 +32,7 @@ import androidx.core.text.HtmlCompat;
 import com.bumptech.glide.Glide;
 import com.google.android.material.snackbar.Snackbar;
 
+import org.lsposed.manager.BuildConfig;
 import org.lsposed.manager.ConfigManager;
 import org.lsposed.manager.R;
 import org.lsposed.manager.databinding.ActivityMainBinding;
@@ -83,6 +84,7 @@ public class MainActivity extends BaseActivity {
             binding.translators.setMovementMethod(LinkMovementMethod.getInstance());
             binding.translators.setTransformationMethod(new LinkTransformationMethod(this));
             binding.translators.setText(HtmlCompat.fromHtml(getString(R.string.about_translators, getString(R.string.translators)), HtmlCompat.FROM_HTML_MODE_LEGACY));
+            binding.version.setText(String.format(Locale.US, "%s (%s)", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE));
             new BlurBehindDialogBuilder(this)
                     .setView(binding.getRoot())
                     .show();
diff --git a/app/src/main/res/layout/dialog_about.xml b/app/src/main/res/layout/dialog_about.xml
index 5ba2e574..8855ff58 100644
--- a/app/src/main/res/layout/dialog_about.xml
+++ b/app/src/main/res/layout/dialog_about.xml
@@ -77,9 +77,9 @@
         android:paddingBottom="?android:dialogPreferredPadding">
 
         <TextView
+            android:id="@+id/version"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/versionName"
             android:textSize="14sp" />
 
         <TextView
@@ -101,4 +101,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>