Merge pull request #88 from CrisisCleanup/version-info

Update version info in Menu
CrisisCleanup · Sep 7, 2023 · 31d5def · 31d5def
2 parents 8badf46 + 79aeb11
commit 31d5def
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/app/src/main/java/com/crisiscleanup/CrisisCleanupAppEnv.kt b/app/src/main/java/com/crisiscleanup/CrisisCleanupAppEnv.kt
@@ -12,6 +12,17 @@ class CrisisCleanupAppEnv @Inject constructor() : AppEnv {
 
     override val isEarlybird = BuildConfig.IS_EARLYBIRD_BUILD
 
+    override val apiEnvironment: String
+        get() {
+            val apiUrl = BuildConfig.API_BASE_URL
+            return when {
+                apiUrl.startsWith("https://api.dev.crisiscleanup.io") -> "Dev"
+                apiUrl.startsWith("https://api.staging.crisiscleanup.io") -> "Staging"
+                apiUrl.startsWith("https://api.crisiscleanup.org") -> "Production"
+                else -> "Local?"
+            }
+        }
+
     override fun runInNonProd(block: () -> Unit) {
         if (isNotProduction) {
             block()

diff --git a/core/common/src/main/java/com/crisiscleanup/core/common/AppEnv.kt b/core/common/src/main/java/com/crisiscleanup/core/common/AppEnv.kt
@@ -5,5 +5,7 @@ interface AppEnv {
     val isProduction: Boolean
     val isNotProduction: Boolean
     val isEarlybird: Boolean
+
+    val apiEnvironment: String
     fun runInNonProd(block: () -> Unit)
 }
diff --git a/feature/menu/src/main/java/com/crisiscleanup/feature/menu/MenuViewModel.kt b/feature/menu/src/main/java/com/crisiscleanup/feature/menu/MenuViewModel.kt
@@ -28,7 +28,7 @@ class MenuViewModel @Inject constructor(
     private val accountDataRefresher: AccountDataRefresher,
     private val appVersionProvider: AppVersionProvider,
     private val appPreferencesRepository: LocalAppPreferencesRepository,
-    appEnv: AppEnv,
+    private val appEnv: AppEnv,
     private val syncPuller: SyncPuller,
     private val databaseVersionProvider: DatabaseVersionProvider,
     @ApplicationScope private val externalScope: CoroutineScope,
@@ -40,11 +40,7 @@ class MenuViewModel @Inject constructor(
     val versionText: String
         get() {
             val version = appVersionProvider.version
-            return if (isNotProduction) {
-                "${version.second} (${version.first})"
-            } else {
-                version.second
-            }
+            return "${version.second} (${version.first}) ${appEnv.apiEnvironment} Android"
         }
 
     val databaseVersionText: String