improved performance and character sheet back button

DatL4g · Apr 26, 2024 · 6967742 · 6967742
1 parent eb1f62d
commit 6967742
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/common/ExtendCompose.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/common/ExtendCompose.kt
@@ -179,6 +179,9 @@ fun LazyListState.isScrollingUp(): Boolean {
 @OptIn(ExperimentalMaterial3Api::class)
 fun SheetState.isFullyExpandedOrTargeted(forceFullExpand: Boolean = false): Boolean {
     val checkState = if (this.hasExpandedState) {
+        if (!this.hasPartiallyExpandedState) {
+            return false
+        }
         SheetValue.Expanded
     } else {
         if (forceFullExpand) {

diff --git a/...Main/kotlin/dev/datlag/aniflow/ui/navigation/screen/medium/component/CollapsingToolbar.kt b/...Main/kotlin/dev/datlag/aniflow/ui/navigation/screen/medium/component/CollapsingToolbar.kt
@@ -147,15 +147,16 @@ fun CollapsingToolbar(
             },
             actions = {
                 val mediumState by mediumStateFlow.collectAsStateWithLifecycle()
-                val isFavoriteBlocked by isFavoriteBlockedFlow.collectAsStateWithLifecycle()
-                val isFavorite by isFavoriteFlow.collectAsStateWithLifecycle()
-                var favoriteChanged by remember(isFavorite) { mutableStateOf<Boolean?>(null) }
 
                 AnimatedVisibility(
                     visible = mediumState.isSuccess,
                     enter = fadeIn(),
                     exit = fadeOut()
                 ) {
+                    val isFavoriteBlocked by isFavoriteBlockedFlow.collectAsStateWithLifecycle()
+                    val isFavorite by isFavoriteFlow.collectAsStateWithLifecycle()
+                    var favoriteChanged by remember(isFavorite) { mutableStateOf<Boolean?>(null) }
+
                     IconButton(
                         modifier = if (isCollapsed) {
                             Modifier

diff --git a/...kotlin/dev/datlag/aniflow/ui/navigation/screen/medium/dialog/character/CharacterDialog.kt b/...kotlin/dev/datlag/aniflow/ui/navigation/screen/medium/dialog/character/CharacterDialog.kt
@@ -60,9 +60,6 @@ fun CharacterDialog(component: CharacterComponent) {
         ) {
             val image by component.image.collectAsStateWithLifecycle()
             val state by component.state.collectAsStateWithLifecycle()
-            val isFavoriteBlocked by component.isFavoriteBlocked.collectAsStateWithLifecycle()
-            val isFavorite by component.isFavorite.collectAsStateWithLifecycle()
-            var favoriteChanged by remember(isFavorite) { mutableStateOf<Boolean?>(null) }
 
             this@ModalBottomSheet.AnimatedVisibility(
                 modifier = Modifier.align(Alignment.CenterStart),
@@ -102,6 +99,10 @@ fun CharacterDialog(component: CharacterComponent) {
                 enter = fadeIn(),
                 exit = fadeOut()
             ) {
+                val isFavoriteBlocked by component.isFavoriteBlocked.collectAsStateWithLifecycle()
+                val isFavorite by component.isFavorite.collectAsStateWithLifecycle()
+                var favoriteChanged by remember(isFavorite) { mutableStateOf<Boolean?>(null) }
+
                 IconButton(
                     onClick = {
                         favoriteChanged = !(favoriteChanged ?: isFavorite)