Use null-safe functions in MainActivity.onCreate
This commit is contained in:
parent
df922376ee
commit
5621e3b4ac
1 changed files with 7 additions and 11 deletions
|
@ -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 )
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue