Skip to content

[All] Update to Compose 1.0.0-alpha06 #261

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.

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
merged 53 commits into from
Oct 28, 2020
Merged
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
8499955
[Jetsnack] Cart implementation
JolandaVerhoef Oct 19, 2020
ba64aa1
[Jetsnack] Reuse Quantity Selector
JolandaVerhoef Oct 21, 2020
a831cd8
[Jetsnack] Reuse Destination Bar
JolandaVerhoef Oct 21, 2020
affce96
[Jetsnack] Add Inspired By Section to Cart
JolandaVerhoef Oct 21, 2020
551af64
[Jetsnack] Add Checkout Bar to cart
JolandaVerhoef Oct 21, 2020
3751be0
[Jetsnack] Fix Spotless issues
JolandaVerhoef Oct 21, 2020
7224519
[Jetsnack] Fix review comments
JolandaVerhoef Oct 21, 2020
bb8a07f
[Jetsnack] Fix review comments
JolandaVerhoef Oct 22, 2020
75ebc9f
Merge pull request #243 from android/main
nickbutcher Oct 22, 2020
ad976e6
Update to snapshot 6922857.
nickbutcher Oct 23, 2020
b48daf7
[Jetsurvey] Bump to alpha06
florina-muntenescu Oct 22, 2020
3b0549b
[Owl] Update to snapshot 6922857.
nickbutcher Oct 23, 2020
98321c8
[JetChat] Update to snapshot 6922857
JoseAlcerreca Oct 23, 2020
fe51364
[Rally] Update to snapshot 6922857
JoseAlcerreca Oct 23, 2020
8a95314
[Jetcaster] Update to snapshot 6922857.
JolandaVerhoef Oct 23, 2020
ecd199e
Merge branch 'dev_alpha06' into jv/jc-alpha06
JolandaVerhoef Oct 23, 2020
c5f8e74
[Rally] Update to snapshot 6922857
JoseAlcerreca Oct 23, 2020
1bc1329
Merge branch 'dev_alpha06' into nb/js-alpha06
nickbutcher Oct 23, 2020
63435f2
Merge branch 'dev_alpha06' into nb/owl_alpha06
nickbutcher Oct 23, 2020
63a4c9a
Merge pull request #244 from android/fm/jetsurvey_alpha06
florina-muntenescu Oct 23, 2020
7edd98c
Merge branch 'dev_alpha06' into nb/js-alpha06
nickbutcher Oct 23, 2020
ff4cc73
Merge pull request #247 from android/nb/js-alpha06
nickbutcher Oct 23, 2020
9ea6419
Merge branch 'dev_alpha06' into nb/owl_alpha06
nickbutcher Oct 23, 2020
b2adc8a
Merge pull request #248 from android/nb/owl_alpha06
nickbutcher Oct 23, 2020
a03dc18
Removes unncessary elevation param
JoseAlcerreca Oct 23, 2020
5fd5485
Merge branch 'dev_alpha06' into jv/jc-alpha06
JolandaVerhoef Oct 23, 2020
d4994a7
Merge pull request #251 from android/jv/jc-alpha06
JolandaVerhoef Oct 23, 2020
80fffe8
[Crane] Update to 6922857 snapshot (#246)
manuelvicnt Oct 23, 2020
90c738e
[Owl] Replace elevation overlay workaround with AmbientElevationOverlay.
nickbutcher Oct 23, 2020
3827868
Merge pull request #253 from android/nb/owl_overlays
nickbutcher Oct 26, 2020
fbe78a8
Merge pull request #249 from JoseAlcerreca/dev_jetchat_alpha06
JoseAlcerreca Oct 26, 2020
c637877
[Jetchat] Replace elevation overlay workaround with AmbientElevationO…
JoseAlcerreca Oct 26, 2020
98cd2cd
[Jetchat] Replace elevation overlay workaround with AmbientElevationO…
JoseAlcerreca Oct 26, 2020
af48642
[Jetsurvey] Redesigned next/prev buttons
florina-muntenescu Oct 23, 2020
0213c71
[Jetsurvey] Redesigned progress indicator
florina-muntenescu Oct 23, 2020
d4e7606
[Jetsurvey] Adding elevation to the action bar
florina-muntenescu Oct 24, 2020
a436d25
[Jetsurvey] Capitalising strings
florina-muntenescu Oct 24, 2020
b727bef
[Jetsurvey] Question title redesigned
florina-muntenescu Oct 24, 2020
c368a40
[Jetsurvey] Removing unused composable
florina-muntenescu Oct 24, 2020
35ed12b
[Jetsurvey] Removing the column usage in progress indicator
florina-muntenescu Oct 26, 2020
7027635
Merge pull request #254 from android/fm/redesign_progress
florina-muntenescu Oct 26, 2020
cd04088
Merge branch 'dev_alpha06' into jv/js_cart
JolandaVerhoef Oct 26, 2020
42f1895
Merge pull request #239 from android/jv/js_cart
JolandaVerhoef Oct 27, 2020
91c38e5
[Crane] Adds Hilt to the project (#237)
manuelvicnt Oct 27, 2020
74bc758
[JetNews] bump to alpha06 (#258)
objcode Oct 28, 2020
aecb508
Update all samples to AGP 4.2.0-alpha15
Oct 28, 2020
6a3ee43
Turn on allWarningsAsErrors in Jetsurvey
Oct 28, 2020
963edaa
Tidy up gradle.properties
Oct 28, 2020
3b9ed84
Disable Jetifier where possible
Oct 28, 2020
7e06aa2
Update all projects to ktlint 0.39.0
Oct 28, 2020
e5e4795
Update snapshot URL
Oct 28, 2020
90f516d
Merge pull request #259 from android/cb/dev06-tidyup
chrisbanes Oct 28, 2020
e1371b4
Update to Compose 1.0.0-alpha06
Oct 28, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[Jetsurvey] Bump to alpha06
florina-muntenescu committed Oct 23, 2020
commit b48daf799513f4a0f98bba5d06a787446c41a05a
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@

package com.example.compose.jetsurvey.signinsignup

import androidx.compose.foundation.AmbientContentColor
import androidx.compose.foundation.Text
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
@@ -165,10 +164,7 @@ fun ErrorSnackbar(
},
action = {
data.actionLabel?.let {
TextButton(
onClick = onDismiss,
contentColor = AmbientContentColor.current
) {
TextButton(onClick = onDismiss) {
Text(
text = stringResource(id = R.string.dismiss),
color = MaterialTheme.colors.snackbarAction
Original file line number Diff line number Diff line change
@@ -17,7 +17,6 @@
package com.example.compose.jetsurvey.signinsignup

import androidx.compose.foundation.AmbientTextStyle
import androidx.compose.foundation.Icon
import androidx.compose.foundation.ScrollableColumn
import androidx.compose.foundation.Text
import androidx.compose.foundation.layout.Box
@@ -31,6 +30,7 @@ import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.foundation.layout.preferredWidth
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.material.AmbientEmphasisLevels
import androidx.compose.material.Icon
import androidx.compose.material.IconButton
import androidx.compose.material.MaterialTheme
import androidx.compose.material.OutlinedButton
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@ import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.foundation.selection.selectable
import androidx.compose.material.Button
import androidx.compose.material.Checkbox
import androidx.compose.material.CheckboxConstants
import androidx.compose.material.MaterialTheme
import androidx.compose.material.RadioButton
import androidx.compose.material.RadioButtonConstants
@@ -141,9 +142,7 @@ private fun SingleChoiceQuestion(
RadioButton(
selected = optionSelected,
onClick = onClickHandle,
color = RadioButtonConstants.animateDefaultColor(
selected = optionSelected,
enabled = true,
colors = RadioButtonConstants.defaultColors(
selectedColor = MaterialTheme.colors.primary
)
)
@@ -188,7 +187,9 @@ private fun MultipleChoiceQuestion(
checkedState = selected
onAnswerSelected(option.value, selected)
},
checkedColor = MaterialTheme.colors.primary
colors = CheckboxConstants.defaultColors(
checkmarkColor = MaterialTheme.colors.primary
)
)
Text(
text = option.key,
Original file line number Diff line number Diff line change
@@ -17,7 +17,6 @@
package com.example.compose.jetsurvey.survey

import androidx.annotation.StringRes
import androidx.compose.foundation.Icon
import androidx.compose.foundation.ScrollableColumn
import androidx.compose.foundation.Text
import androidx.compose.foundation.layout.Row
@@ -29,6 +28,7 @@ import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.foundation.layout.preferredWidth
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.foundation.layout.wrapContentWidth
import androidx.compose.material.Icon
import androidx.compose.material.IconButton
import androidx.compose.material.MaterialTheme
import androidx.compose.material.OutlinedButton
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ object Versions {
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha13"
const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha14"
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"

const val junit = "junit:junit:4.13"
@@ -40,12 +40,12 @@ object Libs {
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha01"

object Compose {
const val snapshot = ""
const val version = "1.0.0-alpha05"
const val snapshot = "6922857"
const val version = "1.0.0-SNAPSHOT"

@get:JvmStatic
val snapshotUrl: String
get() = "https://androidx.dev/snapshots/builds/$snapshot/artifacts/ui/repository/"
get() = "https://androidx.dev/snapshots/builds/$snapshot/artifacts/repository/"

const val foundation = "androidx.compose.foundation:foundation:$version"
const val layout = "androidx.compose.foundation:foundation-layout:$version"
2 changes: 1 addition & 1 deletion Jetsurvey/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip