migrate missing views to Material3

seemoo-lab · Dec 16, 2024 · cedf1ac · cedf1ac
1 parent 968bc42
commit cedf1ac
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 19 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -90,8 +90,8 @@ dependencies {
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
     implementation 'androidx.vectordrawable:vectordrawable:1.2.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.8.4'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.8.4'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.8.5'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.8.5'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.8.7'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
@@ -154,18 +154,18 @@ dependencies {
     // Integration with activities
     implementation 'androidx.activity:activity-compose:1.9.3'
     // Compose Material Design
-    // implementation 'androidx.compose.material:material:1.7.5'
+    // implementation 'androidx.compose.material:material:1.7.6'
     // Compose Material3 Design
     implementation 'androidx.compose.material3:material3:1.3.1'
     implementation 'androidx.compose.material3:material3-window-size-class:1.3.1'
     // Animations
-    implementation 'androidx.compose.animation:animation:1.7.5'
+    implementation 'androidx.compose.animation:animation:1.7.6'
     // Tooling support (Previews, etc.)
-    implementation 'androidx.compose.ui:ui-tooling:1.7.5'
+    implementation 'androidx.compose.ui:ui-tooling:1.7.6'
     // Integration with ViewModels
     implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7'
     // UI Tests
-    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.7.5'
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.7.6'
     // When using a MDC theme
     implementation "com.google.android.material:compose-theme-adapter:1.2.1"
 }

diff --git a/app/src/main/java/de/seemoo/at_tracking_detection/ui/MainActivity.kt b/app/src/main/java/de/seemoo/at_tracking_detection/ui/MainActivity.kt
@@ -10,14 +10,6 @@ import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
 import androidx.preference.PreferenceManager
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.compose.material3.ColorScheme
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.dynamicDarkColorScheme
-import androidx.compose.material3.dynamicLightColorScheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.elevation.SurfaceColors
 import dagger.hilt.android.AndroidEntryPoint

diff --git a/app/src/main/java/de/seemoo/at_tracking_detection/ui/dashboard/ArticleFragment.kt b/app/src/main/java/de/seemoo/at_tracking_detection/ui/dashboard/ArticleFragment.kt
@@ -10,7 +10,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import android.widget.Toast
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.MaterialTheme
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy

diff --git a/app/src/main/java/de/seemoo/at_tracking_detection/ui/debug/DebugScansFragment.kt b/app/src/main/java/de/seemoo/at_tracking_detection/ui/debug/DebugScansFragment.kt
@@ -11,9 +11,9 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material.Divider
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.Divider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -62,7 +62,7 @@ class DebugScansFragment: Fragment() {
     private fun Test() {
         Text(
             text = stringResource(id = R.string.last_scans),
-            style = MaterialTheme.typography.h6,
+            style = MaterialTheme.typography.titleLarge,
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(horizontal = Dp(8.0F))