Первые тесты

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/screens/storage/secrets/TextSecretsScreen.kt

@@ -1,28 +1,16 @@
 package com.github.nullptroma.wallenc.ui.screens.main.screens.storage.secrets
 
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
-import androidx.compose.material.icons.automirrored.outlined.Notes
 import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.KeyboardArrowRight
-import androidx.compose.material.icons.outlined.Notes
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
@@ -33,7 +21,6 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.github.nullptroma.wallenc.domain.datatypes.TextSecretRecord
 import com.github.nullptroma.wallenc.ui.R
-import com.github.nullptroma.wallenc.ui.resources.resolveText
 
 @Composable
 fun TextSecretsScreen(
@@ -60,99 +47,19 @@ fun TextSecretsScreen(
             }
         },
     ) { innerPadding ->
-        Column(
+        TextSecretsScreenContent(
+            uiState = uiState,
             modifier = Modifier
                 .fillMaxSize()
-                .padding(innerPadding)
-                .padding(16.dp),
-            verticalArrangement = Arrangement.spacedBy(12.dp),
+                .padding(innerPadding),
         ) {
-            uiState.errorNotification?.let { notification ->
-                Text(
-                    text = notification.resolveText(),
-                    color = MaterialTheme.colorScheme.error,
-                )
-            }
-
-            if (uiState.items.isEmpty()) {
-                Text(stringResource(R.string.text_secret_empty_state))
-            } else {
-                LazyColumn(verticalArrangement = Arrangement.spacedBy(10.dp)) {
-                    items(uiState.items) { secret ->
-                        Card(
-                            modifier = Modifier.fillMaxWidth(),
-                            onClick = { onOpenSecret(secret) },
-                            enabled = uiState.isAvailable,
-                            colors = CardDefaults.elevatedCardColors(
-                                containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
-                            ),
-                        ) {
-                            Row(
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .padding(14.dp),
-                                horizontalArrangement = Arrangement.SpaceBetween,
-                            ) {
-                                Row(
-                                    modifier = Modifier.weight(1f),
-                                    horizontalArrangement = Arrangement.spacedBy(12.dp),
-                                ) {
-                                    Icon(
-                                        imageVector = Icons.AutoMirrored.Outlined.Notes,
-                                        contentDescription = null,
-                                        modifier = Modifier
-                                            .size(22.dp)
-                                            .padding(top = 2.dp),
-                                        tint = MaterialTheme.colorScheme.primary,
-                                    )
-                                    Column(
-                                        modifier = Modifier.padding(end = 12.dp),
-                                    ) {
-                                        Text(
-                                            text = secret.title,
-                                            style = MaterialTheme.typography.titleSmall,
-                                        )
-                                        Text(
-                                            text = stringResource(R.string.text_secret_items_count, secret.items.size),
-                                            style = MaterialTheme.typography.bodySmall,
-                                            color = MaterialTheme.colorScheme.onSurfaceVariant,
-                                        )
-                                        val fieldNames = secret.items
-                                            .map { item ->
-                                                item.label
-                                                    ?.trim()
-                                                    .takeUnless { it.isNullOrBlank() }
-                                                    ?: stringResource(R.string.text_secret_item_without_label)
-                                            }
-                                        if (fieldNames.isNotEmpty()) {
-                                            fieldNames.take(3).forEach { fieldName ->
-                                                Text(
-                                                    text = "\u2022 $fieldName",
-                                                    style = MaterialTheme.typography.bodySmall,
-                                                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                                                )
-                                            }
-                                            val hiddenCount = fieldNames.size - 3
-                                            if (hiddenCount > 0) {
-                                                Text(
-                                                    text = stringResource(
-                                                        R.string.text_secret_more_fields,
-                                                        hiddenCount,
-                                                    ),
-                                                    style = MaterialTheme.typography.bodySmall,
-                                                    color = MaterialTheme.colorScheme.onSurfaceVariant,
-                                                )
-                                            }
-                                        }
-                                    }
-                                }
-                                Icon(
-                                    imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight,
-                                    contentDescription = null,
-                                )
-                            }
-                        }
-                    }
+            LazyColumn(verticalArrangement = Arrangement.spacedBy(10.dp)) {
+                items(uiState.items) { secret ->
+                    TextSecretListCard(
+                        secret = secret,
+                        onClick = { onOpenSecret(secret) },
+                        enabled = uiState.isAvailable,
+                    )
                 }
             }
         }

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/screens/storage/secrets/TextSecretsScreenContent.kt

@@ -0,0 +1,133 @@
+package com.github.nullptroma.wallenc.ui.screens.main.screens.storage.secrets
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
+import androidx.compose.material.icons.automirrored.outlined.Notes
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+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.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.github.nullptroma.wallenc.domain.datatypes.TextSecretRecord
+import com.github.nullptroma.wallenc.ui.R
+import com.github.nullptroma.wallenc.ui.resources.resolveText
+
+@Composable
+fun TextSecretsScreenContent(
+    uiState: TextSecretsScreenState,
+    modifier: Modifier = Modifier,
+    secretList: @Composable () -> Unit = {},
+) {
+    Column(
+        modifier = modifier
+            .fillMaxSize()
+            .padding(16.dp),
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        uiState.errorNotification?.let { notification ->
+            Text(
+                text = notification.resolveText(),
+                color = MaterialTheme.colorScheme.error,
+            )
+        }
+
+        if (uiState.items.isEmpty()) {
+            Text(stringResource(R.string.text_secret_empty_state))
+        } else {
+            secretList()
+        }
+    }
+}
+
+@Composable
+fun TextSecretListCard(
+    secret: TextSecretRecord,
+    onClick: () -> Unit,
+    enabled: Boolean,
+    modifier: Modifier = Modifier,
+) {
+    Card(
+        modifier = modifier.fillMaxWidth(),
+        onClick = onClick,
+        enabled = enabled,
+        colors = CardDefaults.elevatedCardColors(
+            containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
+        ),
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(14.dp),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.Top,
+        ) {
+            Row(
+                modifier = Modifier.weight(1f),
+                horizontalArrangement = Arrangement.spacedBy(12.dp),
+            ) {
+                Icon(
+                    imageVector = Icons.AutoMirrored.Outlined.Notes,
+                    contentDescription = null,
+                    modifier = Modifier
+                        .size(22.dp)
+                        .padding(top = 2.dp),
+                    tint = MaterialTheme.colorScheme.primary,
+                )
+                Column(modifier = Modifier.padding(end = 12.dp)) {
+                    Text(
+                        text = secret.title,
+                        style = MaterialTheme.typography.titleSmall,
+                    )
+                    Text(
+                        text = stringResource(R.string.text_secret_items_count, secret.items.size),
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                    )
+                    val fieldNames = secret.items
+                        .map { item ->
+                            item.label
+                                ?.trim()
+                                .takeUnless { it.isNullOrBlank() }
+                                ?: stringResource(R.string.text_secret_item_without_label)
+                        }
+                    if (fieldNames.isNotEmpty()) {
+                        fieldNames.take(3).forEach { fieldName ->
+                            Text(
+                                text = "\u2022 $fieldName",
+                                style = MaterialTheme.typography.bodySmall,
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                            )
+                        }
+                        val hiddenCount = fieldNames.size - 3
+                        if (hiddenCount > 0) {
+                            Text(
+                                text = stringResource(
+                                    R.string.text_secret_more_fields,
+                                    hiddenCount,
+                                ),
+                                style = MaterialTheme.typography.bodySmall,
+                                color = MaterialTheme.colorScheme.onSurfaceVariant,
+                            )
+                        }
+                    }
+                }
+            }
+            Icon(
+                imageVector = Icons.AutoMirrored.Filled.KeyboardArrowRight,
+                contentDescription = null,
+            )
+        }
+    }
+}

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/screens/storage/twofa/TwoFaTokensScreen.kt

@@ -122,30 +122,14 @@ fun TwoFaTokensScreen(
             }
         },
     ) { innerPadding ->
-        Column(
+        TwoFaTokensScreenContent(
+            uiState = uiState,
             modifier = Modifier
                 .fillMaxSize()
-                .padding(innerPadding)
-                .padding(16.dp),
-            verticalArrangement = Arrangement.spacedBy(12.dp),
+                .padding(innerPadding),
         ) {
-            if (uiState.isLoading) {
-                CircularProgressIndicator()
-                return@Column
-            }
-
-            uiState.errorNotification?.let { notification ->
-                Text(
-                    text = notification.resolveText(),
-                    color = MaterialTheme.colorScheme.error,
-                )
-            }
-
-            if (uiState.items.isEmpty()) {
-                Text(stringResource(R.string.two_fa_empty_state))
-            } else {
-                LazyColumn(verticalArrangement = Arrangement.spacedBy(10.dp)) {
-                    items(uiState.items) { item ->
+            LazyColumn(verticalArrangement = Arrangement.spacedBy(10.dp)) {
+                items(uiState.items) { item ->
                         Card(
                             modifier = Modifier.fillMaxWidth(),
                             colors = CardDefaults.elevatedCardColors(
@@ -159,30 +143,11 @@ fun TwoFaTokensScreen(
                                     .padding(14.dp),
                                 horizontalArrangement = Arrangement.SpaceBetween,
                             ) {
-                                Row(
+                                TwoFaTokenListHeader(
+                                    issuer = item.issuer,
+                                    account = item.account,
                                     modifier = Modifier.weight(1f),
-                                    horizontalArrangement = Arrangement.spacedBy(12.dp),
-                                ) {
-                                    Icon(
-                                        imageVector = Icons.Outlined.Lock,
-                                        contentDescription = null,
-                                        modifier = Modifier
-                                            .size(22.dp)
-                                            .padding(top = 2.dp),
-                                        tint = MaterialTheme.colorScheme.primary,
-                                    )
-                                    Column {
-                                        Text(
-                                            text = item.issuer,
-                                            style = MaterialTheme.typography.titleSmall,
-                                        )
-                                        Text(
-                                            text = item.account,
-                                            style = MaterialTheme.typography.bodyMedium,
-                                            color = MaterialTheme.colorScheme.onSurfaceVariant,
-                                        )
-                                    }
-                                }
+                                )
                                 Row {
                                     IconButton(
                                         onClick = { editingToken = item },
@@ -282,7 +247,6 @@ fun TwoFaTokensScreen(
                         }
                     }
                 }
-            }
         }
     }
 

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/screens/storage/twofa/TwoFaTokensScreenContent.kt

@@ -0,0 +1,86 @@
+package com.github.nullptroma.wallenc.ui.screens.main.screens.storage.twofa
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Lock
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+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.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.github.nullptroma.wallenc.ui.R
+import com.github.nullptroma.wallenc.ui.resources.resolveText
+
+@Composable
+fun TwoFaTokensScreenContent(
+    uiState: TwoFaTokensScreenState,
+    modifier: Modifier = Modifier,
+    tokenList: @Composable () -> Unit = {},
+) {
+    Column(
+        modifier = modifier
+            .fillMaxSize()
+            .padding(16.dp),
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+    ) {
+        if (uiState.isLoading) {
+            CircularProgressIndicator()
+            return@Column
+        }
+
+        uiState.errorNotification?.let { notification ->
+            Text(
+                text = notification.resolveText(),
+                color = MaterialTheme.colorScheme.error,
+            )
+        }
+
+        if (uiState.items.isEmpty()) {
+            Text(stringResource(R.string.two_fa_empty_state))
+        } else {
+            tokenList()
+        }
+    }
+}
+
+@Composable
+fun TwoFaTokenListHeader(
+    issuer: String,
+    account: String,
+    modifier: Modifier = Modifier,
+) {
+    Row(
+        modifier = modifier,
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
+        verticalAlignment = Alignment.Top,
+    ) {
+        Icon(
+            imageVector = Icons.Outlined.Lock,
+            contentDescription = null,
+            modifier = Modifier
+                .size(22.dp)
+                .padding(top = 2.dp),
+            tint = MaterialTheme.colorScheme.primary,
+        )
+        Column {
+            Text(
+                text = issuer,
+                style = MaterialTheme.typography.titleSmall,
+            )
+            Text(
+                text = account,
+                style = MaterialTheme.typography.bodyMedium,
+                color = MaterialTheme.colorScheme.onSurfaceVariant,
+            )
+        }
+    }
+}