yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert to use SingleChoiceSegmentedButtonRow

Browse Source
This commit is contained in:
tarsin committed 2023-07-27 07:53:55 +08:00
1 parent 2d9a17bd25
commit 4827b7e077
1 file changed
+7 -44
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/hippo/ehviewer/ui/login/SelectSiteScreen.kt
+7 -44
View File
@@ -2,28 +2,19 @@ package com.hippo.ehviewer.ui.login
import android.app.Activity
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.systemBars
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Button
import androidx.compose.material3.Divider
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.SegmentedButton
import androidx.compose.material3.SingleChoiceSegmentedButtonRow
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
@@ -32,7 +23,6 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.stringResource
@@ -62,41 +52,14 @@ fun SelectSiteScreen() {
style = MaterialTheme.typography.titleMedium,
)
Spacer(modifier = Modifier.weight(1f))
// TODO: Replace this dummy impl with official one when available
// See https://m3.material.io/components/segmented-buttons/overview
Row(
modifier = Modifier.height(IntrinsicSize.Min).border(
1.dp,
MaterialTheme.colorScheme.outline,
RoundedCornerShape(90f, 90f, 90f, 90f),
).clip(RoundedCornerShape(90f, 90f, 90f, 90f)),
) {
Box(
modifier = Modifier.background(if (!siteEx) MaterialTheme.colorScheme.secondaryContainer else MaterialTheme.colorScheme.surface).clickable { siteEx = false }.size(100.dp, 40.dp),
contentAlignment = Alignment.Center,
) {
Text(
text = stringResource(id = R.string.site_e),
style = MaterialTheme.typography.labelLarge,
)
SingleChoiceSegmentedButtonRow {
SegmentedButton(selected = !siteEx, onClick = { siteEx = false }) {
Text(text = stringResource(id = R.string.site_e))
}
Divider(
color = MaterialTheme.colorScheme.outline,
modifier = Modifier.fillMaxHeight().width(1.dp),
)
Box(
modifier = Modifier.background(if (siteEx) MaterialTheme.colorScheme.secondaryContainer else MaterialTheme.colorScheme.surface).clickable { siteEx = true }.size(100.dp, 40.dp),
contentAlignment = Alignment.Center,
) {
Text(
text = stringResource(id = R.string.site_ex),
style = MaterialTheme.typography.labelLarge,
)
SegmentedButton(selected = siteEx, onClick = { siteEx = true }) {
Text(text = stringResource(id = R.string.site_ex))
}
}
// Dummy impl end
Text(
text = stringResource(id = R.string.select_scene_explain),
modifier = Modifier.padding(top = 16.dp),