Added One time save locations editing to settings also

T8RIN · Sep 5, 2024 · 2709962 · 2709962
1 parent afec5ec
commit 2709962
Show file tree

Hide file tree

Showing 16 changed files with 108 additions and 30 deletions.
diff --git a/core/resources/src/main/res/values/strings.xml b/core/resources/src/main/res/values/strings.xml
@@ -1366,4 +1366,6 @@
     <string name="formatted_timestamp">Formatted Timestamp</string>
     <string name="formatted_timestamp_sub">Enable Timestamp formatting in output filename instead of basic millis</string>
     <string name="enable_timestamps_to_format_them">Enable Timestamps to select their format</string>
+    <string name="one_time_save_location">One Time Save Location</string>
+    <string name="one_time_save_location_sub">View and Edit one time save locations which you can use by long pressing the save button in mostly all options</string>
 </resources>
diff --git a/...ngs/src/main/java/ru/tech/imageresizershrinker/core/settings/domain/SettingsInteractor.kt b/...ngs/src/main/java/ru/tech/imageresizershrinker/core/settings/domain/SettingsInteractor.kt
@@ -26,7 +26,7 @@ import ru.tech.imageresizershrinker.core.settings.domain.model.DomainFontFamily
 import ru.tech.imageresizershrinker.core.settings.domain.model.NightMode
 import ru.tech.imageresizershrinker.core.settings.domain.model.SwitchType
 
-interface SettingsInteractor : SimpleSettingInteractor {
+interface SettingsInteractor : SimpleSettingsInteractor {
 
     suspend fun toggleAddSequenceNumber()
 

diff --git a/...ettings/domain/SimpleSettingInteractor.kt → ...ttings/domain/SimpleSettingsInteractor.kt b/...ettings/domain/SimpleSettingInteractor.kt → ...ttings/domain/SimpleSettingsInteractor.kt
@@ -19,7 +19,7 @@ package ru.tech.imageresizershrinker.core.settings.domain
 
 import ru.tech.imageresizershrinker.core.settings.domain.model.OneTimeSaveLocation
 
-interface SimpleSettingInteractor {
+interface SimpleSettingsInteractor {
 
     suspend fun toggleMagnifierEnabled()
 

diff --git a/...gs/src/main/java/ru/tech/imageresizershrinker/core/settings/presentation/model/Setting.kt b/...gs/src/main/java/ru/tech/imageresizershrinker/core/settings/presentation/model/Setting.kt
@@ -417,4 +417,9 @@ sealed class Setting(
         title = R.string.formatted_timestamp,
         subtitle = R.string.formatted_timestamp_sub
     )
+
+    data object OneTimeSaveLocation : Setting(
+        title = R.string.one_time_save_location,
+        subtitle = R.string.one_time_save_location_sub
+    )
 }
diff --git a/.../main/java/ru/tech/imageresizershrinker/core/settings/presentation/model/SettingsGroup.kt b/.../main/java/ru/tech/imageresizershrinker/core/settings/presentation/model/SettingsGroup.kt
@@ -178,7 +178,8 @@ sealed class SettingsGroup(
         icon = Icons.Rounded.FolderOpened,
         titleId = R.string.folder,
         settingsList = listOf(
-            Setting.SavingFolder
+            Setting.SavingFolder,
+            Setting.OneTimeSaveLocation
         ),
         initialState = false
     )

diff --git a/...va/ru/tech/imageresizershrinker/core/settings/presentation/provider/LocalSettingsState.kt b/...va/ru/tech/imageresizershrinker/core/settings/presentation/provider/LocalSettingsState.kt
@@ -20,15 +20,15 @@ package ru.tech.imageresizershrinker.core.settings.presentation.provider
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.remember
-import ru.tech.imageresizershrinker.core.settings.domain.SimpleSettingInteractor
+import ru.tech.imageresizershrinker.core.settings.domain.SimpleSettingsInteractor
 import ru.tech.imageresizershrinker.core.settings.presentation.model.EditPresetsController
 import ru.tech.imageresizershrinker.core.settings.presentation.model.UiSettingsState
 
 val LocalSettingsState =
     compositionLocalOf<UiSettingsState> { error("UiSettingsState not present") }
 
-val LocalSimpleSettingInteractor =
-    compositionLocalOf<SimpleSettingInteractor> { error("SimpleSettingInteractor not present") }
+val LocalSimpleSettingsInteractor =
+    compositionLocalOf<SimpleSettingsInteractor> { error("SimpleSettingInteractor not present") }
 
 val LocalEditPresetsController =
     compositionLocalOf<EditPresetsController> { error("EditPresetsController not present") }

diff --git a/...ru/tech/imageresizershrinker/core/ui/widget/dialogs/OneTimeSaveLocationSelectionDialog.kt b/...ru/tech/imageresizershrinker/core/ui/widget/dialogs/OneTimeSaveLocationSelectionDialog.kt
@@ -72,7 +72,7 @@ import kotlinx.coroutines.launch
 import ru.tech.imageresizershrinker.core.resources.R
 import ru.tech.imageresizershrinker.core.settings.domain.model.OneTimeSaveLocation
 import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSettingsState
-import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSimpleSettingInteractor
+import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSimpleSettingsInteractor
 import ru.tech.imageresizershrinker.core.ui.theme.takeColorFromScheme
 import ru.tech.imageresizershrinker.core.ui.utils.helper.toUiPath
 import ru.tech.imageresizershrinker.core.ui.widget.buttons.EnhancedButton
@@ -93,7 +93,7 @@ import java.util.Locale
 @Composable
 fun OneTimeSaveLocationSelectionDialog(
     onDismiss: () -> Unit,
-    onSaveRequest: (String?) -> Unit
+    onSaveRequest: ((String?) -> Unit)?
 ) {
     val settingsState = LocalSettingsState.current
     var tempSelectedSaveFolderUri by rememberSaveable {
@@ -105,14 +105,16 @@ fun OneTimeSaveLocationSelectionDialog(
     AlertDialog(
         onDismissRequest = onDismiss,
         confirmButton = {
-            EnhancedButton(
-                onClick = {
-                    onDismiss()
-                    onSaveRequest(selectedSaveFolderUri)
-                },
-                containerColor = MaterialTheme.colorScheme.primary
-            ) {
-                Text(text = stringResource(id = R.string.save))
+            onSaveRequest?.let {
+                EnhancedButton(
+                    onClick = {
+                        onDismiss()
+                        onSaveRequest(selectedSaveFolderUri)
+                    },
+                    containerColor = MaterialTheme.colorScheme.primary
+                ) {
+                    Text(text = stringResource(id = R.string.save))
+                }
             }
         },
         dismissButton = {
@@ -204,7 +206,7 @@ fun OneTimeSaveLocationSelectionDialog(
                         size = data.size + 1,
                         forceDefault = isDragged
                     )
-                    val settingsInteractor = LocalSimpleSettingInteractor.current
+                    val settingsInteractor = LocalSimpleSettingsInteractor.current
                     val canDeleteItem by remember(item, settingsState) {
                         derivedStateOf {
                             item != null && item in settingsState.oneTimeSaveLocations

diff --git a/.../kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/PreferenceItemOverload.kt b/.../kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/PreferenceItemOverload.kt
@@ -53,6 +53,7 @@ import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -196,6 +197,7 @@ fun PreferenceItemOverload(
                                 Text(
                                     text = sub,
                                     fontSize = 12.sp,
+                                    textAlign = TextAlign.Start,
                                     fontWeight = FontWeight.Normal,
                                     lineHeight = 14.sp,
                                     color = LocalContentColor.current.copy(alpha = 0.5f)

diff --git a/.../draw/src/main/java/ru/tech/imageresizershrinker/feature/draw/presentation/DrawContent.kt b/.../draw/src/main/java/ru/tech/imageresizershrinker/feature/draw/presentation/DrawContent.kt
@@ -129,7 +129,7 @@ import ru.tech.imageresizershrinker.core.domain.model.pt
 import ru.tech.imageresizershrinker.core.resources.R
 import ru.tech.imageresizershrinker.core.resources.icons.ImageTooltip
 import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSettingsState
-import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSimpleSettingInteractor
+import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSimpleSettingsInteractor
 import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant
 import ru.tech.imageresizershrinker.core.ui.utils.animation.fancySlideTransition
 import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiHostState
@@ -445,7 +445,7 @@ fun DrawContent(
                 }
             }.value
         )
-        val settingsInteractor = LocalSimpleSettingInteractor.current
+        val settingsInteractor = LocalSimpleSettingsInteractor.current
         PreferenceRowSwitch(
             modifier = Modifier
                 .fillMaxWidth()

diff --git a/...tech/imageresizershrinker/feature/erase_background/presentation/EraseBackgroundContent.kt b/...tech/imageresizershrinker/feature/erase_background/presentation/EraseBackgroundContent.kt
@@ -107,7 +107,7 @@ import ru.tech.imageresizershrinker.core.domain.image.model.ImageFormatGroup
 import ru.tech.imageresizershrinker.core.domain.model.pt
 import ru.tech.imageresizershrinker.core.resources.R
 import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSettingsState
-import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSimpleSettingInteractor
+import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSimpleSettingsInteractor
 import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant
 import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiHostState
 import ru.tech.imageresizershrinker.core.ui.utils.helper.Picker
@@ -544,7 +544,7 @@ fun EraseBackgroundContent(
                 onCheckedChange = { viewModel.setTrimImage(it) },
                 modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 8.dp)
             )
-            val settingsInteractor = LocalSimpleSettingInteractor.current
+            val settingsInteractor = LocalSimpleSettingsInteractor.current
             PreferenceRowSwitch(
                 modifier = Modifier
                     .fillMaxWidth()

diff --git a/...ru/tech/imageresizershrinker/feature/pick_color/presentation/PickColorFromImageContent.kt b/...ru/tech/imageresizershrinker/feature/pick_color/presentation/PickColorFromImageContent.kt
@@ -94,7 +94,7 @@ import dev.olshevski.navigation.reimagined.hilt.hiltViewModel
 import kotlinx.coroutines.launch
 import ru.tech.imageresizershrinker.core.resources.R
 import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSettingsState
-import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSimpleSettingInteractor
+import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSimpleSettingsInteractor
 import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant
 import ru.tech.imageresizershrinker.core.ui.theme.takeColorFromScheme
 import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.copyToClipboard
@@ -200,7 +200,7 @@ fun PickColorFromImageContent(
     }
 
     val magnifierButton = @Composable {
-        val settingsInteractor = LocalSimpleSettingInteractor.current
+        val settingsInteractor = LocalSimpleSettingsInteractor.current
         EnhancedIconButton(
             containerColor = takeColorFromScheme {
                 if (settingsState.magnifierEnabled) {

diff --git a/.../root/src/main/java/ru/tech/imageresizershrinker/feature/root/presentation/RootContent.kt b/.../root/src/main/java/ru/tech/imageresizershrinker/feature/root/presentation/RootContent.kt
@@ -48,7 +48,7 @@ import ru.tech.imageresizershrinker.core.resources.emoji.Emoji
 import ru.tech.imageresizershrinker.core.settings.presentation.model.toUiState
 import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalEditPresetsController
 import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSettingsState
-import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSimpleSettingInteractor
+import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSimpleSettingsInteractor
 import ru.tech.imageresizershrinker.core.settings.presentation.provider.rememberEditPresetsController
 import ru.tech.imageresizershrinker.core.ui.shapes.IconShapeDefaults
 import ru.tech.imageresizershrinker.core.ui.theme.ImageToolboxTheme
@@ -104,7 +104,7 @@ fun RootContent(
     CompositionLocalProvider(
         LocalToastHostState provides viewModel.toastHostState,
         LocalSettingsState provides settingsState,
-        LocalSimpleSettingInteractor provides viewModel.getSettingsInteractor(),
+        LocalSimpleSettingsInteractor provides viewModel.getSettingsInteractor(),
         LocalEditPresetsController provides editPresetsController,
         LocalConfettiHostState provides rememberConfettiHostState(),
         LocalImageLoader provides viewModel.imageLoader,

diff --git a/...esizershrinker/feature/settings/presentation/components/OneTimeSaveLocationSettingItem.kt b/...esizershrinker/feature/settings/presentation/components/OneTimeSaveLocationSettingItem.kt
@@ -0,0 +1,62 @@
+/*
+ * ImageToolbox is an image editor for android
+ * Copyright (c) 2024 T8RIN (Malik Mukhametzyanov)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * You should have received a copy of the Apache License
+ * along with this program.  If not, see <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+
+package ru.tech.imageresizershrinker.feature.settings.presentation.components
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.LocationSearching
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import ru.tech.imageresizershrinker.core.resources.R
+import ru.tech.imageresizershrinker.core.resources.icons.MiniEdit
+import ru.tech.imageresizershrinker.core.ui.widget.dialogs.OneTimeSaveLocationSelectionDialog
+import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults
+import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem
+
+@Composable
+fun OneTimeSaveLocationSettingItem(
+    shape: Shape = ContainerShapeDefaults.defaultShape,
+    modifier: Modifier = Modifier.padding(horizontal = 8.dp)
+) {
+    var showDialog by rememberSaveable { mutableStateOf(false) }
+
+    PreferenceItem(
+        shape = shape,
+        onClick = { showDialog = true },
+        title = stringResource(R.string.one_time_save_location),
+        subtitle = stringResource(R.string.one_time_save_location_sub),
+        startIcon = Icons.Rounded.LocationSearching,
+        endIcon = Icons.Rounded.MiniEdit,
+        modifier = modifier
+    )
+    if (showDialog) {
+        OneTimeSaveLocationSelectionDialog(
+            onDismiss = {
+                showDialog = false
+            },
+            onSaveRequest = null
+        )
+    }
+}
diff --git a/...java/ru/tech/imageresizershrinker/feature/settings/presentation/components/SettingItem.kt b/...java/ru/tech/imageresizershrinker/feature/settings/presentation/components/SettingItem.kt
@@ -58,7 +58,7 @@ internal fun SettingItem(
     containerColor: Color = MaterialTheme.colorScheme.surface
 ) {
     val context = LocalContext.current as ComponentActivity
-    
+
     fun tryGetUpdate(
         isNewRequest: Boolean = false,
         onNoUpdates: () -> Unit = {}
@@ -520,6 +520,10 @@ internal fun SettingItem(
             Setting.UseFormattedFilenameTimestamp -> {
                 UseFormattedFilenameTimestampSettingItem(onClick = viewModel::toggleUseFormattedFilenameTimestamp)
             }
+
+            Setting.OneTimeSaveLocation -> {
+                OneTimeSaveLocationSettingItem()
+            }
         }
     }
 }
diff --git a/...u/tech/imageresizershrinker/feature/single_edit/presentation/components/DrawEditOption.kt b/...u/tech/imageresizershrinker/feature/single_edit/presentation/components/DrawEditOption.kt
@@ -75,7 +75,7 @@ import ru.tech.imageresizershrinker.core.domain.utils.notNullAnd
 import ru.tech.imageresizershrinker.core.filters.presentation.model.UiFilter
 import ru.tech.imageresizershrinker.core.resources.R
 import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSettingsState
-import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSimpleSettingInteractor
+import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSimpleSettingsInteractor
 import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant
 import ru.tech.imageresizershrinker.core.ui.widget.buttons.EnhancedIconButton
 import ru.tech.imageresizershrinker.core.ui.widget.buttons.EraseModeButton
@@ -316,7 +316,7 @@ fun DrawEditOption(
                         }
                     }.value
                 )
-                val settingsInteractor = LocalSimpleSettingInteractor.current
+                val settingsInteractor = LocalSimpleSettingsInteractor.current
                 val scope = rememberCoroutineScope()
                 PreferenceRowSwitch(
                     modifier = Modifier

diff --git a/...eresizershrinker/feature/single_edit/presentation/components/EraseBackgroundEditOption.kt b/...eresizershrinker/feature/single_edit/presentation/components/EraseBackgroundEditOption.kt
@@ -71,7 +71,7 @@ import kotlinx.coroutines.launch
 import ru.tech.imageresizershrinker.core.domain.model.pt
 import ru.tech.imageresizershrinker.core.resources.R
 import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSettingsState
-import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSimpleSettingInteractor
+import ru.tech.imageresizershrinker.core.settings.presentation.provider.LocalSimpleSettingsInteractor
 import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant
 import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiHostState
 import ru.tech.imageresizershrinker.core.ui.widget.buttons.EnhancedIconButton
@@ -283,7 +283,7 @@ fun EraseBackgroundEditOption(
                         top = 8.dp,
                     )
                 )
-                val settingsInteractor = LocalSimpleSettingInteractor.current
+                val settingsInteractor = LocalSimpleSettingsInteractor.current
                 PreferenceRowSwitch(
                     modifier = Modifier
                         .fillMaxWidth()