zedfrigg/zanbur
1
0
Fork 0
Code Releases Activity Actions

Use null-safe functions in MainActivity.onCreate

Browse source
This commit is contained in:
Reinout Meliesie 2024-11-22 23:11:04 +01:00
parent df922376ee
commit 5621e3b4ac
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/com/kernelmaft/zanbur/main.kt
View file

@ -25,14 +25,10 @@ class MainActivity : EdgeToEdgeActivity () {
lifecycleScope . launch (IO) { lifecycleScope . launch (IO) {
val prefs = dataStore . data . firstOrNull () val prefs = dataStore . data . firstOrNull ()
if ( prefs != null ) { val savedSceneName = prefs ?. get ( stringPreferencesKey ("scene") )
val savedSceneName = prefs [ stringPreferencesKey ("scene") ]
if ( savedSceneName != null ) { if ( savedSceneName != null ) {
val savedScene = AppState . groups [0] . scenes . find { it . name == savedSceneName } val savedScene = AppState . groups [0] . scenes . find { it . name == savedSceneName }
if ( savedScene != null ) { savedScene ?. let { AppState . setCurrentScene ( 0 , it ) }
AppState . setCurrentScene ( 0 , savedScene )
}
}
} }
} }
@ -40,9 +36,9 @@ class MainActivity : EdgeToEdgeActivity () {
AppFrame { AppFrame {
Column ( Modifier . width ( 300 . dp ) ) { Column ( Modifier . width ( 300 . dp ) ) {
groups . forEach { group -> groups . forEach { group ->
SceneSwitcher (group) { SceneSwitcher (group) { newScene ->
AppState . setCurrentScene ( group . id , it ) AppState . setCurrentScene ( group . id , newScene )
publishSceneChange ( group , it ) publishSceneChange ( group , newScene )
} }
} }
} }