Show version number in settings

Author: joreilly

fastlane/Fastfile

@@ -4,8 +4,8 @@ default_platform :android
 
 platform :android do
 
-    androidVersionNum = 255
-    wearVersionNum = 330
+    androidVersionNum = 257
+    wearVersionNum = 332
 
     before_all do
     end

shared/src/androidMain/kotlin/dev/johnoreilly/confetti/di/KoinAndroid.kt

@@ -6,6 +6,7 @@
 
 package dev.johnoreilly.confetti.di
 
+import android.app.Application
 import android.content.Context
 import android.os.Build
 import androidx.core.app.NotificationManagerCompat
@@ -30,6 +31,7 @@ import com.russhwolf.settings.datastore.DataStoreSettings
 import dev.johnoreilly.confetti.analytics.AnalyticsLogger
 import dev.johnoreilly.confetti.analytics.AndroidLoggingAnalyticsLogger
 import dev.johnoreilly.confetti.analytics.FirebaseAnalyticsLogger
+import dev.johnoreilly.confetti.appconfig.ApplicationInfo
 import dev.johnoreilly.confetti.settings.WearSettingsSerializer
 import dev.johnoreilly.confetti.shared.BuildConfig
 import dev.johnoreilly.confetti.utils.AndroidDateService
@@ -120,6 +122,8 @@ actual fun platformModule() = module {
     single<NotificationSender> {
         get<SessionNotificationSender>()
     }
+
+    single<ApplicationInfo> { getApplicationInfo(get()) }
 }
 
 val Context.settingsStore by preferencesDataStore("settings")
@@ -140,4 +144,11 @@ private val Context.versionCode: String
                 it.versionCode
             }
         }.toString()
-    }
+    }
+
+
+private fun getApplicationInfo(application: Application): ApplicationInfo {
+    val packageManager = application.packageManager
+    val versionName = packageManager.getPackageInfo(application.packageName, 0).versionName ?: ""
+    return ApplicationInfo(versionName)
+}

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/appconfig/ApplicationInfo.kt

@@ -0,0 +1,5 @@
+package dev.johnoreilly.confetti.appconfig
+
+data class ApplicationInfo(
+    val versionName: String
+)

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/SettingsComponent.kt

@@ -5,6 +5,7 @@ package dev.johnoreilly.confetti.decompose
 import com.arkivanov.decompose.ComponentContext
 import com.russhwolf.settings.ExperimentalSettingsApi
 import dev.johnoreilly.confetti.AppSettings
+import dev.johnoreilly.confetti.appconfig.ApplicationInfo
 import dev.johnoreilly.confetti.auth.Authentication
 import dev.johnoreilly.confetti.work.NotificationSender
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -16,6 +17,8 @@ import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 
 data class DeveloperSettings(
     val token: String?
@@ -42,6 +45,7 @@ interface SettingsComponent {
 
     val developerSettings: StateFlow<DeveloperSettings?>
     val userEditableSettings: StateFlow<UserEditableSettings?>
+    val applicationInfo: ApplicationInfo
 
     fun updateDarkThemeConfig(darkThemeConfig: DarkThemeConfig)
     fun updateUseExperimentalFeatures(value: Boolean)
@@ -51,15 +55,17 @@ interface SettingsComponent {
     val supportsNotifications: Boolean
 }
 
+@OptIn(ExperimentalSettingsApi::class)
 class DefaultSettingsComponent(
     componentContext: ComponentContext,
     private val appSettings: AppSettings,
     private val authentication: Authentication,
     private val notificationSender: NotificationSender?,
-) : SettingsComponent, ComponentContext by componentContext {
+) : SettingsComponent, KoinComponent, ComponentContext by componentContext {
 
     private val coroutineScope = coroutineScope()
     private val settings = appSettings.settings
+    override val applicationInfo: ApplicationInfo by inject()
 
     override val developerSettings: StateFlow<DeveloperSettings?> = appSettings.developerModeFlow().flatMapLatest {
         if (!it) {

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/settings/SettingsUI.kt

@@ -51,6 +51,7 @@ import confetti.shared.generated.resources.settings_boolean_false
 import confetti.shared.generated.resources.settings_boolean_true
 import confetti.shared.generated.resources.settings_title
 import confetti.shared.generated.resources.use_experimental_features
+import dev.johnoreilly.confetti.appconfig.ApplicationInfo
 import dev.johnoreilly.confetti.decompose.DarkThemeConfig
 import dev.johnoreilly.confetti.decompose.DeveloperSettings
 import dev.johnoreilly.confetti.decompose.SettingsComponent
@@ -65,11 +66,13 @@ fun SettingsUI(
 ) {
     val userEditableSettings by component.userEditableSettings.collectAsStateWithLifecycle()
     val developerSettings by component.developerSettings.collectAsStateWithLifecycle()
+
     SettingsUI(
         userEditableSettings = userEditableSettings,
         onChangeDarkThemeConfig = component::updateDarkThemeConfig,
         onChangeUseExperimentalFeatures = component::updateUseExperimentalFeatures,
         developerSettings = developerSettings,
+        applicationInfo = component.applicationInfo,
         onEnableDeveloperMode = component::enableDeveloperMode,
         onSendNotifications = component::sendNotifications,
         supportsNotifications = component.supportsNotifications,
@@ -84,6 +87,7 @@ fun SettingsUI(
     onChangeUseExperimentalFeatures: (value: Boolean) -> Unit,
     onChangeDarkThemeConfig: (darkThemeConfig: DarkThemeConfig) -> Unit,
     developerSettings: DeveloperSettings?,
+    applicationInfo: ApplicationInfo,
     onEnableDeveloperMode: () -> Unit,
     onSendNotifications: () -> Unit,
     supportsNotifications: Boolean,
@@ -203,8 +207,7 @@ fun SettingsUI(
                         Modifier.fillMaxWidth(),
                         horizontalAlignment = Alignment.CenterHorizontally,
                     ) {
-                        // Keep version so developer mode is accessible
-                        Text("Version: ")
+                        Text("Version: ${applicationInfo.versionName}")
                     }
                 }
             }

shared/src/iosMain/kotlin/dev/johnoreilly/confetti/di/KoiniOS.kt

@@ -12,6 +12,7 @@ import com.russhwolf.settings.ExperimentalSettingsApi
 import com.russhwolf.settings.NSUserDefaultsSettings
 import com.russhwolf.settings.ObservableSettings
 import com.russhwolf.settings.coroutines.toFlowSettings
+import dev.johnoreilly.confetti.appconfig.ApplicationInfo
 import dev.johnoreilly.confetti.auth.Authentication
 import dev.johnoreilly.confetti.dev.johnoreilly.confetti.work.SessionNotificationSender
 import dev.johnoreilly.confetti.utils.DateService
@@ -20,6 +21,7 @@ import dev.johnoreilly.confetti.work.NotificationSender
 import org.koin.core.module.dsl.bind
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
+import platform.Foundation.NSBundle
 import platform.Foundation.NSUserDefaults
 
 
@@ -36,10 +38,18 @@ actual fun platformModule() = module {
             .addHttpInterceptor(ApolloClientAwarenessInterceptor("confetti-ios", "fixme"))
     }
     single<NotificationSender> { SessionNotificationSender() }
+
+    single<ApplicationInfo> { getApplicationInfo() }
 }
 
 actual fun getNormalizedCacheFactory(conference: String, uid: String?): NormalizedCacheFactory {
     val sqlNormalizedCacheFactory = SqlNormalizedCacheFactory("$conference$uid.db")
     return MemoryCacheFactory(10 * 1024 * 1024)
         .chain(sqlNormalizedCacheFactory)
+}
+
+private fun getApplicationInfo(): ApplicationInfo {
+    val versionName = NSBundle.mainBundle.infoDictionary
+        ?.get("CFBundleShortVersionString") as? String ?: ""
+    return ApplicationInfo(versionName)
 }