Skip to content

Merges alpha05 branch to main #228

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
manuelvicnt merged 27 commits into from
Oct 14, 2020
Merged

Merges alpha05 branch to main #228

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ff64a77
[Jetcaster] Update to SNAPSHOT 6891475 (#216)
chrisbanes Oct 8, 2020
f2eb002
[Crane] Update to SNAPSHOT 6891475 (#217)
manuelvicnt Oct 9, 2020
48b8213
[Jetchat] Update to SNAPSHOT 6891475
JoseAlcerreca Oct 9, 2020
2c47c1a
Spotless
JoseAlcerreca Oct 9, 2020
38eff0b
[Rally] Update to SNAPSHOT 6891475
JoseAlcerreca Oct 12, 2020
3ef25ab
[Jetsurvey] Bump to alpha05
florina-muntenescu Oct 13, 2020
1a0e2cd
[Jetsurvey] Using onSizeChanged to set the branding height
florina-muntenescu Oct 13, 2020
cd6cc13
Merge pull request #223 from android/fm/jetsurvey_alpha05
florina-muntenescu Oct 13, 2020
7285d77
[Jetsurvey] Bump to alpha05
florina-muntenescu Oct 13, 2020
94c4e96
[Jetsurvey] Using onSizeChanged to set the branding height
florina-muntenescu Oct 13, 2020
4f1f177
[Rally] Removes maven central snapshot repo
JoseAlcerreca Oct 13, 2020
abc776f
Merge branch 'dev_alpha05' of github.com:android/compose-samples into…
JoseAlcerreca Oct 13, 2020
eb1fde4
[Rally] Update to SNAPSHOT 6891475
JoseAlcerreca Oct 13, 2020
edf370e
[Jetchat] Removes maven central snapshot repo
JoseAlcerreca Oct 13, 2020
49af7f4
Merge remote-tracking branch 'github/dev_alpha05' into dev_jetchat_al…
JoseAlcerreca Oct 13, 2020
f7a193c
Merge pull request #218 from JoseAlcerreca/dev_jetchat_alpha05
JoseAlcerreca Oct 13, 2020
2a5305f
[Jetsnack] Update to snapshot 6901934.
nickbutcher Oct 13, 2020
6d1f8bd
[Jetsnack] Remove unused import.
nickbutcher Oct 13, 2020
e09d997
[Owl] Accept modifiers in search suggestion items.
nickbutcher Oct 13, 2020
64e0508
Merge pull request #224 from android/nb/jetsnack_alpha05
nickbutcher Oct 13, 2020
0e3edfc
[Owl] Update to snapshot 6901934.
nickbutcher Oct 13, 2020
40b99f8
Bump JetNews to alpha05 (#221)
objcode Oct 14, 2020
f59851e
Merge branch 'dev_alpha05' into nb/owl_alpha05
nickbutcher Oct 14, 2020
a3bfd5d
Merge pull request #225 from android/nb/owl_alpha05
nickbutcher Oct 14, 2020
a50a961
[Readme] Removes known issues (#222)
manuelvicnt Oct 14, 2020
5fe42bd
[All] Updates to alpha05 (#227)
manuelvicnt Oct 14, 2020
7143bfa
Merge branch 'main' into dev_alpha05
manuelvicnt Oct 14, 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
7 changes: 7 additions & 0 deletions Jetsurvey/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,13 @@ android {

buildFeatures {
compose true

// Disable unused AGP features
buildConfig false
aidl false
renderScript false
resValues false
shaders false
}

composeOptions {
Expand Down
4 changes: 2 additions & 2 deletions Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignInScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

package com.example.compose.jetsurvey.signinsignup

import androidx.compose.foundation.AmbientContentColor
import androidx.compose.foundation.Text
import androidx.compose.foundation.contentColor
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
Expand Down Expand Up @@ -167,7 +167,7 @@ fun ErrorSnackbar(
data.actionLabel?.let {
TextButton(
onClick = onDismiss,
contentColor = contentColor()
contentColor = AmbientContentColor.current
) {
Text(
text = stringResource(id = R.string.dismiss),
Expand Down
12 changes: 6 additions & 6 deletions Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignInSignUp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

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.currentTextStyle
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
Expand All @@ -30,7 +30,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.foundation.layout.preferredWidth
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.material.EmphasisAmbient
import androidx.compose.material.AmbientEmphasisLevels
import androidx.compose.material.IconButton
import androidx.compose.material.MaterialTheme
import androidx.compose.material.OutlinedButton
Expand Down Expand Up @@ -117,7 +117,7 @@ fun Email(
emailState.text = it
},
label = {
ProvideEmphasis(emphasis = EmphasisAmbient.current.medium) {
ProvideEmphasis(emphasis = AmbientEmphasisLevels.current.medium) {
Text(
text = stringResource(id = R.string.email),
style = MaterialTheme.typography.body2
Expand Down Expand Up @@ -170,7 +170,7 @@ fun Password(
},
textStyle = MaterialTheme.typography.body2,
label = {
ProvideEmphasis(emphasis = EmphasisAmbient.current.medium) {
ProvideEmphasis(emphasis = AmbientEmphasisLevels.current.medium) {
Text(
text = label,
style = MaterialTheme.typography.body2
Expand Down Expand Up @@ -216,7 +216,7 @@ fun TextFieldError(textError: String) {
Text(
text = textError,
modifier = Modifier.fillMaxWidth(),
style = currentTextStyle().copy(color = MaterialTheme.colors.error)
style = AmbientTextStyle.current.copy(color = MaterialTheme.colors.error)
)
}
}
Expand All @@ -231,7 +231,7 @@ fun OrSignInAsGuest(
horizontalAlignment = Alignment.CenterHorizontally
) {
Surface {
ProvideEmphasis(emphasis = EmphasisAmbient.current.medium) {
ProvideEmphasis(emphasis = AmbientEmphasisLevels.current.medium) {
Text(
text = stringResource(id = R.string.or),
style = MaterialTheme.typography.subtitle2
Expand Down
4 changes: 2 additions & 2 deletions Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignUpScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.material.AmbientEmphasisLevels
import androidx.compose.material.Button
import androidx.compose.material.EmphasisAmbient
import androidx.compose.material.MaterialTheme
import androidx.compose.material.ProvideEmphasis
import androidx.compose.material.Scaffold
Expand Down Expand Up @@ -103,7 +103,7 @@ fun SignUpContent(
)

Spacer(modifier = Modifier.preferredHeight(16.dp))
ProvideEmphasis(emphasis = EmphasisAmbient.current.medium) {
ProvideEmphasis(emphasis = AmbientEmphasisLevels.current.medium) {
Text(
text = stringResource(id = R.string.terms_and_conditions),
style = MaterialTheme.typography.caption
Expand Down
15 changes: 8 additions & 7 deletions Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/WelcomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import androidx.compose.foundation.layout.offsetPx
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.material.AmbientEmphasisLevels
import androidx.compose.material.Button
import androidx.compose.material.EmphasisAmbient
import androidx.compose.material.MaterialTheme
import androidx.compose.material.ProvideEmphasis
import androidx.compose.material.Surface
Expand All @@ -39,7 +39,8 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.boundsInParent
import androidx.compose.ui.onPositioned
import androidx.compose.ui.onGloballyPositioned
import androidx.compose.ui.onSizeChanged
import androidx.compose.ui.platform.DensityAmbient
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
Expand Down Expand Up @@ -72,14 +73,14 @@ fun WelcomeScreen(onEvent: (WelcomeEvent) -> Unit) {
modifier = Modifier.fillMaxWidth()
.brandingPreferredHeight(showBranding, heightDp)
.offsetPx(y = currentOffsetHolder)
.onPositioned {
.onSizeChanged {
if (showBranding) {
heightWithBranding = it.size.height
heightWithBranding = it.height
}
}
) {
Branding(
modifier = Modifier.fillMaxWidth().weight(1f).onPositioned {
modifier = Modifier.fillMaxWidth().weight(1f).onGloballyPositioned {
if (brandingBottom == 0f) {
brandingBottom = it.boundsInParent.bottom
}
Expand Down Expand Up @@ -112,7 +113,7 @@ private fun Branding(modifier: Modifier = Modifier) {
modifier = modifier.wrapContentHeight(align = Alignment.CenterVertically)
) {
Logo(modifier = Modifier.align(Alignment.CenterHorizontally).padding(horizontal = 76.dp))
ProvideEmphasis(emphasis = EmphasisAmbient.current.high) {
ProvideEmphasis(emphasis = AmbientEmphasisLevels.current.high) {
Text(
text = stringResource(id = R.string.app_tagline),
style = MaterialTheme.typography.subtitle1,
Expand Down Expand Up @@ -147,7 +148,7 @@ private fun SignInCreateAccount(
) {
val emailState = remember { EmailState() }
Column(modifier = modifier, horizontalAlignment = Alignment.CenterHorizontally) {
ProvideEmphasis(emphasis = EmphasisAmbient.current.medium) {
ProvideEmphasis(emphasis = AmbientEmphasisLevels.current.medium) {
Text(
text = stringResource(id = R.string.sign_in_create_account),
style = MaterialTheme.typography.subtitle2,
Expand Down
6 changes: 2 additions & 4 deletions Jetsurvey/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@ subprojects {
mavenCentral()
jcenter()

if (!Libs.AndroidX.Compose.snapshot.isEmpty()) {
maven {
url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/ui/repository/"
}
if (Libs.AndroidX.Compose.version.endsWith("SNAPSHOT")) {
maven { url Libs.AndroidX.Compose.snapshotUrl }
}
}

Expand Down
11 changes: 7 additions & 4 deletions Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt
View file
Open in desktop
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.0"
private const val version = "1.4.10"
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 @@ -40,10 +40,13 @@ object Libs {
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha01"

object Compose {
const val snapshot = ""
const val version = "1.0.0-alpha04"
const val snapshot = "6901934"
const val version = "1.0.0-SNAPSHOT"

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

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