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

chore: update compose destinations and navigation libs #2339

Merged
merged 3 commits into from
Oct 18, 2023
Merged

chore: update compose destinations and navigation libs #2339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68332bb
chore: update compose destinations and navigation libs
saleniuk Oct 17, 2023
a36caaa
chore: update compose navigation lib
saleniuk Oct 17, 2023
b96c09f
Merge remote-tracking branch 'origin/develop' into chore/update_navig…
saleniuk Oct 17, 2023
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
4 changes: 2 additions & 2 deletions app/src/main/kotlin/com/wire/android/navigation/style/WireDestinationStyleAnimated.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import androidx.compose.animation.EnterTransition
import androidx.compose.animation.ExitTransition
import androidx.compose.animation.ExperimentalAnimationApi
import androidx.navigation.NavBackStackEntry
import com.ramcosta.composedestinations.spec.DestinationStyleAnimated
import com.ramcosta.composedestinations.spec.DestinationStyle
import com.wire.android.ui.appDestination
import com.wire.android.ui.destinations.Destination

Expand All @@ -32,7 +32,7 @@ import com.wire.android.ui.destinations.Destination
* Thanks to that animations are consistent and not mixed when both destinations involved in the transition use different styles.
*/
@OptIn(ExperimentalAnimationApi::class)
internal interface WireDestinationStyleAnimated : DestinationStyleAnimated {
internal interface WireDestinationStyleAnimated : DestinationStyle.Animated {
fun animationType(): TransitionAnimationType = TransitionAnimationType.SLIDE
private fun Destination.getAnimationTypeStyle() =
(this.style as? WireDestinationStyleAnimated)?.animationType() ?: SlideNavigationAnimation.animationType()
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@ androidx-biometric = "1.1.0"
composeBom = "2023.10.00" # TODO check if in new version [anchoredDraggable] is available
compose-compiler = "1.5.2"
compose-constraint = "1.0.1"
compose-navigation = "2.6.0"
compose-destinations = "1.9.40-beta"
compose-navigation = "2.7.3" # adjusted to work with compose-destinations "1.9.54"
compose-destinations = "1.9.54"

# Hilt
hilt = "2.48"
hilt-composeNavigation = "1.0.0"
hilt-work = "1.0.0"

# Android UI
accompanist = "0.31.0-alpha" # adjusted to work with compose-destinations "1.9.40-beta"
accompanist = "0.32.0" # adjusted to work with compose-destinations "1.9.54"
material = "1.9.0"
coil = "2.4.0"
commonmark = "0.21.0"
Expand Down
Loading