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

Unverified Commit 6b081727 authored by Ido Ben-Hur's avatar Ido Ben-Hur Committed by Michael Bestas
Browse files

BrightnessSlider: Adjust brightness icon size and corner radius 



so we look more consistent with the slider and the tiles

Co-authored-by: default avatarMichael Bestas <mkbestas@lineageos.org>
Change-Id: I247b294ccb890c07cb5250c93ab86e50bbe3cfe4
parent ad871c19

packages/SystemUI/src/com/android/systemui/brightness/ui/compose/BrightnessSlider.kt

+21 −8
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import androidx.compose.animation.animateColorAsState 
import androidx.compose.animation.core.Animatable

import androidx.compose.animation.core.AnimationVector1D

import androidx.compose.animation.core.VectorConverter

import androidx.compose.animation.core.animateDpAsState

import androidx.compose.animation.core.animateFloatAsState

import androidx.compose.animation.core.tween

import androidx.compose.foundation.background
@@ -43,10 +44,10 @@ import androidx.compose.foundation.layout.size 
import androidx.compose.foundation.layout.width

import androidx.compose.foundation.shape.CircleShape

import androidx.compose.foundation.shape.CornerSize

import androidx.compose.foundation.shape.RoundedCornerShape

import androidx.compose.material3.ExperimentalMaterial3Api

import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi

import androidx.compose.material3.Icon

import androidx.compose.material3.IconButton

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.Slider

import androidx.compose.material3.SliderColors
@@ -420,6 +421,13 @@ private fun drawAutoBrightnessButton( 
) {

    val view = LocalView.current

    val coroutineScope = rememberCoroutineScope()

    val animatedCornerRadius by animateDpAsState(

        targetValue = if (autoMode) {

            SliderTrackRoundedCorner

        } else {

            22.5.dp

        }

    )

    val backgroundColor by animateColorAsState(

        targetValue = if (autoMode) {

            MaterialTheme.colorScheme.primary
@@ -445,15 +453,20 @@ private fun drawAutoBrightnessButton( 
        HapticFeedbackConstants.TOGGLE_ON

    }



    IconButton(

    Box(

        modifier = Modifier

            .size(45.dp)

            .clip(RoundedCornerShape(animatedCornerRadius))

            .background(backgroundColor)

            .clickable(

                interactionSource = remember { MutableInteractionSource() },

                indication = null, // Disable ripple effect

                onClick = {

                    view.performHapticFeedback(hapticConstant)

                    coroutineScope.launch { onIconClick() }

        },

        modifier = Modifier

            .size(52.dp)

            .clip(CircleShape)

            .background(backgroundColor)

                }

            ),

        contentAlignment = Alignment.Center

    ) {

        Icon(

            painter = painterResource(painterRes),