Skip to content

Commit

Permalink
Merge pull request android#325 from JoseAlcerreca/rally_alpha09
Browse files Browse the repository at this point in the history
[Rally] Updates to 7033025
  • Loading branch information
JoseAlcerreca authored Dec 16, 2020
2 parents 2cff653 + cec6809 commit a09e341
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,13 @@ import androidx.compose.material.Icon
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Surface
import androidx.compose.material.Text
import androidx.compose.material.ripple.rememberRippleIndication
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.example.compose.rally.RallyScreen

Expand Down Expand Up @@ -88,7 +89,11 @@ private fun RallyTab(
.selectable(
selected = selected,
onClick = onSelected,
indication = rememberRippleIndication(bounded = false)
indication = rememberRipple(
bounded = false,
radius = Dp.Unspecified,
color = Color.Unspecified
)
)
) {
Icon(imageVector = icon, tint = tabTintColor)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ object Libs {
const val material = "com.google.android.material:material:1.1.0"

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

object Compose {
const val snapshot = ""
const val version = "1.0.0-alpha08"
const val snapshot = "7033025"
const val version = "1.0.0-SNAPSHOT"

const val core = "androidx.compose.ui:ui:$version"
const val foundation = "androidx.compose.foundation:foundation:$version"
Expand Down

0 comments on commit a09e341

Please sign in to comment.