build: compose 1.7 and kotlin 2.0

oxyroid · May 26, 2024 · 6f74e04 · 6f74e04
1 parent 4cb7a44
commit 6f74e04
Show file tree

Hide file tree

Showing 22 changed files with 296 additions and 235 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,4 @@ local.properties
 jks.txt
 *.jks
 /sample/
+/.kotlin
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -154,6 +154,4 @@ dependencies {
     implementation(libs.androidx.hilt.work)
 
     debugImplementation(libs.squareup.leakcanary)
-
-    implementation(libs.androidx.compose.material3.adaptive)
 }
diff --git a/androidApp/src/main/java/com/m3u/androidApp/ui/sheet/RemoteControlSheet.kt b/androidApp/src/main/java/com/m3u/androidApp/ui/sheet/RemoteControlSheet.kt
@@ -63,7 +63,7 @@ internal fun RemoteControlSheet(
     if (visible) {
         ModalBottomSheet(
             sheetState = sheetState,
-            windowInsets = WindowInsets(0),
+//            windowInsets = WindowInsets(0),
             onDismissRequest = {
                 if (!searchingOrConnecting) onDismissRequest()
             },

diff --git a/androidApp/src/main/java/com/m3u/androidApp/ui/sheet/VirtualNumberKeyboard.kt b/androidApp/src/main/java/com/m3u/androidApp/ui/sheet/VirtualNumberKeyboard.kt
@@ -14,7 +14,7 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.ArrowBackIosNew
 import androidx.compose.material.icons.rounded.Delete
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material3.ripple
 import com.m3u.material.components.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -111,7 +111,7 @@ internal fun VirtualNumberKeyboard(
                                 )
                             }
                         },
-                        indication = rememberRipple(color = MaterialTheme.colorScheme.primary),
+                        indication = ripple(color = MaterialTheme.colorScheme.primary),
                         interactionSource = remember { MutableInteractionSource() }
                     ),
                 horizontalAlignment = Alignment.CenterHorizontally,
@@ -139,7 +139,7 @@ internal fun VirtualNumberKeyboard(
                                 onCode("")
                             }
                         },
-                        indication = rememberRipple(color = MaterialTheme.colorScheme.primary),
+                        indication = ripple(color = MaterialTheme.colorScheme.primary),
                         interactionSource = remember { MutableInteractionSource() }
                     ),
                 horizontalAlignment = Alignment.CenterHorizontally,

diff --git a/features/playlist/build.gradle.kts b/features/playlist/build.gradle.kts
@@ -51,7 +51,7 @@ dependencies {
     implementation(libs.androidx.core.ktx)
 
     // for m2 BackdropScaffold only
-    implementation("androidx.compose.material:material:${libs.versions.androidx.compose}")
+    implementation("androidx.compose.material:material")
 
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.lifecycle.runtime.compose)

diff --git a/features/playlist/src/main/java/com/m3u/features/playlist/PlaylistViewModel.kt b/features/playlist/src/main/java/com/m3u/features/playlist/PlaylistViewModel.kt
@@ -347,7 +347,7 @@ class PlaylistViewModel @Inject constructor(
     )
 
     @OptIn(FlowPreview::class)
-    private val categories = flatmapCombined(playlistUrl, query) { playlistUrl, query ->
+    private val categories: Flow<List<String>> = flatmapCombined(playlistUrl, query) { playlistUrl, query ->
         playlistRepository.observeCategoriesByPlaylistUrlIgnoreHidden(playlistUrl, query)
     }
         .let { flow ->
@@ -360,8 +360,7 @@ class PlaylistViewModel @Inject constructor(
     internal val channels: StateFlow<List<Channel>> = combine(
         playlistUrl,
         categories,
-        query,
-        sort
+        query, sort
     ) { playlistUrl, categories, query, sort ->
         ChannelParameters(
             playlistUrl = playlistUrl,

diff --git a/features/playlist/src/main/java/com/m3u/features/playlist/components/PlaylistTabRow.kt b/features/playlist/src/main/java/com/m3u/features/playlist/components/PlaylistTabRow.kt
@@ -25,13 +25,13 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Menu
 import androidx.compose.material.icons.rounded.PushPin
 import androidx.compose.material.icons.rounded.VisibilityOff
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
+import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
@@ -213,7 +213,7 @@ private fun PlaylistTabRowItem(
             }
         )
     ) {
-        val indication = if (hasOtherFocused) null else rememberRipple()
+        val indication = if (hasOtherFocused) null else ripple()
         val shape = if (isExpanded) RectangleShape
         else RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp)
         Card(

diff --git a/features/setting/build.gradle.kts b/features/setting/build.gradle.kts
@@ -60,4 +60,6 @@ dependencies {
     implementation(libs.androidx.hilt.work)
 
     implementation(libs.androidx.compose.material3.adaptive)
+    implementation(libs.androidx.compose.material3.adaptive.navigation)
+    implementation(libs.androidx.compose.material3.adaptive.layout)
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,3 +19,4 @@ local.properties @@
     jks.txt
     *.jks
     /sample/
+    /.kotlin