Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb737f81 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Remove customized SettingsRippleTheme 

Which not allowed in androidx.compose.material.ripple library anymore.

And by removing this, we can follow material3, and align with other
parts in  Settings.

Using LocalContentColor provides MaterialTheme.colorScheme.onSurface
to fix ripple color instead.

Fix: 313682621
Test: visual
Change-Id: I7337d25889c4091ae8d3c063caa30cbf1edd4930
parent 9a964b91

packages/SettingsLib/Spa/build.gradle.kts

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ val androidTop : String = File(rootDir, "../../../../..").canonicalPath 


allprojects {

    extra["androidTop"] = androidTop

    extra["jetpackComposeVersion"] = "1.6.0-alpha08"

    extra["jetpackComposeVersion"] = "1.6.0-beta01"

}



subprojects {

packages/SettingsLib/Spa/spa/build.gradle.kts

+2 −2
Original line number Diff line number Diff line
@@ -57,13 +57,13 @@ dependencies { 
    api("androidx.slice:slice-builders:1.1.0-alpha02")

    api("androidx.slice:slice-core:1.1.0-alpha02")

    api("androidx.slice:slice-view:1.1.0-alpha02")

    api("androidx.compose.material3:material3:1.2.0-alpha10")

    api("androidx.compose.material3:material3:1.2.0-alpha11")

    api("androidx.compose.material:material-icons-extended:$jetpackComposeVersion")

    api("androidx.compose.runtime:runtime-livedata:$jetpackComposeVersion")

    api("androidx.compose.ui:ui-tooling-preview:$jetpackComposeVersion")

    api("androidx.lifecycle:lifecycle-livedata-ktx")

    api("androidx.lifecycle:lifecycle-runtime-compose")

    api("androidx.navigation:navigation-compose:2.7.5")

    api("androidx.navigation:navigation-compose:2.7.4")

    api("com.github.PhilJay:MPAndroidChart:v3.1.0-alpha")

    api("com.google.android.material:material:1.7.0-alpha03")

    debugApi("androidx.compose.ui:ui-tooling:$jetpackComposeVersion")

packages/SettingsLib/Spa/spa/src/com/android/settingslib/spa/framework/theme/SettingsTheme.kt

+2 −20
Original line number Diff line number Diff line
@@ -17,9 +17,7 @@ 
package com.android.settingslib.spa.framework.theme



import androidx.compose.foundation.isSystemInDarkTheme

import androidx.compose.material.ripple.LocalRippleTheme

import androidx.compose.material.ripple.RippleAlpha

import androidx.compose.material.ripple.RippleTheme

import androidx.compose.material3.LocalContentColor

import androidx.compose.material3.MaterialTheme

import androidx.compose.runtime.Composable

import androidx.compose.runtime.CompositionLocalProvider
@@ -39,7 +37,7 @@ fun SettingsTheme(content: @Composable () -> Unit) { 
    MaterialTheme(colorScheme = colorScheme, typography = rememberSettingsTypography()) {

        CompositionLocalProvider(

            LocalColorScheme provides settingsColorScheme(isDarkTheme),

            LocalRippleTheme provides SettingsRippleTheme,

            LocalContentColor provides MaterialTheme.colorScheme.onSurface,

        ) {

            content()

        }
@@ -52,19 +50,3 @@ object SettingsTheme { 
        @ReadOnlyComposable

        get() = LocalColorScheme.current

}
 


private object SettingsRippleTheme : RippleTheme {

    @Composable

    override fun defaultColor() = MaterialTheme.colorScheme.onSurface



    @Composable

    override fun rippleAlpha() = RippleAlpha

}



/** Alpha levels for all content. */

private val RippleAlpha = RippleAlpha(

    pressedAlpha = 0.48f,

    focusedAlpha = 0.48f,

    draggedAlpha = 0.32f,

    hoveredAlpha = 0.16f,

)