Code refactor

T8RIN · Jan 24, 2025 · dc994a7 · dc994a7
1 parent b210939
commit dc994a7
Show file tree

Hide file tree

Showing 7 changed files with 309 additions and 281 deletions.
diff --git a/...src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImageNotPickedWidget.kt b/...src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImageNotPickedWidget.kt
@@ -24,6 +24,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.twotone.FileOpen
 import androidx.compose.material.icons.twotone.Image
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -41,8 +42,8 @@ import ru.tech.imageresizershrinker.core.ui.widget.modifier.container
 
 @Composable
 fun ImageNotPickedWidget(
-    modifier: Modifier = Modifier,
     onPickImage: () -> Unit,
+    modifier: Modifier = Modifier,
     text: String = stringResource(R.string.pick_image),
 ) {
     Column(
@@ -72,4 +73,39 @@ fun ImageNotPickedWidget(
             color = MaterialTheme.colorScheme.onSurfaceVariant
         )
     }
+}
+
+@Composable
+fun FileNotPickedWidget(
+    onPickFile: () -> Unit,
+    modifier: Modifier = Modifier,
+    text: String = stringResource(R.string.pick_file_to_start)
+) {
+    Column(
+        modifier = modifier.container(),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Spacer(Modifier.height(16.dp))
+        Icon(
+            imageVector = Icons.TwoTone.FileOpen,
+            contentDescription = null,
+            modifier = Modifier
+                .size(100.dp)
+                .container(
+                    shape = CloverShape,
+                    resultPadding = 0.dp,
+                    color = MaterialTheme.colorScheme.secondaryContainer
+                )
+                .hapticsClickable(onClick = onPickFile)
+                .padding(12.dp),
+            tint = MaterialTheme.colorScheme.onSecondaryContainer
+        )
+        Text(
+            text = text,
+            modifier = Modifier.padding(16.dp),
+            textAlign = TextAlign.Center,
+            color = MaterialTheme.colorScheme.onSurfaceVariant
+        )
+    }
 }
diff --git a/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/Marquee.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/Marquee.kt
@@ -36,7 +36,7 @@ import com.gigamole.composefadingedges.marqueeHorizontalFadingEdges
 
 
 fun Modifier.marquee(
-    edgeColor: Color = Color.Unspecified,
+    edgesColor: Color = Color.Unspecified,
 ) = this.composed {
     var showMarquee by remember { mutableStateOf(false) }
 
@@ -45,9 +45,9 @@ fun Modifier.marquee(
         .then(
             if (showMarquee) {
                 Modifier.marqueeHorizontalFadingEdges(
-                    fillType = if (edgeColor.isSpecified) {
+                    fillType = if (edgesColor.isSpecified) {
                         FadingEdgesFillType.FadeColor(
-                            color = edgeColor
+                            color = edgesColor
                         )
                     } else FadingEdgesFillType.FadeClip(),
                     length = 10.dp,

diff --git a/...r/src/main/java/ru/tech/imageresizershrinker/feature/cipher/presentation/CipherContent.kt b/...r/src/main/java/ru/tech/imageresizershrinker/feature/cipher/presentation/CipherContent.kt
@@ -48,7 +48,6 @@ import androidx.compose.material.icons.rounded.FileOpen
 import androidx.compose.material.icons.rounded.Key
 import androidx.compose.material.icons.rounded.Share
 import androidx.compose.material.icons.rounded.Shuffle
-import androidx.compose.material.icons.twotone.FileOpen
 import androidx.compose.material3.Badge
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LocalContentColor
@@ -78,7 +77,6 @@ import ru.tech.imageresizershrinker.core.resources.R
 import ru.tech.imageresizershrinker.core.resources.icons.ShieldKey
 import ru.tech.imageresizershrinker.core.resources.icons.ShieldOpen
 import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSettingsState
-import ru.tech.imageresizershrinker.core.ui.shapes.CloverShape
 import ru.tech.imageresizershrinker.core.ui.theme.Green
 import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant
 import ru.tech.imageresizershrinker.core.ui.utils.content_pickers.rememberFilePicker
@@ -94,8 +92,8 @@ import ru.tech.imageresizershrinker.core.ui.widget.dialogs.ExitWithoutSavingDial
 import ru.tech.imageresizershrinker.core.ui.widget.dialogs.LoadingDialog
 import ru.tech.imageresizershrinker.core.ui.widget.enhanced.EnhancedButton
 import ru.tech.imageresizershrinker.core.ui.widget.enhanced.EnhancedIconButton
-import ru.tech.imageresizershrinker.core.ui.widget.enhanced.hapticsClickable
 import ru.tech.imageresizershrinker.core.ui.widget.image.AutoFilePicker
+import ru.tech.imageresizershrinker.core.ui.widget.image.FileNotPickedWidget
 import ru.tech.imageresizershrinker.core.ui.widget.modifier.container
 import ru.tech.imageresizershrinker.core.ui.widget.modifier.scaleOnTap
 import ru.tech.imageresizershrinker.core.ui.widget.other.TopAppBarEmoji
@@ -251,33 +249,7 @@ fun CipherContent(
         },
         canShowScreenData = component.uri != null,
         noDataControls = {
-            Column(
-                modifier = Modifier.container(),
-                verticalArrangement = Arrangement.Center,
-                horizontalAlignment = Alignment.CenterHorizontally
-            ) {
-                Spacer(Modifier.height(16.dp))
-                Icon(
-                    imageVector = Icons.TwoTone.FileOpen,
-                    contentDescription = null,
-                    modifier = Modifier
-                        .size(100.dp)
-                        .container(
-                            shape = CloverShape,
-                            resultPadding = 0.dp,
-                            color = MaterialTheme.colorScheme.secondaryContainer
-                        )
-                        .hapticsClickable(onClick = filePicker::pickFile)
-                        .padding(12.dp),
-                    tint = MaterialTheme.colorScheme.onSecondaryContainer
-                )
-                Text(
-                    text = stringResource(R.string.pick_file_to_start),
-                    modifier = Modifier.padding(16.dp),
-                    textAlign = TextAlign.Center,
-                    color = MaterialTheme.colorScheme.onSurfaceVariant
-                )
-            }
+            FileNotPickedWidget(onPickFile = filePicker::pickFile)
         },
         controls = {
             Column(horizontalAlignment = Alignment.CenterHorizontally) {

diff --git a/.../main/java/ru/tech/imageresizershrinker/feature/pdf_tools/presentation/PdfToolsContent.kt b/.../main/java/ru/tech/imageresizershrinker/feature/pdf_tools/presentation/PdfToolsContent.kt
@@ -197,7 +197,10 @@ fun PdfToolsContent(
             }
         },
         title = {
-            TitleItem(text = stringResource(id = R.string.pick_file), icon = Icons.Rounded.FileOpen)
+            TitleItem(
+                text = stringResource(id = R.string.pick_file),
+                icon = Icons.Rounded.FileOpen
+            )
         }
     )