Skip to content

Commit c755c67

Browse files
committed
Update commons to remove the need for minActiveState
1 parent afe23bf commit c755c67

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,7 @@ class MainActivity : ComponentActivity() {
8787
)
8888
},
8989
brightDisplayButton = {
90-
val showBrightDisplayButton by preferences.brightDisplayFlow.collectAsStateWithLifecycle(
91-
config.brightDisplay,
92-
minActiveState = Lifecycle.State.CREATED
93-
)
90+
val showBrightDisplayButton by preferences.brightDisplayFlow.collectAsStateWithLifecycle(config.brightDisplay)
9491
if (showBrightDisplayButton) {
9592
BrightDisplayButton(
9693
onBrightDisplayPress = {
@@ -100,7 +97,7 @@ class MainActivity : ComponentActivity() {
10097
}
10198
},
10299
sosButton = {
103-
val showSosButton by preferences.sosFlow.collectAsStateWithLifecycle(config.sos, minActiveState = Lifecycle.State.CREATED)
100+
val showSosButton by preferences.sosFlow.collectAsStateWithLifecycle(config.sos)
104101
val sosActive by viewModel.sosActive.collectAsStateWithLifecycle()
105102

106103
if (showSosButton) {
@@ -113,10 +110,7 @@ class MainActivity : ComponentActivity() {
113110
}
114111
},
115112
stroboscopeButton = {
116-
val showStroboscopeButton by preferences.stroboscopeFlow.collectAsStateWithLifecycle(
117-
config.stroboscope,
118-
minActiveState = Lifecycle.State.CREATED
119-
)
113+
val showStroboscopeButton by preferences.stroboscopeFlow.collectAsStateWithLifecycle(config.stroboscope)
120114
val stroboscopeActive by viewModel.stroboscopeActive.collectAsStateWithLifecycle()
121115

122116
if (showStroboscopeButton) {

app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/Config.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ class Config(context: Context) : BaseConfig(context) {
1313
get() = prefs.getBoolean(BRIGHT_DISPLAY, true)
1414
set(brightDisplay) = prefs.edit().putBoolean(BRIGHT_DISPLAY, brightDisplay).apply()
1515

16-
val brightDisplayFlow = ::brightDisplay.asFlowNonNull()
16+
val brightDisplayFlow = ::brightDisplay.asFlowNonNull(emitOnCollect = true)
1717

1818
var stroboscope: Boolean
1919
get() = prefs.getBoolean(STROBOSCOPE, true)
2020
set(stroboscope) = prefs.edit().putBoolean(STROBOSCOPE, stroboscope).apply()
2121

22-
val stroboscopeFlow = ::stroboscope.asFlowNonNull()
22+
val stroboscopeFlow = ::stroboscope.asFlowNonNull(emitOnCollect = true)
2323

2424
var sos: Boolean
2525
get() = prefs.getBoolean(SOS, true)
2626
set(sos) = prefs.edit().putBoolean(SOS, sos).apply()
2727

28-
val sosFlow = ::sos.asFlowNonNull()
28+
val sosFlow = ::sos.asFlowNonNull(emitOnCollect = true)
2929

3030
var turnFlashlightOn: Boolean
3131
get() = prefs.getBoolean(TURN_FLASHLIGHT_ON, false)

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ androidx-customView = "1.2.0-alpha02"
66
androidx-customViewPooling = "1.0.0"
77
androidx-lifecycle = "2.7.0-alpha02"
88
#Simple tools
9-
simple-commons = "7076fbaf6e"
9+
simple-commons = "fd497d3719"
1010
#Compose
1111
composeActivity = "1.8.0"
1212
compose = "1.6.0-alpha07"

0 commit comments

Comments
 (0)