Use null-safe functions in MainActivity.onCreate

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

View file

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