upgrade compose version to v1.7.0

amir1376 · Oct 16, 2024 · 81b81f9 · 81b81f9
1 parent 59e37b3
commit 81b81f9
Show file tree

Hide file tree

Showing 5 changed files with 412 additions and 31 deletions.
diff --git a/desktop/app/src/main/kotlin/com/abdownloadmanager/desktop/ui/theme/ABDownloaderTheme.kt b/desktop/app/src/main/kotlin/com/abdownloadmanager/desktop/ui/theme/ABDownloaderTheme.kt
@@ -10,12 +10,6 @@ import com.abdownloadmanager.desktop.utils.div
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.*
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.ripple.LocalRippleTheme
-import androidx.compose.material.ripple.RippleAlpha
-import androidx.compose.material.ripple.RippleTheme
-import androidx.compose.material.ripple.RippleTheme.Companion.defaultRippleAlpha
-import androidx.compose.material.ripple.RippleTheme.Companion.defaultRippleColor
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.*
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.TextUnit
@@ -116,10 +110,7 @@ fun ABDownloaderTheme(
         CompositionLocalProvider(
             LocalContextMenuRepresentation provides myContextMenuRepresentation(),
             LocalScrollbarStyle provides myDefaultScrollBarStyle(),
-            // there is a modification in newer version of compose that change line height
-            // I want to remove material design for good but for now I override this
-            LocalRippleTheme provides remember { MyRippleTheme() },
-            LocalIndication provides rememberRipple(),
+            LocalIndication provides ripple(),
             LocalContentColor provides myColors.onBackground,
             LocalContentAlpha provides 1f,
             LocalTextSizes provides textSizes,
@@ -133,24 +124,6 @@ fun ABDownloaderTheme(
     }
 }
 
-private class MyRippleTheme:RippleTheme{
-    @Composable
-    override fun defaultColor():Color {
-        return defaultRippleColor(
-            contentColor = LocalContentColor.current,
-            lightTheme = myColors.isLight
-        )
-    }
-
-    @Composable
-    override fun rippleAlpha(): RippleAlpha {
-        return defaultRippleAlpha(
-            contentColor = LocalContentColor.current,
-            lightTheme = myColors.isLight
-        )
-    }
-}
-
 private class MyContextMenuRepresentation : ContextMenuRepresentation {
     @Composable
     override fun Representation(state: ContextMenuState, items: () -> List<ContextMenuItem>) {