Fix popups disappearing on orientation change. (#1680)

LemmyNet · Sep 27, 2024 · f78d156 · f78d156
1 parent f9a07e8
commit f78d156
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
diff --git a/app/src/main/java/com/jerboa/ui/components/comment/CommentNode.kt b/app/src/main/java/com/jerboa/ui/components/comment/CommentNode.kt
@@ -32,6 +32,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -759,7 +760,7 @@ fun CommentFooterLine(
     account: Account,
     viewSource: Boolean,
 ) {
-    var showMoreOptions by remember { mutableStateOf(false) }
+    var showMoreOptions by rememberSaveable { mutableStateOf(false) }
 
     val amMod = remember(moderators) {
         amMod(

diff --git a/app/src/main/java/com/jerboa/ui/components/comment/mentionnode/CommentMentionNode.kt b/app/src/main/java/com/jerboa/ui/components/comment/mentionnode/CommentMentionNode.kt
@@ -22,6 +22,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -111,7 +112,7 @@ fun CommentMentionNodeFooterLine(
     enableDownvotes: Boolean,
     viewSource: Boolean,
 ) {
-    var showMoreOptions by remember { mutableStateOf(false) }
+    var showMoreOptions by rememberSaveable { mutableStateOf(false) }
 
     val canMod =
         remember(admins) {

diff --git a/app/src/main/java/com/jerboa/ui/components/comment/replynode/CommentReplyNode.kt b/app/src/main/java/com/jerboa/ui/components/comment/replynode/CommentReplyNode.kt
@@ -22,6 +22,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -103,7 +104,7 @@ fun CommentReplyNodeInboxFooterLine(
     enableDownvotes: Boolean,
     viewSource: Boolean,
 ) {
-    var showMoreOptions by remember { mutableStateOf(false) }
+    var showMoreOptions by rememberSaveable { mutableStateOf(false) }
 
     if (showMoreOptions) {
         CommentReplyOptionsDropdown(

diff --git a/app/src/main/java/com/jerboa/ui/components/community/Community.kt b/app/src/main/java/com/jerboa/ui/components/community/Community.kt
@@ -35,7 +35,7 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -175,8 +175,8 @@ fun CommunityHeader(
     scrollBehavior: TopAppBarScrollBehavior,
     isBlocked: Boolean,
 ) {
-    var showSortOptions by remember { mutableStateOf(false) }
-    var showMoreOptions by remember { mutableStateOf(false) }
+    var showSortOptions by rememberSaveable { mutableStateOf(false) }
+    var showMoreOptions by rememberSaveable { mutableStateOf(false) }
 
     TopAppBar(
         scrollBehavior = scrollBehavior,

diff --git a/app/src/main/java/com/jerboa/ui/components/home/Home.kt b/app/src/main/java/com/jerboa/ui/components/home/Home.kt
@@ -29,6 +29,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
@@ -66,9 +67,9 @@ fun HomeHeader(
     scrollBehavior: TopAppBarScrollBehavior,
 ) {
     val ctx = LocalContext.current
-    var showSortOptions by remember { mutableStateOf(false) }
-    var showListingTypeOptions by remember { mutableStateOf(false) }
-    var showMoreOptions by remember { mutableStateOf(false) }
+    var showSortOptions by rememberSaveable { mutableStateOf(false) }
+    var showListingTypeOptions by rememberSaveable { mutableStateOf(false) }
+    var showMoreOptions by rememberSaveable { mutableStateOf(false) }
 
     TopAppBar(
         scrollBehavior = scrollBehavior,

diff --git a/app/src/main/java/com/jerboa/ui/components/person/PersonProfile.kt b/app/src/main/java/com/jerboa/ui/components/person/PersonProfile.kt
@@ -31,7 +31,7 @@ import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -176,8 +176,8 @@ fun PersonProfileHeader(
 ) {
     val ctx = LocalContext.current
 
-    var showSortOptions by remember { mutableStateOf(false) }
-    var showMoreOptions by remember { mutableStateOf(false) }
+    var showSortOptions by rememberSaveable { mutableStateOf(false) }
+    var showMoreOptions by rememberSaveable { mutableStateOf(false) }
 
     TopAppBar(
         scrollBehavior = scrollBehavior,

diff --git a/app/src/main/java/com/jerboa/ui/components/post/PostListingCard.kt b/app/src/main/java/com/jerboa/ui/components/post/PostListingCard.kt
@@ -32,6 +32,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -464,7 +465,7 @@ fun PostFooterLine(
     scope: CoroutineScope,
 ) {
     val ctx = LocalContext.current
-    var showMoreOptions by remember { mutableStateOf(false) }
+    var showMoreOptions by rememberSaveable { mutableStateOf(false) }
 
     if (showMoreOptions) {
         val fallbackModerators = remember(moderators) {