From 10fa01981372275461a8f627488d03cefe96e210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= <dev@ensarsarajcic.com>
Date: Mon, 2 Oct 2023 16:44:15 +0200
Subject: [PATCH] Use `asFlowNonNull` for all flow properties in `Config`

---
 .../simplemobiletools/flashlight/helpers/Config.kt   | 12 +++++-------
 gradle/libs.versions.toml                            |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/Config.kt
index d6e5c2e..c106ab5 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/Config.kt
@@ -2,9 +2,7 @@ package com.simplemobiletools.flashlight.helpers
 
 import android.content.Context
 import android.graphics.Color
-import com.simplemobiletools.commons.extensions.sharedPreferencesCallback
 import com.simplemobiletools.commons.helpers.BaseConfig
-import kotlinx.coroutines.flow.filterNotNull
 
 class Config(context: Context) : BaseConfig(context) {
     companion object {
@@ -15,25 +13,25 @@ class Config(context: Context) : BaseConfig(context) {
         get() = prefs.getBoolean(BRIGHT_DISPLAY, true)
         set(brightDisplay) = prefs.edit().putBoolean(BRIGHT_DISPLAY, brightDisplay).apply()
 
-    val brightDisplayFlow = prefs.run { sharedPreferencesCallback { brightDisplay } }.filterNotNull()
+    val brightDisplayFlow = ::brightDisplay.asFlowNonNull()
 
     var stroboscope: Boolean
         get() = prefs.getBoolean(STROBOSCOPE, true)
         set(stroboscope) = prefs.edit().putBoolean(STROBOSCOPE, stroboscope).apply()
 
-    val stroboscopeFlow = ::stroboscope.asFlow()
+    val stroboscopeFlow = ::stroboscope.asFlowNonNull()
 
     var sos: Boolean
         get() = prefs.getBoolean(SOS, true)
         set(sos) = prefs.edit().putBoolean(SOS, sos).apply()
 
-    val sosFlow = ::sos.asFlow()
+    val sosFlow = ::sos.asFlowNonNull()
 
     var turnFlashlightOn: Boolean
         get() = prefs.getBoolean(TURN_FLASHLIGHT_ON, false)
         set(turnFlashlightOn) = prefs.edit().putBoolean(TURN_FLASHLIGHT_ON, turnFlashlightOn).apply()
 
-    val turnFlashlightOnFlow = ::turnFlashlightOn.asFlow()
+    val turnFlashlightOnFlow = ::turnFlashlightOn.asFlowNonNull()
 
     var stroboscopeProgress: Int
         get() = prefs.getInt(STROBOSCOPE_PROGRESS, 1000)
@@ -51,7 +49,7 @@ class Config(context: Context) : BaseConfig(context) {
         get() = prefs.getBoolean(FORCE_PORTRAIT_MODE, true)
         set(forcePortraitMode) = prefs.edit().putBoolean(FORCE_PORTRAIT_MODE, forcePortraitMode).apply()
 
-    val forcePortraitModeFlow = ::forcePortraitMode.asFlow()
+    val forcePortraitModeFlow = ::forcePortraitMode.asFlowNonNull()
 
     var brightnessLevel: Int
         get() = prefs.getInt(BRIGHTNESS_LEVEL, DEFAULT_BRIGHTNESS_LEVEL)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3177b6f..9b72545 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ androidx-lifecycle = "2.7.0-alpha02"
 #EventBus
 eventbusVersion = "3.3.1"
 #Simple tools
-simple-commons = "13f995cb51"
+simple-commons = "b7dd6ad428"
 #Compose
 composeActivity = "1.8.0-rc01"
 compose = "1.6.0-alpha06"