Merge pull request #1018 from Corvus400/bug/fix_about_screen_navigati…

…on_problem 🗑️ DropUnlessResumed is causing navigation issues on AboutScreen, so DropUnlessResumed is removed.
DroidKaigi · Sep 9, 2024 · 75ed6fe · 75ed6fe
2 parents 82bcd5c + 576d8a6
commit 75ed6fe
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 19 deletions.
diff --git a/...monMain/kotlin/io/github/droidkaigi/confsched/droidkaigiui/component/TimetableItemCard.kt b/...monMain/kotlin/io/github/droidkaigi/confsched/droidkaigiui/component/TimetableItemCard.kt
@@ -52,7 +52,6 @@ import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.lifecycle.compose.dropUnlessResumed
 import conference_app_2024.core.droidkaigiui.generated.resources.bookmarked
 import conference_app_2024.core.droidkaigiui.generated.resources.image
 import conference_app_2024.core.droidkaigiui.generated.resources.not_bookmarked
@@ -120,7 +119,7 @@ fun TimetableItemCard(
                 .clickable(
                     interactionSource = remember { MutableInteractionSource() },
                     indication = ripple(color = LocalRoomTheme.current.primaryColor),
-                    onClick = dropUnlessResumed { onTimetableItemClick(timetableItem) },
+                    onClick = { onTimetableItemClick(timetableItem) },
                 ),
         ) {
             val contentPadding = 12.dp

diff --git a/...rc/commonMain/kotlin/io/github/droidkaigi/confsched/about/component/AboutContentColumn.kt b/...rc/commonMain/kotlin/io/github/droidkaigi/confsched/about/component/AboutContentColumn.kt
@@ -19,7 +19,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.dropUnlessResumed
 import conference_app_2024.feature.about.generated.resources.staff
 import io.github.droidkaigi.confsched.about.AboutRes
 import io.github.droidkaigi.confsched.designsystem.theme.KaigiTheme
@@ -40,7 +39,7 @@ fun AboutContentColumn(
             .fillMaxWidth()
             .height(73.dp)
             .testTag(testTag)
-            .clickable(onClick = dropUnlessResumed(block = onClickAction)),
+            .clickable(onClick = onClickAction),
     ) {
         Row(
             modifier = Modifier

diff --git a/...s/src/commonMain/kotlin/io/github/droidkaigi/confsched/contributors/ContributorsScreen.kt b/...s/src/commonMain/kotlin/io/github/droidkaigi/confsched/contributors/ContributorsScreen.kt
@@ -20,7 +20,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.dropUnlessResumed
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import conference_app_2024.feature.contributors.generated.resources.contributor_title
@@ -46,7 +45,7 @@ fun NavGraphBuilder.contributorsScreens(
 ) {
     composable(contributorsScreenRoute) {
         ContributorsScreen(
-            onNavigationIconClick = dropUnlessResumed(block = onNavigationIconClick),
+            onNavigationIconClick = onNavigationIconClick,
             onContributorsItemClick = onContributorItemClick,
         )
     }

diff --git a/...re/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/SearchScreen.kt b/...re/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/SearchScreen.kt
@@ -15,7 +15,6 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.dropUnlessResumed
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
@@ -52,7 +51,7 @@ fun NavGraphBuilder.searchScreens(
         ) {
             SearchScreen(
                 onTimetableItemClick = onTimetableItemClick,
-                onBackClick = dropUnlessResumed(block = onBackClick),
+                onBackClick = onBackClick,
             )
         }
     }

diff --git a/...rc/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/TimetableItemDetailScreen.kt b/...rc/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/TimetableItemDetailScreen.kt
@@ -25,7 +25,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.testTag
-import androidx.lifecycle.compose.dropUnlessResumed
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
@@ -71,11 +70,11 @@ fun NavGraphBuilder.sessionScreens(
             LocalAnimatedVisibilityScope provides this@composable,
         ) {
             TimetableItemDetailScreen(
-                onNavigationIconClick = dropUnlessResumed(block = onNavigationIconClick),
+                onNavigationIconClick = onNavigationIconClick,
                 onLinkClick = onLinkClick,
                 onCalendarRegistrationClick = onCalendarRegistrationClick,
                 onShareClick = onShareClick,
-                onFavoriteListClick = dropUnlessResumed(block = onFavoriteListClick),
+                onFavoriteListClick = onFavoriteListClick,
             )
         }
     }

diff --git a/...sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/TimetableScreen.kt b/...sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/TimetableScreen.kt
@@ -32,7 +32,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.dropUnlessResumed
 import androidx.navigation.NavController
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavGraphBuilder
@@ -165,7 +164,7 @@ private fun TimetableScreen(
                             maxLines = 1,
                         )
                         IconButton(
-                            onClick = dropUnlessResumed(block = onSearchClick),
+                            onClick = onSearchClick,
                         ) {
                             Icon(
                                 imageVector = Icons.Default.Search,

diff --git a/.../settings/src/commonMain/kotlin/io/github/droidkaigi/confsched/settings/SettingsScreen.kt b/.../settings/src/commonMain/kotlin/io/github/droidkaigi/confsched/settings/SettingsScreen.kt
@@ -15,7 +15,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.dropUnlessResumed
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import conference_app_2024.feature.settings.generated.resources.settings_title
@@ -38,7 +37,7 @@ fun NavGraphBuilder.settingsScreens(
 ) {
     composable(settingsScreenRoute) {
         SettingsScreen(
-            onNavigationIconClick = dropUnlessResumed(block = onNavigationIconClick),
+            onNavigationIconClick = onNavigationIconClick,
         )
     }
 }

diff --git a/.../sponsors/src/commonMain/kotlin/io/github/droidkaigi/confsched/sponsors/SponsorsScreen.kt b/.../sponsors/src/commonMain/kotlin/io/github/droidkaigi/confsched/sponsors/SponsorsScreen.kt
@@ -12,7 +12,6 @@ import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.lifecycle.compose.dropUnlessResumed
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import conference_app_2024.feature.sponsors.generated.resources.content_description_back
@@ -42,7 +41,7 @@ fun NavGraphBuilder.sponsorsScreens(
 ) {
     composable(sponsorsScreenRoute) {
         SponsorsScreen(
-            onNavigationIconClick = dropUnlessResumed(block = onNavigationIconClick),
+            onNavigationIconClick = onNavigationIconClick,
             onSponsorsItemClick = onSponsorsItemClick,
         )
     }

diff --git a/feature/staff/src/commonMain/kotlin/io/github/droidkaigi/confsched/staff/StaffScreen.kt b/feature/staff/src/commonMain/kotlin/io/github/droidkaigi/confsched/staff/StaffScreen.kt
@@ -21,7 +21,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.dropUnlessResumed
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import conference_app_2024.feature.staff.generated.resources.staff_title
@@ -49,7 +48,7 @@ fun NavGraphBuilder.staffScreens(
 ) {
     composable(staffScreenRoute) {
         StaffScreen(
-            onNavigationIconClick = dropUnlessResumed(block = onNavigationIconClick),
+            onNavigationIconClick = onNavigationIconClick,
             onStaffItemClick = onStaffItemClick,
         )
     }