Merge pull request #20 from djkovrik/release/1.3.0

Release 1.3.0
djkovrik · Jul 23, 2023 · 9dce1da · 9dce1da
2 parents 0d7a0c5 + cf9529e
commit 9dce1da
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 25 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -23,8 +23,8 @@ android {
         applicationId = "com.sedsoftware.blinktracker"
         minSdk = 26
         targetSdk = 33
-        versionCode = 100200
-        versionName = "1.2.0"
+        versionCode = 100300
+        versionName = "1.3.0"
         setProperty("archivesBaseName", applicationId)
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/src/main/java/com/sedsoftware/blinktracker/MainActivity.kt b/app/src/main/java/com/sedsoftware/blinktracker/MainActivity.kt
@@ -23,7 +23,7 @@ import com.sedsoftware.blinktracker.database.StatisticsRepositoryReal
 import com.sedsoftware.blinktracker.root.BlinkRoot
 import com.sedsoftware.blinktracker.root.integration.BlinkRootComponent
 import com.sedsoftware.blinktracker.settings.AppSettings
-import com.sedsoftware.blinktracker.settings.ObservableOpacityProvider
+import com.sedsoftware.blinktracker.settings.Settings
 import com.sedsoftware.blinktracker.tools.AppErrorHandler
 import com.sedsoftware.blinktracker.tools.AppNotificationsManager
 import com.sedsoftware.blinktracker.ui.BlinkRootContent
@@ -60,7 +60,7 @@ class MainActivity : ComponentActivity(), PictureInPictureLauncher {
         }
 
     private var currentWindowAlpha: Float = 1f
-    private var opacityProvider: ObservableOpacityProvider? = null
+    private var settings: Settings? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -75,14 +75,14 @@ class MainActivity : ComponentActivity(), PictureInPictureLauncher {
             .build()
 
         _imageProcessor = FaceDetectorProcessor(faceDetectorOptions)
-        opacityProvider = ObservableOpacityProvider(applicationContext)
+        settings = AppSettings(applicationContext)
 
         _root = BlinkRootComponent(
             componentContext = defaultComponentContext(),
             storeFactory = DefaultStoreFactory(),
             errorHandler = errorHandler,
             notificationsManager = AppNotificationsManager(this),
-            settings = AppSettings(applicationContext),
+            settings = settings!!,
             repo = StatisticsRepositoryReal(applicationContext),
             pipLauncher = this,
         )
@@ -91,7 +91,7 @@ class MainActivity : ComponentActivity(), PictureInPictureLauncher {
             .onEach { root.onFaceDataChanged(it) }
             .launchIn(lifecycleScope)
 
-        opacityProvider?.opacity
+        settings?.observableOpacity
             ?.onEach { currentWindowAlpha = it }
             ?.launchIn(lifecycleScope)
 
@@ -123,6 +123,7 @@ class MainActivity : ComponentActivity(), PictureInPictureLauncher {
         _root = null
         _imageProcessor?.run { this.stop() }
         _imageProcessor = null
+        settings = null
         enableKeepScreenOn(false)
     }
 

diff --git a/distribution/changelog.md b/distribution/changelog.md
@@ -1 +1 @@
-* Additional statistic filters
+* Added new option to control minimized window opacity (#19)
diff --git a/distribution/whatsnew/whatsnew-en-US b/distribution/whatsnew/whatsnew-en-US
@@ -1 +1 @@
-Additional statistic filters
+Added new option to control minimized window opacity
diff --git a/distribution/whatsnew/whatsnew-ru-RU b/distribution/whatsnew/whatsnew-ru-RU
@@ -1 +1 @@
-Дополнительные фильтры для статистики
+Добавлена дополнительная опция для управления непрозрачностью свернутого окна
diff --git a/sources/settings/src/main/kotlin/com/sedsoftware/blinktracker/settings/AppSettings.kt b/sources/settings/src/main/kotlin/com/sedsoftware/blinktracker/settings/AppSettings.kt
@@ -31,6 +31,11 @@ class AppSettings(
     private val launchMinimizedEnabledKey: Preferences.Key<Boolean> = booleanPreferencesKey(PreferenceKey.LAUNCH_MINIMIZED)
     private val minimizedOpacityKey: Preferences.Key<Float> = floatPreferencesKey(PreferenceKey.OPACITY)
 
+    override val observableOpacity: Flow<Float> =
+        Store.get(context).data.map { preferences ->
+            preferences[minimizedOpacityKey] ?: 1f
+        }
+
     override suspend fun getPerMinuteThreshold(): Flow<Float> =
         getPrefsValue(perMinuteThresholdKey, PER_MINUTE_THRESHOLD_DEFAULT)
 

diff --git a/...ttings/src/main/kotlin/com/sedsoftware/blinktracker/settings/ObservableOpacityProvider.kt b/...ttings/src/main/kotlin/com/sedsoftware/blinktracker/settings/ObservableOpacityProvider.kt
diff --git a/sources/settings/src/main/kotlin/com/sedsoftware/blinktracker/settings/Settings.kt b/sources/settings/src/main/kotlin/com/sedsoftware/blinktracker/settings/Settings.kt
@@ -3,6 +3,8 @@ package com.sedsoftware.blinktracker.settings
 import kotlinx.coroutines.flow.Flow
 
 interface Settings {
+    val observableOpacity: Flow<Float>
+
     suspend fun getPerMinuteThreshold(): Flow<Float>
     suspend fun getNotifySoundEnabled(): Flow<Boolean>
     suspend fun getNotifyVibrationEnabled(): Flow<Boolean>