Skip to content

Commit

Permalink
Update dependencies (#241)
Browse files Browse the repository at this point in the history
  • Loading branch information
mars885 authored Sep 17, 2024
1 parent 7dcf3f8 commit feccd35
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 43 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ private fun Input(
textStyle = titleTextStyle.copy(color = LocalContentColor.current),
keyboardOptions = KeyboardOptions(
capitalization = KeyboardCapitalization.Words,
autoCorrect = false,
autoCorrectEnabled = false,
imeAction = ImeAction.Search,
),
keyboardActions = KeyboardActions(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.ui.Modifier
import androidx.compose.ui.composed
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.compose.ui.platform.LocalView
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.unit.TextUnit
Expand All @@ -42,6 +41,7 @@ import androidx.core.view.WindowInsetsControllerCompat
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.compose.LocalLifecycleOwner

@Composable
fun textSizeResource(@DimenRes id: Int): TextUnit {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,9 @@ import androidx.compose.material.LocalElevationOverlay
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Shapes
import androidx.compose.material.Typography
import androidx.compose.material.ripple.LocalRippleTheme
import androidx.compose.material.ripple.RippleTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.Immutable
import androidx.compose.runtime.ReadOnlyComposable
import androidx.compose.ui.graphics.Color

private const val DefaultContentAlpha = 1f

Expand Down Expand Up @@ -69,28 +65,10 @@ fun GamedgeTheme(
typography = typography,
shapes = shapes,
) {
CompositionLocalProvider(LocalRippleTheme provides GamedgeRippleTheme) {
CompositionLocalProvider(LocalContentAlpha provides DefaultContentAlpha) {
content()
}
CompositionLocalProvider(LocalContentAlpha provides DefaultContentAlpha) {
content()
}
}
}
}
}

@Immutable
private object GamedgeRippleTheme : RippleTheme {

@Composable
override fun defaultColor() = RippleTheme.defaultRippleColor(
contentColor = Color.Black,
lightTheme = true,
)

@Composable
override fun rippleAlpha() = RippleTheme.defaultRippleAlpha(
contentColor = Color.Black,
lightTheme = true,
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ private fun Pager(
HorizontalPager(
state = pagerState,
modifier = modifier,
beyondBoundsPageCount = 1,
beyondViewportPageCount = 1,
pageSpacing = GamedgeTheme.spaces.spacing_2_0,
) { pageIndex ->
ImageItem(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.FloatingActionButton
import androidx.compose.material.Icon
import androidx.compose.material.Text
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.material.ripple
import androidx.compose.runtime.Composable
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
Expand Down Expand Up @@ -206,7 +206,7 @@ internal fun GameInfoAnimatableHeader(
.statusBarsPadding()
.size(56.dp)
.clickable(
indication = rememberRipple(
indication = ripple(
bounded = false,
radius = 18.dp,
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.FloatingActionButton
import androidx.compose.material.Icon
import androidx.compose.material.Text
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.material.ripple
import androidx.compose.runtime.Composable
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
Expand Down Expand Up @@ -135,7 +135,7 @@ internal fun GameInfoHeader(
.statusBarsPadding()
.size(56.dp)
.clickable(
indication = rememberRipple(
indication = ripple(
bounded = false,
radius = 18.dp,
),
Expand Down
24 changes: 12 additions & 12 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,31 @@ daggerHilt = "2.52"
# Plugins
androidPlugin = "8.5.2"
protobufPlugin = "0.9.4"
kspPlugin = "2.0.20-1.0.24"
kspPlugin = "2.0.20-1.0.25"
gradleVersionsPlugin = "0.51.0"
detektPlugin = "1.23.6"
detektPlugin = "1.23.7"
ktlintPlugin = "12.1.1"

# Kotlin
coroutines = "1.8.1"
serialization = "1.7.1"
coroutines = "1.9.0"
serialization = "1.7.2"

# AndroidX
activity = "1.9.1"
activity = "1.9.2"
splash = "1.0.1"
viewModel = "2.5.1" # to be deleted when the linked issue at use site is fixed
browser = "1.8.0"
room = "2.6.1"
dataStore = "1.1.1"
viewModel = "2.8.5" # to be deleted when the linked issue at use site is fixed

# Compose
composeBom = "2024.06.00"
navigation = "2.7.7"
composeBom = "2024.09.01"
navigation = "2.8.0"
constraintLayout = "1.1.0-alpha13"
composeHilt = "1.2.0"

# Google
protobuf = "4.27.3"
protobuf = "4.28.1"

# Square
javaPoet = "1.13.0"
Expand All @@ -51,11 +51,11 @@ commonsNetwork = "1.0.3"
commonsWindowAnims = "1.0.2"

# Misc
desugaredJdk = "2.0.4"
desugaredJdk = "2.1.2"
kotlinResult = "2.0.0"
hiltBinder = "1.1.3"
coil = "2.7.0"
zoomable = "1.6.1"
zoomable = "1.6.2"
ktlint = "1.3.1"

# Testing
Expand All @@ -64,7 +64,7 @@ jUnitExt = "1.2.1"
truth = "1.4.4"
mockk = "1.13.12"
turbine = "1.1.0"
testRunner = "1.6.1"
testRunner = "1.6.2"
archCore = "2.2.0"
mockWebServer = "4.12.0"

Expand Down

0 comments on commit feccd35

Please sign in to comment.