Skip to content

Commit a8387f0

Browse files
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 <nicolas.raoul@gmail.com>
1 parent ae52267 commit a8387f0

File tree

9 files changed

+944
-1132
lines changed

9 files changed

+944
-1132
lines changed

app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ dependencies {
4747

4848
implementation 'com.jakewharton.timber:timber:4.7.1'
4949
implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0'
50-
implementation "com.google.android.material:material:1.9.0"
50+
implementation "com.google.android.material:material:1.12.0"
5151
implementation 'com.karumi:dexter:5.0.0'
5252
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
5353

app/src/main/java/fr/free/nrw/commons/navtab/MoreBottomSheetFragment.kt

+11-3
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,18 @@ class MoreBottomSheetFragment : BottomSheetDialogFragment() {
111111
private fun setUserName() {
112112
val store = BasicKvStore(requireContext(), getUserName())
113113
val level = store.getString("userAchievementsLevel", "0")
114-
binding?.moreProfile?.text = if (level == "0") {
115-
"${getUserName()} (${getString(R.string.see_your_achievements)})"
114+
if (level == "0"){
115+
binding?.moreProfile?.text = getString(
116+
R.string.profileLevel,
117+
getUserName(),
118+
getString(R.string.see_your_achievements) // Second argument
119+
)
116120
} else {
117-
"${getUserName()} (${getString(R.string.level)} $level)"
121+
binding?.moreProfile?.text = getString(
122+
R.string.profileLevel,
123+
getUserName(),
124+
level
125+
)
118126
}
119127
}
120128

app/src/main/java/fr/free/nrw/commons/profile/ProfileActivity.java

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import androidx.core.content.FileProvider;
1717
import androidx.fragment.app.Fragment;
1818
import androidx.fragment.app.FragmentManager;
19-
import com.google.android.material.tabs.TabLayout;
2019
import fr.free.nrw.commons.R;
2120
import fr.free.nrw.commons.Utils;
2221
import fr.free.nrw.commons.ViewPagerAdapter;

0 commit comments

Comments
 (0)