|
@@ -4,6 +4,8 @@ import androidx.annotation.StringRes
|
|
|
import androidx.compose.foundation.clickable
|
|
|
import androidx.compose.foundation.layout.Arrangement
|
|
|
import androidx.compose.foundation.layout.Column
|
|
|
+import androidx.compose.foundation.layout.FlowRow
|
|
|
+import androidx.compose.foundation.layout.FlowRowScope
|
|
|
import androidx.compose.foundation.layout.Row
|
|
|
import androidx.compose.foundation.layout.RowScope
|
|
|
import androidx.compose.foundation.layout.Spacer
|
|
@@ -61,7 +63,10 @@ fun HeadingItem(
|
|
|
style = MaterialTheme.typography.header,
|
|
|
modifier = Modifier
|
|
|
.fillMaxWidth()
|
|
|
- .padding(horizontal = SettingsItemsPaddings.Horizontal, vertical = SettingsItemsPaddings.Vertical),
|
|
|
+ .padding(
|
|
|
+ horizontal = SettingsItemsPaddings.Horizontal,
|
|
|
+ vertical = SettingsItemsPaddings.Vertical,
|
|
|
+ ),
|
|
|
)
|
|
|
}
|
|
|
|
|
@@ -203,7 +208,10 @@ fun SelectItem(
|
|
|
modifier = Modifier
|
|
|
.menuAnchor()
|
|
|
.fillMaxWidth()
|
|
|
- .padding(horizontal = SettingsItemsPaddings.Horizontal, vertical = SettingsItemsPaddings.Vertical),
|
|
|
+ .padding(
|
|
|
+ horizontal = SettingsItemsPaddings.Horizontal,
|
|
|
+ vertical = SettingsItemsPaddings.Vertical,
|
|
|
+ ),
|
|
|
label = { Text(text = label) },
|
|
|
value = options[selectedIndex].toString(),
|
|
|
onValueChange = {},
|
|
@@ -259,7 +267,10 @@ fun TriStateItem(
|
|
|
},
|
|
|
)
|
|
|
.fillMaxWidth()
|
|
|
- .padding(horizontal = SettingsItemsPaddings.Horizontal, vertical = SettingsItemsPaddings.Vertical),
|
|
|
+ .padding(
|
|
|
+ horizontal = SettingsItemsPaddings.Horizontal,
|
|
|
+ vertical = SettingsItemsPaddings.Vertical,
|
|
|
+ ),
|
|
|
verticalAlignment = Alignment.CenterVertically,
|
|
|
horizontalArrangement = Arrangement.spacedBy(24.dp),
|
|
|
) {
|
|
@@ -306,6 +317,26 @@ fun TextItem(
|
|
|
)
|
|
|
}
|
|
|
|
|
|
+@Composable
|
|
|
+fun SettingsFlowRow(
|
|
|
+ @StringRes labelRes: Int,
|
|
|
+ content: @Composable FlowRowScope.() -> Unit,
|
|
|
+) {
|
|
|
+ Column {
|
|
|
+ HeadingItem(labelRes)
|
|
|
+ FlowRow(
|
|
|
+ modifier = Modifier.padding(
|
|
|
+ start = SettingsItemsPaddings.Horizontal,
|
|
|
+ top = 0.dp,
|
|
|
+ end = SettingsItemsPaddings.Horizontal,
|
|
|
+ bottom = SettingsItemsPaddings.Vertical,
|
|
|
+ ),
|
|
|
+ horizontalArrangement = Arrangement.spacedBy(4.dp),
|
|
|
+ content = content,
|
|
|
+ )
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
@Composable
|
|
|
private fun BaseSettingsItem(
|
|
|
label: String,
|
|
@@ -316,7 +347,10 @@ private fun BaseSettingsItem(
|
|
|
modifier = Modifier
|
|
|
.clickable(onClick = onClick)
|
|
|
.fillMaxWidth()
|
|
|
- .padding(horizontal = SettingsItemsPaddings.Horizontal, vertical = SettingsItemsPaddings.Vertical),
|
|
|
+ .padding(
|
|
|
+ horizontal = SettingsItemsPaddings.Horizontal,
|
|
|
+ vertical = SettingsItemsPaddings.Vertical,
|
|
|
+ ),
|
|
|
verticalAlignment = Alignment.CenterVertically,
|
|
|
horizontalArrangement = Arrangement.spacedBy(24.dp),
|
|
|
) {
|