Figured out the issue. AnimatedPane is blocking...something. Not sure…

… what but committing now because it works and will continue to look into it
jakepurple13 · Dec 20, 2023 · 81c9842 · 81c9842
1 parent e8c0648
commit 81c9842
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 15 deletions.
diff --git a/UIViews/src/main/java/com/programmersbox/uiviews/lists/OtakuListScreen.kt b/UIViews/src/main/java/com/programmersbox/uiviews/lists/OtakuListScreen.kt
@@ -19,7 +19,6 @@ import androidx.compose.material.icons.automirrored.filled.PlaylistPlay
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
-import androidx.compose.material3.adaptive.AnimatedPane
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.HingePolicy
 import androidx.compose.material3.adaptive.ListDetailPaneScaffold
@@ -59,7 +58,7 @@ fun OtakuListScreen(
     )
 
     val details: @Composable ThreePaneScaffoldScope.() -> Unit = {
-        AnimatedPane(modifier = Modifier.fillMaxSize()) {
+        //AnimatedPane(modifier = Modifier.fillMaxSize()) {
             AnimatedContent(
                 targetState = viewModel.customItem,
                 label = "",
@@ -95,13 +94,13 @@ fun OtakuListScreen(
                     NoDetailSelected()
                 }
             }
-        }
+        //}
     }
 
     ListDetailPaneScaffold(
         scaffoldState = state.scaffoldState,
         listPane = {
-            AnimatedPane(modifier = Modifier.fillMaxSize()) {
+            //AnimatedPane(modifier = Modifier.fillMaxSize()) {
                 OtakuListView(
                     customItem = viewModel.customItem,
                     customLists = viewModel.customLists,
@@ -113,7 +112,7 @@ fun OtakuListScreen(
                             state.navigateTo(ListDetailPaneScaffoldRole.Extra)
                     }
                 )
-            }
+            //}
         },
         detailPane = { if (showListDetail) details() },
         extraPane = if (!showListDetail) {

diff --git a/UIViews/src/main/java/com/programmersbox/uiviews/settings/SettingsFragment.kt b/UIViews/src/main/java/com/programmersbox/uiviews/settings/SettingsFragment.kt
@@ -38,6 +38,7 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.TopAppBarScrollBehavior
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
@@ -109,6 +110,7 @@ class ComposeSettingsDsl {
     }
 }
 
+@OptIn(ExperimentalMaterial3AdaptiveApi::class)
 @ExperimentalComposeUiApi
 @ExperimentalMaterial3Api
 @Composable
@@ -166,8 +168,10 @@ fun SettingScreen(
     }
 
     //TODO: This will be for the future when this works again
-    /*val navigator = rememberListDetailPaneScaffoldNavigator()
-    var settingChoice by remember { mutableStateOf(SettingChoice.None) }
+    /*val navigator = rememberListDetailPaneScaffoldNavigator(
+        scaffoldDirective = calculateStandardPaneScaffoldDirective(currentWindowAdaptiveInfo())
+    )
+    var settingChoice by remember { mutableStateOf(SettingChoice.General) }
 
     BackHandler(settingChoice != SettingChoice.None) {
         navigator.navigateBack()
@@ -182,7 +186,7 @@ fun SettingScreen(
     ListDetailPaneScaffold(
         scaffoldState = navigator.scaffoldState,
         listPane = {
-            AnimatedPane(modifier = Modifier) {
+            //AnimatedPane(modifier = Modifier) {
                 val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(rememberTopAppBarState())
                 OtakuScaffold(
                     topBar = {
@@ -213,17 +217,17 @@ fun SettingScreen(
                             globalSearchClick = globalSearchClick,
                             listClick = listClick,
                             extensionClick = extensionClick,
-                            notificationSettingsClick = { ChangeSetting(SettingChoice.Notification) },//notificationSettingsClick,
-                            generalClick = { ChangeSetting(SettingChoice.General) },//generalClick,
-                            otherClick = { ChangeSetting(SettingChoice.Other) },//otherClick,
-                            moreInfoClick = { ChangeSetting(SettingChoice.MoreInfo) }//moreInfoClick
+                            notificationSettingsClick = { ChangeSetting(SettingChoice.Notification) },
+                            generalClick = { ChangeSetting(SettingChoice.General) },
+                            otherClick = { ChangeSetting(SettingChoice.Other) },
+                            moreInfoClick = { ChangeSetting(SettingChoice.MoreInfo) }
                         )
                     }
                 }
-            }
+            //}
         }
     ) {
-        AnimatedPane(modifier = Modifier.fillMaxSize()) {
+        //AnimatedPane(modifier = Modifier.fillMaxSize()) {
             AnimatedContent(
                 targetState = settingChoice,
                 label = "",
@@ -242,7 +246,7 @@ fun SettingScreen(
                     SettingChoice.None -> {}
                 }
             }
-        }
+        //}
     }*/
 }