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

Commit 23e5cb83 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Split BaseLayout from BasePreference

BaseLayout could be share by Slider widget.

Bug: 235727273
Test: Manual with Codelab app
Change-Id: I2fe9096fd52695ba16a2a6e085f5a496be0fa669
parent e313ea01
Loading
Loading
Loading
Loading
+117 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2022 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.settingslib.spa.widget.preference

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.material3.Divider
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.State
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.android.settingslib.spa.framework.toState
import com.android.settingslib.spa.theme.SettingsDimension
import com.android.settingslib.spa.theme.SettingsOpacity
import com.android.settingslib.spa.theme.SettingsTheme

@Composable
internal fun BaseLayout(
    title: String,
    subTitle: @Composable () -> Unit,
    modifier: Modifier = Modifier,
    icon: (@Composable () -> Unit)? = null,
    enabled: State<Boolean> = true.toState(),
    paddingStart: Dp = SettingsDimension.itemPaddingStart,
    paddingEnd: Dp = SettingsDimension.itemPaddingEnd,
    paddingVertical: Dp = SettingsDimension.itemPaddingVertical,
    widget: @Composable () -> Unit = {},
) {
    Row(
        modifier = modifier
            .fillMaxWidth()
            .padding(end = paddingEnd),
        verticalAlignment = Alignment.CenterVertically,
    ) {
        val alphaModifier =
            Modifier.alpha(if (enabled.value) SettingsOpacity.Full else SettingsOpacity.Disabled)
        BaseIcon(icon, alphaModifier, paddingStart)
        Titles(
            title = title,
            subTitle = subTitle,
            modifier = alphaModifier
                .weight(1f)
                .padding(vertical = paddingVertical),
        )
        widget()
    }
}

@Composable
private fun BaseIcon(
    icon: @Composable (() -> Unit)?,
    modifier: Modifier,
    paddingStart: Dp,
) {
    if (icon != null) {
        Box(
            modifier = modifier.size(SettingsDimension.itemIconContainerSize),
            contentAlignment = Alignment.Center,
        ) {
            icon()
        }
    } else {
        Spacer(modifier = Modifier.width(width = paddingStart))
    }
}

// Extracts a scope to avoid frequent recompose outside scope.
@Composable
private fun Titles(title: String, subTitle: @Composable () -> Unit, modifier: Modifier) {
    Column(modifier) {
        Text(
            text = title,
            color = MaterialTheme.colorScheme.onSurface,
            style = MaterialTheme.typography.titleMedium,
        )
        subTitle()
    }
}

@Preview
@Composable
private fun BaseLayoutPreview() {
    SettingsTheme {
        BaseLayout(
            title = "Title",
            subTitle = {
                Divider(thickness = 10.dp)
            }
        )
    }
}
+18 −56
Original line number Diff line number Diff line
@@ -16,14 +16,6 @@

package com.android.settingslib.spa.widget.preference

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.BatteryChargingFull
import androidx.compose.material3.Icon
@@ -31,14 +23,11 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.State
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Dp
import com.android.settingslib.spa.framework.toState
import com.android.settingslib.spa.theme.SettingsDimension
import com.android.settingslib.spa.theme.SettingsOpacity
import com.android.settingslib.spa.theme.SettingsTheme

@Composable
@@ -53,44 +42,9 @@ internal fun BasePreference(
    paddingVertical: Dp = SettingsDimension.itemPaddingVertical,
    widget: @Composable () -> Unit = {},
) {
    Row(
        modifier = modifier
            .fillMaxWidth()
            .padding(end = paddingEnd),
        verticalAlignment = Alignment.CenterVertically,
    ) {
        val alphaModifier =
            Modifier.alpha(if (enabled.value) SettingsOpacity.Full else SettingsOpacity.Disabled)
        if (icon != null) {
            Box(
                modifier = alphaModifier.size(SettingsDimension.itemIconContainerSize),
                contentAlignment = Alignment.Center,
            ) {
                icon()
            }
        } else {
            Spacer(modifier = Modifier.width(width = paddingStart))
        }
        TitleAndSummary(
    BaseLayout(
        title = title,
            summary = summary,
            modifier = alphaModifier
                .weight(1f)
                .padding(vertical = paddingVertical),
        )
        widget()
    }
}

// Extracts a scope to avoid frequent recompose outside scope.
@Composable
private fun TitleAndSummary(title: String, summary: State<String>, modifier: Modifier) {
    Column(modifier) {
        Text(
            text = title,
            color = MaterialTheme.colorScheme.onSurface,
            style = MaterialTheme.typography.titleMedium,
        )
        subTitle = {
            if (summary.value.isNotEmpty()) {
                Text(
                    text = summary.value,
@@ -98,7 +52,15 @@ private fun TitleAndSummary(title: String, summary: State<String>, modifier: Mod
                    style = MaterialTheme.typography.bodyMedium,
                )
            }
    }
        },
        modifier = modifier,
        icon = icon,
        enabled = enabled,
        paddingStart = paddingStart,
        paddingEnd = paddingEnd,
        paddingVertical = paddingVertical,
        widget = widget,
    )
}

@Preview