FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[Rally] Updates to 7033025 by JoseAlcerreca · Pull Request #331 · android/compose-samples · GitHub

/ compose-samples Public

[Rally] Updates to 7033025 #331

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

Merged
JoseAlcerreca merged 2 commits into from
Dec 16, 2020
Conversation 0 Commits 2 Checks 0 Files changed
Merged

[Rally] Updates to 7033025 #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a88a119
[Rally] Updates to 7033025
JoseAlcerreca Dec 15, 2020
cec6809
[Rally] Adds names to arguments
JoseAlcerreca Dec 16, 2020
File filter

Filter by extension

Filter by extension .kt  (2) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
      • TopAppBar.kt
      • dependencies.kt
9 changes: 7 additions & 2 deletions Rally/app/src/main/java/com/example/compose/rally/ui/components/TopAppBar.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
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
6 changes: 3 additions & 3 deletions Rally/buildSrc/src/main/java/com/example/compose/rally/buildsrc/dependencies.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
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
Back | FazBrowse Home | New Git URL