v4.1.0 - Remote freq control for Hamlib/SDR++, by londre7

data/src/main/java/com/rtbishop/look4sat/data/injection/MainContainer.kt

@@ -61,10 +61,6 @@ class MainContainer(private val context: Context) {
     val satelliteRepo = provideSatelliteRepo()
     val databaseRepo = provideDatabaseRepo()
 
-    fun provideAppVersionName(): String {
-        return context.packageManager.getPackageInfo(context.packageName, 0).versionName ?: "4.0.0"
-    }
-
     fun provideAddToCalendar(): IAddToCalendar = AddToCalendar(context)
 
     fun provideShowToast(): IShowToast = ShowToast(context)
@@ -111,6 +107,7 @@ class MainContainer(private val context: Context) {
         val manager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
         val appPrefsFileName = "${context.packageName}_preferences"
         val appPreferences = context.getSharedPreferences(appPrefsFileName, Context.MODE_PRIVATE)
-        return SettingsRepo(manager, appPreferences)
+        val appVersionName = context.packageManager.getPackageInfo(context.packageName, 0).versionName ?: "4.0.4"
+        return SettingsRepo(manager, appPreferences, appVersionName)
     }
 }

data/src/main/java/com/rtbishop/look4sat/data/repository/SettingsRepo.kt

@@ -39,7 +39,8 @@ import kotlinx.coroutines.flow.update
 
 class SettingsRepo(
     private val locationManager: LocationManager,
-    private val preferences: SharedPreferences
+    private val preferences: SharedPreferences,
+    override val appVersionName: String
 ) : ISettingsRepo, LocationListenerCompat {
 
     private val keyBluetoothRotatorAddress = "bluetoothAddress"
@@ -76,7 +77,7 @@ class SettingsRepo(
     private val keyStationTimestamp = "stationTimestamp"
     private val keyUpdateTimestamp = "updateTimestamp"
     private val keyShouldSeeWarning = "shouldSeeWarning"
-    private val keyShouldSeeWelcome = "shouldSeeWelcome"
+    private val keyShouldSeeWhatsNew = "shouldSeeWhatsNew_v$appVersionName"
     private val keyUseCustomTle = "useCustomTle"
     private val keyUseCustomTransceivers = "useCustomTransceivers"
     private val keyTleUrl = "tleUrl"
@@ -376,9 +377,9 @@ class SettingsRepo(
         _otherSettings.update { it.copy(shouldSeeWarning = false) }
     }
 
-    override fun setWelcomeDismissed() {
-        preferences.edit { putBoolean(keyShouldSeeWelcome, false) }
-        _otherSettings.update { it.copy(shouldSeeWelcome = false) }
+    override fun setWhatsNewDismissed() {
+        preferences.edit { putBoolean(keyShouldSeeWhatsNew, false) }
+        _otherSettings.update { it.copy(shouldSeeWhatsNew = false) }
     }
 
     private fun getOtherSettings(): OtherSettings = OtherSettings(
@@ -388,7 +389,7 @@ class SettingsRepo(
         stateOfUtc = preferences.getBoolean(keyStateOfUtc, false),
         stateOfLightTheme = preferences.getBoolean(keyStateOfLightTheme, false),
         shouldSeeWarning = preferences.getBoolean(keyShouldSeeWarning, true),
-        shouldSeeWelcome = preferences.getBoolean(keyShouldSeeWelcome, true)
+        shouldSeeWhatsNew = preferences.getBoolean(keyShouldSeeWhatsNew, true)
     )
     //endregion