Merge branch 'release/1.2.0' into main

Author: rafakob

app/build.gradle.kts

@@ -23,8 +23,8 @@ android {
 
     defaultConfig {
         applicationId = "com.twofasapp.pass"
-        versionName = "1.1.6"
-        versionCode = 26
+        versionName = "1.2.0"
+        versionCode = 27
     }
 
     applicationVariants.all {

core/android/src/main/java/com/twofasapp/core/android/navigation/Screen.kt

@@ -109,6 +109,9 @@ sealed class Screen(
     @Serializable
     data object Customization : Screen()
 
+    @Serializable
+    data object ManageTags : Screen()
+
     @Serializable
     data object KnownBrowsers : Screen()
 

core/common/src/main/java/com/twofasapp/core/common/domain/Tag.kt

@@ -0,0 +1,23 @@
+package com.twofasapp.core.common.domain
+
+data class Tag(
+    val id: String,
+    val vaultId: String,
+    val name: String,
+    val color: String?,
+    val position: Int,
+    val updatedAt: Long,
+    val assignedItemsCount: Int,
+) {
+    companion object {
+        val Empty = Tag(
+            id = "",
+            vaultId = "",
+            name = "",
+            color = null,
+            position = 0,
+            updatedAt = 0,
+            assignedItemsCount = 0,
+        )
+    }
+}

core/common/src/main/java/com/twofasapp/core/common/ktx/ListKtx.kt

@@ -0,0 +1,4 @@
+package com.twofasapp.core.common.ktx
+
+fun <T> List<T>.toggle(item: T): List<T> =
+    if (any { it == item }) filterNot { it == item } else this + item

core/common/src/main/java/com/twofasapp/core/common/ktx/RoomKtx.kt

@@ -0,0 +1,3 @@
+package com.twofasapp.core.common.ktx
+
+const val StringListSeparator = "«§»"

core/design/src/main/java/com/twofasapp/core/design/AppTheme.kt

@@ -79,6 +79,7 @@ fun AppTheme(
         background = colorScheme.background,
         onBackground = colorScheme.onBackground,
         success = if (isInDarkTheme) successDark else successLight,
+        notice = colorScheme.error,
         surface = colorScheme.surface,
         onSurface = colorScheme.onSurface,
         surfaceVariant = colorScheme.surfaceVariant,

core/design/src/main/java/com/twofasapp/core/design/MdtIcons.kt

@@ -45,6 +45,7 @@ object MdtIcons {
     val ChevronUp @Composable get() = painterResource(R.drawable.ic_chevron_up)
     val ChevronDown @Composable get() = painterResource(R.drawable.ic_chevron_down)
     val Check @Composable get() = painterResource(R.drawable.ic_check)
+    val CircleFilled @Composable get() = painterResource(R.drawable.ic_circle_filled)
     val CircleCheck @Composable get() = painterResource(R.drawable.ic_circle_check)
     val CircleCheckFilled @Composable get() = painterResource(R.drawable.ic_circle_check_filled)
     val CircleCheckThinFilled @Composable get() = painterResource(R.drawable.ic_circle_check_thin_filled)
@@ -73,6 +74,7 @@ object MdtIcons {
     val Document @Composable get() = painterResource(R.drawable.ic_document)
     val PasswordGenerator @Composable get() = painterResource(R.drawable.ic_password_generator)
     val Filter @Composable get() = painterResource(R.drawable.ic_filter)
+    val FilterAlt @Composable get() = painterResource(R.drawable.ic_filter_alt)
     val Sort @Composable get() = painterResource(R.drawable.ic_sort)
     val LockTime @Composable get() = painterResource(R.drawable.ic_lock_time)
     val LockAttempts @Composable get() = painterResource(R.drawable.ic_lock_attempts)
@@ -106,6 +108,7 @@ object MdtIcons {
     val AddCircle @Composable get() = painterResource(R.drawable.ic_add_circle)
     val RotateLeft @Composable get() = painterResource(R.drawable.ic_rotate_left)
     val Tag @Composable get() = painterResource(R.drawable.ic_tag)
+    val AddTag @Composable get() = painterResource(R.drawable.ic_add_tag)
     val Hashtag @Composable get() = painterResource(R.drawable.ic_hashtag)
     val Rocket @Composable get() = painterResource(R.drawable.ic_rocket)
     val RocketLaunch @Composable get() = painterResource(R.drawable.ic_rocket_launch)

core/design/src/main/java/com/twofasapp/core/design/feature/password/PasswordGeneratorForm.kt

@@ -88,7 +88,7 @@ fun PasswordGeneratorForm(
                 .padding(horizontal = 16.dp)
                 .fillMaxWidth()
                 .heightIn(min = 100.dp)
-                .background(MdtTheme.color.surfaceContainer, RoundedShape12)
+                .background(MdtTheme.color.surfaceContainerHigh, RoundedShape12)
                 .padding(horizontal = 16.dp)
                 .animateContentSize(),
             horizontalAlignment = Alignment.CenterHorizontally,

core/design/src/main/java/com/twofasapp/core/design/feature/tags/TagDialog.kt

@@ -0,0 +1,66 @@
+package com.twofasapp.core.design.feature.tags
+
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.tooling.preview.Preview
+import com.twofasapp.core.common.domain.Tag
+import com.twofasapp.core.design.MdtIcons
+import com.twofasapp.core.design.foundation.dialog.InputDialog
+import com.twofasapp.core.design.foundation.dialog.InputValidation
+import com.twofasapp.core.design.foundation.preview.PreviewTheme
+import com.twofasapp.core.locale.MdtLocale
+
+@Composable
+fun TagDialog(
+    onDismissRequest: () -> Unit,
+    tag: Tag,
+    onSaveClick: (Tag) -> Unit = {},
+) {
+    InputDialog(
+        onDismissRequest = onDismissRequest,
+        title = if (tag.id.isEmpty()) {
+            MdtLocale.strings.tagEditorNewTitle
+        } else {
+            MdtLocale.strings.tagEditorEditTitle
+        },
+        body = MdtLocale.strings.tagEditorDescription,
+        icon = if (tag.id.isEmpty()) {
+            MdtIcons.AddTag
+        } else {
+            MdtIcons.Tag
+        },
+        prefill = tag.name,
+        label = MdtLocale.strings.tagEditorPlaceholder,
+        keyboardOptions = KeyboardOptions(
+            capitalization = KeyboardCapitalization.Sentences,
+        ),
+        onPositive = { text ->
+            onSaveClick(
+                tag.copy(
+                    name = text.trim(),
+                ),
+            )
+        },
+        validate = { text ->
+            if (text.isBlank()) {
+                InputValidation.Invalid("Name can not be empty")
+            } else if (text.length > 1000) {
+                InputValidation.Invalid("Max length is 1000 characters")
+            } else {
+                InputValidation.Valid
+            }
+        },
+    )
+}
+
+@Preview
+@Composable
+private fun Preview() {
+    PreviewTheme {
+        TagDialog(
+            onDismissRequest = {},
+            tag = Tag.Empty,
+        )
+    }
+}

core/design/src/main/java/com/twofasapp/core/design/foundation/dialog/InputDialog.kt

@@ -28,8 +28,6 @@ import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.input.key.onKeyEvent
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.TextRange
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.window.DialogProperties
@@ -67,6 +65,7 @@ fun InputDialog(
     neutralColor: Color = Color.Unspecified,
     actionsAlignment: ActionsAlignment = ActionsAlignment.Horizontal,
     properties: DialogProperties = DialogProperties(),
+    keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
 ) {
     val focusRequester = remember { FocusRequester() }
     var textFieldValue by remember {
@@ -77,8 +76,16 @@ fun InputDialog(
             ),
         )
     }
-    val inputValidation by remember { derivedStateOf { validate(textFieldValue.text) } }
     var startedTyping by remember { mutableStateOf(false) }
+    val inputValidation by remember {
+        derivedStateOf {
+            if (startedTyping.not() && textFieldValue.text.isEmpty()) {
+                InputValidation.Invalid(null)
+            } else {
+                validate(textFieldValue.text)
+            }
+        }
+    }
 
     LaunchedEffect(Unit) {
         awaitFrame()
@@ -123,7 +130,7 @@ fun InputDialog(
                     maxLines = 1,
                     supportingText = (inputValidation as? InputValidation.Invalid)?.error.orEmpty(),
                     isError = startedTyping && inputValidation is InputValidation.Invalid,
-                    keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password, imeAction = ImeAction.Done),
+                    keyboardOptions = keyboardOptions,
                     keyboardActions = if (inputValidation is InputValidation.Valid) {
                         KeyboardActions(
                             onDone = { onPositive(textFieldValue.text) },