Skip to content

Commit

Permalink
dependency updates
Browse files Browse the repository at this point in the history
  • Loading branch information
raamcosta committed May 31, 2023
1 parent c34e013 commit 5185a19
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 32 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Setup JDK 18
- name: Setup JDK 17
uses: actions/setup-java@v1
with:
java-version: 18
java-version: 17

- name: Build
uses: gradle/gradle-build-action@v2
with:
gradle-version: 7.6
gradle-version: 8.1.1
arguments: build
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
- name: Checkout
uses: actions/checkout@v3

- name: Setup JDK 18
- name: Setup JDK 17
uses: actions/setup-java@v1
with:
java-version: 18
java-version: 17

- name: Cache
uses: actions/cache@v3
Expand All @@ -36,7 +36,7 @@ jobs:
- name: Build
uses: gradle/gradle-build-action@v2
with:
gradle-version: 7.6
gradle-version: 8.1.1
arguments: build

- name: Run unit tests
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,11 +294,11 @@ internal class AnimatedNavHostEngine(
}
}

private fun DestinationEnterTransition.toAccompanist(): (AnimatedContentScope<NavBackStackEntry>.() -> EnterTransition) {
private fun DestinationEnterTransition.toAccompanist(): (AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition) {
return { enter() }
}

private fun DestinationExitTransition.toAccompanist(): (AnimatedContentScope<NavBackStackEntry>.() -> ExitTransition) {
private fun DestinationExitTransition.toAccompanist(): (AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition) {
return { exit() }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.ramcosta.composedestinations.animations.defaults
import androidx.compose.animation.*
import androidx.compose.animation.core.tween

@ExperimentalAnimationApi
interface NavGraphDefaultAnimationParams {
val enterTransition: DestinationEnterTransition?
val exitTransition: DestinationExitTransition?
Expand All @@ -19,7 +18,6 @@ interface NavGraphDefaultAnimationParams {
*
* @see [com.google.accompanist.navigation.animation.AnimatedNavHost] for a parameters explanation
*/
@ExperimentalAnimationApi
class RootNavGraphDefaultAnimations(
override val enterTransition: DestinationEnterTransition = DestinationEnterTransition { EnterTransition.None },
override val exitTransition: DestinationExitTransition = DestinationExitTransition { ExitTransition.None },
Expand All @@ -43,7 +41,6 @@ class RootNavGraphDefaultAnimations(
*
* @see [com.google.accompanist.navigation.animation.navigation] for a parameters explanation
*/
@ExperimentalAnimationApi
class NestedNavGraphDefaultAnimations(
override val enterTransition: DestinationEnterTransition? = null,
override val exitTransition: DestinationExitTransition? = null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ import androidx.compose.animation.*
import androidx.navigation.NavBackStackEntry

fun interface DestinationEnterTransition {
@ExperimentalAnimationApi
fun AnimatedContentScope<NavBackStackEntry>.enter() : EnterTransition
fun AnimatedContentTransitionScope<NavBackStackEntry>.enter() : EnterTransition
}

fun interface DestinationExitTransition {
@ExperimentalAnimationApi
fun AnimatedContentScope<NavBackStackEntry>.exit() : ExitTransition
fun AnimatedContentTransitionScope<NavBackStackEntry>.exit() : ExitTransition
}
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ fun <T> ManualComposableCallsBuilder.bottomSheetComposable(
)
}

@ExperimentalAnimationApi
private fun ManualComposableCallsBuilder.validateAnimated(
destination: DestinationSpec<*>
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ object DestinationStyleBottomSheet : DestinationStyle
* You will need to create an object which implements this interface
* and use its KClass in [com.ramcosta.composedestinations.annotation.Destination.style]
*/
@ExperimentalAnimationApi
interface DestinationStyleAnimated : DestinationStyle {

fun AnimatedContentTransitionScope<NavBackStackEntry>.enterTransition(): EnterTransition? {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ internal class WearNavHostEngine(
with(defaultNavHostEngine) { navigation(navGraph, builder) }
}

@OptIn(ExperimentalAnimationApi::class, InternalDestinationsApi::class)
@OptIn(InternalDestinationsApi::class)
override fun <T> NavGraphBuilder.composable(
destination: DestinationSpec<T>,
navController: NavHostController,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ internal class DefaultNavHostEngine : NavHostEngine {
)
}

@OptIn(ExperimentalAnimationApi::class, InternalDestinationsApi::class)
@OptIn(InternalDestinationsApi::class)
override fun <T> NavGraphBuilder.composable(
destination: DestinationSpec<T>,
navController: NavHostController,
Expand Down
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ targetSdk = "33"

kotlin = "1.8.21"
dependencyCheckPluginVersion = "0.46.0"
gradlePluginVersion = "8.0.1"
gradlePluginVersion = "8.0.2"
mavenPublishPluginVersion = "0.25.2"

composeViewModel = "2.6.1"
activityCompose = "1.7.1"
activityCompose = "1.7.2"

material = "1.9.0"
lifecycleRuntimeKtx = "2.6.1"
Expand All @@ -19,11 +19,11 @@ ksp = "1.8.21-1.0.11"

junit = "4.13.2"

compose = "1.5.0-alpha04"
composeMaterial = "1.5.0-alpha04"
compose = "1.5.0-beta01"
composeMaterial = "1.5.0-beta01"
composeCompiler = "1.4.7"
composeNavigation = "2.6.0-rc01"
accompanist = "0.31.2-alpha"
composeNavigation = "2.6.0-rc02"
accompanist = "0.31.3-beta"

ktxSerialization = "1.5.1"
mockk = "1.13.5"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Aug 23 16:48:14 WEST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import com.ramcosta.samples.playground.ui.screens.appDestination
import com.ramcosta.samples.playground.ui.screens.destinations.ProfileScreenDestination
import com.ramcosta.samples.playground.ui.screens.destinations.SettingsScreenDestination

@OptIn(ExperimentalAnimationApi::class)
object GreetingTransitions : DestinationStyleAnimated {

override fun AnimatedContentTransitionScope<NavBackStackEntry>.enterTransition(): EnterTransition? {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import com.ramcosta.composedestinations.spec.DestinationStyleAnimated
import com.ramcosta.samples.playground.ui.screens.appDestination
import com.ramcosta.samples.playground.ui.screens.destinations.GreetingScreenDestination

@OptIn(ExperimentalAnimationApi::class)
object ProfileTransitions : DestinationStyleAnimated {

override fun AnimatedContentTransitionScope<NavBackStackEntry>.enterTransition(): EnterTransition? {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import com.ramcosta.samples.playground.ui.screens.destinations.GreetingScreenDes
import com.ramcosta.composedestinations.spec.DestinationStyleAnimated
import com.ramcosta.samples.playground.ui.screens.appDestination

@OptIn(ExperimentalAnimationApi::class)
object SettingsTransitions : DestinationStyleAnimated {

override fun AnimatedContentTransitionScope<NavBackStackEntry>.enterTransition(): EnterTransition? {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.platform.LocalTextInputService
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.unit.dp
import kotlinx.coroutines.delay

@OptIn(ExperimentalComposeUiApi::class)
@Composable
fun TitleConfirmDialog(
type: String,
Expand All @@ -27,7 +29,7 @@ fun TitleConfirmDialog(
onConfirm: () -> Unit,
) {
val focusRequester = remember { FocusRequester() }
val inputService = LocalTextInputService.current
val inputService = LocalSoftwareKeyboardController.current
Column(
modifier = Modifier
.background(MaterialTheme.colors.surface)
Expand All @@ -53,7 +55,7 @@ fun TitleConfirmDialog(

LaunchedEffect(Unit) {
delay(300)
inputService?.showSoftwareKeyboard()
inputService?.show()
focusRequester.requestFocus()
}
}

0 comments on commit 5185a19

Please sign in to comment.