Skip to content

Commit a09e341

Browse files
authoredDec 16, 2020
Merge pull request android#325 from JoseAlcerreca/rally_alpha09
[Rally] Updates to 7033025
2 parents 2cff653 + cec6809 commit a09e341

File tree

2 files changed

+10
-5
lines changed
  • Rally
    • app/src/main/java/com/example/compose/rally/ui/components
    • buildSrc/src/main/java/com/example/compose/rally/buildsrc

2 files changed

+10
-5
lines changed
 

‎Rally/app/src/main/java/com/example/compose/rally/ui/components/TopAppBar.kt

+7-2
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,13 @@ import androidx.compose.material.Icon
3131
import androidx.compose.material.MaterialTheme
3232
import androidx.compose.material.Surface
3333
import androidx.compose.material.Text
34-
import androidx.compose.material.ripple.rememberRippleIndication
34+
import androidx.compose.material.ripple.rememberRipple
3535
import androidx.compose.runtime.Composable
3636
import androidx.compose.runtime.remember
3737
import androidx.compose.ui.Modifier
3838
import androidx.compose.ui.graphics.Color
3939
import androidx.compose.ui.graphics.vector.ImageVector
40+
import androidx.compose.ui.unit.Dp
4041
import androidx.compose.ui.unit.dp
4142
import com.example.compose.rally.RallyScreen
4243

@@ -88,7 +89,11 @@ private fun RallyTab(
8889
.selectable(
8990
selected = selected,
9091
onClick = onSelected,
91-
indication = rememberRippleIndication(bounded = false)
92+
indication = rememberRipple(
93+
bounded = false,
94+
radius = Dp.Unspecified,
95+
color = Color.Unspecified
96+
)
9297
)
9398
) {
9499
Icon(imageVector = icon, tint = tabTintColor)

‎Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ object Libs {
2929
const val material = "com.google.android.material:material:1.1.0"
3030

3131
object Kotlin {
32-
private const val version = "1.4.20"
32+
private const val version = "1.4.21"
3333
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
3434
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
3535
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -47,8 +47,8 @@ object Libs {
4747
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha02"
4848

4949
object Compose {
50-
const val snapshot = ""
51-
const val version = "1.0.0-alpha08"
50+
const val snapshot = "7033025"
51+
const val version = "1.0.0-SNAPSHOT"
5252

5353
const val core = "androidx.compose.ui:ui:$version"
5454
const val foundation = "androidx.compose.foundation:foundation:$version"

0 commit comments

Comments
 (0)