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

Refactor deprecated M1 SwipeToDismiss, use M3 SwipeToDismissBox #1537

Merged
merged 1 commit into from
Jun 1, 2024
Merged

Refactor deprecated M1 SwipeToDismiss, use M3 SwipeToDismissBox #1537

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
8 changes: 1 addition & 7 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,6 @@ dependencies {
implementation("io.noties.markwon:image-coil:4.6.2")
implementation("io.noties.markwon:linkify:4.6.2")

// Accompanist
implementation("com.google.accompanist:accompanist-pager:0.34.0")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🥳

implementation("com.google.accompanist:accompanist-pager-indicators:0.34.0")
implementation("com.google.accompanist:accompanist-flowlayout:0.34.0")
implementation("com.google.accompanist:accompanist-navigation-animation:0.34.0")

// LiveData
implementation("androidx.compose.runtime:runtime-livedata")
implementation("androidx.lifecycle:lifecycle-runtime-compose")
Expand Down Expand Up @@ -184,7 +178,7 @@ dependencies {
implementation("androidx.compose.material:material-icons-extended")

implementation("org.ocpsoft.prettytime:prettytime:5.0.8.Final")
implementation("androidx.navigation:navigation-compose")
implementation("androidx.navigation:navigation-compose:2.7.7")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This version should come automatically with bom, no?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It did not for me, must ve come from accompanist

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gotcha.

testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.1")

testImplementation("junit:junit:4.13.2")
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/jerboa/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ class MainActivity : AppCompatActivity() {
val args = Route.PostArgs(it)

SwipeToNavigateBack(
appSettings.postNavigationGestureMode,
appSettings.postNavigationGestureMode.toEnumSafe(),
appState::navigateUp,
) {
PostActivity(
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/jerboa/feat/PostNavigationGestureMode.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ enum class PostNavigationGestureMode(
Disabled(R.string.look_and_feel_post_navigation_gesture_mode_disabled),

/**
* Enable swiping left to navigate away from a post.
* Enable swiping right to navigate away from a post.
*/
SwipeLeft(R.string.look_and_feel_post_navigation_gesture_mode_swipe_left),
SwipeRight(R.string.look_and_feel_post_navigation_gesture_mode_swipe_right),
}
1 change: 0 additions & 1 deletion app/src/main/java/com/jerboa/ui/components/common/SwipeToAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ fun SwipeToAction(
)
}

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun rememberSwipeActionState(
swipeToActionPreset: SwipeToActionPreset,
Expand Down
50 changes: 20 additions & 30 deletions app/src/main/java/com/jerboa/ui/components/common/SwipeToNavigateBack.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,56 +3,46 @@ package com.jerboa.ui.components.common
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material.DismissDirection
import androidx.compose.material.DismissValue
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.FractionalThreshold
import androidx.compose.material.SwipeToDismiss
import androidx.compose.material.rememberDismissState
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.SwipeToDismissBox
import androidx.compose.material3.SwipeToDismissBoxValue
import androidx.compose.material3.rememberSwipeToDismissBoxState
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import com.jerboa.feat.PostNavigationGestureMode

@OptIn(ExperimentalMaterialApi::class)
@Composable
fun SwipeToNavigateBack(
useSwipeBack: Int,
useSwipeBack: PostNavigationGestureMode,
onSwipeBack: () -> Unit,
content: @Composable () -> Unit,
) {
if (useSwipeBack == PostNavigationGestureMode.SwipeLeft.ordinal) {
val dismissState =
rememberDismissState(
confirmStateChange = {
if (useSwipeBack == PostNavigationGestureMode.SwipeRight) {
SwipeToDismissBox(
state = rememberSwipeToDismissBoxState(
confirmValueChange = {
when (it) {
DismissValue.DismissedToEnd -> {
SwipeToDismissBoxValue.StartToEnd -> {
onSwipeBack()
true
}

else -> {
false
}
else -> false
}
},
)
SwipeToDismiss(
state = dismissState,
background = {
positionalThreshold = { it * 0.7f },
),
enableDismissFromEndToStart = false,
backgroundContent = {
Box(
modifier =
Modifier
.fillMaxSize()
.background(MaterialTheme.colorScheme.background),
modifier = Modifier
.fillMaxSize()
.background(MaterialTheme.colorScheme.background),
)
},
dismissContent = {
content()
},
directions = setOf(DismissDirection.StartToEnd),
dismissThresholds = { FractionalThreshold(0.8f) },
)
) {
content()
}
} else {
content()
}
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@
<string name="look_and_feel_look_and_feel">الأسلوب</string>
<string name="look_and_feel_post_navigation_gesture_mode">إيماءات التنقُّل بين الموضوعات</string>
<string name="look_and_feel_post_navigation_gesture_mode_disabled">معطَّل</string>
<string name="look_and_feel_post_navigation_gesture_mode_swipe_left">اسحب يسارًا ترجع</string>
<string name="look_and_feel_post_view">منظور الموضوعات</string>
<string name="look_and_feel_post_view_card">بطائق</string>
<string name="look_and_feel_post_view_list">قائمة</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-bg/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@
<string name="look_and_feel_look_and_feel">Външен вид</string>
<string name="look_and_feel_post_navigation_gesture_mode">Post navigation gestures</string>
<string name="look_and_feel_post_navigation_gesture_mode_disabled">Disabled</string>
<string name="look_and_feel_post_navigation_gesture_mode_swipe_left">Swipe left to navigate back</string>
<string name="look_and_feel_post_view">Изглед на публикациите</string>
<string name="look_and_feel_post_view_card">Карта</string>
<string name="look_and_feel_post_view_list">Списък</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ru/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<string name="look_and_feel_look_and_feel">Внешний вид и предпочтения</string>
<string name="look_and_feel_post_navigation_gesture_mode">Жесты навигации по публикациям</string>
<string name="look_and_feel_post_navigation_gesture_mode_disabled">Отключен</string>
<string name="look_and_feel_post_navigation_gesture_mode_swipe_left">Проведите пальцем слева, чтобы вернуться назад.</string>
<string name="look_and_feel_post_navigation_gesture_mode_swipe_right">Проведите пальцем слева, чтобы вернуться назад.</string>
<string name="look_and_feel_post_view">Внешний вид постов</string>
<string name="look_and_feel_post_view_card">Карточка</string>
<string name="look_and_feel_post_view_list">Список</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-tr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@
<string name="look_and_feel_look_and_feel">Bak ve hisset</string>
<string name="look_and_feel_post_navigation_gesture_mode">Gezinme sonrası hareketleri</string>
<string name="look_and_feel_post_navigation_gesture_mode_disabled">Devre dışı</string>
<string name="look_and_feel_post_navigation_gesture_mode_swipe_left">Geri gitmek için sola kaydırın</string>
<string name="look_and_feel_post_view">Gönderi Görünümü</string>
<string name="look_and_feel_post_view_card">Kart</string>
<string name="look_and_feel_post_view_list">Liste</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
<string name="look_and_feel_look_and_feel">Look and feel</string>
<string name="look_and_feel_post_navigation_gesture_mode">Post navigation gestures</string>
<string name="look_and_feel_post_navigation_gesture_mode_disabled">Disabled</string>
<string name="look_and_feel_post_navigation_gesture_mode_swipe_left">Swipe left to navigate back</string>
<string name="look_and_feel_post_navigation_gesture_mode_swipe_right">Swipe right to navigate back</string>
<string name="look_and_feel_post_view">Post View</string>
<string name="look_and_feel_post_view_card">Card</string>
<string name="look_and_feel_post_view_list">List</string>
Expand Down