Update more design elements to M3

cyb3rko · Dec 6, 2022 · 1ce1a55 · 1ce1a55
1 parent 4cbcdc8
commit 1ce1a55
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -71,7 +71,7 @@ dependencies {
     implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.0'
     implementation 'com.github.AppIntro:AppIntro:6.0.0'
     implementation 'com.github.cyb3rko:about-icons:1.5.0'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.google.android.material:material:1.8.0-alpha03'
     implementation 'com.google.android.play:core-ktx:1.8.1'
     implementation 'com.google.firebase:firebase-analytics-ktx' // BOM versioning
     implementation 'com.google.firebase:firebase-crashlytics-ktx' // BOM versioning

diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
@@ -26,20 +26,18 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/http_button"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="HTTP"
-                android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
                 tools:ignore="HardcodedText" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/https_button"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="HTTPS"
-                android:textAppearance="@style/TextAppearance.MaterialComponents.Button"
                 tools:ignore="HardcodedText" />
 
         </com.google.android.material.button.MaterialButtonToggleGroup>
@@ -71,13 +69,14 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
-        <CheckBox
+        <com.google.android.material.checkbox.MaterialCheckBox
             android:id="@+id/hostname_ip_address_check"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:checked="true"
             android:text="@string/main_checks_text"
             android:textSize="14sp"
+            android:textColor="@color/textColor"
             app:layout_constraintStart_toStartOf="@+id/hostname_ip_address"
             app:layout_constraintTop_toBottomOf="@+id/hostname_ip_address" />
 
@@ -105,7 +104,7 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
-        <CheckBox
+        <com.google.android.material.checkbox.MaterialCheckBox
             android:id="@+id/port_check"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -137,7 +136,7 @@
             android:enabled="false"
             tools:enabled="true"
             android:textAllCaps="false"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/Widget.Material3.Button.OutlinedButton"
             android:text="@string/main_edit_button"
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintTop_toTopOf="@+id/connect_button"
@@ -157,7 +156,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/connect_button" />
 
-        <CheckBox
+        <com.google.android.material.checkbox.MaterialCheckBox
             android:id="@+id/connect_check"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"