Bug Fixs & Enhancement of Achievement Screen (commons-app#5666)

* Rename AchievementFragment from `.java` to `.kt` * Migrated AchievementFragment to kotlin * Revamped Achievement Screen * fixed AchievementFragment Unit Test * fixed Level on MoreBottomSheetFragment * Implemented Badge and Minor Code Refactor * Fixed the badge issue & made the badge clickable * Removed Redundant XML Code & Converted badges to green color and added values inside it * Fixed : showSnackBarWithRetry Test * Fixed : Theme issues on Light Mode --------- Co-authored-by: Nicolas Raoul <[email protected]>
neeldoshii · Dec 6, 2024 · a8387f0 · a8387f0
1 parent ae52267
commit a8387f0
Show file tree

Hide file tree

Showing 9 changed files with 944 additions and 1,132 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -47,7 +47,7 @@ dependencies {
 
     implementation 'com.jakewharton.timber:timber:4.7.1'
     implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'
-    implementation "com.google.android.material:material:1.9.0"
+    implementation "com.google.android.material:material:1.12.0"
     implementation 'com.karumi:dexter:5.0.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 

diff --git a/app/src/main/java/fr/free/nrw/commons/navtab/MoreBottomSheetFragment.kt b/app/src/main/java/fr/free/nrw/commons/navtab/MoreBottomSheetFragment.kt
@@ -111,10 +111,18 @@ class MoreBottomSheetFragment : BottomSheetDialogFragment() {
     private fun setUserName() {
         val store = BasicKvStore(requireContext(), getUserName())
         val level = store.getString("userAchievementsLevel", "0")
-        binding?.moreProfile?.text = if (level == "0") {
-            "${getUserName()} (${getString(R.string.see_your_achievements)})"
+        if (level == "0"){
+            binding?.moreProfile?.text = getString(
+                R.string.profileLevel,
+                getUserName(),
+                getString(R.string.see_your_achievements) // Second argument
+            )
         } else {
-            "${getUserName()} (${getString(R.string.level)} $level)"
+            binding?.moreProfile?.text = getString(
+                R.string.profileLevel,
+                getUserName(),
+                level
+            )
         }
     }
 

diff --git a/app/src/main/java/fr/free/nrw/commons/profile/ProfileActivity.java b/app/src/main/java/fr/free/nrw/commons/profile/ProfileActivity.java
@@ -16,7 +16,6 @@
 import androidx.core.content.FileProvider;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
-import com.google.android.material.tabs.TabLayout;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
 import fr.free.nrw.commons.ViewPagerAdapter;