refactor: remove last of material 2 references

Author: tien

app/src/main/java/com/tien/piholeconnect/ui/component/TopBar.kt

@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.MoreVert
@@ -90,7 +89,6 @@ fun OptionsMenu(
     }
 }
 
-@OptIn(ExperimentalMaterialApi::class)
 @Composable
 private fun Menu(
     piHoleConnections: Iterable<PiHoleConnection>,

app/src/main/java/com/tien/piholeconnect/ui/screen/filterrules/FilterRulesScreen.kt

@@ -1,17 +1,17 @@
+// TODO: Remove after material3 make swipe-able public
+@file:Suppress("INVISIBLE_MEMBER")
+
 package com.tien.piholeconnect.ui.screen.filterrules
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.Orientation
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Block
 import androidx.compose.material.icons.filled.CheckCircleOutline
 import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.rememberSwipeableState
-import androidx.compose.material.swipeable
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
@@ -35,7 +35,7 @@ import kotlinx.coroutines.launch
 import java.text.DateFormat
 import kotlin.math.roundToInt
 
-@OptIn(ExperimentalMaterialApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun FilterRulesScreen(viewModel: FilterRulesViewModel = viewModel()) {
     val context = LocalContext.current

app/src/main/java/com/tien/piholeconnect/ui/screen/log/LogScreen.kt

@@ -6,7 +6,6 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.selection.selectable
-import androidx.compose.material.BottomSheetScaffoldDefaults
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Search
@@ -126,7 +125,7 @@ fun LogScreen(viewModel: LogViewModel = viewModel(), actions: @Composable () ->
     }
 
     BottomSheetScaffold(scaffoldState = scaffoldState,
-        sheetPeekHeight = BottomSheetScaffoldDefaults.SheetPeekHeight * 0.75f,
+        sheetPeekHeight = BottomSheetDefaults.SheetPeekHeight * 0.75f,
         topBar = {
             Box(Modifier.fillMaxWidth()) {
                 SearchBar(modifier = Modifier.align(Alignment.TopCenter),

gradle/libs.versions.toml

@@ -20,7 +20,6 @@ androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.r
 androidx-camera-lifecycle = { module = "androidx.camera:camera-lifecycle", version.ref = "camerax" }
 androidx-camera-view = { module = "androidx.camera:camera-view", version.ref = "camerax" }
 androidx-compose-iconsExtended = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" }
-androidx-compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
 androidx-compose-material3 = { module = "androidx.compose.material3:material3", version = "1.1.0" }
 androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
 androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
@@ -51,7 +50,7 @@ philJay-mpAndroidChart = { module = "com.github.PhilJay:MPAndroidChart", version
 accompanist = ["accompanist-swiperefresh", "accompanist-systemuicontroller"]
 androidTest = ["androidx-test-espresso-core", "androidx-test-ext-junit"]
 camerax = ["androidx-camera-camera2", "androidx-camera-lifecycle", "androidx-camera-view"]
-compose = ["androidx-compose-iconsExtended", "androidx-compose-material", "androidx-compose-material3", "androidx-compose-ui", "androidx-compose-ui-tooling"]
+compose = ["androidx-compose-iconsExtended", "androidx-compose-material3", "androidx-compose-ui", "androidx-compose-ui-tooling"]
 kotlin = ["kotlin-reflect", "kotlin-serialization"]
 ktor = ["ktor-client-auth", "ktor-client-contentNegotiation", "ktor-client-core", "ktor-client-okhttp", "ktor-serialization-json"]