From b85b2afd356ee1f8d12b8698d66043acc2be0781 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Thu, 4 Apr 2024 13:51:38 +0530
Subject: [PATCH] AboutFragment: Format app version name and code properly

Appending version code to name confuses users regarding version they are using.

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
 app/src/main/java/com/aurora/store/MainActivity.kt         | 7 +++++--
 .../java/com/aurora/store/view/ui/about/AboutFragment.kt   | 6 +++++-
 app/src/main/res/values/strings.xml                        | 3 +++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/MainActivity.kt b/app/src/main/java/com/aurora/store/MainActivity.kt
index fd93817e5..7d9b4cedc 100644
--- a/app/src/main/java/com/aurora/store/MainActivity.kt
+++ b/app/src/main/java/com/aurora/store/MainActivity.kt
@@ -205,8 +205,11 @@ class MainActivity : AppCompatActivity() {
                 transformations(RoundedCornersTransformation(8F))
             }
             it.findViewById<TextView>(R.id.txt_name)?.text = getString(R.string.app_name)
-            it.findViewById<TextView>(R.id.txt_email)?.text =
-                ("v${BuildConfig.VERSION_NAME}.${BuildConfig.VERSION_CODE}")
+            it.findViewById<TextView>(R.id.txt_email)?.text = getString(
+                R.string.version,
+                BuildConfig.VERSION_NAME,
+                BuildConfig.VERSION_CODE
+            )
         }
 
         appConfig = AppBarConfiguration.Builder(topLevelFrags.toSet())
diff --git a/app/src/main/java/com/aurora/store/view/ui/about/AboutFragment.kt b/app/src/main/java/com/aurora/store/view/ui/about/AboutFragment.kt
index caf8b9072..83634e2e1 100644
--- a/app/src/main/java/com/aurora/store/view/ui/about/AboutFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/about/AboutFragment.kt
@@ -54,7 +54,11 @@ class AboutFragment : Fragment(R.layout.fragment_about) {
 
         // About Details
         binding.imgIcon.load(R.mipmap.ic_launcher)
-        binding.line2.text = ("v${BuildConfig.VERSION_NAME}(${BuildConfig.VERSION_CODE})")
+        binding.line2.text = view.context.getString(
+            R.string.version,
+            BuildConfig.VERSION_NAME,
+            BuildConfig.VERSION_CODE
+        )
 
         binding.epoxyRecycler.layoutManager =
             LinearLayoutManager(view.context, RecyclerView.VERTICAL, false)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 48addffb5..2815bd05c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -428,4 +428,7 @@
     <string name="privacy_policy_title">Privacy policy</string>
     <string name="privacy_policy_subtitle">Learn how Aurora Store uses your data</string>
     <string name="disclaimer_subtitle">Accountability and responsibility</string>
+
+    <!-- AboutFragment -->
+    <string name="version" translatable="false">v<xliff:g id="version_name">%1$s</xliff:g> (<xliff:g id="version_code">%2$d</xliff:g>)</string>
 </resources>