Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🗑️ DropUnlessResumed is causing navigation issues on AboutScreen, so DropUnlessResumed is removed. #1018

Merged
merged 1 commit into from
Sep 9, 2024
Merged

🗑️ DropUnlessResumed is causing navigation issues on AboutScreen, so DropUnlessResumed is removed. #1018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...monMain/kotlin/io/github/droidkaigi/confsched/droidkaigiui/component/TimetableItemCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions ...rc/commonMain/kotlin/io/github/droidkaigi/confsched/about/component/AboutContentColumn.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -40,7 +39,7 @@ fun AboutContentColumn(
.fillMaxWidth()
.height(73.dp)
.testTag(testTag)
.clickable(onClick = dropUnlessResumed(block = onClickAction)),
.clickable(onClick = onClickAction),
) {
Row(
modifier = Modifier
Expand Down
3 changes: 1 addition & 2 deletions ...s/src/commonMain/kotlin/io/github/droidkaigi/confsched/contributors/ContributorsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -46,7 +45,7 @@ fun NavGraphBuilder.contributorsScreens(
) {
composable(contributorsScreenRoute) {
ContributorsScreen(
onNavigationIconClick = dropUnlessResumed(block = onNavigationIconClick),
onNavigationIconClick = onNavigationIconClick,
onContributorsItemClick = onContributorItemClick,
)
}
Expand Down
3 changes: 1 addition & 2 deletions ...re/sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/SearchScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -52,7 +51,7 @@ fun NavGraphBuilder.searchScreens(
) {
SearchScreen(
onTimetableItemClick = onTimetableItemClick,
onBackClick = dropUnlessResumed(block = onBackClick),
onBackClick = onBackClick,
)
}
}
Expand Down
5 changes: 2 additions & 3 deletions ...rc/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/TimetableItemDetailScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
)
}
}
Expand Down
3 changes: 1 addition & 2 deletions ...sessions/src/commonMain/kotlin/io/github/droidkaigi/confsched/sessions/TimetableScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -165,7 +164,7 @@ private fun TimetableScreen(
maxLines = 1,
)
IconButton(
onClick = dropUnlessResumed(block = onSearchClick),
onClick = onSearchClick,
) {
Icon(
imageVector = Icons.Default.Search,
Expand Down
3 changes: 1 addition & 2 deletions .../settings/src/commonMain/kotlin/io/github/droidkaigi/confsched/settings/SettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -38,7 +37,7 @@ fun NavGraphBuilder.settingsScreens(
) {
composable(settingsScreenRoute) {
SettingsScreen(
onNavigationIconClick = dropUnlessResumed(block = onNavigationIconClick),
onNavigationIconClick = onNavigationIconClick,
)
}
}
Expand Down
3 changes: 1 addition & 2 deletions .../sponsors/src/commonMain/kotlin/io/github/droidkaigi/confsched/sponsors/SponsorsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -42,7 +41,7 @@ fun NavGraphBuilder.sponsorsScreens(
) {
composable(sponsorsScreenRoute) {
SponsorsScreen(
onNavigationIconClick = dropUnlessResumed(block = onNavigationIconClick),
onNavigationIconClick = onNavigationIconClick,
onSponsorsItemClick = onSponsorsItemClick,
)
}
Expand Down
3 changes: 1 addition & 2 deletions feature/staff/src/commonMain/kotlin/io/github/droidkaigi/confsched/staff/StaffScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -49,7 +48,7 @@ fun NavGraphBuilder.staffScreens(
) {
composable(staffScreenRoute) {
StaffScreen(
onNavigationIconClick = dropUnlessResumed(block = onNavigationIconClick),
onNavigationIconClick = onNavigationIconClick,
onStaffItemClick = onStaffItemClick,
)
}
Expand Down
Loading