all: smoother challenge cap (fixes #4803) (#4804)

Co-authored-by: dogi <[email protected]>
open-learning-exchange · Nov 25, 2024 · 9c6a888 · 9c6a888
1 parent 2a21f84
commit 9c6a888
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.ole.planet.myplanet"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 2109
-        versionName "0.21.9"
+        versionCode 2110
+        versionName "0.21.10"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt
@@ -393,7 +393,7 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
     }
 
     private fun calculateProgress(allVoiceCount: Int): Int {
-        return (allVoiceCount) * 5
+        return (allVoiceCount * 5).coerceAtMost(500)
     }
 
     private fun setupRealmListeners() {

diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt.lite b/app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt.lite
@@ -393,7 +393,7 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
     }
 
     private fun calculateProgress(allVoiceCount: Int): Int {
-        return (allVoiceCount) * 5
+        return (allVoiceCount * 5).coerceAtMost(500)
     }
 
     private fun setupRealmListeners() {

diff --git a/app/src/main/java/org/ole/planet/myplanet/utilities/MarkdownDialog.kt b/app/src/main/java/org/ole/planet/myplanet/utilities/MarkdownDialog.kt
@@ -81,9 +81,8 @@ class MarkdownDialog : DialogFragment() {
         setupCloseButton()
 
         val earnedDollars = allVoiceCount * 5
-        val progressValue = ((earnedDollars.toDouble() / 500) * 100).toInt()
+        val progressValue = ((earnedDollars.toDouble() / 500) * 100).toInt().coerceAtMost(100)
         dialogCampaignChallengeBinding.progressBar.progress = progressValue
-
     }
 
     override fun onStart() {