mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-11-01 07:13:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed the badge issue & made the badge clickable

Browse source
This commit is contained in:
Neel Doshi 2024-12-02 01:07:41 +05:30
parent 21af5b4627
commit eef23f0c24
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -47,7 +47,7 @@ dependencies {
implementation 'com.jakewharton.timber:timber:4.7.1' implementation 'com.jakewharton.timber:timber:4.7.1'
implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0' 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 'com.karumi:dexter:5.0.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'

9
app/src/main/java/fr/free/nrw/commons/profile/achievements/AchievementsFragment.kt
View file

@ -68,9 +68,9 @@ class AchievementsFragment : CommonsDaggerSupportFragment(){
binding.imagesUploadInfoIcon.setOnClickListener { showUploadInfo() } binding.imagesUploadInfoIcon.setOnClickListener { showUploadInfo() }
binding.imagesRevertedInfoIcon.setOnClickListener { showRevertedInfo() } binding.imagesRevertedInfoIcon.setOnClickListener { showRevertedInfo() }
binding.imagesUsedByWikiInfoIcon.setOnClickListener { showUsedByWikiInfo() } binding.imagesUsedByWikiInfoIcon.setOnClickListener { showUsedByWikiInfo() }
//binding.imagesNearbyInfoIcon.setOnClickListener { showImagesViaNearbyInfo() } binding.wikidataEditsIcon.setOnClickListener { showImagesViaNearbyInfo() }
//binding.imagesFeaturedInfoIcon.setOnClickListener { showFeaturedImagesInfo() } binding.featuredImageIcon.setOnClickListener { showFeaturedImagesInfo() }
//binding.thanksReceivedInfoIcon.setOnClickListener { showThanksReceivedInfo() } binding.thanksImageIcon.setOnClickListener { showThanksReceivedInfo() }
binding.qualityImageIcon.setOnClickListener { showQualityImagesInfo() } binding.qualityImageIcon.setOnClickListener { showQualityImagesInfo() }
// DisplayMetrics used to fetch the size of the screen // DisplayMetrics used to fetch the size of the screen
@ -345,7 +345,6 @@ class AchievementsFragment : CommonsDaggerSupportFragment(){
* and assign badge and level. Also stores the achievements level of the user in BasicKvStore to display in menu * and assign badge and level. Also stores the achievements level of the user in BasicKvStore to display in menu
* @param achievements * @param achievements
*/ */
// @OptIn(ExperimentalBadgeUtils::class)
private fun inflateAchievements(achievements: Achievements) { private fun inflateAchievements(achievements: Achievements) {
// Thanks Received Badge // Thanks Received Badge
@ -412,7 +411,7 @@ class AchievementsFragment : CommonsDaggerSupportFragment(){
badgeDrawable.badgeGravity = badgeGravity badgeDrawable.badgeGravity = badgeGravity
badgeDrawable.badgeTextColor = badgeTextColor badgeDrawable.badgeTextColor = badgeTextColor
badgeDrawable.backgroundColor = backgroundColor badgeDrawable.backgroundColor = backgroundColor
BadgeUtils.attachBadgeDrawable(badgeDrawable, binding.wikidataEditsIcon) BadgeUtils.attachBadgeDrawable(badgeDrawable, view)
view.getViewTreeObserver().removeOnGlobalLayoutListener(this) view.getViewTreeObserver().removeOnGlobalLayoutListener(this)
} }
}) })

8
app/src/main/res/layout/fragment_achievements.xml
View file

@ -396,7 +396,7 @@
android:id="@+id/wikidata_edits_icon" android:id="@+id/wikidata_edits_icon"
android:layout_width="@dimen/dimen_40" android:layout_width="@dimen/dimen_40"
android:layout_height="@dimen/dimen_40" android:layout_height="@dimen/dimen_40"
android:layout_marginEnd="@dimen/medium_width" android:layout_marginEnd="@dimen/large_gap"
app:srcCompat="@drawable/ic_custom_map_marker" /> app:srcCompat="@drawable/ic_custom_map_marker" />
<!--Featured Image Statistics--> <!--Featured Image Statistics-->
@ -404,7 +404,7 @@
android:id="@+id/featured_image_icon" android:id="@+id/featured_image_icon"
android:layout_width="@dimen/dimen_40" android:layout_width="@dimen/dimen_40"
android:layout_height="@dimen/dimen_40" android:layout_height="@dimen/dimen_40"
android:layout_marginEnd="@dimen/medium_width" android:layout_marginEnd="@dimen/large_gap"
app:srcCompat="@drawable/featured" /> app:srcCompat="@drawable/featured" />
<!--Quality Image Statistics--> <!--Quality Image Statistics-->
@ -412,7 +412,7 @@
android:id="@+id/quality_image_icon" android:id="@+id/quality_image_icon"
android:layout_width="@dimen/dimen_40" android:layout_width="@dimen/dimen_40"
android:layout_height="@dimen/dimen_40" android:layout_height="@dimen/dimen_40"
android:layout_marginEnd="@dimen/medium_width" android:layout_marginEnd="@dimen/large_gap"
app:srcCompat="@drawable/ic_quality_images_logo" /> app:srcCompat="@drawable/ic_quality_images_logo" />
<!--Thank Image Statistics--> <!--Thank Image Statistics-->
@ -421,7 +421,7 @@
android:layout_width="@dimen/dimen_40" android:layout_width="@dimen/dimen_40"
android:layout_height="@dimen/dimen_40" android:layout_height="@dimen/dimen_40"
android:layout_marginEnd="@dimen/medium_width" android:layout_marginEnd="@dimen/large_gap"
app:srcCompat="@drawable/ic_thanks" /> app:srcCompat="@drawable/ic_thanks" />