Skip to content

feat(authenticator): Upgrade to Material 3 1.1.0 #31

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
merged 1 commit into from
May 16, 2023
Merged

feat(authenticator): Upgrade to Material 3 1.1.0 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions authenticator/src/main/java/com/amplifyframework/ui/authenticator/ui/DateInputField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package com.amplifyframework.ui.authenticator.ui
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand Down Expand Up @@ -71,7 +70,6 @@ private object DateVisualTransformation : VisualTransformation {
}
}

@OptIn(ExperimentalMaterial3Api::class)
@Composable
internal fun DateInputField(
fieldConfig: FieldConfig.Date,
Expand Down
2 changes: 0 additions & 2 deletions authenticator/src/main/java/com/amplifyframework/ui/authenticator/ui/PasswordInputField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package com.amplifyframework.ui.authenticator.ui
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.OutlinedTextField
Expand All @@ -37,7 +36,6 @@ import com.amplifyframework.ui.authenticator.forms.FieldConfig
import com.amplifyframework.ui.authenticator.forms.MutablePasswordFieldState
import com.amplifyframework.ui.authenticator.strings.StringResolver

@OptIn(ExperimentalMaterial3Api::class)
@Composable
internal fun PasswordInputField(
fieldConfig: FieldConfig.Password,
Expand Down
2 changes: 0 additions & 2 deletions authenticator/src/main/java/com/amplifyframework/ui/authenticator/ui/PhoneInputField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material3.Divider
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Surface
Expand Down Expand Up @@ -69,7 +68,6 @@ private class PhoneNumberFieldState(
}
}

@OptIn(ExperimentalMaterial3Api::class)
@Composable
internal fun PhoneInputField(
fieldConfig: FieldConfig.PhoneNumber,
Expand Down
2 changes: 0 additions & 2 deletions authenticator/src/main/java/com/amplifyframework/ui/authenticator/ui/TextInputField.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package com.amplifyframework.ui.authenticator.ui
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand All @@ -30,7 +29,6 @@ import com.amplifyframework.ui.authenticator.forms.FieldConfig
import com.amplifyframework.ui.authenticator.forms.MutableFieldState
import com.amplifyframework.ui.authenticator.strings.StringResolver

@OptIn(ExperimentalMaterial3Api::class)
@Composable
internal fun TextInputField(
fieldConfig: FieldConfig.Text,
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[versions]
amplify = "2.7.1"
cameraX = "1.2.0"
lifecycle = "2.4.0"
compose = "1.3.2"
lifecycle = "2.4.0"
material3 = "1.1.0"
paparazzi = "1.2.0"

[libraries]
Expand All @@ -18,7 +19,7 @@ android-desugar = "com.android.tools:desugar_jdk_libs:1.1.8"
androidx-camera-core = { module = "androidx.camera:camera-core", version.ref = "cameraX" }
androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "cameraX" }
androidx-camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "cameraX" }
androidx-compose-material = "androidx.compose.material3:material3:1.0.1"
androidx-compose-material = { module = "androidx.compose.material3:material3", version.ref = "material3" }
androidx-compose-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
androidx-compose-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
androidx-futures = "androidx.concurrent:concurrent-futures:1.1.0"
Expand All @@ -45,6 +46,5 @@ camera = ["androidx-camera-core", "androidx-camera-camera2", "androidx-camera-li
compose = ["androidx-compose-material", "androidx-compose-tooling"]
test = ["test-androidx-junit", "test-junit", "test-mockk", "test-robolectric", "test-compose-junit", "test-compose-manifest", "test-espresso"]


[plugins]
paparazzi = { id = "app.cash.paparazzi", version.ref = "paparazzi" }
2 changes: 1 addition & 1 deletion samples/authenticator/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ dependencies {
implementation 'androidx.activity:activity-compose:1.6.1'
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
implementation 'androidx.compose.material3:material3:1.0.1'
implementation 'androidx.compose.material3:material3:1.1.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
Expand Down
3 changes: 0 additions & 3 deletions ...henticator/app/src/main/java/com/amplifyframework/ui/sample/authenticator/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@

package com.amplifyframework.ui.sample.authenticator

import android.app.Activity
import android.content.Context
import android.content.ContextWrapper
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
Expand Down
2 changes: 0 additions & 2 deletions ...enticator/app/src/main/java/com/amplifyframework/ui/sample/authenticator/ThemeSelector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package com.amplifyframework.ui.sample.authenticator
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.RadioButton
import androidx.compose.material3.Switch
import androidx.compose.material3.Text
Expand All @@ -34,7 +33,6 @@ enum class SupportedTheme {
Amplify
}

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun ThemeSelector(
modifier: Modifier = Modifier,
Expand Down