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

Commit 7478bab7 authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Automerger Merge Worker
Browse files

Merge "[flexiglass] Composables for scenes and scene container." into udc-dev am: c7814a5d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23067065



Change-Id: I252f6857d319af2828187d09d2a0fa2dbccf1deb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9b52ff78 c7814a5d

packages/SystemUI/compose/facade/disabled/src/com/android/systemui/scene/shared/page/SceneModule.kt

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

 * Copyright (C) 2023 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.scene.shared.page



import com.android.systemui.scene.shared.model.Scene

import dagger.Module

import dagger.multibindings.Multibinds



@Module

interface SceneModule {

    @Multibinds fun scenes(): Set<Scene>

}

packages/SystemUI/compose/facade/enabled/src/com/android/systemui/scene/ui/composable/SceneModule.kt

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

 * Copyright (C) 2023 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.scene.ui.composable



import com.android.systemui.bouncer.ui.composable.BouncerScene

import com.android.systemui.keyguard.ui.composable.LockScreenScene

import com.android.systemui.qs.ui.composable.QuickSettingsScene

import com.android.systemui.scene.shared.model.Scene

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

import dagger.Module

import dagger.Provides



@Module

object SceneModule {

    @Provides

    fun scenes(

        bouncer: BouncerScene,

        gone: GoneScene,

        lockScreen: LockScreenScene,

        qs: QuickSettingsScene,

        shade: ShadeScene,

    ): Set<Scene> {

        return setOf(

            bouncer,

            gone,

            lockScreen,

            qs,

            shade,

        )

    }

}

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

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

 * Copyright (C) 2023 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.bouncer.ui.composable



import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.Box

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.Row

import androidx.compose.material3.Button

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable

import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import androidx.compose.ui.unit.dp

import com.android.systemui.bouncer.ui.viewmodel.BouncerViewModel

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.scene.shared.model.SceneKey

import com.android.systemui.scene.shared.model.SceneModel

import com.android.systemui.scene.shared.model.UserAction

import com.android.systemui.scene.ui.composable.ComposableScene

import javax.inject.Inject

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.flow.StateFlow

import kotlinx.coroutines.flow.asStateFlow



/** The bouncer scene displays authentication challenges like PIN, password, or pattern. */

@SysUISingleton

class BouncerScene

@Inject

constructor(

    private val viewModel: BouncerViewModel,

) : ComposableScene {

    override val key = SceneKey.Bouncer



    override fun destinationScenes(): StateFlow<Map<UserAction, SceneModel>> =

        MutableStateFlow<Map<UserAction, SceneModel>>(

                mapOf(

                    UserAction.Back to SceneModel(SceneKey.LockScreen),

                )

            )

            .asStateFlow()



    @Composable

    override fun Content(

        modifier: Modifier,

    ) {

        // TODO(b/280877228): implement the real UI.



        Box(modifier = modifier) {

            Column(

                horizontalAlignment = Alignment.CenterHorizontally,

                modifier = Modifier.align(Alignment.Center)

            ) {

                Text("Bouncer", style = MaterialTheme.typography.headlineLarge)

                Row(

                    horizontalArrangement = Arrangement.spacedBy(8.dp),

                ) {

                    Button(onClick = { viewModel.onAuthenticateButtonClicked() }) {

                        Text("Authenticate")

                    }

                }

            }

        }

    }

}

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/LockScreenScene.kt

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

 * Copyright (C) 2023 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.keyguard.ui.composable



import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.Box

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.Row

import androidx.compose.material3.Button

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable

import androidx.compose.runtime.collectAsState

import androidx.compose.runtime.getValue

import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import androidx.compose.ui.unit.dp

import com.android.systemui.common.shared.model.Icon

import com.android.systemui.common.ui.compose.Icon

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.keyguard.ui.viewmodel.LockScreenSceneViewModel

import com.android.systemui.scene.shared.model.Direction

import com.android.systemui.scene.shared.model.SceneKey

import com.android.systemui.scene.shared.model.SceneModel

import com.android.systemui.scene.shared.model.UserAction

import com.android.systemui.scene.ui.composable.ComposableScene

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.flow.SharingStarted

import kotlinx.coroutines.flow.StateFlow

import kotlinx.coroutines.flow.map

import kotlinx.coroutines.flow.stateIn



/** The lock screen scene shows when the device is locked. */

@SysUISingleton

class LockScreenScene

@Inject

constructor(

    @Application private val applicationScope: CoroutineScope,

    private val viewModel: LockScreenSceneViewModel,

) : ComposableScene {

    override val key = SceneKey.LockScreen



    override fun destinationScenes(): StateFlow<Map<UserAction, SceneModel>> =

        viewModel.upDestinationSceneKey

            .map { pageKey -> destinationScenes(up = pageKey) }

            .stateIn(

                scope = applicationScope,

                started = SharingStarted.Eagerly,

                initialValue = destinationScenes(up = viewModel.upDestinationSceneKey.value)

            )



    @Composable

    override fun Content(

        modifier: Modifier,

    ) {

        LockScreenScene(

            viewModel = viewModel,

            modifier = modifier,

        )

    }



    private fun destinationScenes(

        up: SceneKey,

    ): Map<UserAction, SceneModel> {

        return mapOf(

            UserAction.Swipe(Direction.UP) to SceneModel(up),

            UserAction.Swipe(Direction.DOWN) to SceneModel(SceneKey.Shade)

        )

    }

}



@Composable

private fun LockScreenScene(

    viewModel: LockScreenSceneViewModel,

    modifier: Modifier = Modifier,

) {

    // TODO(b/280879610): implement the real UI.



    val lockButtonIcon: Icon by viewModel.lockButtonIcon.collectAsState()



    Box(modifier = modifier) {

        Column(

            horizontalAlignment = Alignment.CenterHorizontally,

            modifier = Modifier.align(Alignment.Center)

        ) {

            Text("Lock screen", style = MaterialTheme.typography.headlineMedium)

            Row(

                horizontalArrangement = Arrangement.spacedBy(8.dp),

            ) {

                Button(onClick = { viewModel.onLockButtonClicked() }) { Icon(lockButtonIcon) }



                Button(onClick = { viewModel.onContentClicked() }) { Text("Open some content") }

            }

        }

    }

}

packages/SystemUI/compose/features/src/com/android/systemui/qs/ui/composable/QuickSettingsScene.kt

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

 * Copyright (C) 2023 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.qs.ui.composable



import androidx.compose.foundation.layout.Arrangement

import androidx.compose.foundation.layout.Box

import androidx.compose.foundation.layout.Column

import androidx.compose.foundation.layout.Row

import androidx.compose.material3.Button

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.Text

import androidx.compose.runtime.Composable

import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import androidx.compose.ui.unit.dp

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.qs.ui.viewmodel.QuickSettingsSceneViewModel

import com.android.systemui.scene.shared.model.Direction

import com.android.systemui.scene.shared.model.SceneKey

import com.android.systemui.scene.shared.model.SceneModel

import com.android.systemui.scene.shared.model.UserAction

import com.android.systemui.scene.ui.composable.ComposableScene

import javax.inject.Inject

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.flow.StateFlow

import kotlinx.coroutines.flow.asStateFlow



/** The Quick Settings (AKA "QS") scene shows the quick setting tiles. */

@SysUISingleton

class QuickSettingsScene

@Inject

constructor(

    private val viewModel: QuickSettingsSceneViewModel,

) : ComposableScene {

    override val key = SceneKey.QuickSettings



    override fun destinationScenes(): StateFlow<Map<UserAction, SceneModel>> =

        MutableStateFlow<Map<UserAction, SceneModel>>(

                mapOf(

                    UserAction.Swipe(Direction.UP) to SceneModel(SceneKey.Shade),

                )

            )

            .asStateFlow()



    @Composable

    override fun Content(

        modifier: Modifier,

    ) {

        QuickSettingsScene(

            viewModel = viewModel,

            modifier = modifier,

        )

    }

}



@Composable

private fun QuickSettingsScene(

    viewModel: QuickSettingsSceneViewModel,

    modifier: Modifier = Modifier,

) {

    // TODO(b/280887232): implement the real UI.



    Box(modifier = modifier) {

        Column(

            horizontalAlignment = Alignment.CenterHorizontally,

            modifier = Modifier.align(Alignment.Center)

        ) {

            Text("Quick settings", style = MaterialTheme.typography.headlineMedium)

            Row(

                horizontalArrangement = Arrangement.spacedBy(8.dp),

            ) {

                Button(onClick = { viewModel.onContentClicked() }) { Text("Open some content") }

            }

        }

    }

}