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

Commit 67e6d656 authored by Anton Potapov's avatar Anton Potapov
Browse files

Update PlatformSlider dark theme text colour 

Flag: aconfig new_volume_panel TEAMFOOD
Test: manual on the phone. Open Volume panel with the dark theme
Bug: 332720172
Change-Id: I81392f958a98f17ff3a5786cabe55332354906e3
parent b828afed

packages/SystemUI/compose/core/src/com/android/compose/PlatformSlider.kt

+11 −34
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import androidx.compose.foundation.Canvas 
import androidx.compose.foundation.background

import androidx.compose.foundation.interaction.DragInteraction

import androidx.compose.foundation.interaction.MutableInteractionSource

import androidx.compose.foundation.isSystemInDarkTheme

import androidx.compose.foundation.layout.Box

import androidx.compose.foundation.layout.Spacer

import androidx.compose.foundation.layout.fillMaxSize
@@ -63,7 +62,6 @@ import androidx.compose.ui.layout.Placeable 
import androidx.compose.ui.layout.layoutId

import androidx.compose.ui.platform.LocalDensity

import androidx.compose.ui.platform.LocalLayoutDirection

import androidx.compose.ui.res.colorResource

import androidx.compose.ui.unit.Constraints

import androidx.compose.ui.unit.Dp

import androidx.compose.ui.unit.IntOffset
@@ -458,39 +456,18 @@ object PlatformSliderDefaults { 


    @Composable

    fun defaultPlatformSliderColors(): PlatformSliderColors =

        if (isSystemInDarkTheme()) darkThemePlatformSliderColors()

        else lightThemePlatformSliderColors()

}



/** [PlatformSliderColors] for the light theme */

@Composable

private fun lightThemePlatformSliderColors() =

    PlatformSliderColors(

        trackColor = colorResource(android.R.color.system_accent3_200),

        indicatorColor = MaterialTheme.colorScheme.tertiary,

        iconColor = MaterialTheme.colorScheme.onTertiary,

        labelColorOnIndicator = MaterialTheme.colorScheme.onTertiary,

        labelColorOnTrack = MaterialTheme.colorScheme.onTertiaryContainer,

        disabledTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest,

        disabledIndicatorColor = MaterialTheme.colorScheme.surfaceContainerHighest,

        disabledIconColor = MaterialTheme.colorScheme.outline,

        disabledLabelColor = MaterialTheme.colorScheme.onSurfaceVariant,

    )



/** [PlatformSliderColors] for the dark theme */

@Composable

private fun darkThemePlatformSliderColors() =

        PlatformSliderColors(

        trackColor = colorResource(android.R.color.system_accent3_600),

        indicatorColor = MaterialTheme.colorScheme.tertiary,

        iconColor = MaterialTheme.colorScheme.onTertiary,

        labelColorOnIndicator = MaterialTheme.colorScheme.onTertiary,

        labelColorOnTrack = colorResource(android.R.color.system_accent3_900),

            trackColor = MaterialTheme.colorScheme.secondaryContainer,

            indicatorColor = MaterialTheme.colorScheme.primary,

            iconColor = MaterialTheme.colorScheme.onPrimary,

            labelColorOnIndicator = MaterialTheme.colorScheme.onPrimary,

            labelColorOnTrack = MaterialTheme.colorScheme.onSecondaryContainer,

            disabledTrackColor = MaterialTheme.colorScheme.surfaceContainerHighest,

            disabledIndicatorColor = MaterialTheme.colorScheme.surfaceContainerHighest,

            disabledIconColor = MaterialTheme.colorScheme.outline,

            disabledLabelColor = MaterialTheme.colorScheme.onSurfaceVariant,

        )

}



private fun PlatformSliderColors.getTrackColor(isEnabled: Boolean): Color =

    if (isEnabled) trackColor else disabledTrackColor