Skip to content

Commit a7ab396

Browse files
authored
feat(authenticator): Upgrade to Material 3 1.1.0 (#31)
1 parent 49e4be0 commit a7ab396

File tree

8 files changed

+4
-17
lines changed

8 files changed

+4
-17
lines changed

authenticator/src/main/java/com/amplifyframework/ui/authenticator/ui/DateInputField.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package com.amplifyframework.ui.authenticator.ui
1818
import androidx.compose.foundation.layout.fillMaxWidth
1919
import androidx.compose.foundation.text.KeyboardActions
2020
import androidx.compose.foundation.text.KeyboardOptions
21-
import androidx.compose.material3.ExperimentalMaterial3Api
2221
import androidx.compose.material3.OutlinedTextField
2322
import androidx.compose.material3.Text
2423
import androidx.compose.runtime.Composable
@@ -71,7 +70,6 @@ private object DateVisualTransformation : VisualTransformation {
7170
}
7271
}
7372

74-
@OptIn(ExperimentalMaterial3Api::class)
7573
@Composable
7674
internal fun DateInputField(
7775
fieldConfig: FieldConfig.Date,

authenticator/src/main/java/com/amplifyframework/ui/authenticator/ui/PasswordInputField.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package com.amplifyframework.ui.authenticator.ui
1818
import androidx.compose.foundation.layout.fillMaxWidth
1919
import androidx.compose.foundation.text.KeyboardActions
2020
import androidx.compose.foundation.text.KeyboardOptions
21-
import androidx.compose.material3.ExperimentalMaterial3Api
2221
import androidx.compose.material3.Icon
2322
import androidx.compose.material3.IconButton
2423
import androidx.compose.material3.OutlinedTextField
@@ -37,7 +36,6 @@ import com.amplifyframework.ui.authenticator.forms.FieldConfig
3736
import com.amplifyframework.ui.authenticator.forms.MutablePasswordFieldState
3837
import com.amplifyframework.ui.authenticator.strings.StringResolver
3938

40-
@OptIn(ExperimentalMaterial3Api::class)
4139
@Composable
4240
internal fun PasswordInputField(
4341
fieldConfig: FieldConfig.Password,

authenticator/src/main/java/com/amplifyframework/ui/authenticator/ui/PhoneInputField.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import androidx.compose.foundation.lazy.rememberLazyListState
2727
import androidx.compose.foundation.text.KeyboardActions
2828
import androidx.compose.foundation.text.KeyboardOptions
2929
import androidx.compose.material3.Divider
30-
import androidx.compose.material3.ExperimentalMaterial3Api
3130
import androidx.compose.material3.MaterialTheme
3231
import androidx.compose.material3.OutlinedTextField
3332
import androidx.compose.material3.Surface
@@ -69,7 +68,6 @@ private class PhoneNumberFieldState(
6968
}
7069
}
7170

72-
@OptIn(ExperimentalMaterial3Api::class)
7371
@Composable
7472
internal fun PhoneInputField(
7573
fieldConfig: FieldConfig.PhoneNumber,

authenticator/src/main/java/com/amplifyframework/ui/authenticator/ui/TextInputField.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package com.amplifyframework.ui.authenticator.ui
1818
import androidx.compose.foundation.layout.fillMaxWidth
1919
import androidx.compose.foundation.text.KeyboardActions
2020
import androidx.compose.foundation.text.KeyboardOptions
21-
import androidx.compose.material3.ExperimentalMaterial3Api
2221
import androidx.compose.material3.OutlinedTextField
2322
import androidx.compose.material3.Text
2423
import androidx.compose.runtime.Composable
@@ -30,7 +29,6 @@ import com.amplifyframework.ui.authenticator.forms.FieldConfig
3029
import com.amplifyframework.ui.authenticator.forms.MutableFieldState
3130
import com.amplifyframework.ui.authenticator.strings.StringResolver
3231

33-
@OptIn(ExperimentalMaterial3Api::class)
3432
@Composable
3533
internal fun TextInputField(
3634
fieldConfig: FieldConfig.Text,

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[versions]
22
amplify = "2.7.1"
33
cameraX = "1.2.0"
4-
lifecycle = "2.4.0"
54
compose = "1.3.2"
5+
lifecycle = "2.4.0"
6+
material3 = "1.1.0"
67
paparazzi = "1.2.0"
78

89
[libraries]
@@ -18,7 +19,7 @@ android-desugar = "com.android.tools:desugar_jdk_libs:1.1.8"
1819
androidx-camera-core = { module = "androidx.camera:camera-core", version.ref = "cameraX" }
1920
androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "cameraX" }
2021
androidx-camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "cameraX" }
21-
androidx-compose-material = "androidx.compose.material3:material3:1.0.1"
22+
androidx-compose-material = { module = "androidx.compose.material3:material3", version.ref = "material3" }
2223
androidx-compose-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
2324
androidx-compose-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
2425
androidx-futures = "androidx.concurrent:concurrent-futures:1.1.0"
@@ -45,6 +46,5 @@ camera = ["androidx-camera-core", "androidx-camera-camera2", "androidx-camera-li
4546
compose = ["androidx-compose-material", "androidx-compose-tooling"]
4647
test = ["test-androidx-junit", "test-junit", "test-mockk", "test-robolectric", "test-compose-junit", "test-compose-manifest", "test-espresso"]
4748

48-
4949
[plugins]
5050
paparazzi = { id = "app.cash.paparazzi", version.ref = "paparazzi" }

samples/authenticator/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ dependencies {
6161
implementation 'androidx.activity:activity-compose:1.6.1'
6262
implementation "androidx.compose.ui:ui:$compose_version"
6363
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
64-
implementation 'androidx.compose.material3:material3:1.0.1'
64+
implementation 'androidx.compose.material3:material3:1.1.0'
6565
implementation 'androidx.appcompat:appcompat:1.6.1'
6666
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
6767
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"

samples/authenticator/app/src/main/java/com/amplifyframework/ui/sample/authenticator/MainActivity.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515

1616
package com.amplifyframework.ui.sample.authenticator
1717

18-
import android.app.Activity
19-
import android.content.Context
20-
import android.content.ContextWrapper
2118
import android.os.Bundle
2219
import androidx.activity.ComponentActivity
2320
import androidx.activity.compose.setContent

samples/authenticator/app/src/main/java/com/amplifyframework/ui/sample/authenticator/ThemeSelector.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package com.amplifyframework.ui.sample.authenticator
1818
import androidx.compose.foundation.layout.Column
1919
import androidx.compose.foundation.layout.Row
2020
import androidx.compose.foundation.layout.padding
21-
import androidx.compose.material3.ExperimentalMaterial3Api
2221
import androidx.compose.material3.RadioButton
2322
import androidx.compose.material3.Switch
2423
import androidx.compose.material3.Text
@@ -34,7 +33,6 @@ enum class SupportedTheme {
3433
Amplify
3534
}
3635

37-
@OptIn(ExperimentalMaterial3Api::class)
3836
@Composable
3937
fun ThemeSelector(
4038
modifier: Modifier = Modifier,

0 commit comments

Comments
 (0)