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

Commit 201a2ecd authored by Nikki Moteva's avatar Nikki Moteva
Browse files

System UI: move the button outside of the region select box depending on dimensions 

If the dimensions of the box is smaller than the size of the box, the button should move outside to the top of the box. Otherwise, the button will remain inside of the box.

Screen Recording: http://shortn/_ZYwwpjMw8B

Bug: 424449567
Test: Manual
Flag: com.android.systemui.desktop_screen_capture
Change-Id: I314c64a2078fde03951fb9931d310fa447aaba25
parent 658d789e

packages/SystemUI/src/com/android/systemui/screencapture/record/largescreen/ui/compose/RegionBox.kt

+14 −22
Original line number Diff line number Diff line
@@ -37,12 +37,8 @@ import androidx.compose.ui.input.pointer.PointerInputChange 
import androidx.compose.ui.input.pointer.pointerInput

import androidx.compose.ui.layout.onSizeChanged

import androidx.compose.ui.platform.LocalDensity

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.unit.IntSize

import androidx.compose.ui.unit.dp

import com.android.systemui.res.R

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

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

import com.android.systemui.screencapture.common.ui.viewmodel.DrawableLoaderViewModel

import kotlin.math.max

import kotlin.math.min
@@ -287,32 +283,28 @@ fun RegionBox( 
        val borderStrokeWidth = 4.dp



        state.rect?.let { currentRect ->

            val boxWidthDp = with(density) { currentRect.width.toDp() }

            val boxHeightDp = with(density) { currentRect.height.toDp() }



            // The box that represents the region.

            Box(

                modifier =

                    Modifier.graphicsLayer(

                            translationX = currentRect.left,

                            translationY = currentRect.top,

                        )

                        .size(

                            width = with(density) { currentRect.width.toDp() },

                            height = with(density) { currentRect.height.toDp() },

                        )

                        .size(width = boxWidthDp, height = boxHeightDp)

                        .border(borderStrokeWidth, MaterialTheme.colorScheme.onSurfaceVariant),

                contentAlignment = Alignment.Center,

            ) {

                PrimaryButton(

                    text = stringResource(id = R.string.screen_capture_region_selection_button),

                    onClick = {

                        // TODO(b/417534202): trigger a screenshot of the selected area.

                    },

                    icon =

                        loadIcon(

                            viewModel = drawableLoaderViewModel,

                            resId = R.drawable.ic_screen_capture_camera,

                            contentDescription = null,

                        ),

            ) {}



            // The screenshot button that is positioned inside or outside the region box.

            RegionScreenshotButton(

                boxWidthDp,

                boxHeightDp,

                currentRect,

                drawableLoaderViewModel = drawableLoaderViewModel,

            )

        }

    }

}
 
}

packages/SystemUI/src/com/android/systemui/screencapture/record/largescreen/ui/compose/RegionScreenshotButton.kt

0 → 100644
+111 −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.screencapture.record.largescreen.ui.compose



import androidx.compose.animation.core.animateFloatAsState

import androidx.compose.runtime.Composable

import androidx.compose.runtime.getValue

import androidx.compose.runtime.mutableStateOf

import androidx.compose.runtime.remember

import androidx.compose.runtime.setValue

import androidx.compose.ui.Modifier

import androidx.compose.ui.geometry.Rect

import androidx.compose.ui.graphics.graphicsLayer

import androidx.compose.ui.layout.onSizeChanged

import androidx.compose.ui.platform.LocalDensity

import androidx.compose.ui.res.stringResource

import androidx.compose.ui.unit.Dp

import androidx.compose.ui.unit.IntSize

import com.android.systemui.res.R

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

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

import com.android.systemui.screencapture.common.ui.viewmodel.DrawableLoaderViewModel



/**

 * A composable that represents the screenshot button that is positioned inside or outside the

 * region box.

 *

 * @param boxWidthDp The width of the region box in dp.

 * @param boxHeightDp The height of the region box in dp.

 * @param currentRect The current region box.

 * @param drawableLoaderViewModel The view model that is used to load drawables.

 * @param modifier The modifier to be applied to the composable.

 */

@Composable

fun RegionScreenshotButton(

    boxWidthDp: Dp,

    boxHeightDp: Dp,

    currentRect: Rect,

    drawableLoaderViewModel: DrawableLoaderViewModel,

    modifier: Modifier = Modifier,

) {

    val density = LocalDensity.current



    var buttonSize by remember { mutableStateOf(IntSize.Zero) }

    val buttonWidthDp = with(density) { buttonSize.width.toDp() }

    val buttonHeightDp = with(density) { buttonSize.height.toDp() }



    // Check if the box dimensions is smaller than the screenshot button. If so, the button

    // will be positioned outside the box.

    val isButtonOutside = boxWidthDp < buttonWidthDp || boxHeightDp < buttonHeightDp



    // The translation of the button in the X direction.

    val targetTranslationX by

        animateFloatAsState(

            targetValue =

                if (isButtonOutside) {

                    // Position is centered horizontally, just above the box.

                    currentRect.left + (currentRect.width - buttonSize.width) / 2f

                } else {

                    // Position is centered inside the box.

                    currentRect.left + (currentRect.width - buttonSize.width) / 2f

                }

        )



    // The translation of the button in the Y direction.

    val targetTranslationY by

        animateFloatAsState(

            targetValue =

                if (isButtonOutside) {

                    // Position is centered horizontally, just above the box.

                    currentRect.top - buttonSize.height

                } else {

                    // Position is centered inside the box.

                    currentRect.top + (currentRect.height - buttonSize.height) / 2f

                }

        )



    PrimaryButton(

        modifier =

            modifier

                .onSizeChanged { screenshotButtonSize -> buttonSize = screenshotButtonSize }

                .graphicsLayer {

                    translationX = targetTranslationX

                    translationY = targetTranslationY

                },

        text = stringResource(id = R.string.screen_capture_region_selection_button),

        onClick = {

            // TODO(b/417534202): trigger a screenshot of the selected area.

        },

        icon =

            loadIcon(

                viewModel = drawableLoaderViewModel,

                resId = R.drawable.ic_screen_capture_camera,

                contentDescription = null,

            ),

    )

}