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

Commit 36542874 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Hook up large screen share UI" into main

parents 5a369599 e9e78e9f

packages/SystemUI/src/com/android/systemui/screencapture/sharescreen/largescreen/ui/compose/LargeScreenCaptureShareScreenContent.kt

+9 −2
Original line number Original line Diff line number Diff line
@@ -17,13 +17,20 @@ 
package com.android.systemui.screencapture.sharescreen.largescreen.ui.compose

package com.android.systemui.screencapture.sharescreen.largescreen.ui.compose





import androidx.compose.runtime.Composable

import androidx.compose.runtime.Composable

import com.android.systemui.lifecycle.rememberViewModel

import com.android.systemui.screencapture.common.ui.compose.ScreenCaptureContent

import com.android.systemui.screencapture.common.ui.compose.ScreenCaptureContent

import com.android.systemui.screencapture.sharescreen.largescreen.ui.viewmodel.PreShareViewModel

import javax.inject.Inject

import javax.inject.Inject





class LargeScreenCaptureShareScreenContent @Inject constructor() : ScreenCaptureContent {

class LargeScreenCaptureShareScreenContent

@Inject

constructor(private val viewModelFactory: PreShareViewModel.Factory) : ScreenCaptureContent {





    @Composable

    @Composable

    override fun Content() {

    override fun Content() {

        TODO("NOT_IMPLEMENTED")

        val viewModel: PreShareViewModel =

            rememberViewModel("PreShareViewModel") { viewModelFactory.create() }



        PreShareUI(viewModel = viewModel)

    }

    }

}
 
}

packages/SystemUI/src/com/android/systemui/screencapture/sharescreen/largescreen/ui/compose/PreShareUI.kt

+1 −5
Original line number Original line Diff line number Diff line
@@ -17,15 +17,11 @@ 
package com.android.systemui.screencapture.sharescreen.largescreen.ui.compose

package com.android.systemui.screencapture.sharescreen.largescreen.ui.compose





import androidx.compose.runtime.Composable

import androidx.compose.runtime.Composable

import com.android.systemui.lifecycle.rememberViewModel

import com.android.systemui.screencapture.sharescreen.largescreen.ui.viewmodel.PreShareViewModel

import com.android.systemui.screencapture.sharescreen.largescreen.ui.viewmodel.PreShareViewModel





/** Main component for the screen share UI. */

/** Main component for the screen share UI. */

@Composable

@Composable

fun PreShareUI(preShareViewModelFactory: PreShareViewModel.Factory) {

fun PreShareUI(viewModel: PreShareViewModel) {

    val viewModel: PreShareViewModel =

        rememberViewModel("PreShareViewModel") { preShareViewModelFactory.create() }



    PreShareToolbar(viewModel = viewModel, expanded = true, onCloseClick = {})

    PreShareToolbar(viewModel = viewModel, expanded = true, onCloseClick = {})





    // TODO: Add PreShareSelector here.

    // TODO: Add PreShareSelector here.