Skip to content

[Jetsurvey] Bump to alpha05 #223

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
florina-muntenescu merged 2 commits into from
Oct 13, 2020
Merged

[Jetsurvey] Bump to alpha05 #223

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ef25ab
[Jetsurvey] Bump to alpha05
florina-muntenescu Oct 13, 2020
1a0e2cd
[Jetsurvey] Using onSizeChanged to set the branding height
florina-muntenescu Oct 13, 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
12 changes: 6 additions & 6 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,7 @@ 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.platform.DensityAmbient
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
Expand Down Expand Up @@ -72,14 +72,14 @@ fun WelcomeScreen(onEvent: (WelcomeEvent) -> Unit) {
modifier = Modifier.fillMaxWidth()
.brandingPreferredHeight(showBranding, heightDp)
.offsetPx(y = currentOffsetHolder)
.onPositioned {
.onGloballyPositioned {
if (showBranding) {
heightWithBranding = it.size.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 +112,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 +147,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