Move logout and report bug to Setting screen

2022-12-21 21:48:16 +01:00 · 2022-12-21 21:48:16 +01:00 · 166f9e47f2
commit 166f9e47f2
parent 3f7a83c519
36 changed files with 429 additions and 175 deletions
--- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/ColorUtil.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/ColorUtil.kt
@ -0,0 +1,14 @@
+package io.element.android.x.designsystem
+
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+
+@Composable
+fun Boolean.toEnabledColor(): Color {
+    return if (this) {
+        MaterialTheme.colorScheme.primary
+    } else {
+        MaterialTheme.colorScheme.secondary
+    }
+}
--- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/dialogs/ConfirmationDialog.kt
@ -13,7 +13,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-
 import io.element.android.x.element.resources.R as ElementR

@Composable
--- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/preferences/PreferenceCategory.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/preferences/PreferenceCategory.kt
@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Divider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@ -20,9 +21,14 @@ fun PreferenceCategory(
    Column(
        modifier = modifier
            .fillMaxWidth()
-            .padding(horizontal = 16.dp)
    ) {
+        Divider(
+            modifier = Modifier.padding(horizontal = 16.dp),
+            color = MaterialTheme.colorScheme.secondary,
+            thickness = 1.dp
+        )
        Text(
+            modifier = Modifier.padding(top = 8.dp, start = 56.dp),
            style = MaterialTheme.typography.titleSmall,
            text = title
        )
--- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/preferences/PreferenceSlide.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/preferences/PreferenceSlide.kt
@ -3,6 +3,7 @@ package io.element.android.x.designsystem.components.preferences
 import androidx.annotation.FloatRange
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.MaterialTheme
@ -11,7 +12,10 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.tooling.preview.Preview
+import io.element.android.x.designsystem.components.preferences.components.PreferenceIcon
+import io.element.android.x.designsystem.toEnabledColor

@Composable
 fun PreferenceSlide(
@ -19,6 +23,8 @@ fun PreferenceSlide(
    @FloatRange(0.0, 1.0)
    value: Float,
    modifier: Modifier = Modifier,
+    icon: ImageVector? = null,
+    enabled: Boolean = true,
    summary: String? = null,
    steps: Int = 0,
    onValueChange: (Float) -> Unit = {},
@ -29,27 +35,32 @@ fun PreferenceSlide(
            .defaultMinSize(minHeight = preferenceMinHeight),
        contentAlignment = Alignment.CenterStart
    ) {
-        Column(
-            modifier = modifier
-                .fillMaxWidth(),
-        ) {
-            Text(
-                modifier = Modifier.fillMaxWidth(),
-                style = MaterialTheme.typography.bodyLarge,
-                text = title
-            )
-            summary?.let {
+        Row(modifier = Modifier.fillMaxWidth()) {
+            PreferenceIcon(icon = icon)
+            Column(
+                modifier = Modifier.weight(1f),
+            ) {
                Text(
                    modifier = Modifier.fillMaxWidth(),
-                    style = MaterialTheme.typography.bodyMedium,
-                    text = summary
+                    style = MaterialTheme.typography.bodyLarge,
+                    color = enabled.toEnabledColor(),
+                    text = title
+                )
+                summary?.let {
+                    Text(
+                        modifier = Modifier.fillMaxWidth(),
+                        style = MaterialTheme.typography.bodyMedium,
+                        color = enabled.toEnabledColor(),
+                        text = summary
+                    )
+                }
+                Slider(
+                    value = value,
+                    steps = steps,
+                    onValueChange = onValueChange,
+                    enabled = enabled,
                )
            }
-            Slider(
-                value = value,
-                steps = steps,
-                onValueChange = onValueChange
-            )
        }
    }
 }
--- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/preferences/PreferenceSwitch.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/preferences/PreferenceSwitch.kt
@ -1,42 +1,58 @@
 package io.element.android.x.designsystem.components.preferences

+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Announcement
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.tooling.preview.Preview
+import io.element.android.x.designsystem.components.preferences.components.PreferenceIcon
+import io.element.android.x.designsystem.toEnabledColor

@Composable
 fun PreferenceSwitch(
    title: String,
    isChecked: Boolean,
    modifier: Modifier = Modifier,
+    enabled: Boolean = true,
+    icon: ImageVector? = null,
    onCheckedChange: (Boolean) -> Unit = {},
 ) {
    Box(
        modifier = modifier
            .fillMaxWidth()
-            .defaultMinSize(minHeight = preferenceMinHeight),
+            .defaultMinSize(minHeight = preferenceMinHeight)
+            .clickable { onCheckedChange(!isChecked) },
        contentAlignment = Alignment.CenterStart
    ) {
        Row(
-            modifier = modifier
-                .fillMaxWidth(),
+            modifier = Modifier.fillMaxWidth(),
            verticalAlignment = Alignment.CenterVertically
        ) {
+            PreferenceIcon(
+                icon = icon,
+                enabled = enabled
+            )
            Text(
-                modifier = modifier
-                    .weight(1f),
+                modifier = Modifier.weight(1f),
                style = MaterialTheme.typography.bodyLarge,
+                color = enabled.toEnabledColor(),
                text = title
            )
-            Checkbox(checked = isChecked, onCheckedChange = onCheckedChange)
+            Checkbox(
+                checked = isChecked,
+                enabled = enabled,
+                onCheckedChange = onCheckedChange
+            )
        }
    }
 }
@ -46,6 +62,7 @@ fun PreferenceSwitch(
 fun PreferenceSwitchPreview() {
    PreferenceSwitch(
        title = "Switch",
+        icon = Icons.Default.Announcement,
        isChecked = true
    )
 }
--- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/preferences/PreferenceText.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/preferences/PreferenceText.kt
@ -2,20 +2,26 @@ package io.element.android.x.designsystem.components.preferences

 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.BugReport
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.tooling.preview.Preview
+import io.element.android.x.designsystem.components.preferences.components.PreferenceIcon

@Composable
 fun PreferenceText(
    title: String,
    // TODO subtitle
    modifier: Modifier = Modifier,
+    icon: ImageVector? = null,
    onClick: () -> Unit = {},
 ) {
    Box(
@ -25,12 +31,17 @@ fun PreferenceText(
            .clickable { onClick() },
        contentAlignment = Alignment.Center
    ) {
-        Text(
-            modifier = Modifier
-                .fillMaxWidth(),
-            style = MaterialTheme.typography.bodyLarge,
-            text = title
-        )
+        Row(
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            PreferenceIcon(icon = icon)
+            Text(
+                modifier = Modifier
+                    .weight(1f),
+                style = MaterialTheme.typography.bodyLarge,
+                text = title
+            )
+        }
    }
 }

@ -39,5 +50,6 @@ fun PreferenceText(
 fun PreferenceTextPreview() {
    PreferenceText(
        title = "Title",
+        icon = Icons.Default.BugReport,
    )
 }
--- a/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/preferences/components/PreferenceIcon.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/designsystem/components/preferences/components/PreferenceIcon.kt
@ -0,0 +1,31 @@
+package io.element.android.x.designsystem.components.preferences.components
+
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.unit.dp
+import io.element.android.x.designsystem.toEnabledColor
+
+@Composable
+fun PreferenceIcon(
+    icon: ImageVector?,
+    modifier: Modifier = Modifier,
+    enabled: Boolean = true
+) {
+    if (icon != null) {
+        Icon(
+            imageVector = icon,
+            contentDescription = "",
+            tint = enabled.toEnabledColor(),
+            modifier = modifier
+                .padding(start = 8.dp)
+                .width(48.dp),
+        )
+    } else {
+        Spacer(modifier = modifier.width(56.dp))
+    }
+}