Added Crossfade when entering source

This commit is contained in:
tom5079
2022-04-01 16:27:42 +09:00
parent fc3a0fa178
commit 9beb4ded2e

View File

@@ -18,11 +18,14 @@
package xyz.quaver.pupil.ui package xyz.quaver.pupil.ui
import android.annotation.SuppressLint
import android.os.Bundle import android.os.Bundle
import androidx.activity.ComponentActivity import androidx.activity.ComponentActivity
import androidx.activity.compose.BackHandler import androidx.activity.compose.BackHandler
import androidx.activity.compose.setContent import androidx.activity.compose.setContent
import androidx.compose.animation.Crossfade
import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.animation.core.tween
import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.MaterialTheme import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.* import androidx.compose.runtime.*
@@ -48,6 +51,7 @@ class MainActivity : ComponentActivity(), DIAware {
private val logger = newLogger(LoggerFactory.default) private val logger = newLogger(LoggerFactory.default)
@SuppressLint("UnusedCrossfadeTargetStateParameter")
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
@@ -80,14 +84,16 @@ class MainActivity : ComponentActivity(), DIAware {
source = null source = null
} }
if (source == null) Crossfade(source) { _source ->
SourceSelector { if (_source == null)
coroutineScope.launch { SourceSelector {
source = loadSource(application, it) coroutineScope.launch {
source = loadSource(application, it)
}
} }
else {
_source.Entry()
} }
else {
source!!.Entry()
} }
} }
composable("settings") { composable("settings") {