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

Commit f8322e45 authored by Ahmed Mehfooz's avatar Ahmed Mehfooz
Browse files

[DesktopStatusBar] Add Time and Date 

Test: manual
Bug: 433589833
Flag: com.android.systemui.status_bar_for_desktop
Change-Id: Ic0cc057793e025eab4c8d6fc83b8c47a317c4408
parent 1c75a364

packages/SystemUI/src/com/android/systemui/clock/ui/composable/ClockLegacy.kt

0 → 100644
+45 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2025 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.clock.ui.composable



import android.view.ContextThemeWrapper

import androidx.compose.foundation.clickable

import androidx.compose.runtime.Composable

import androidx.compose.ui.Modifier

import androidx.compose.ui.graphics.Color

import androidx.compose.ui.graphics.toArgb

import androidx.compose.ui.viewinterop.AndroidView

import com.android.compose.modifiers.thenIf

import com.android.systemui.res.R



/**

 * Composable wrapper around the legacy [com.android.systemui.statusbar.policy.Clock] view. Will be

 * replaced by the fully composable [Clock].

 */

@Composable

fun ClockLegacy(textColor: Color, onClick: (() -> Unit)?, modifier: Modifier = Modifier) {

    AndroidView(

        factory = { context ->

            com.android.systemui.statusbar.policy.Clock(

                ContextThemeWrapper(context, R.style.Theme_SystemUI),

                null,

            )

        },

        update = { view -> view.setTextColor(textColor.toArgb()) },

        modifier = modifier.thenIf(onClick != null) { Modifier.clickable { onClick?.invoke() } },

    )

}

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/DesktopStatusBar.kt

+39 −3
Original line number Diff line number Diff line
@@ -16,13 +16,49 @@ 


package com.android.systemui.statusbar.pipeline.shared.ui.composable



import androidx.compose.material3.Text

import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.Row

import androidx.compose.foundation.layout.fillMaxWidth

import androidx.compose.foundation.layout.padding

import androidx.compose.runtime.Composable

import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import androidx.compose.ui.graphics.Color

import androidx.compose.ui.unit.dp

import com.android.compose.theme.colorAttr

import com.android.systemui.clock.ui.composable.ClockLegacy

import com.android.systemui.clock.ui.viewmodel.AmPmStyle

import com.android.systemui.clock.ui.viewmodel.ClockViewModel

import com.android.systemui.lifecycle.rememberViewModel

import com.android.systemui.res.R

import com.android.systemui.shade.ui.composable.VariableDayDate

import com.android.systemui.statusbar.pipeline.shared.ui.viewmodel.HomeStatusBarViewModel



/** Top level composable responsible for all UI shown for the Status Bar for DesktopMode. */

@Composable

fun DesktopStatusBar(viewModel: HomeStatusBarViewModel, modifier: Modifier = Modifier) {

    Text("Desktop Status Bar", modifier = modifier)

fun DesktopStatusBar(

    viewModel: HomeStatusBarViewModel,

    clockViewModelFactory: ClockViewModel.Factory,

    modifier: Modifier = Modifier,

) {

    // TODO(433589833): Update padding values to match UX specs.

    Row(modifier = modifier.fillMaxWidth().padding(top = 8.dp, start = 12.dp, end = 12.dp)) {

        Row(

            horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.Start),

            modifier = Modifier.padding(vertical = 4.dp),

        ) {

            // TODO(433589833): Add support for color themes.

            ClockLegacy(textColor = Color.White, onClick = null)



            val clockViewModel =

                rememberViewModel("HomeStatusBar.Clock") {

                    clockViewModelFactory.create(AmPmStyle.Gone)

                }

            VariableDayDate(

                longerDateText = clockViewModel.longerDateText,

                shorterDateText = clockViewModel.shorterDateText,

                textColor = colorAttr(R.attr.wallpaperTextColor),

            )

        }

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/shared/ui/composable/StatusBarRoot.kt

+4 −1
Original line number Diff line number Diff line
@@ -207,7 +207,10 @@ fun StatusBarRoot( 


    // Let the DesktopStatusBar compose all the UI if [isDesktopStatusBarEnabled] is true.

    if (StatusBarForDesktop.isEnabled && statusBarViewModel.isDesktopStatusBarEnabled) {

        DesktopStatusBar(viewModel = statusBarViewModel)

        DesktopStatusBar(

            viewModel = statusBarViewModel,

            clockViewModelFactory = clockViewModelFactory,

        )

        return

    }