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

Commit f3ca2e11 authored by Fabián Kozynski's avatar Fabián Kozynski
Browse files

Fix colors of EditTabs 

Test: atest EditModeTabsScreenshotTest
Fixes: 428955274
Flag: com.android.systemui.qs_edit_mode_tabs
Change-Id: Ie594ea00601f4fff2dd74c3b9dffa6bf3bbc4489
parent a1f819a3

packages/SystemUI/src/com/android/systemui/qs/panels/ui/compose/tabs/EditModeTabs.kt

+17 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.qs.panels.ui.compose.tabs



import androidx.compose.animation.AnimatedVisibility

import androidx.compose.animation.animateColor

import androidx.compose.animation.core.animateFloat

import androidx.compose.animation.core.updateTransition

import androidx.compose.animation.expandIn
@@ -30,11 +31,12 @@ import androidx.compose.foundation.layout.Row 
import androidx.compose.foundation.layout.fillMaxHeight

import androidx.compose.foundation.layout.height

import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.text.BasicText

import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi

import androidx.compose.material3.FloatingToolbarDefaults

import androidx.compose.material3.HorizontalFloatingToolbar

import androidx.compose.material3.Icon

import androidx.compose.material3.Text

import androidx.compose.material3.MaterialTheme

import androidx.compose.runtime.Composable

import androidx.compose.runtime.getValue

import androidx.compose.ui.Alignment
@@ -56,7 +58,9 @@ fun EditModeTabs( 
    onTabChanged: () -> Unit = {},

) {

    val containerColor = LocalAndroidColorScheme.current.surfaceEffect1

    val selectedButtonColor = LocalAndroidColorScheme.current.surfaceEffect2

    val selectedButtonColor = MaterialTheme.colorScheme.secondary

    val selectedTextColor = MaterialTheme.colorScheme.onSecondary

    val unselectedTextColor = MaterialTheme.colorScheme.onSurfaceVariant

    HorizontalFloatingToolbar(

        modifier = modifier.height(60.dp),

        expanded = false,
@@ -66,9 +70,17 @@ fun EditModeTabs( 
                toolbarContainerColor = containerColor

            ),

    ) {

        viewModel.tabs.forEach { tab ->

        EditModeTabViewModel.tabs.forEach { tab ->

            val isSelected = updateTransition(viewModel.selectedTab == tab)

            val selectionBackgroundAlpha by isSelected.animateFloat { if (it) 1f else 0f }

            val textColor by

                isSelected.animateColor {

                    if (it) {

                        selectedTextColor

                    } else {

                        unselectedTextColor

                    }

                }

            Row(

                horizontalArrangement = Arrangement.Center,

                verticalAlignment = Alignment.CenterVertically,
@@ -98,10 +110,11 @@ fun EditModeTabs( 
                    Icon(

                        imageVector = tab.titleIcon,

                        contentDescription = null,

                        tint = MaterialTheme.colorScheme.onSecondary,

                        modifier = Modifier.padding(end = 8.dp),

                    )

                }

                Text(stringResource(tab.titleResId))

                BasicText(stringResource(tab.titleResId), color = { textColor })

            }

        }

    }

packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/EditModeTabViewModel.kt

+4 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ import com.android.systemui.qs.panels.ui.model.EditModeTab 


@Stable

class EditModeTabViewModel {

    val tabs: List<EditModeTab> = listOf(EditModeTab.EditingTab, EditModeTab.LayoutTab)



    var selectedTab: EditModeTab by mutableStateOf(tabs.first())

        private set
@@ -34,4 +32,8 @@ class EditModeTabViewModel { 
            selectedTab = tab

        }

    }



    companion object {

        val tabs: List<EditModeTab> = listOf(EditModeTab.EditingTab, EditModeTab.LayoutTab)

    }

}