Skip to content

Commit 331ee07

Browse files
[skip_ci] [fix] Add missing toAndroidNightMode
1 parent 951878f commit 331ee07

4 files changed

Lines changed: 15 additions & 14 deletions

File tree

platform/android/app/src/main/java/com/skyd/podaura/App.kt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import com.skyd.podaura.di.repositoryModule
99
import com.skyd.podaura.di.viewModelModule
1010
import com.skyd.podaura.ext.getOrDefault
1111
import com.skyd.podaura.model.preference.appearance.DarkModePreference
12+
import com.skyd.podaura.model.preference.appearance.DarkModePreference.toAndroidNightMode
1213
import com.skyd.podaura.model.preference.dataStore
1314
import com.skyd.podaura.model.worker.deletearticle.listenDeleteArticleFrequency
1415
import com.skyd.podaura.model.worker.rsssync.listenRssSyncConfig
1516
import com.skyd.podaura.util.CrashHandler
1617
import com.skyd.podaura.util.isDebug
1718
import org.koin.android.ext.koin.androidContext
1819
import org.koin.android.ext.koin.androidLogger
19-
import org.koin.core.context.loadKoinModules
2020

2121
class App : Application() {
2222

@@ -26,13 +26,16 @@ class App : Application() {
2626
initKoin {
2727
androidLogger()
2828
androidContext(this@App)
29-
}
30-
loadKoinModules(
31-
listOf(
32-
notificationModule, repositoryModule, viewModelModule,
29+
modules(
30+
notificationModule,
31+
repositoryModule,
32+
viewModelModule
3333
)
34+
}
35+
36+
AppCompatDelegate.setDefaultNightMode(
37+
dataStore.getOrDefault(DarkModePreference).toAndroidNightMode()
3438
)
35-
AppCompatDelegate.setDefaultNightMode(dataStore.getOrDefault(DarkModePreference))
3639

3740
mviConfig { printLog = isDebug }
3841

shared/src/androidMain/kotlin/com/skyd/podaura/model/preference/appearance/DarkModePreference.android.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ actual object DarkModePreference : BaseDarkModePreference() {
2020
MODE_NIGHT_NO
2121
}
2222

23-
private fun Int.toAndroidNightMode() = when (this) {
23+
fun Int.toAndroidNightMode() = when (this) {
2424
MODE_NIGHT_NO -> AppCompatDelegate.MODE_NIGHT_NO
2525
MODE_NIGHT_YES -> AppCompatDelegate.MODE_NIGHT_YES
2626
MODE_NIGHT_FOLLOW_SYSTEM -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM

shared/src/androidMain/kotlin/com/skyd/podaura/ui/activity/CrashActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import com.skyd.podaura.ui.screen.settings.CrashScreen
2323
import com.skyd.podaura.ui.theme.PodAuraTheme
2424

2525
/**
26-
* CrashActivity, do not extends BaseActivity
26+
* CrashActivity, do not extend BaseActivity
2727
*/
2828
class CrashActivity : ComponentActivity() {
2929
companion object {
@@ -68,4 +68,4 @@ class CrashActivity : ComponentActivity() {
6868
}
6969
}
7070
}
71-
}
71+
}

shared/src/commonMain/kotlin/com/skyd/podaura/ext/DataStoreExt.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import kotlinx.coroutines.withContext
1717

1818

1919
suspend fun <T> DataStore<Preferences>.put(key: Preferences.Key<T>, value: T) {
20-
this.edit {
20+
edit {
2121
withContext(Dispatchers.IO) {
2222
it[key] = value
2323
}
@@ -30,9 +30,7 @@ fun <T> DataStore<Preferences>.getOrNull(key: Preferences.Key<T>): T? {
3030
this@getOrNull.data.catch { exception ->
3131
exception.printStackTrace()
3232
emit(emptyPreferences())
33-
}.map {
34-
it[key]
35-
}.first() as T
33+
}.map { it[key] }.first() as T
3634
}
3735
}
3836

@@ -67,4 +65,4 @@ fun <T1, T2, T3> DataStore<Preferences>.flowOf(
6765
pref3: BasePreference<T3>,
6866
): Flow<Triple<T1, T2, T3>> = data.map {
6967
Triple(it[pref1], it[pref2], it[pref3])
70-
}.distinctUntilChanged()
68+
}.distinctUntilChanged()

0 commit comments

Comments
 (0)