[Jetsurvey] Update to alpha12 snapshot

florina-muntenescu · florina-muntenescu · commit 5635deb7bac8 · 2021-02-10T17:51:11.000Z
diff --git a/Jetsurvey/app/build.gradle b/Jetsurvey/app/build.gradle
@@ -95,6 +95,9 @@ dependencies {
     implementation Libs.AndroidX.Material.material
     implementation Libs.material
 
+    implementation Libs.AndroidX.Lifecycle.viewmodel
+    implementation Libs.AndroidX.Lifecycle.viewModelCompose
+
     implementation Libs.AndroidX.Compose.layout
     implementation Libs.AndroidX.Compose.material
     implementation Libs.AndroidX.Compose.materialIconsExtended
diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignInFragment.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignInFragment.kt
@@ -23,7 +23,6 @@ import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.observe
 import com.example.compose.jetsurvey.R
 import com.example.compose.jetsurvey.Screen
 import com.example.compose.jetsurvey.navigate
@@ -41,7 +40,7 @@ class SignInFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        viewModel.navigateTo.observe(owner = viewLifecycleOwner) { navigateToEvent ->
+        viewModel.navigateTo.observe(viewLifecycleOwner) { navigateToEvent ->
             navigateToEvent.getContentIfNotHandled()?.let { navigateTo ->
                 navigate(navigateTo, Screen.SignIn)
             }
diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignInSignUp.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignInSignUp.kt
@@ -27,12 +27,13 @@ import androidx.compose.foundation.layout.preferredHeight
 import androidx.compose.foundation.layout.preferredWidth
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.AmbientContentAlpha
-import androidx.compose.material.AmbientTextStyle
 import androidx.compose.material.ContentAlpha
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
+import androidx.compose.material.LocalContentAlpha
+import androidx.compose.material.LocalTextStyle
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedButton
 import androidx.compose.material.OutlinedTextField
@@ -52,6 +53,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusState
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.SoftwareKeyboardController
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
@@ -122,13 +124,14 @@ fun Email(
     imeAction: ImeAction = ImeAction.Next,
     onImeAction: () -> Unit = {}
 ) {
+    lateinit var softwareKeyboardController: SoftwareKeyboardController
     OutlinedTextField(
         value = emailState.text,
         onValueChange = {
             emailState.text = it
         },
         label = {
-            Providers(AmbientContentAlpha provides ContentAlpha.medium) {
+            Providers(LocalContentAlpha provides ContentAlpha.medium) {
                 Text(
                     text = stringResource(id = R.string.email),
                     style = MaterialTheme.typography.body2
@@ -146,13 +149,14 @@ fun Email(
             },
         textStyle = MaterialTheme.typography.body2,
         isErrorValue = emailState.showErrors(),
+        onTextInputStarted = { softwareKeyboardController = it },
         keyboardOptions = KeyboardOptions.Default.copy(imeAction = imeAction),
-        onImeActionPerformed = { action, softKeyboardController ->
-            if (action == ImeAction.Done) {
-                softKeyboardController?.hideSoftwareKeyboard()
+        keyboardActions = KeyboardActions(
+            onDone = {
+                onImeAction()
+                softwareKeyboardController.hideSoftwareKeyboard()
             }
-            onImeAction()
-        }
+        )
     )
 
     emailState.getError()?.let { error -> TextFieldError(textError = error) }
@@ -166,6 +170,7 @@ fun Password(
     imeAction: ImeAction = ImeAction.Done,
     onImeAction: () -> Unit = {}
 ) {
+    lateinit var softwareKeyboardController: SoftwareKeyboardController
     val showPassword = remember { mutableStateOf(false) }
     OutlinedTextField(
         value = passwordState.text,
@@ -184,7 +189,7 @@ fun Password(
             },
         textStyle = MaterialTheme.typography.body2,
         label = {
-            Providers(AmbientContentAlpha provides ContentAlpha.medium) {
+            Providers(LocalContentAlpha provides ContentAlpha.medium) {
                 Text(
                     text = label,
                     style = MaterialTheme.typography.body2
@@ -214,13 +219,14 @@ fun Password(
             PasswordVisualTransformation()
         },
         isErrorValue = passwordState.showErrors(),
+        onTextInputStarted = { softwareKeyboardController = it },
         keyboardOptions = KeyboardOptions.Default.copy(imeAction = imeAction),
-        onImeActionPerformed = { action, softKeyboardController ->
-            if (action == ImeAction.Done) {
-                softKeyboardController?.hideSoftwareKeyboard()
+        keyboardActions = KeyboardActions(
+            onDone = {
+                onImeAction()
+                softwareKeyboardController.hideSoftwareKeyboard()
             }
-            onImeAction()
-        }
+        )
     )
 
     passwordState.getError()?.let { error -> TextFieldError(textError = error) }
@@ -236,7 +242,7 @@ fun TextFieldError(textError: String) {
         Text(
             text = textError,
             modifier = Modifier.fillMaxWidth(),
-            style = AmbientTextStyle.current.copy(color = MaterialTheme.colors.error)
+            style = LocalTextStyle.current.copy(color = MaterialTheme.colors.error)
         )
     }
 }
@@ -251,7 +257,7 @@ fun OrSignInAsGuest(
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
         Surface {
-            Providers(AmbientContentAlpha provides ContentAlpha.medium) {
+            Providers(LocalContentAlpha provides ContentAlpha.medium) {
                 Text(
                     text = stringResource(id = R.string.or),
                     style = MaterialTheme.typography.subtitle2
diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignUpFragment.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignUpFragment.kt
@@ -23,7 +23,6 @@ import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.observe
 import com.example.compose.jetsurvey.R
 import com.example.compose.jetsurvey.Screen
 import com.example.compose.jetsurvey.navigate
@@ -41,7 +40,7 @@ class SignUpFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        viewModel.navigateTo.observe(owner = viewLifecycleOwner) { navigateToEvent ->
+        viewModel.navigateTo.observe(viewLifecycleOwner) { navigateToEvent ->
             navigateToEvent.getContentIfNotHandled()?.let { navigateTo ->
                 navigate(navigateTo, Screen.SignUp)
             }
diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignUpScreen.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/SignUpScreen.kt
@@ -20,9 +20,9 @@ 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.AmbientContentAlpha
 import androidx.compose.material.Button
 import androidx.compose.material.ContentAlpha
+import androidx.compose.material.LocalContentAlpha
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Scaffold
 import androidx.compose.material.Text
@@ -102,7 +102,7 @@ fun SignUpContent(
         )
 
         Spacer(modifier = Modifier.preferredHeight(16.dp))
-        Providers(AmbientContentAlpha provides ContentAlpha.medium) {
+        Providers(LocalContentAlpha provides ContentAlpha.medium) {
             Text(
                 text = stringResource(id = R.string.terms_and_conditions),
                 style = MaterialTheme.typography.caption
diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/WelcomeFragment.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/WelcomeFragment.kt
@@ -23,7 +23,6 @@ import android.view.ViewGroup
 import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.observe
 import com.example.compose.jetsurvey.Screen
 import com.example.compose.jetsurvey.navigate
 import com.example.compose.jetsurvey.theme.JetsurveyTheme
@@ -40,7 +39,7 @@ class WelcomeFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        viewModel.navigateTo.observe(owner = viewLifecycleOwner) { navigateToEvent ->
+        viewModel.navigateTo.observe(viewLifecycleOwner) { navigateToEvent ->
             navigateToEvent.getContentIfNotHandled()?.let { navigateTo ->
                 navigate(navigateTo, Screen.Welcome)
             }
diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/WelcomeScreen.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/signinsignup/WelcomeScreen.kt
@@ -25,9 +25,9 @@ import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.preferredHeight
 import androidx.compose.foundation.layout.wrapContentHeight
-import androidx.compose.material.AmbientContentAlpha
 import androidx.compose.material.Button
 import androidx.compose.material.ContentAlpha
+import androidx.compose.material.LocalContentAlpha
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.material.Text
@@ -42,9 +42,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.boundsInParent
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.layout.onSizeChanged
-import androidx.compose.ui.platform.AmbientDensity
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -67,8 +67,8 @@ fun WelcomeScreen(onEvent: (WelcomeEvent) -> Unit) {
     val currentOffsetHolder = remember { mutableStateOf(0f) }
     currentOffsetHolder.value = if (showBranding) 0f else -brandingBottom
     val currentOffsetHolderDp =
-        with(AmbientDensity.current) { currentOffsetHolder.value.toDp() }
-    val heightDp = with(AmbientDensity.current) { heightWithBranding.toDp() }
+        with(LocalDensity.current) { currentOffsetHolder.value.toDp() }
+    val heightDp = with(LocalDensity.current) { heightWithBranding.toDp() }
     Surface(modifier = Modifier.fillMaxSize()) {
         val offset by animateDpAsState(targetValue = currentOffsetHolderDp)
         Column(
@@ -148,7 +148,7 @@ private fun Logo(
         R.drawable.ic_logo_dark
     }
     Image(
-        imageVector = vectorResource(id = assetId),
+        painter = painterResource(id = assetId),
         modifier = modifier,
         contentDescription = null
     )
@@ -162,7 +162,7 @@ private fun SignInCreateAccount(
 ) {
     val emailState = remember { EmailState() }
     Column(modifier = modifier, horizontalAlignment = Alignment.CenterHorizontally) {
-        Providers(AmbientContentAlpha provides ContentAlpha.medium) {
+        Providers(LocalContentAlpha provides ContentAlpha.medium) {
             Text(
                 text = stringResource(id = R.string.sign_in_create_account),
                 style = MaterialTheme.typography.subtitle2,
diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyQuestions.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyQuestions.kt
@@ -34,12 +34,12 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.selection.selectable
-import androidx.compose.material.AmbientContentAlpha
 import androidx.compose.material.Button
 import androidx.compose.material.Checkbox
 import androidx.compose.material.CheckboxDefaults
 import androidx.compose.material.ContentAlpha
 import androidx.compose.material.Icon
+import androidx.compose.material.LocalContentAlpha
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedButton
 import androidx.compose.material.RadioButton
@@ -58,8 +58,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.example.compose.jetsurvey.R
@@ -103,7 +103,7 @@ fun Question(
             }
             Spacer(modifier = Modifier.preferredHeight(24.dp))
             if (question.description != null) {
-                Providers(AmbientContentAlpha provides ContentAlpha.medium) {
+                Providers(LocalContentAlpha provides ContentAlpha.medium) {
                     Text(
                         text = stringResource(id = question.description),
                         style = MaterialTheme.typography.caption,
@@ -384,7 +384,7 @@ private fun PhotoDefaultImage(
         R.drawable.ic_selfie_dark
     }
     Image(
-        imageVector = vectorResource(id = assetId),
+        painter = painterResource(id = assetId),
         modifier = modifier,
         contentDescription = null
     )
diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyScreen.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyScreen.kt
@@ -26,12 +26,12 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.preferredHeight
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.AmbientContentAlpha
 import androidx.compose.material.Button
 import androidx.compose.material.ContentAlpha
 import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.LinearProgressIndicator
+import androidx.compose.material.LocalContentAlpha
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.OutlinedButton
 import androidx.compose.material.Scaffold
@@ -174,6 +174,7 @@ private fun TopAppBarTitle(
     )
 }
 
+@Suppress("DEPRECATION") // ConstraintLayout
 @OptIn(ExperimentalLayout::class)
 @Composable
 private fun SurveyTopAppBar(
@@ -191,7 +192,7 @@ private fun SurveyTopAppBar(
                 .constrainAs(text) { centerHorizontallyTo(parent) }
         )
 
-        Providers(AmbientContentAlpha provides ContentAlpha.medium) {
+        Providers(LocalContentAlpha provides ContentAlpha.medium) {
             IconButton(
                 onClick = onBackPressed,
                 modifier = Modifier
diff --git a/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/theme/Typography.kt b/Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/theme/Typography.kt
@@ -21,7 +21,6 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.font.font
 import androidx.compose.ui.unit.sp
 import com.example.compose.jetsurvey.R
 
diff --git a/Jetsurvey/build.gradle b/Jetsurvey/build.gradle
@@ -39,7 +39,7 @@ subprojects {
         jcenter()
 
         if (Libs.AndroidX.Compose.version.endsWith("SNAPSHOT")) {
-            maven { url Libs.AndroidX.Compose.snapshotUrl }
+            maven { url 'https://storage.googleapis.com/temp-androidx-snapshot.appspot.com/7123292/' }
         }
 
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
@@ -74,4 +74,17 @@ subprojects {
             jvmTarget = "1.8"
         }
     }
+
+    // FIXME: Only needed for Compose 1.0.0-alpha12 snapshots
+    configurations.configureEach {
+        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+            if (details.requested.group == 'androidx.lifecycle' &&
+                    details.requested.name != 'lifecycle-viewmodel-compose') {
+                details.useVersion('2.3.0-rc01')
+            }
+            if (details.requested.group == 'androidx.savedstate') {
+                details.useVersion('1.1.0-rc01')
+            }
+        }
+    }
 }
diff --git a/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt b/Jetsurvey/buildSrc/src/main/java/com/example/compose/jetsurvey/buildsrc/dependencies.kt
