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

Commit 907f436c authored by andreydav's avatar andreydav
Browse files

[Flexiglass] New typography for compose bouncer's status message 

Based on BC25 mocks.

Bug: 413302868
Test: manual
Flag: com.android.systemui.compose_bouncer
Change-Id: Id250734ea02a7fc73cc7bb7847f6c456a20f2a10
parent 4b00ce41

packages/SystemUI/compose/features/src/com/android/systemui/bouncer/ui/composable/BouncerContent.kt

+4 −5
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import androidx.compose.material.icons.filled.KeyboardArrowDown 
import androidx.compose.material3.ButtonDefaults

import androidx.compose.material3.DropdownMenu

import androidx.compose.material3.DropdownMenuItem

import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi

import androidx.compose.material3.Icon

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.Text
@@ -88,7 +89,6 @@ import androidx.compose.ui.unit.DpOffset 
import androidx.compose.ui.unit.IntOffset

import androidx.compose.ui.unit.LayoutDirection

import androidx.compose.ui.unit.dp

import androidx.compose.ui.unit.sp

import androidx.compose.ui.unit.times

import androidx.lifecycle.compose.collectAsStateWithLifecycle

import com.android.compose.PlatformButton
@@ -662,6 +662,7 @@ private fun ContentScope.FoldableScene( 
    }

}



@OptIn(ExperimentalMaterial3ExpressiveApi::class)

@Composable

private fun StatusMessage(viewModel: BouncerMessageViewModel, modifier: Modifier = Modifier) {

    val message: MessageViewModel? by viewModel.message.collectAsStateWithLifecycle()
@@ -685,16 +686,14 @@ private fun StatusMessage(viewModel: BouncerMessageViewModel, modifier: Modifier 
                Text(

                    text = it.text,

                    color = MaterialTheme.colorScheme.onSurface,

                    fontSize = 18.sp,

                    lineHeight = 24.sp,

                    style = MaterialTheme.typography.titleLargeEmphasized,

                    overflow = TextOverflow.Ellipsis,

                )

                Spacer(modifier = Modifier.size(10.dp))

                Text(

                    text = it.secondaryText ?: "",

                    color = MaterialTheme.colorScheme.onSurface,

                    fontSize = 14.sp,

                    lineHeight = 20.sp,

                    style = MaterialTheme.typography.titleMediumEmphasized,

                    overflow = TextOverflow.Ellipsis,

                    maxLines = 2,

                )