diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 28b3765d9..d1626542d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -158,7 +158,7 @@ dependencies { kapt(libs.dagger.hilt.compiler) implementation(project(":core:domain")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) implementation(project(":core:data")) implementation(project(":core:resources")) diff --git a/app/src/foss/java/ru/tech/imageresizershrinker/presentation/main_screen/components/UpdateSheet.kt b/app/src/foss/java/ru/tech/imageresizershrinker/presentation/main_screen/components/UpdateSheet.kt index 474d95ce1..4d98ff9b3 100644 --- a/app/src/foss/java/ru/tech/imageresizershrinker/presentation/main_screen/components/UpdateSheet.kt +++ b/app/src/foss/java/ru/tech/imageresizershrinker/presentation/main_screen/components/UpdateSheet.kt @@ -26,12 +26,12 @@ import androidx.compose.ui.unit.dp import androidx.core.net.toUri import ru.tech.imageresizershrinker.R import ru.tech.imageresizershrinker.core.APP_RELEASES -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleDragHandle -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.HtmlText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleDragHandle +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.HtmlText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem @Composable fun UpdateSheet(changelog: String, tag: String, visible: MutableState) { diff --git a/app/src/foss/java/ru/tech/imageresizershrinker/presentation/root/app/ImageApplication.kt b/app/src/foss/java/ru/tech/imageresizershrinker/presentation/root/app/ImageApplication.kt index a6ae5b980..94c8fee3e 100644 --- a/app/src/foss/java/ru/tech/imageresizershrinker/presentation/root/app/ImageApplication.kt +++ b/app/src/foss/java/ru/tech/imageresizershrinker/presentation/root/app/ImageApplication.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.app +package ru.tech.imageresizershrinker.core.ui.app import android.app.Application import dagger.hilt.android.HiltAndroidApp diff --git a/app/src/foss/java/ru/tech/imageresizershrinker/presentation/root/utils/exception/GlobalExceptionHandler.kt b/app/src/foss/java/ru/tech/imageresizershrinker/presentation/root/utils/exception/GlobalExceptionHandler.kt index a747a601c..a8998c471 100644 --- a/app/src/foss/java/ru/tech/imageresizershrinker/presentation/root/utils/exception/GlobalExceptionHandler.kt +++ b/app/src/foss/java/ru/tech/imageresizershrinker/presentation/root/utils/exception/GlobalExceptionHandler.kt @@ -1,10 +1,10 @@ -package ru.tech.imageresizershrinker.coreui.utils.exception +package ru.tech.imageresizershrinker.core.ui.utils.exception import android.app.Activity import android.content.Context import android.content.Intent import android.util.Log -import ru.tech.imageresizershrinker.coreui.widget.activity.M3Activity +import ru.tech.imageresizershrinker.core.ui.widget.activity.M3Activity import kotlin.system.exitProcess diff --git a/app/src/foss/java/ru/tech/imageresizershrinker/presentation/root/utils/helper/ReviewUtils.kt b/app/src/foss/java/ru/tech/imageresizershrinker/presentation/root/utils/helper/ReviewUtils.kt index 3e70c85ab..9c4c3dc79 100644 --- a/app/src/foss/java/ru/tech/imageresizershrinker/presentation/root/utils/helper/ReviewUtils.kt +++ b/app/src/foss/java/ru/tech/imageresizershrinker/presentation/root/utils/helper/ReviewUtils.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.helper +package ru.tech.imageresizershrinker.core.ui.utils.helper import android.content.Context diff --git a/app/src/foss/java/ru/tech/imageresizershrinker/presentation/root/widget/activity/M3Activity.kt b/app/src/foss/java/ru/tech/imageresizershrinker/presentation/root/widget/activity/M3Activity.kt index bba5dab2b..cb5e23594 100644 --- a/app/src/foss/java/ru/tech/imageresizershrinker/presentation/root/widget/activity/M3Activity.kt +++ b/app/src/foss/java/ru/tech/imageresizershrinker/presentation/root/widget/activity/M3Activity.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.activity +package ru.tech.imageresizershrinker.core.ui.widget.activity import android.content.Context import android.content.res.Configuration @@ -14,8 +14,8 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import ru.tech.imageresizershrinker.domain.model.SettingsState import ru.tech.imageresizershrinker.presentation.crash_screen.CrashActivity -import ru.tech.imageresizershrinker.coreui.utils.exception.GlobalExceptionHandler -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.adjustFontSize +import ru.tech.imageresizershrinker.core.ui.utils.exception.GlobalExceptionHandler +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.adjustFontSize @AndroidEntryPoint open class M3Activity : AppCompatActivity() { diff --git a/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/main_screen/components/UpdateSheet.kt b/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/main_screen/components/UpdateSheet.kt index 474d95ce1..4d98ff9b3 100644 --- a/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/main_screen/components/UpdateSheet.kt +++ b/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/main_screen/components/UpdateSheet.kt @@ -26,12 +26,12 @@ import androidx.compose.ui.unit.dp import androidx.core.net.toUri import ru.tech.imageresizershrinker.R import ru.tech.imageresizershrinker.core.APP_RELEASES -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleDragHandle -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.HtmlText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleDragHandle +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.HtmlText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem @Composable fun UpdateSheet(changelog: String, tag: String, visible: MutableState) { diff --git a/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/root/app/ImageApplication.kt b/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/root/app/ImageApplication.kt index 94280194a..c5430390e 100644 --- a/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/root/app/ImageApplication.kt +++ b/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/root/app/ImageApplication.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.app +package ru.tech.imageresizershrinker.core.ui.app import android.app.Application import com.google.mlkit.common.sdkinternal.MlKitContext diff --git a/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/root/utils/exception/GlobalExceptionHandler.kt b/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/root/utils/exception/GlobalExceptionHandler.kt index 1d2f16035..a010a319e 100644 --- a/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/root/utils/exception/GlobalExceptionHandler.kt +++ b/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/root/utils/exception/GlobalExceptionHandler.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.exception +package ru.tech.imageresizershrinker.core.ui.utils.exception import android.app.Activity import android.content.Context @@ -7,7 +7,7 @@ import android.util.Log import com.google.firebase.analytics.ktx.analytics import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase -import ru.tech.imageresizershrinker.coreui.widget.activity.M3Activity +import ru.tech.imageresizershrinker.core.ui.widget.activity.M3Activity import kotlin.system.exitProcess diff --git a/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/root/utils/helper/ReviewUtils.kt b/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/root/utils/helper/ReviewUtils.kt index 445b162f4..da11ed816 100644 --- a/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/root/utils/helper/ReviewUtils.kt +++ b/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/root/utils/helper/ReviewUtils.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.helper +package ru.tech.imageresizershrinker.core.ui.utils.helper import android.app.Activity import android.content.Context diff --git a/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/root/widget/activity/M3Activity.kt b/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/root/widget/activity/M3Activity.kt index a9d0d4a08..efec9b27f 100644 --- a/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/root/widget/activity/M3Activity.kt +++ b/app/src/jxl/java/ru/tech/imageresizershrinker/presentation/root/widget/activity/M3Activity.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.activity +package ru.tech.imageresizershrinker.core.ui.widget.activity import android.content.Context import android.content.res.Configuration @@ -16,8 +16,8 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import ru.tech.imageresizershrinker.domain.model.SettingsState import ru.tech.imageresizershrinker.presentation.crash_screen.CrashActivity -import ru.tech.imageresizershrinker.coreui.utils.exception.GlobalExceptionHandler -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.adjustFontSize +import ru.tech.imageresizershrinker.core.ui.utils.exception.GlobalExceptionHandler +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.adjustFontSize @AndroidEntryPoint open class M3Activity : AppCompatActivity() { diff --git a/app/src/main/java/ru/tech/imageresizershrinker/presentation/MainActivity.kt b/app/src/main/java/ru/tech/imageresizershrinker/presentation/MainActivity.kt index 9d10df7e9..9c32c9a9e 100644 --- a/app/src/main/java/ru/tech/imageresizershrinker/presentation/MainActivity.kt +++ b/app/src/main/java/ru/tech/imageresizershrinker/presentation/MainActivity.kt @@ -28,23 +28,23 @@ import com.google.accompanist.systemuicontroller.rememberSystemUiController import dagger.hilt.android.AndroidEntryPoint import dev.olshevski.navigation.reimagined.navigate import nl.dionsegijn.konfetti.compose.KonfettiView -import ru.tech.imageresizershrinker.coreui.model.toUiState -import ru.tech.imageresizershrinker.coreui.theme.ImageToolboxTheme -import ru.tech.imageresizershrinker.coreui.utils.confetti.LocalConfettiController -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.isInstalledFromPlayStore -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.parseImageFromIntent -import ru.tech.imageresizershrinker.coreui.utils.navigation.LocalNavController -import ru.tech.imageresizershrinker.coreui.widget.UpdateSheet -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSliderInit -import ru.tech.imageresizershrinker.coreui.widget.haptics.customHapticFeedback -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.ToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.rememberToastHostState -import ru.tech.imageresizershrinker.coreui.widget.sheets.ProcessImagesPreferenceSheet -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalEditPresetsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalImageLoader -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.setContentWithWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.model.toUiState +import ru.tech.imageresizershrinker.core.ui.theme.ImageToolboxTheme +import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiController +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.isInstalledFromPlayStore +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.parseImageFromIntent +import ru.tech.imageresizershrinker.core.ui.utils.navigation.LocalNavController +import ru.tech.imageresizershrinker.core.ui.widget.UpdateSheet +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSliderInit +import ru.tech.imageresizershrinker.core.ui.widget.haptics.customHapticFeedback +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.ToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.rememberToastHostState +import ru.tech.imageresizershrinker.core.ui.widget.sheets.ProcessImagesPreferenceSheet +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalEditPresetsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalImageLoader +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.setContentWithWindowSizeClass import ru.tech.imageresizershrinker.feature.main.presentation.components.AppExitDialog import ru.tech.imageresizershrinker.feature.main.presentation.components.EditPresetsSheet import ru.tech.imageresizershrinker.feature.main.presentation.components.FirstLaunchSetupDialog diff --git a/app/src/main/java/ru/tech/imageresizershrinker/presentation/crash_screen/CrashActivity.kt b/app/src/main/java/ru/tech/imageresizershrinker/presentation/crash_screen/CrashActivity.kt index d1e541b61..f26d2e602 100644 --- a/app/src/main/java/ru/tech/imageresizershrinker/presentation/crash_screen/CrashActivity.kt +++ b/app/src/main/java/ru/tech/imageresizershrinker/presentation/crash_screen/CrashActivity.kt @@ -65,25 +65,25 @@ import ru.tech.imageresizershrinker.core.domain.AUTHOR_TG import ru.tech.imageresizershrinker.core.domain.ISSUE_TRACKER import ru.tech.imageresizershrinker.presentation.crash_screen.viewModel.CrashViewModel import ru.tech.imageresizershrinker.presentation.MainActivity -import ru.tech.imageresizershrinker.coreui.icons.material.Github -import ru.tech.imageresizershrinker.coreui.icons.material.Robot -import ru.tech.imageresizershrinker.coreui.icons.material.Telegram -import ru.tech.imageresizershrinker.coreui.model.toUiState -import ru.tech.imageresizershrinker.coreui.theme.Black -import ru.tech.imageresizershrinker.coreui.theme.Blue -import ru.tech.imageresizershrinker.coreui.theme.ImageToolboxTheme -import ru.tech.imageresizershrinker.coreui.theme.White -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.icons.material.Github +import ru.tech.imageresizershrinker.core.ui.icons.material.Robot +import ru.tech.imageresizershrinker.core.ui.icons.material.Telegram +import ru.tech.imageresizershrinker.core.ui.model.toUiState +import ru.tech.imageresizershrinker.core.ui.theme.Black +import ru.tech.imageresizershrinker.core.ui.theme.Blue +import ru.tech.imageresizershrinker.core.ui.theme.ImageToolboxTheme +import ru.tech.imageresizershrinker.core.ui.theme.White +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant import ru.tech.imageresizershrinker.presentation.CrashHandler -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.copyToClipboard -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedFloatingActionButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.other.ToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.rememberToastHostState -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.copyToClipboard +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedFloatingActionButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.other.ToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.rememberToastHostState +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @AndroidEntryPoint class CrashActivity : CrashHandler() { diff --git a/app/src/main/java/ru/tech/imageresizershrinker/presentation/services/ColorPickerTile.kt b/app/src/main/java/ru/tech/imageresizershrinker/presentation/services/ColorPickerTile.kt index f632352e0..1c7dbc810 100644 --- a/app/src/main/java/ru/tech/imageresizershrinker/presentation/services/ColorPickerTile.kt +++ b/app/src/main/java/ru/tech/imageresizershrinker/presentation/services/ColorPickerTile.kt @@ -8,7 +8,7 @@ import android.os.Build import android.service.quicksettings.TileService import androidx.annotation.RequiresApi import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.utils.navigation.Screen +import ru.tech.imageresizershrinker.core.ui.utils.navigation.Screen @RequiresApi(Build.VERSION_CODES.N) class ColorPickerTile : TileService() { diff --git a/app/src/market/java/ru/tech/imageresizershrinker/presentation/M3Activity.kt b/app/src/market/java/ru/tech/imageresizershrinker/presentation/M3Activity.kt index d7d22c0b1..242ef50a9 100644 --- a/app/src/market/java/ru/tech/imageresizershrinker/presentation/M3Activity.kt +++ b/app/src/market/java/ru/tech/imageresizershrinker/presentation/M3Activity.kt @@ -15,8 +15,8 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import ru.tech.imageresizershrinker.core.domain.model.SettingsState -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.adjustFontSize -import ru.tech.imageresizershrinker.coreui.widget.activity.SettingsStateEntryPoint +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.adjustFontSize +import ru.tech.imageresizershrinker.core.ui.widget.activity.SettingsStateEntryPoint import ru.tech.imageresizershrinker.presentation.crash_screen.CrashActivity @AndroidEntryPoint diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/confetti/LocalConfettiController.kt b/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/confetti/LocalConfettiController.kt deleted file mode 100644 index aa7a19ec3..000000000 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/confetti/LocalConfettiController.kt +++ /dev/null @@ -1,6 +0,0 @@ -package ru.tech.imageresizershrinker.coreui.utils.confetti - -import androidx.compose.runtime.compositionLocalOf -import ru.tech.imageresizershrinker.coreui.widget.other.ToastHostState - -val LocalConfettiController = compositionLocalOf { ToastHostState() } \ No newline at end of file diff --git a/core/filters/build.gradle.kts b/core/filters/build.gradle.kts index 0c8b36284..e79858ecb 100644 --- a/core/filters/build.gradle.kts +++ b/core/filters/build.gradle.kts @@ -47,5 +47,5 @@ android { dependencies { implementation(project(":core:domain")) implementation(project(":core:resources")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) } \ No newline at end of file diff --git a/core-ui/.gitignore b/core/ui/.gitignore similarity index 100% rename from core-ui/.gitignore rename to core/ui/.gitignore diff --git a/core-ui/build.gradle.kts b/core/ui/build.gradle.kts similarity index 98% rename from core-ui/build.gradle.kts rename to core/ui/build.gradle.kts index b0549c4ff..e001bb0b9 100644 --- a/core-ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } android { - namespace = "ru.tech.imageresizershrinker.coreui" + namespace = "ru.tech.imageresizershrinker.core.ui" compileSdk = libs.versions.androidCompileSdk.get().toIntOrNull() defaultConfig { diff --git a/core-ui/src/main/AndroidManifest.xml b/core/ui/src/main/AndroidManifest.xml similarity index 100% rename from core-ui/src/main/AndroidManifest.xml rename to core/ui/src/main/AndroidManifest.xml diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/emoji/Emoji.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/emoji/Emoji.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/emoji/Emoji.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/emoji/Emoji.kt index e255aff9a..dafacb711 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/emoji/Emoji.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/emoji/Emoji.kt @@ -1,6 +1,6 @@ @file:Suppress("PrivatePropertyName") -package ru.tech.imageresizershrinker.coreui.icons.emoji +package ru.tech.imageresizershrinker.core.ui.icons.emoji import android.content.Context import android.net.Uri diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/emoji/EmojiData.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/emoji/EmojiData.kt similarity index 75% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/emoji/EmojiData.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/emoji/EmojiData.kt index 42d426594..fa4a0ba2a 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/emoji/EmojiData.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/emoji/EmojiData.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.emoji +package ru.tech.imageresizershrinker.core.ui.icons.emoji import android.net.Uri import androidx.compose.ui.graphics.vector.ImageVector diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/emoji/EmojiItem.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/emoji/EmojiItem.kt similarity index 92% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/emoji/EmojiItem.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/emoji/EmojiItem.kt index de53aa30b..e2b0592c6 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/emoji/EmojiItem.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/emoji/EmojiItem.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.emoji +package ru.tech.imageresizershrinker.core.ui.icons.emoji import androidx.compose.animation.AnimatedContent import androidx.compose.foundation.layout.Box @@ -24,9 +24,9 @@ import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.dp import coil.compose.rememberAsyncImagePainter import coil.request.ImageRequest -import ru.tech.imageresizershrinker.coreui.shapes.CloverShape -import ru.tech.imageresizershrinker.coreui.widget.modifier.shimmer -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalImageLoader +import ru.tech.imageresizershrinker.core.ui.shapes.CloverShape +import ru.tech.imageresizershrinker.core.ui.widget.modifier.shimmer +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalImageLoader @Composable fun EmojiItem( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Analytics.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Analytics.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Analytics.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Analytics.kt index de4c91def..3895041c8 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Analytics.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Analytics.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Beta.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Beta.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Beta.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Beta.kt index 6819e72a2..bef54088b 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Beta.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Beta.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Bitcoin.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Bitcoin.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Bitcoin.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Bitcoin.kt index 8afe21604..c64312606 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Bitcoin.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Bitcoin.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Cool.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Cool.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Cool.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Cool.kt index 6d9a514fd..59f727ac6 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Cool.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Cool.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Crashlytics.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Crashlytics.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Crashlytics.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Crashlytics.kt index b351c41be..3dde0ba5d 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Crashlytics.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Crashlytics.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/CreateAlt.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/CreateAlt.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/CreateAlt.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/CreateAlt.kt index cb9f0029a..870e81663 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/CreateAlt.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/CreateAlt.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Cube.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Cube.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Cube.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Cube.kt index b3e0068f5..f11b94bab 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Cube.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Cube.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Dots.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Dots.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Dots.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Dots.kt index 8e0688187..18da7f99d 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Dots.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Dots.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/DownloadFile.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/DownloadFile.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/DownloadFile.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/DownloadFile.kt index d23eb5613..af8905fa6 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/DownloadFile.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/DownloadFile.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Eraser.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Eraser.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Eraser.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Eraser.kt index 6868014fe..64e5b7d01 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Eraser.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Eraser.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FingerprintOff.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FingerprintOff.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FingerprintOff.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FingerprintOff.kt index 966522c19..092202af5 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FingerprintOff.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FingerprintOff.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Firebase.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Firebase.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Firebase.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Firebase.kt index a22fb498e..6ff6ec004 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Firebase.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Firebase.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FloatingActionButton.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FloatingActionButton.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FloatingActionButton.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FloatingActionButton.kt index 734fb6bfa..c1b2a4d8a 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FloatingActionButton.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FloatingActionButton.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FolderOpen.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FolderOpen.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FolderOpen.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FolderOpen.kt index 55505ddb1..4e38893c5 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FolderOpen.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FolderOpen.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FontFamily.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FontFamily.kt similarity index 99% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FontFamily.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FontFamily.kt index 89ce5bc20..e39433ecd 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FontFamily.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FontFamily.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FreeArrow.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FreeArrow.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FreeArrow.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FreeArrow.kt index 96be36b62..91a6f49f6 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FreeArrow.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FreeArrow.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FreeDoubleArrow.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FreeDoubleArrow.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FreeDoubleArrow.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FreeDoubleArrow.kt index 2e6622ea8..32ad1834e 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FreeDoubleArrow.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FreeDoubleArrow.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FreeDraw.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FreeDraw.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FreeDraw.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FreeDraw.kt index 9f85243b1..35a2f81aa 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/FreeDraw.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/FreeDraw.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Github.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Github.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Github.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Github.kt index 75fb2d84b..8e5f7e10d 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Github.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Github.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/GooglePlay.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/GooglePlay.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/GooglePlay.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/GooglePlay.kt index 1d98b925d..e6eec0049 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/GooglePlay.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/GooglePlay.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Highlighter.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Highlighter.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Highlighter.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Highlighter.kt index 879c457aa..4cc5bf296 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Highlighter.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Highlighter.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Interface.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Interface.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Interface.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Interface.kt index e0ba5d5e7..051912664 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Interface.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Interface.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Jxl.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Jxl.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Jxl.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Jxl.kt index 21029b736..24cd207e5 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Jxl.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Jxl.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Laser.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Laser.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Laser.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Laser.kt index 925418509..e929045ac 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Laser.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Laser.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Lasso.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Lasso.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Lasso.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Lasso.kt index 89271a274..c2cda9bc8 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Lasso.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Lasso.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/LetterO.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/LetterO.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/LetterO.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/LetterO.kt index 2fb61ad0f..4f2ea3fe9 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/LetterO.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/LetterO.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/LetterS.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/LetterS.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/LetterS.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/LetterS.kt index 18671baeb..b2405f2d8 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/LetterS.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/LetterS.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Line.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Line.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Line.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Line.kt index 0971be8a9..f2ce95347 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Line.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Line.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/LineArrow.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/LineArrow.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/LineArrow.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/LineArrow.kt index a36338ec3..7434f934a 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/LineArrow.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/LineArrow.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/LineDoubleArrow.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/LineDoubleArrow.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/LineDoubleArrow.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/LineDoubleArrow.kt index 67f29d331..8f3b1cfa8 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/LineDoubleArrow.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/LineDoubleArrow.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Numeric.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Numeric.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Numeric.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Numeric.kt index 4a1e08b37..9ed8b7565 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Numeric.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Numeric.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/PaletteSwatch.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/PaletteSwatch.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/PaletteSwatch.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/PaletteSwatch.kt index 68cb87118..686825a89 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/PaletteSwatch.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/PaletteSwatch.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Prefix.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Prefix.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Prefix.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Prefix.kt index 597f1e57c..208581560 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Prefix.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Prefix.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Puzzle.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Puzzle.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Puzzle.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Puzzle.kt index a7593568f..d5d2143df 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Puzzle.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Puzzle.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Resize.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Resize.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Resize.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Resize.kt index bad649efc..ea09465c9 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Resize.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Resize.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Robot.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Robot.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Robot.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Robot.kt index cc66c85dd..8803f0e13 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Robot.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Robot.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Shadow.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Shadow.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Shadow.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Shadow.kt index e2fab56fd..417b71cf6 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Shadow.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Shadow.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/ShieldKey.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/ShieldKey.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/ShieldKey.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/ShieldKey.kt index 7f3b82f29..470eb961c 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/ShieldKey.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/ShieldKey.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/ShieldOpen.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/ShieldOpen.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/ShieldOpen.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/ShieldOpen.kt index a3632d4db..72cb8f870 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/ShieldOpen.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/ShieldOpen.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Slider.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Slider.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Slider.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Slider.kt index 71e756daa..fe506e047 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Slider.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Slider.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Square.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Square.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Square.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Square.kt index a54b457c2..a840aa968 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Square.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Square.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/SquareEdit.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/SquareEdit.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/SquareEdit.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/SquareEdit.kt index c36117473..7ed46a1d8 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/SquareEdit.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/SquareEdit.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Stacks.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Stacks.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Stacks.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Stacks.kt index 0bdea051d..0eaf83555 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Stacks.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Stacks.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Suffix.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Suffix.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Suffix.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Suffix.kt index 42c077868..bb58cdb2b 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Suffix.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Suffix.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Swatch.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Swatch.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Swatch.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Swatch.kt index 2ada5ec21..9b64b2c1a 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Swatch.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Swatch.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Symbol.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Symbol.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Symbol.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Symbol.kt index 507c901ff..3d3f60ad2 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Symbol.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Symbol.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Telegram.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Telegram.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Telegram.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Telegram.kt index 138ab4abf..110b6326c 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Telegram.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Telegram.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Theme.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Theme.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Theme.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Theme.kt index 8f3fe1e09..5d6052900 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Theme.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Theme.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Ton.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Ton.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Ton.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Ton.kt index 1732cf8c9..f64d1f4ab 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Ton.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Ton.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Toolbox.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Toolbox.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Toolbox.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Toolbox.kt index 0f0878762..5fb1bb8cc 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Toolbox.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Toolbox.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Transparency.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Transparency.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Transparency.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Transparency.kt index b50fd3e76..56454ed7a 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/Transparency.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/Transparency.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/USDT.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/USDT.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/USDT.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/USDT.kt index 2d64f63f3..34f265769 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/icons/material/USDT.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/icons/material/USDT.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.icons.material +package ru.tech.imageresizershrinker.core.ui.icons.material import androidx.compose.material.icons.Icons import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/model/UiFontFam.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/model/UiFontFam.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/model/UiFontFam.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/model/UiFontFam.kt index 5d921bb20..5e7a4fa4c 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/model/UiFontFam.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/model/UiFontFam.kt @@ -1,10 +1,10 @@ -package ru.tech.imageresizershrinker.coreui.model +package ru.tech.imageresizershrinker.core.ui.model import android.os.Build import androidx.compose.ui.text.font.FontFamily import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.model.FontFam -import ru.tech.imageresizershrinker.coreui.theme.fontFamilyResource +import ru.tech.imageresizershrinker.core.ui.theme.fontFamilyResource sealed class UiFontFam( val fontFamily: FontFamily, diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/model/UiPathPaint.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/model/UiPathPaint.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/model/UiPathPaint.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/model/UiPathPaint.kt index f949d885e..4ef0e17b3 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/model/UiPathPaint.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/model/UiPathPaint.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.model +package ru.tech.imageresizershrinker.core.ui.model import androidx.compose.runtime.saveable.Saver import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/model/UiSettingsState.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/model/UiSettingsState.kt similarity index 95% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/model/UiSettingsState.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/model/UiSettingsState.kt index dd04ad0f0..648d783cd 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/model/UiSettingsState.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/model/UiSettingsState.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.model +package ru.tech.imageresizershrinker.core.ui.model import android.net.Uri import androidx.compose.animation.core.animateDpAsState @@ -17,11 +17,11 @@ import ru.tech.imageresizershrinker.core.domain.model.DomainAspectRatio import ru.tech.imageresizershrinker.core.domain.model.FontFam import ru.tech.imageresizershrinker.core.domain.model.NightMode import ru.tech.imageresizershrinker.core.domain.model.SettingsState -import ru.tech.imageresizershrinker.coreui.icons.emoji.Emoji -import ru.tech.imageresizershrinker.coreui.icons.emoji.allIcons -import ru.tech.imageresizershrinker.coreui.theme.defaultColorTuple -import ru.tech.imageresizershrinker.coreui.theme.toColor -import ru.tech.imageresizershrinker.coreui.utils.navigation.Screen +import ru.tech.imageresizershrinker.core.ui.icons.emoji.Emoji +import ru.tech.imageresizershrinker.core.ui.icons.emoji.allIcons +import ru.tech.imageresizershrinker.core.ui.theme.defaultColorTuple +import ru.tech.imageresizershrinker.core.ui.theme.toColor +import ru.tech.imageresizershrinker.core.ui.utils.navigation.Screen data class UiSettingsState( val isNightMode: Boolean = false, diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/CloverShape.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/CloverShape.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/CloverShape.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/CloverShape.kt index 2948fbb13..15fa25b0b 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/CloverShape.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/CloverShape.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.shapes +package ru.tech.imageresizershrinker.core.ui.shapes import android.graphics.Matrix import androidx.compose.ui.geometry.Size diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/KotlinShape.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/KotlinShape.kt similarity index 95% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/KotlinShape.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/KotlinShape.kt index b7422b688..479b37e7f 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/KotlinShape.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/KotlinShape.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.shapes +package ru.tech.imageresizershrinker.core.ui.shapes import android.graphics.Matrix import androidx.compose.ui.geometry.Size diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/MaterialStarShape.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/MaterialStarShape.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/MaterialStarShape.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/MaterialStarShape.kt index cbcd72d36..6bfbb84ec 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/MaterialStarShape.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/MaterialStarShape.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.shapes +package ru.tech.imageresizershrinker.core.ui.shapes import android.graphics.Matrix import androidx.compose.ui.geometry.Size diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/OctagonShape.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/OctagonShape.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/OctagonShape.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/OctagonShape.kt index 55345f9af..8178b47f2 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/OctagonShape.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/OctagonShape.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.shapes +package ru.tech.imageresizershrinker.core.ui.shapes import android.graphics.Matrix import androidx.compose.ui.geometry.Size diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/OvalShape.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/OvalShape.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/OvalShape.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/OvalShape.kt index 65a8173f2..a2ff0c375 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/OvalShape.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/OvalShape.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.shapes +package ru.tech.imageresizershrinker.core.ui.shapes import android.graphics.Matrix import androidx.compose.ui.geometry.Size diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/PentagonShape.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/PentagonShape.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/PentagonShape.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/PentagonShape.kt index 6e0472edd..e4e07f669 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/PentagonShape.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/PentagonShape.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.shapes +package ru.tech.imageresizershrinker.core.ui.shapes import android.graphics.Matrix import androidx.compose.ui.geometry.Size diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/SquircleShape.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/SquircleShape.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/SquircleShape.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/SquircleShape.kt index 963bfd604..4d912b846 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/shapes/SquircleShape.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/shapes/SquircleShape.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.shapes +package ru.tech.imageresizershrinker.core.ui.shapes import android.graphics.Matrix import androidx.compose.ui.geometry.Size diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/theme/Color.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/theme/Color.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/theme/Color.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/theme/Color.kt index 8a3be97f8..edfc0f7ec 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/theme/Color.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.theme +package ru.tech.imageresizershrinker.core.ui.theme import androidx.annotation.FloatRange import androidx.compose.material3.ColorScheme @@ -11,7 +11,7 @@ import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.unit.dp import androidx.core.graphics.ColorUtils import com.t8rin.dynamic.theme.ColorTuple -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState val md_theme_dark_primary = Color(0xFF8FDB3A) diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/theme/Theme.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/theme/Theme.kt similarity index 90% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/theme/Theme.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/theme/Theme.kt index 16f66d996..03b41dd11 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/theme/Theme.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/theme/Theme.kt @@ -1,10 +1,10 @@ -package ru.tech.imageresizershrinker.coreui.theme +package ru.tech.imageresizershrinker.core.ui.theme import androidx.compose.runtime.Composable import com.t8rin.dynamic.theme.DynamicTheme import com.t8rin.dynamic.theme.rememberAppColorTuple import com.t8rin.dynamic.theme.rememberDynamicThemeState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun ImageToolboxTheme( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/theme/Type.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/theme/Type.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/theme/Type.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/theme/Type.kt index e974c3ba5..d3324314e 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/theme/Type.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/theme/Type.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalTextApi::class) -package ru.tech.imageresizershrinker.coreui.theme +package ru.tech.imageresizershrinker.core.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.ExperimentalTextApi @@ -12,7 +12,7 @@ import androidx.compose.ui.text.font.FontVariation import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.sp -import ru.tech.imageresizershrinker.coreui.model.UiFontFam +import ru.tech.imageresizershrinker.core.ui.model.UiFontFam fun fontFamilyResource(resId: Int) = FontFamily( Font( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/transformation/ImageInfoTransformation.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/transformation/ImageInfoTransformation.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/transformation/ImageInfoTransformation.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/transformation/ImageInfoTransformation.kt index ec3e19c43..ccfd849df 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/transformation/ImageInfoTransformation.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/transformation/ImageInfoTransformation.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.transformation +package ru.tech.imageresizershrinker.core.ui.transformation import android.graphics.Bitmap import androidx.exifinterface.media.ExifInterface diff --git a/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/confetti/LocalConfettiController.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/confetti/LocalConfettiController.kt new file mode 100644 index 000000000..dca9eea23 --- /dev/null +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/confetti/LocalConfettiController.kt @@ -0,0 +1,6 @@ +package ru.tech.imageresizershrinker.core.ui.utils.confetti + +import androidx.compose.runtime.compositionLocalOf +import ru.tech.imageresizershrinker.core.ui.widget.other.ToastHostState + +val LocalConfettiController = compositionLocalOf { ToastHostState() } \ No newline at end of file diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ActivityUtils.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ActivityUtils.kt similarity index 81% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ActivityUtils.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ActivityUtils.kt index 47b5831fa..6be4904df 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ActivityUtils.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ActivityUtils.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.helper +package ru.tech.imageresizershrinker.core.ui.utils.helper import android.app.Activity import androidx.compose.material.icons.Icons @@ -7,9 +7,10 @@ import androidx.compose.material.icons.rounded.Save import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.requestStoragePermission -import ru.tech.imageresizershrinker.coreui.widget.other.ToastDuration -import ru.tech.imageresizershrinker.coreui.widget.other.ToastHostState +import ru.tech.imageresizershrinker.core.ui.utils.helper.showReview +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.requestStoragePermission +import ru.tech.imageresizershrinker.core.ui.widget.other.ToastDuration +import ru.tech.imageresizershrinker.core.ui.widget.other.ToastHostState fun Activity.failedToSaveImages( scope: CoroutineScope, diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ColorUtils.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ColorUtils.kt similarity index 68% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ColorUtils.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ColorUtils.kt index 2e1d389f7..84cb286ea 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ColorUtils.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ColorUtils.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.helper +package ru.tech.imageresizershrinker.core.ui.utils.helper import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.toArgb diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ContextUtils.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ContextUtils.kt similarity index 92% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ContextUtils.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ContextUtils.kt index 1d914d497..bcd7f06d7 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ContextUtils.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ContextUtils.kt @@ -1,6 +1,6 @@ @file:Suppress("SameParameterValue", "KotlinConstantConditions") -package ru.tech.imageresizershrinker.coreui.utils.helper +package ru.tech.imageresizershrinker.core.ui.utils.helper import android.Manifest import android.app.Activity @@ -19,15 +19,15 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat import androidx.documentfile.provider.DocumentFile -import ru.tech.imageresizershrinker.coreui.BuildConfig +import ru.tech.imageresizershrinker.core.ui.BuildConfig import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.utils.helper.IntentUtils.parcelable -import ru.tech.imageresizershrinker.coreui.utils.helper.IntentUtils.parcelableArrayList -import ru.tech.imageresizershrinker.coreui.utils.navigation.Screen -import ru.tech.imageresizershrinker.coreui.utils.permission.PermissionStatus -import ru.tech.imageresizershrinker.coreui.utils.permission.PermissionUtils.askUserToRequestPermissionExplicitly -import ru.tech.imageresizershrinker.coreui.utils.permission.PermissionUtils.checkPermissions -import ru.tech.imageresizershrinker.coreui.utils.permission.PermissionUtils.setPermissionsAllowed +import ru.tech.imageresizershrinker.core.ui.utils.helper.IntentUtils.parcelable +import ru.tech.imageresizershrinker.core.ui.utils.helper.IntentUtils.parcelableArrayList +import ru.tech.imageresizershrinker.core.ui.utils.navigation.Screen +import ru.tech.imageresizershrinker.core.ui.utils.permission.PermissionStatus +import ru.tech.imageresizershrinker.core.ui.utils.permission.PermissionUtils.askUserToRequestPermissionExplicitly +import ru.tech.imageresizershrinker.core.ui.utils.permission.PermissionUtils.checkPermissions +import ru.tech.imageresizershrinker.core.ui.utils.permission.PermissionUtils.setPermissionsAllowed import java.io.BufferedReader import java.io.InputStreamReader diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/DrawUtils.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/DrawUtils.kt similarity index 94% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/DrawUtils.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/DrawUtils.kt index a3146113f..a03973954 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/DrawUtils.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/DrawUtils.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.helper +package ru.tech.imageresizershrinker.core.ui.utils.helper import android.graphics.Matrix import androidx.compose.ui.geometry.Offset diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ImagePicker.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ImagePicker.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ImagePicker.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ImagePicker.kt index 8d1268162..184fc61a0 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ImagePicker.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ImagePicker.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.helper +package ru.tech.imageresizershrinker.core.ui.utils.helper import android.content.Context import android.content.Intent @@ -14,7 +14,7 @@ import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState class ImagePicker( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ImageUtils.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ImageUtils.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ImageUtils.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ImageUtils.kt index 6546d9daf..fdec5d69b 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ImageUtils.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ImageUtils.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.helper +package ru.tech.imageresizershrinker.core.ui.utils.helper import android.content.Context import android.graphics.Bitmap diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/IntentUtils.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/IntentUtils.kt similarity index 92% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/IntentUtils.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/IntentUtils.kt index 2610eec1a..aa8c65acf 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/IntentUtils.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/IntentUtils.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.helper +package ru.tech.imageresizershrinker.core.ui.utils.helper import android.content.Intent import android.os.Build diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ListUtils.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ListUtils.kt similarity index 87% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ListUtils.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ListUtils.kt index 65eb9c3c7..0367411c1 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ListUtils.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ListUtils.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.helper +package ru.tech.imageresizershrinker.core.ui.utils.helper object ListUtils { fun List.nearestFor(item: T): T? { diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/PaddingUtils.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/PaddingUtils.kt similarity index 92% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/PaddingUtils.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/PaddingUtils.kt index 1b5084ef3..369192eb2 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/PaddingUtils.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/PaddingUtils.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.helper +package ru.tech.imageresizershrinker.core.ui.utils.helper import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.calculateEndPadding diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ParseSaveResult.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ParseSaveResult.kt similarity index 81% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ParseSaveResult.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ParseSaveResult.kt index 2db4f2187..23278412c 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/ParseSaveResult.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ParseSaveResult.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.helper +package ru.tech.imageresizershrinker.core.ui.utils.helper import android.content.Context import androidx.compose.material.icons.Icons @@ -7,9 +7,10 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.saving.SaveResult -import ru.tech.imageresizershrinker.coreui.widget.other.ToastDuration -import ru.tech.imageresizershrinker.coreui.widget.other.ToastHostState -import ru.tech.imageresizershrinker.coreui.widget.other.showError +import ru.tech.imageresizershrinker.core.ui.utils.helper.showReview +import ru.tech.imageresizershrinker.core.ui.widget.other.ToastDuration +import ru.tech.imageresizershrinker.core.ui.widget.other.ToastHostState +import ru.tech.imageresizershrinker.core.ui.widget.other.showError fun parseSaveResult( saveResult: SaveResult, diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/UriUtils.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/UriUtils.kt similarity index 91% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/UriUtils.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/UriUtils.kt index dd9ac1a04..68e4a6730 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/helper/UriUtils.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/UriUtils.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.helper +package ru.tech.imageresizershrinker.core.ui.utils.helper import android.content.Context import android.net.Uri diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/navigation/LocalNavController.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/navigation/LocalNavController.kt similarity index 70% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/navigation/LocalNavController.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/navigation/LocalNavController.kt index 9bb785261..9281deb6a 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/navigation/LocalNavController.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/navigation/LocalNavController.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.navigation +package ru.tech.imageresizershrinker.core.ui.utils.navigation import androidx.compose.runtime.compositionLocalOf import dev.olshevski.navigation.reimagined.NavController diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/navigation/Screen.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/navigation/Screen.kt similarity index 93% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/navigation/Screen.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/navigation/Screen.kt index f664111bb..19a7e2adb 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/navigation/Screen.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/navigation/Screen.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.navigation +package ru.tech.imageresizershrinker.core.ui.utils.navigation import android.net.Uri import android.os.Parcelable @@ -26,14 +26,14 @@ import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize import kotlinx.parcelize.RawValue import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.CreateAlt -import ru.tech.imageresizershrinker.coreui.icons.material.FingerprintOff -import ru.tech.imageresizershrinker.coreui.icons.material.Interface -import ru.tech.imageresizershrinker.coreui.icons.material.PaletteSwatch -import ru.tech.imageresizershrinker.coreui.icons.material.Puzzle -import ru.tech.imageresizershrinker.coreui.icons.material.Resize -import ru.tech.imageresizershrinker.coreui.icons.material.Toolbox -import ru.tech.imageresizershrinker.coreui.icons.material.Transparency +import ru.tech.imageresizershrinker.core.ui.icons.material.CreateAlt +import ru.tech.imageresizershrinker.core.ui.icons.material.FingerprintOff +import ru.tech.imageresizershrinker.core.ui.icons.material.Interface +import ru.tech.imageresizershrinker.core.ui.icons.material.PaletteSwatch +import ru.tech.imageresizershrinker.core.ui.icons.material.Puzzle +import ru.tech.imageresizershrinker.core.ui.icons.material.Resize +import ru.tech.imageresizershrinker.core.ui.icons.material.Toolbox +import ru.tech.imageresizershrinker.core.ui.icons.material.Transparency @Parcelize sealed class Screen( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/permission/PermissionResult.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/permission/PermissionResult.kt similarity index 72% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/permission/PermissionResult.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/permission/PermissionResult.kt index 604c7131b..c05890fc1 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/permission/PermissionResult.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/permission/PermissionResult.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.permission +package ru.tech.imageresizershrinker.core.ui.utils.permission class PermissionResult { var permissionStatus: HashMap = hashMapOf() diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/permission/PermissionStatus.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/permission/PermissionStatus.kt similarity index 56% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/permission/PermissionStatus.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/permission/PermissionStatus.kt index 0d344b0f3..53c5a8b23 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/permission/PermissionStatus.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/permission/PermissionStatus.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.permission +package ru.tech.imageresizershrinker.core.ui.utils.permission enum class PermissionStatus { ALLOWED, diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/permission/PermissionUtils.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/permission/PermissionUtils.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/permission/PermissionUtils.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/permission/PermissionUtils.kt index b6f2e8d58..456e295bf 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/permission/PermissionUtils.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/permission/PermissionUtils.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.permission +package ru.tech.imageresizershrinker.core.ui.utils.permission import android.app.Activity import android.content.Context diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/state/Update.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/state/Update.kt similarity index 74% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/state/Update.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/state/Update.kt index 41d8d95ba..8bb9d77ca 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/utils/state/Update.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/state/Update.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.state +package ru.tech.imageresizershrinker.core.ui.utils.state import androidx.compose.runtime.MutableState diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/activity/SettingsStateEntryPoint.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/activity/SettingsStateEntryPoint.kt similarity index 85% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/activity/SettingsStateEntryPoint.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/activity/SettingsStateEntryPoint.kt index 2a66abb7e..4ed5bb4ff 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/activity/SettingsStateEntryPoint.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/activity/SettingsStateEntryPoint.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.activity +package ru.tech.imageresizershrinker.core.ui.widget.activity import dagger.hilt.EntryPoint import dagger.hilt.InstallIn diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/buttons/BottomButtonsBlock.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/buttons/BottomButtonsBlock.kt similarity index 94% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/buttons/BottomButtonsBlock.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/buttons/BottomButtonsBlock.kt index 9cde61b1c..4cbcdf9e2 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/buttons/BottomButtonsBlock.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/buttons/BottomButtonsBlock.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.buttons +package ru.tech.imageresizershrinker.core.ui.widget.buttons import androidx.compose.animation.AnimatedContent import androidx.compose.animation.AnimatedVisibility @@ -29,9 +29,9 @@ import androidx.compose.ui.graphics.RectangleShape import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedFloatingActionButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedFloatingActionButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke @Composable fun BottomButtonsBlock( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/buttons/ToggleGroupButton.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/buttons/ToggleGroupButton.kt similarity index 95% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/buttons/ToggleGroupButton.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/buttons/ToggleGroupButton.kt index 2f21625e1..380836136 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/buttons/ToggleGroupButton.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/buttons/ToggleGroupButton.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.buttons +package ru.tech.imageresizershrinker.core.ui.widget.buttons import android.annotation.SuppressLint import androidx.compose.animation.core.animateDpAsState @@ -22,9 +22,9 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.max import androidx.compose.ui.unit.sp -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.modifier.materialShadow -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.modifier.materialShadow +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun ToggleGroupButton( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/AlphaColorSelection.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/AlphaColorSelection.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/AlphaColorSelection.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/AlphaColorSelection.kt index 766901873..4b38a3900 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/AlphaColorSelection.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/AlphaColorSelection.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.color_picker +package ru.tech.imageresizershrinker.core.ui.widget.color_picker import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -23,7 +23,7 @@ import com.smarttoolfactory.colordetector.util.ColorUtil import com.smarttoolfactory.colorpicker.selector.SelectorRectSaturationValueHSV import com.smarttoolfactory.colorpicker.slider.SliderAlphaHSL import com.smarttoolfactory.colorpicker.slider.SliderHueHSV -import ru.tech.imageresizershrinker.coreui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container @Composable fun AlphaColorSelection( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/AvailableColorTuplesSheet.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/AvailableColorTuplesSheet.kt similarity index 93% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/AvailableColorTuplesSheet.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/AvailableColorTuplesSheet.kt index c333fad97..0af9e898f 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/AvailableColorTuplesSheet.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/AvailableColorTuplesSheet.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.color_picker +package ru.tech.imageresizershrinker.core.ui.widget.color_picker import android.content.res.Configuration import androidx.compose.animation.AnimatedVisibility @@ -61,24 +61,24 @@ import com.t8rin.dynamic.theme.ColorTupleItem import com.t8rin.dynamic.theme.PaletteStyle import com.t8rin.dynamic.theme.rememberColorScheme import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.CreateAlt -import ru.tech.imageresizershrinker.coreui.icons.material.Theme -import ru.tech.imageresizershrinker.coreui.shapes.MaterialStarShape -import ru.tech.imageresizershrinker.coreui.theme.defaultColorTuple -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.utils.helper.ListUtils.nearestFor -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSliderItem -import ru.tech.imageresizershrinker.coreui.widget.modifier.alertDialogBorder -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.palette_selection.PaletteStyleSelection -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleDragHandle -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.icons.material.CreateAlt +import ru.tech.imageresizershrinker.core.ui.icons.material.Theme +import ru.tech.imageresizershrinker.core.ui.shapes.MaterialStarShape +import ru.tech.imageresizershrinker.core.ui.theme.defaultColorTuple +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.utils.helper.ListUtils.nearestFor +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSliderItem +import ru.tech.imageresizershrinker.core.ui.widget.modifier.alertDialogBorder +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.palette_selection.PaletteStyleSelection +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleDragHandle +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass @OptIn( ExperimentalMaterial3Api::class diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/ColorInfo.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/ColorInfo.kt similarity index 93% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/ColorInfo.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/ColorInfo.kt index 801150637..eb864d481 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/ColorInfo.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/ColorInfo.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.color_picker +package ru.tech.imageresizershrinker.core.ui.widget.color_picker import androidx.compose.animation.AnimatedContent import androidx.compose.animation.animateColorAsState @@ -47,15 +47,15 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import kotlinx.coroutines.delay import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.theme.inverse -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.copyToClipboard -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.pasteColorFromClipboard -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.alertDialogBorder -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.transparencyChecker -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.theme.inverse +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.copyToClipboard +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.pasteColorFromClipboard +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.alertDialogBorder +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.transparencyChecker +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText import kotlin.random.Random @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/ColorSelection.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/ColorSelection.kt similarity index 95% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/ColorSelection.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/ColorSelection.kt index 59d15bb30..29942197a 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/ColorSelection.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/ColorSelection.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.color_picker +package ru.tech.imageresizershrinker.core.ui.widget.color_picker import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -22,7 +22,7 @@ import androidx.compose.ui.unit.dp import com.smarttoolfactory.colordetector.util.ColorUtil import com.smarttoolfactory.colorpicker.selector.SelectorRectSaturationValueHSV import com.smarttoolfactory.colorpicker.slider.SliderHueHSV -import ru.tech.imageresizershrinker.coreui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container @Composable fun ColorSelection( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/ColorSelectionRow.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/ColorSelectionRow.kt similarity index 92% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/ColorSelectionRow.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/ColorSelectionRow.kt index efff5bf9a..7ce02bd49 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/ColorSelectionRow.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/ColorSelectionRow.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.color_picker +package ru.tech.imageresizershrinker.core.ui.widget.color_picker import androidx.compose.animation.core.animateDpAsState import androidx.compose.foundation.background @@ -38,14 +38,14 @@ import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.theme.inverse -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.fadingEdges -import ru.tech.imageresizershrinker.coreui.widget.modifier.transparencyChecker -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.theme.inverse +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.fadingEdges +import ru.tech.imageresizershrinker.core.ui.widget.modifier.transparencyChecker +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem @Composable fun ColorSelectionRow( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/ColorTupleDefaults.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/ColorTupleDefaults.kt similarity index 90% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/ColorTupleDefaults.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/ColorTupleDefaults.kt index 429fae6c7..fd70f1744 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/ColorTupleDefaults.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/ColorTupleDefaults.kt @@ -1,11 +1,11 @@ -package ru.tech.imageresizershrinker.coreui.widget.color_picker +package ru.tech.imageresizershrinker.core.ui.widget.color_picker import androidx.compose.ui.graphics.Color import com.t8rin.dynamic.theme.ColorTuple import com.t8rin.dynamic.theme.calculateSecondaryColor import com.t8rin.dynamic.theme.calculateSurfaceColor import com.t8rin.dynamic.theme.calculateTertiaryColor -import ru.tech.imageresizershrinker.coreui.theme.toColor +import ru.tech.imageresizershrinker.core.ui.theme.toColor object ColorTupleDefaults { val defaultColorTuples by lazy { diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/ColorTuplePicker.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/ColorTuplePicker.kt similarity index 95% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/ColorTuplePicker.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/ColorTuplePicker.kt index fccb6fb08..de48210c2 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/ColorTuplePicker.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/ColorTuplePicker.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.color_picker +package ru.tech.imageresizershrinker.core.ui.widget.color_picker import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -42,12 +42,12 @@ import com.t8rin.dynamic.theme.rememberAppColorTuple import com.t8rin.dynamic.theme.rememberColorScheme import kotlinx.coroutines.delay import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @ExperimentalMaterial3Api @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/ColorTuplePreview.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/ColorTuplePreview.kt similarity index 91% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/ColorTuplePreview.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/ColorTuplePreview.kt index 095133a71..b838504dc 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/color_picker/ColorTuplePreview.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/color_picker/ColorTuplePreview.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.color_picker +package ru.tech.imageresizershrinker.core.ui.widget.color_picker import androidx.compose.animation.AnimatedContent import androidx.compose.animation.animateColorAsState @@ -28,11 +28,11 @@ import com.t8rin.dynamic.theme.ColorTuple import com.t8rin.dynamic.theme.ColorTupleItem import com.t8rin.dynamic.theme.PaletteStyle import com.t8rin.dynamic.theme.rememberColorScheme -import ru.tech.imageresizershrinker.coreui.shapes.MaterialStarShape -import ru.tech.imageresizershrinker.coreui.theme.inverse -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.shapes.MaterialStarShape +import ru.tech.imageresizershrinker.core.ui.theme.inverse +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/DrawBackgroundSelector.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/DrawBackgroundSelector.kt similarity index 87% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/DrawBackgroundSelector.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/DrawBackgroundSelector.kt index 546b24783..a587e3e3b 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/DrawBackgroundSelector.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/DrawBackgroundSelector.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls +package ru.tech.imageresizershrinker.core.ui.widget.controls import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -18,9 +18,9 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.color_picker.ColorSelectionRow -import ru.tech.imageresizershrinker.coreui.widget.color_picker.ColorSelectionRowDefaults -import ru.tech.imageresizershrinker.coreui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.color_picker.ColorSelectionRow +import ru.tech.imageresizershrinker.core.ui.widget.color_picker.ColorSelectionRowDefaults +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container @Composable fun DrawBackgroundSelector( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedButton.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedButton.kt similarity index 94% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedButton.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedButton.kt index 73c459612..af0d6da7d 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedButton.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedButton.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls +package ru.tech.imageresizershrinker.core.ui.widget.controls import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.animateDpAsState @@ -28,11 +28,11 @@ import androidx.compose.ui.graphics.takeOrElse import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.unit.dp -import ru.tech.imageresizershrinker.coreui.widget.modifier.materialShadow -import ru.tech.imageresizershrinker.coreui.theme.mixedContainer -import ru.tech.imageresizershrinker.coreui.theme.onMixedContainer -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.materialShadow +import ru.tech.imageresizershrinker.core.ui.theme.mixedContainer +import ru.tech.imageresizershrinker.core.ui.theme.onMixedContainer +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedFloatingActionButton.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedFloatingActionButton.kt similarity index 89% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedFloatingActionButton.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedFloatingActionButton.kt index 91dcd8c38..53fea72c2 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedFloatingActionButton.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedFloatingActionButton.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls +package ru.tech.imageresizershrinker.core.ui.widget.controls import androidx.compose.animation.core.animateDpAsState import androidx.compose.foundation.interaction.MutableInteractionSource @@ -21,10 +21,10 @@ import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import ru.tech.imageresizershrinker.coreui.theme.mixedContainer -import ru.tech.imageresizershrinker.coreui.theme.onMixedContainer -import ru.tech.imageresizershrinker.coreui.widget.modifier.containerFabBorder -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.theme.mixedContainer +import ru.tech.imageresizershrinker.core.ui.theme.onMixedContainer +import ru.tech.imageresizershrinker.core.ui.widget.modifier.containerFabBorder +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun EnhancedFloatingActionButton( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedFloatingActionButtonType.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedFloatingActionButtonType.kt similarity index 92% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedFloatingActionButtonType.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedFloatingActionButtonType.kt index 68e0990e6..2dcc7f0f9 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedFloatingActionButtonType.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedFloatingActionButtonType.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls +package ru.tech.imageresizershrinker.core.ui.widget.controls import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.ui.graphics.Shape diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedSlider.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedSlider.kt similarity index 94% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedSlider.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedSlider.kt index 1889816b2..cfd0fb1e0 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedSlider.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedSlider.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls +package ru.tech.imageresizershrinker.core.ui.widget.controls import androidx.compose.animation.core.animateDpAsState import androidx.compose.animation.core.animateFloatAsState @@ -35,9 +35,9 @@ import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex -import ru.tech.imageresizershrinker.coreui.widget.modifier.materialShadow -import ru.tech.imageresizershrinker.coreui.shapes.MaterialStarShape -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.materialShadow +import ru.tech.imageresizershrinker.core.ui.shapes.MaterialStarShape +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedSliderInit.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedSliderInit.kt similarity index 93% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedSliderInit.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedSliderInit.kt index 502e38cd1..b87c0e2bb 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedSliderInit.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedSliderInit.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls +package ru.tech.imageresizershrinker.core.ui.widget.controls import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedSliderItem.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedSliderItem.kt similarity index 95% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedSliderItem.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedSliderItem.kt index 9f7b476e9..584620459 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedSliderItem.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedSliderItem.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls +package ru.tech.imageresizershrinker.core.ui.widget.controls import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.animateContentSize @@ -29,9 +29,9 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.value.ValueDialog -import ru.tech.imageresizershrinker.coreui.widget.value.ValueText +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.value.ValueDialog +import ru.tech.imageresizershrinker.core.ui.widget.value.ValueText @Composable fun EnhancedSliderItem( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedSwitch.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedSwitch.kt similarity index 94% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedSwitch.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedSwitch.kt index 51f83ea49..ddd18e441 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedSwitch.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedSwitch.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls +package ru.tech.imageresizershrinker.core.ui.widget.controls import androidx.compose.animation.AnimatedContent import androidx.compose.animation.core.animateDpAsState @@ -23,8 +23,8 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.unit.dp -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedSwitchDefaults.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedSwitchDefaults.kt similarity index 91% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedSwitchDefaults.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedSwitchDefaults.kt index 7fcf92374..508813e8a 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/EnhancedSwitchDefaults.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/EnhancedSwitchDefaults.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls +package ru.tech.imageresizershrinker.core.ui.widget.controls import androidx.compose.material3.MaterialTheme import androidx.compose.material3.SwitchColors diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/ExtensionGroup.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/ExtensionGroup.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/ExtensionGroup.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/ExtensionGroup.kt index 6d8b3c122..649ecde56 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/ExtensionGroup.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/ExtensionGroup.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls +package ru.tech.imageresizershrinker.core.ui.widget.controls import android.os.Build import androidx.compose.animation.AnimatedContent @@ -41,8 +41,8 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.model.ImageFormat -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container @OptIn(ExperimentalLayoutApi::class) @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/FormatExifWarning.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/FormatExifWarning.kt similarity index 94% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/FormatExifWarning.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/FormatExifWarning.kt index f03a54ed6..5e94752c0 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/FormatExifWarning.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/FormatExifWarning.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls +package ru.tech.imageresizershrinker.core.ui.widget.controls import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.expandVertically @@ -22,7 +22,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.model.ImageFormat -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun FormatExifWarning( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/ImageReorderCarousel.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/ImageReorderCarousel.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/ImageReorderCarousel.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/ImageReorderCarousel.kt index 0b7965a00..8ab26f933 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/ImageReorderCarousel.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/ImageReorderCarousel.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls +package ru.tech.imageresizershrinker.core.ui.widget.controls import android.annotation.SuppressLint import android.net.Uri @@ -50,8 +50,8 @@ import org.burnoutcrew.reorderable.detectReorderAfterLongPress import org.burnoutcrew.reorderable.rememberReorderableLazyListState import org.burnoutcrew.reorderable.reorderable import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.image.Picture -import ru.tech.imageresizershrinker.coreui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.image.Picture +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container @Composable fun ImageReorderCarousel( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/ImageTransformBar.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/ImageTransformBar.kt similarity index 94% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/ImageTransformBar.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/ImageTransformBar.kt index 4d9fc570f..69087c109 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/ImageTransformBar.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/ImageTransformBar.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls +package ru.tech.imageresizershrinker.core.ui.widget.controls import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.animateContentSize @@ -31,10 +31,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.model.ImageFormat -import ru.tech.imageresizershrinker.coreui.icons.material.Transparency -import ru.tech.imageresizershrinker.coreui.theme.mixedContainer -import ru.tech.imageresizershrinker.coreui.theme.onMixedContainer -import ru.tech.imageresizershrinker.coreui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.icons.material.Transparency +import ru.tech.imageresizershrinker.core.ui.theme.mixedContainer +import ru.tech.imageresizershrinker.core.ui.theme.onMixedContainer +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container @Composable fun ImageTransformBar( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/OOMWarning.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/OOMWarning.kt similarity index 94% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/OOMWarning.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/OOMWarning.kt index df9fd137b..95274d4c7 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/OOMWarning.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/OOMWarning.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls +package ru.tech.imageresizershrinker.core.ui.widget.controls import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.expandVertically @@ -21,7 +21,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun OOMWarning(visible: Boolean) { diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/PresetWidget.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/PresetWidget.kt similarity index 91% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/PresetWidget.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/PresetWidget.kt index fd85c5cfd..180e4dda1 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/PresetWidget.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/PresetWidget.kt @@ -1,6 +1,6 @@ @file:Suppress("AnimateAsStateLabel") -package ru.tech.imageresizershrinker.coreui.widget.controls +package ru.tech.imageresizershrinker.core.ui.widget.controls import androidx.compose.animation.animateColorAsState @@ -55,20 +55,20 @@ import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.model.Preset -import ru.tech.imageresizershrinker.coreui.icons.material.CreateAlt -import ru.tech.imageresizershrinker.coreui.icons.material.Telegram -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.utils.navigation.LocalNavController -import ru.tech.imageresizershrinker.coreui.utils.navigation.Screen -import ru.tech.imageresizershrinker.coreui.widget.modifier.alertDialogBorder -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.fadingEdges -import ru.tech.imageresizershrinker.coreui.widget.other.RevealValue -import ru.tech.imageresizershrinker.coreui.widget.other.SwipeToReveal -import ru.tech.imageresizershrinker.coreui.widget.other.rememberRevealState -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalEditPresetsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.CreateAlt +import ru.tech.imageresizershrinker.core.ui.icons.material.Telegram +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.utils.navigation.LocalNavController +import ru.tech.imageresizershrinker.core.ui.utils.navigation.Screen +import ru.tech.imageresizershrinker.core.ui.widget.modifier.alertDialogBorder +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.fadingEdges +import ru.tech.imageresizershrinker.core.ui.widget.other.RevealValue +import ru.tech.imageresizershrinker.core.ui.widget.other.SwipeToReveal +import ru.tech.imageresizershrinker.core.ui.widget.other.rememberRevealState +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalEditPresetsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @OptIn(ExperimentalMaterialApi::class) @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/QualityWidget.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/QualityWidget.kt similarity index 95% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/QualityWidget.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/QualityWidget.kt index c580f9229..a30c79785 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/QualityWidget.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/QualityWidget.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls +package ru.tech.imageresizershrinker.core.ui.widget.controls import androidx.compose.animation.AnimatedContent import androidx.compose.animation.AnimatedVisibility @@ -34,9 +34,9 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ru.tech.imageresizershrinker.core.domain.model.ImageFormat import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.value.ValueDialog -import ru.tech.imageresizershrinker.coreui.widget.value.ValueText +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.value.ValueDialog +import ru.tech.imageresizershrinker.core.ui.widget.value.ValueText import kotlin.math.roundToInt @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/ResizeImageField.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/ResizeImageField.kt similarity index 92% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/ResizeImageField.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/ResizeImageField.kt index c8cb3df98..6a79cc78e 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/ResizeImageField.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/ResizeImageField.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls +package ru.tech.imageresizershrinker.core.ui.widget.controls import androidx.compose.animation.animateContentSize import androidx.compose.foundation.layout.Column @@ -15,9 +15,9 @@ import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.model.ImageInfo import ru.tech.imageresizershrinker.core.domain.model.IntegerSize -import ru.tech.imageresizershrinker.coreui.utils.helper.ImageUtils.restrict -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.text.RoundedTextField +import ru.tech.imageresizershrinker.core.ui.utils.helper.ImageUtils.restrict +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.text.RoundedTextField @Composable fun ResizeImageField( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/SaveExifWidget.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/SaveExifWidget.kt similarity index 91% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/SaveExifWidget.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/SaveExifWidget.kt index 247edd801..0ba3bc483 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/SaveExifWidget.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/SaveExifWidget.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls +package ru.tech.imageresizershrinker.core.ui.widget.controls import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons @@ -12,7 +12,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.model.ImageFormat -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch @Composable fun SaveExifWidget( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/ScaleSmallImagesToLargeToggle.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/ScaleSmallImagesToLargeToggle.kt similarity index 85% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/ScaleSmallImagesToLargeToggle.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/ScaleSmallImagesToLargeToggle.kt index 991e2fc2d..04b76b8d4 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/ScaleSmallImagesToLargeToggle.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/ScaleSmallImagesToLargeToggle.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls +package ru.tech.imageresizershrinker.core.ui.widget.controls import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons @@ -8,7 +8,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch @Composable fun ScaleSmallImagesToLargeToggle( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/AutoEraseBackgroundCard.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/AutoEraseBackgroundCard.kt similarity index 87% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/AutoEraseBackgroundCard.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/AutoEraseBackgroundCard.kt index a5a764720..46b54fe1d 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/AutoEraseBackgroundCard.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/AutoEraseBackgroundCard.kt @@ -1,6 +1,6 @@ @file:Suppress("KotlinConstantConditions") -package ru.tech.imageresizershrinker.coreui.widget.controls.draw +package ru.tech.imageresizershrinker.core.ui.widget.controls.draw import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column @@ -23,11 +23,11 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.BuildConfig -import ru.tech.imageresizershrinker.coreui.theme.mixedContainer -import ru.tech.imageresizershrinker.coreui.theme.onMixedContainer -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.BuildConfig +import ru.tech.imageresizershrinker.core.ui.theme.mixedContainer +import ru.tech.imageresizershrinker.core.ui.theme.onMixedContainer +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container @Composable fun AutoEraseBackgroundCard( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/BrushSoftnessSelector.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/BrushSoftnessSelector.kt similarity index 86% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/BrushSoftnessSelector.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/BrushSoftnessSelector.kt index 4a6e8e318..ff115ba25 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/BrushSoftnessSelector.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/BrushSoftnessSelector.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls.draw +package ru.tech.imageresizershrinker.core.ui.widget.controls.draw import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape @@ -11,8 +11,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.smarttoolfactory.colordetector.util.ColorUtil.roundToTwoDigits import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.Dots -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSliderItem +import ru.tech.imageresizershrinker.core.ui.icons.material.Dots +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSliderItem @Composable fun BrushSoftnessSelector( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/DrawAlphaSelector.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/DrawAlphaSelector.kt similarity index 89% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/DrawAlphaSelector.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/DrawAlphaSelector.kt index 2765228a0..e43c5fe13 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/DrawAlphaSelector.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/DrawAlphaSelector.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls.draw +package ru.tech.imageresizershrinker.core.ui.widget.controls.draw import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape @@ -11,7 +11,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.smarttoolfactory.colordetector.util.ColorUtil.roundToTwoDigits import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSliderItem +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSliderItem @Composable fun DrawAlphaSelector( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/DrawColorSelector.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/DrawColorSelector.kt similarity index 86% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/DrawColorSelector.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/DrawColorSelector.kt index 5164ae19a..a04a0e1b1 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/DrawColorSelector.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/DrawColorSelector.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls.draw +package ru.tech.imageresizershrinker.core.ui.widget.controls.draw import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -18,9 +18,9 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.color_picker.ColorSelectionRow -import ru.tech.imageresizershrinker.coreui.widget.color_picker.ColorSelectionRowDefaults -import ru.tech.imageresizershrinker.coreui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.color_picker.ColorSelectionRow +import ru.tech.imageresizershrinker.core.ui.widget.color_picker.ColorSelectionRowDefaults +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container @Composable fun DrawColorSelector( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/DrawModeSelector.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/DrawModeSelector.kt similarity index 92% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/DrawModeSelector.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/DrawModeSelector.kt index 04b1b885a..c663d37b0 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/DrawModeSelector.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/DrawModeSelector.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls.draw +package ru.tech.imageresizershrinker.core.ui.widget.controls.draw import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.animateDpAsState @@ -60,19 +60,19 @@ import androidx.compose.ui.unit.max import androidx.compose.ui.unit.sp import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.image.draw.DrawMode -import ru.tech.imageresizershrinker.coreui.icons.material.Cube -import ru.tech.imageresizershrinker.coreui.icons.material.Highlighter -import ru.tech.imageresizershrinker.coreui.icons.material.Laser -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.resize_group.components.BlurRadiusSelector -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.materialShadow -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.Cube +import ru.tech.imageresizershrinker.core.ui.icons.material.Highlighter +import ru.tech.imageresizershrinker.core.ui.icons.material.Laser +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.resize_group.components.BlurRadiusSelector +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.materialShadow +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/DrawPathModeSelector.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/DrawPathModeSelector.kt similarity index 90% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/DrawPathModeSelector.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/DrawPathModeSelector.kt index ab8450c8d..ff7f082f2 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/DrawPathModeSelector.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/DrawPathModeSelector.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls.draw +package ru.tech.imageresizershrinker.core.ui.widget.controls.draw import androidx.compose.animation.core.animateDpAsState import androidx.compose.foundation.BorderStroke @@ -56,23 +56,23 @@ import androidx.compose.ui.unit.max import androidx.compose.ui.unit.sp import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.image.draw.DrawPathMode -import ru.tech.imageresizershrinker.coreui.icons.material.FreeArrow -import ru.tech.imageresizershrinker.coreui.icons.material.FreeDoubleArrow -import ru.tech.imageresizershrinker.coreui.icons.material.FreeDraw -import ru.tech.imageresizershrinker.coreui.icons.material.Lasso -import ru.tech.imageresizershrinker.coreui.icons.material.Line -import ru.tech.imageresizershrinker.coreui.icons.material.LineArrow -import ru.tech.imageresizershrinker.coreui.icons.material.LineDoubleArrow -import ru.tech.imageresizershrinker.coreui.icons.material.Square -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.materialShadow -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.FreeArrow +import ru.tech.imageresizershrinker.core.ui.icons.material.FreeDoubleArrow +import ru.tech.imageresizershrinker.core.ui.icons.material.FreeDraw +import ru.tech.imageresizershrinker.core.ui.icons.material.Lasso +import ru.tech.imageresizershrinker.core.ui.icons.material.Line +import ru.tech.imageresizershrinker.core.ui.icons.material.LineArrow +import ru.tech.imageresizershrinker.core.ui.icons.material.LineDoubleArrow +import ru.tech.imageresizershrinker.core.ui.icons.material.Square +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.materialShadow +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/EraseModeCard.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/EraseModeCard.kt similarity index 89% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/EraseModeCard.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/EraseModeCard.kt index 6f5263b6c..5893d788f 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/EraseModeCard.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/EraseModeCard.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls.draw +package ru.tech.imageresizershrinker.core.ui.widget.controls.draw import androidx.compose.animation.AnimatedContent import androidx.compose.animation.SizeTransform @@ -15,10 +15,10 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.Eraser -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRow +import ru.tech.imageresizershrinker.core.ui.icons.material.Eraser +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRow @Composable fun EraseModeCard( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/LineWidthSelector.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/LineWidthSelector.kt similarity index 89% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/LineWidthSelector.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/LineWidthSelector.kt index 6904d4d98..f7611adf5 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/LineWidthSelector.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/LineWidthSelector.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls.draw +package ru.tech.imageresizershrinker.core.ui.widget.controls.draw import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape @@ -12,7 +12,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.smarttoolfactory.colordetector.util.ColorUtil.roundToTwoDigits import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSliderItem +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSliderItem @Composable fun LineWidthSelector( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/OpenColorPickerCard.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/OpenColorPickerCard.kt similarity index 85% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/OpenColorPickerCard.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/OpenColorPickerCard.kt index 91c0c8963..b14c4b020 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/OpenColorPickerCard.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/OpenColorPickerCard.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls.draw +package ru.tech.imageresizershrinker.core.ui.widget.controls.draw import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Row @@ -15,9 +15,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.theme.mixedContainer -import ru.tech.imageresizershrinker.coreui.theme.onMixedContainer -import ru.tech.imageresizershrinker.coreui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.theme.mixedContainer +import ru.tech.imageresizershrinker.core.ui.theme.onMixedContainer +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container @Composable fun OpenColorPickerCard( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/PixelSizeSelector.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/PixelSizeSelector.kt similarity index 84% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/PixelSizeSelector.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/PixelSizeSelector.kt index 6ee91d166..2f700f169 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/PixelSizeSelector.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/PixelSizeSelector.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls.draw +package ru.tech.imageresizershrinker.core.ui.widget.controls.draw import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape @@ -10,8 +10,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.smarttoolfactory.colordetector.util.ColorUtil.roundToTwoDigits import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.Cube -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSliderItem +import ru.tech.imageresizershrinker.core.ui.icons.material.Cube +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSliderItem @Composable fun PixelSizeSelector( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/TrimImageToggle.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/TrimImageToggle.kt similarity index 87% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/TrimImageToggle.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/TrimImageToggle.kt index d0c985a8f..03fd12ee1 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/draw/TrimImageToggle.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/draw/TrimImageToggle.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls.draw +package ru.tech.imageresizershrinker.core.ui.widget.controls.draw import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons @@ -10,7 +10,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch @Composable fun TrimImageToggle( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/resize_group/ResizeTypeSelector.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/resize_group/ResizeTypeSelector.kt similarity index 91% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/resize_group/ResizeTypeSelector.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/resize_group/ResizeTypeSelector.kt index 5298f33b2..cb3cf8ae2 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/resize_group/ResizeTypeSelector.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/resize_group/ResizeTypeSelector.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls.resize_group +package ru.tech.imageresizershrinker.core.ui.widget.controls.resize_group import androidx.compose.animation.AnimatedContent import androidx.compose.animation.AnimatedVisibility @@ -49,17 +49,17 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.model.ResizeType -import ru.tech.imageresizershrinker.coreui.widget.buttons.ToggleGroupButton -import ru.tech.imageresizershrinker.coreui.widget.controls.DrawBackgroundSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.resize_group.components.BlurRadiusSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.resize_group.components.UseBlurredBackgroundToggle -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.saver.ColorSaver -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.buttons.ToggleGroupButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.DrawBackgroundSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.resize_group.components.BlurRadiusSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.resize_group.components.UseBlurredBackgroundToggle +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.saver.ColorSaver +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/resize_group/components/BlurRadiusSelector.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/resize_group/components/BlurRadiusSelector.kt similarity index 88% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/resize_group/components/BlurRadiusSelector.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/resize_group/components/BlurRadiusSelector.kt index e6016d48a..160e791a3 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/resize_group/components/BlurRadiusSelector.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/resize_group/components/BlurRadiusSelector.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls.resize_group.components +package ru.tech.imageresizershrinker.core.ui.widget.controls.resize_group.components import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape @@ -10,7 +10,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSliderItem +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSliderItem import kotlin.math.roundToInt @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/resize_group/components/UseBlurredBackgroundToggle.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/resize_group/components/UseBlurredBackgroundToggle.kt similarity index 84% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/resize_group/components/UseBlurredBackgroundToggle.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/resize_group/components/UseBlurredBackgroundToggle.kt index 5cc8bbdc2..ca5ab4817 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/controls/resize_group/components/UseBlurredBackgroundToggle.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/controls/resize_group/components/UseBlurredBackgroundToggle.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.controls.resize_group.components +package ru.tech.imageresizershrinker.core.ui.widget.controls.resize_group.components import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons @@ -9,7 +9,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch @Composable fun UseBlurredBackgroundToggle( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/dialogs/ExitWithoutSavingDialog.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/dialogs/ExitWithoutSavingDialog.kt similarity index 88% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/dialogs/ExitWithoutSavingDialog.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/dialogs/ExitWithoutSavingDialog.kt index a4f55f377..6d4e894e5 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/dialogs/ExitWithoutSavingDialog.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/dialogs/ExitWithoutSavingDialog.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.dialogs +package ru.tech.imageresizershrinker.core.ui.widget.dialogs import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Save @@ -11,8 +11,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.alertDialogBorder +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.alertDialogBorder @Composable fun ExitWithoutSavingDialog( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/dialogs/FullscreenDialog.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/dialogs/FullscreenDialog.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/dialogs/FullscreenDialog.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/dialogs/FullscreenDialog.kt index 878947ee0..7ba2d4f3e 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/dialogs/FullscreenDialog.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/dialogs/FullscreenDialog.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.dialogs +package ru.tech.imageresizershrinker.core.ui.widget.dialogs import android.app.Activity import android.content.Context diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/dialogs/ResetDialog.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/dialogs/ResetDialog.kt similarity index 88% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/dialogs/ResetDialog.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/dialogs/ResetDialog.kt index 39b42d7b5..2139ff5d5 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/dialogs/ResetDialog.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/dialogs/ResetDialog.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.dialogs +package ru.tech.imageresizershrinker.core.ui.widget.dialogs import androidx.compose.material.icons.Icons import androidx.compose.material.icons.rounded.DoneOutline @@ -14,9 +14,9 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.alertDialogBorder -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.alertDialogBorder +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost @Composable fun ResetDialog( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/haptics/CustomHapticFeedback.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/haptics/CustomHapticFeedback.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/haptics/CustomHapticFeedback.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/haptics/CustomHapticFeedback.kt index 56de49553..8fa4268d1 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/haptics/CustomHapticFeedback.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/haptics/CustomHapticFeedback.kt @@ -1,6 +1,6 @@ @file:Suppress("DEPRECATION") -package ru.tech.imageresizershrinker.coreui.widget.haptics +package ru.tech.imageresizershrinker.core.ui.widget.haptics import android.content.Context import android.os.Build diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/BadImageWidget.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/BadImageWidget.kt similarity index 91% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/BadImageWidget.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/BadImageWidget.kt index 920a84af9..6511bc58c 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/BadImageWidget.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/BadImageWidget.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.image +package ru.tech.imageresizershrinker.core.ui.widget.image import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -17,7 +17,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container @Composable fun BadImageWidget() { diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/ImageContainer.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImageContainer.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/ImageContainer.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImageContainer.kt index 33ff7f111..20ee6c3bf 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/ImageContainer.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImageContainer.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.image +package ru.tech.imageresizershrinker.core.ui.widget.image import android.graphics.Bitmap import androidx.compose.animation.AnimatedContent @@ -18,7 +18,7 @@ import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import ru.tech.imageresizershrinker.coreui.widget.other.Loading +import ru.tech.imageresizershrinker.core.ui.widget.other.Loading @Composable fun ImageContainer( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/ImageCounter.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImageCounter.kt similarity index 89% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/ImageCounter.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImageCounter.kt index 5e413680d..2d94ee53e 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/ImageCounter.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImageCounter.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.image +package ru.tech.imageresizershrinker.core.ui.widget.image import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.expandVertically @@ -22,10 +22,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container @Composable fun ImageCounter( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/ImageHeaderState.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImageHeaderState.kt similarity index 61% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/ImageHeaderState.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImageHeaderState.kt index e913f2df7..91e3873ae 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/ImageHeaderState.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImageHeaderState.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.image +package ru.tech.imageresizershrinker.core.ui.widget.image data class ImageHeaderState( val position: Int = 1, diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/ImageNotPickedWidget.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImageNotPickedWidget.kt similarity index 92% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/ImageNotPickedWidget.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImageNotPickedWidget.kt index 5b8a8de31..f5e5b4008 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/ImageNotPickedWidget.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImageNotPickedWidget.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.image +package ru.tech.imageresizershrinker.core.ui.widget.image import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -21,8 +21,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.shapes.CloverShape -import ru.tech.imageresizershrinker.coreui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.shapes.CloverShape +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container @Composable fun ImageNotPickedWidget( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/ImagePager.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImagePager.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/ImagePager.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImagePager.kt index cc741c88c..0df50681e 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/ImagePager.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImagePager.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.image +package ru.tech.imageresizershrinker.core.ui.widget.image import android.net.Uri import androidx.activity.compose.BackHandler @@ -52,10 +52,10 @@ import com.smarttoolfactory.image.zoom.rememberAnimatedZoomState import dev.olshevski.navigation.reimagined.navigate import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import ru.tech.imageresizershrinker.coreui.icons.material.CreateAlt -import ru.tech.imageresizershrinker.coreui.theme.White -import ru.tech.imageresizershrinker.coreui.utils.navigation.LocalNavController -import ru.tech.imageresizershrinker.coreui.widget.sheets.ProcessImagesPreferenceSheet +import ru.tech.imageresizershrinker.core.ui.icons.material.CreateAlt +import ru.tech.imageresizershrinker.core.ui.theme.White +import ru.tech.imageresizershrinker.core.ui.utils.navigation.LocalNavController +import ru.tech.imageresizershrinker.core.ui.widget.sheets.ProcessImagesPreferenceSheet @OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class) @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/ImageStickyHeader.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImageStickyHeader.kt similarity index 95% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/ImageStickyHeader.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImageStickyHeader.kt index 2710e929e..22c49ce1e 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/ImageStickyHeader.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImageStickyHeader.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.image +package ru.tech.imageresizershrinker.core.ui.widget.image import androidx.compose.animation.AnimatedContent import androidx.compose.foundation.BorderStroke @@ -38,11 +38,11 @@ import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import ru.tech.imageresizershrinker.coreui.widget.modifier.materialShadow -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSlider -import ru.tech.imageresizershrinker.coreui.widget.other.GradientEdge -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.materialShadow +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSlider +import ru.tech.imageresizershrinker.core.ui.widget.other.GradientEdge +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class) fun LazyListScope.imageStickyHeader( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/LazyImagesGrid.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/LazyImagesGrid.kt similarity index 92% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/LazyImagesGrid.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/LazyImagesGrid.kt index bae3fa2ef..3dae0f927 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/LazyImagesGrid.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/LazyImagesGrid.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.image +package ru.tech.imageresizershrinker.core.ui.widget.image import android.net.Uri import androidx.compose.foundation.clickable @@ -39,13 +39,13 @@ import coil.request.ImageRequest import com.t8rin.dynamic.theme.LocalDynamicThemeState import com.t8rin.dynamic.theme.rememberAppColorTuple import com.t8rin.modalsheet.FullscreenPopup -import ru.tech.imageresizershrinker.coreui.utils.helper.ImageUtils.toBitmap -import ru.tech.imageresizershrinker.coreui.utils.helper.Picker -import ru.tech.imageresizershrinker.coreui.utils.helper.localImagePickerMode -import ru.tech.imageresizershrinker.coreui.utils.helper.rememberImagePicker -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalImageLoader -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.utils.helper.ImageUtils.toBitmap +import ru.tech.imageresizershrinker.core.ui.utils.helper.Picker +import ru.tech.imageresizershrinker.core.ui.utils.helper.localImagePickerMode +import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberImagePicker +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalImageLoader +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun LazyImagesGrid( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/Picture.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/Picture.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/Picture.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/Picture.kt index 881cc468d..8822f0d0c 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/Picture.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/Picture.kt @@ -1,6 +1,6 @@ @file:Suppress("ObjectPropertyName") -package ru.tech.imageresizershrinker.coreui.widget.image +package ru.tech.imageresizershrinker.core.ui.widget.image import android.app.Activity import android.content.res.Configuration @@ -64,12 +64,12 @@ import coil.request.ImageRequest import coil.transform.Transformation import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.launch -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.findActivity -import ru.tech.imageresizershrinker.coreui.widget.image.StatusBarUtils.hideSystemBars -import ru.tech.imageresizershrinker.coreui.widget.image.StatusBarUtils.showSystemBars -import ru.tech.imageresizershrinker.coreui.widget.modifier.shimmer -import ru.tech.imageresizershrinker.coreui.widget.modifier.transparencyChecker -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalImageLoader +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.findActivity +import ru.tech.imageresizershrinker.core.ui.widget.image.StatusBarUtils.hideSystemBars +import ru.tech.imageresizershrinker.core.ui.widget.image.StatusBarUtils.showSystemBars +import ru.tech.imageresizershrinker.core.ui.widget.modifier.shimmer +import ru.tech.imageresizershrinker.core.ui.widget.modifier.transparencyChecker +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalImageLoader @Composable fun Picture( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/SimplePicture.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/SimplePicture.kt similarity index 83% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/SimplePicture.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/SimplePicture.kt index 7de0e21c4..a3ae652e3 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/image/SimplePicture.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/SimplePicture.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.image +package ru.tech.imageresizershrinker.core.ui.widget.image import android.graphics.Bitmap import androidx.compose.foundation.Image @@ -12,9 +12,9 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.unit.dp -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.shimmer -import ru.tech.imageresizershrinker.coreui.widget.modifier.transparencyChecker +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.shimmer +import ru.tech.imageresizershrinker.core.ui.widget.modifier.transparencyChecker @Composable fun SimplePicture( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/AlertDialogBorder.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/AlertDialogBorder.kt similarity index 84% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/AlertDialogBorder.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/AlertDialogBorder.kt index 53f47662b..de513f35c 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/AlertDialogBorder.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/AlertDialogBorder.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.modifier +package ru.tech.imageresizershrinker.core.ui.widget.modifier import androidx.compose.animation.core.animateDpAsState import androidx.compose.foundation.layout.displayCutoutPadding @@ -10,8 +10,8 @@ import androidx.compose.material3.surfaceColorAtElevation import androidx.compose.ui.Modifier import androidx.compose.ui.composed import androidx.compose.ui.unit.dp -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState fun Modifier.alertDialogBorder() = composed { navigationBarsPadding() diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/AutoElevatedBorder.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/AutoElevatedBorder.kt similarity index 82% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/AutoElevatedBorder.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/AutoElevatedBorder.kt index 6a60bb9c4..30ba748cc 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/AutoElevatedBorder.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/AutoElevatedBorder.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.modifier +package ru.tech.imageresizershrinker.core.ui.widget.modifier import androidx.compose.animation.core.animateDpAsState import androidx.compose.foundation.border @@ -13,10 +13,10 @@ import androidx.compose.ui.graphics.isSpecified import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.isUnspecified -import ru.tech.imageresizershrinker.coreui.widget.modifier.materialShadow -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.theme.suggestContainerColorBy -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.materialShadow +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.theme.suggestContainerColorBy +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState fun Modifier.autoElevatedBorder( height: Dp = Dp.Unspecified, diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/Blink.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/Blink.kt similarity index 95% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/Blink.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/Blink.kt index 5359a51f0..16dc6fbb3 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/Blink.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/Blink.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.modifier +package ru.tech.imageresizershrinker.core.ui.widget.modifier import androidx.compose.animation.Animatable import androidx.compose.animation.core.tween diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/Container.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/Container.kt similarity index 92% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/Container.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/Container.kt index aaafea230..f43ca6bd4 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/Container.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/Container.kt @@ -1,6 +1,6 @@ @file:Suppress("AnimateAsStateLabel") -package ru.tech.imageresizershrinker.coreui.widget.modifier +package ru.tech.imageresizershrinker.core.ui.widget.modifier import androidx.compose.animation.core.animateDpAsState import androidx.compose.foundation.background @@ -23,9 +23,9 @@ import androidx.compose.ui.graphics.isUnspecified import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalContainerShape -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalContainerShape +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState fun Modifier.container( shape: Shape = RoundedCornerShape(16.dp), diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/ContainerShapeDefaults.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/ContainerShapeDefaults.kt similarity index 93% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/ContainerShapeDefaults.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/ContainerShapeDefaults.kt index 77868ff80..e5bd02932 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/ContainerShapeDefaults.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/ContainerShapeDefaults.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.modifier +package ru.tech.imageresizershrinker.core.ui.widget.modifier import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.ui.graphics.Shape diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/DrawHorizontalStroke.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/DrawHorizontalStroke.kt similarity index 91% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/DrawHorizontalStroke.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/DrawHorizontalStroke.kt index df510de54..69535301c 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/DrawHorizontalStroke.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/DrawHorizontalStroke.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.modifier +package ru.tech.imageresizershrinker.core.ui.widget.modifier import androidx.compose.animation.core.animateDpAsState import androidx.compose.material3.MaterialTheme @@ -16,8 +16,8 @@ import androidx.compose.ui.unit.isUnspecified import androidx.compose.ui.zIndex import com.gigamole.composeshadowsplus.common.ShadowsPlusType import com.gigamole.composeshadowsplus.common.shadowsPlus -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState fun Modifier.drawHorizontalStroke( top: Boolean = false, diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/FadingEdges.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/FadingEdges.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/FadingEdges.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/FadingEdges.kt index 4d419e66b..6857144ba 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/FadingEdges.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/FadingEdges.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.modifier +package ru.tech.imageresizershrinker.core.ui.widget.modifier import android.annotation.SuppressLint import androidx.compose.foundation.ScrollState diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/MaterialShadow.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/MaterialShadow.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/MaterialShadow.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/MaterialShadow.kt index 0f63a9291..c7dd592ad 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/MaterialShadow.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/MaterialShadow.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.modifier +package ru.tech.imageresizershrinker.core.ui.widget.modifier import android.os.Build import androidx.compose.animation.core.animateDpAsState diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/Padding.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/Padding.kt similarity index 95% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/Padding.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/Padding.kt index f5b36b7ad..4c74995b2 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/Padding.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/Padding.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.modifier +package ru.tech.imageresizershrinker.core.ui.widget.modifier import android.content.res.Configuration import androidx.compose.foundation.layout.WindowInsets diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/Pulsate.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/Pulsate.kt similarity index 93% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/Pulsate.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/Pulsate.kt index 4f27572d5..30323e753 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/Pulsate.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/Pulsate.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.modifier +package ru.tech.imageresizershrinker.core.ui.widget.modifier import androidx.compose.animation.core.RepeatMode import androidx.compose.animation.core.animateFloat diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/RotateAnimation.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/RotateAnimation.kt similarity index 93% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/RotateAnimation.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/RotateAnimation.kt index bffd0b39a..016f76cca 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/RotateAnimation.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/RotateAnimation.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.modifier +package ru.tech.imageresizershrinker.core.ui.widget.modifier import androidx.compose.animation.core.RepeatMode import androidx.compose.animation.core.animateFloat diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/ScaleOnTap.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/ScaleOnTap.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/ScaleOnTap.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/ScaleOnTap.kt index b4281749f..2d1813c7b 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/ScaleOnTap.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/ScaleOnTap.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.modifier +package ru.tech.imageresizershrinker.core.ui.widget.modifier import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.gestures.detectTapGestures diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/Shimmer.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/Shimmer.kt similarity index 85% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/Shimmer.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/Shimmer.kt index 396bdc58a..e3d4911eb 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/Shimmer.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/Shimmer.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.modifier +package ru.tech.imageresizershrinker.core.ui.widget.modifier import androidx.compose.material3.MaterialTheme import androidx.compose.material3.surfaceColorAtElevation @@ -9,7 +9,7 @@ import androidx.compose.ui.unit.dp import com.google.accompanist.placeholder.PlaceholderHighlight import com.google.accompanist.placeholder.placeholder import com.google.accompanist.placeholder.shimmer -import ru.tech.imageresizershrinker.coreui.theme.harmonizeWithPrimary +import ru.tech.imageresizershrinker.core.ui.theme.harmonizeWithPrimary @Composable fun Modifier.shimmer( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/TransparencyChecker.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/TransparencyChecker.kt similarity index 95% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/TransparencyChecker.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/TransparencyChecker.kt index 459ec52cb..dbccc7a63 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/TransparencyChecker.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/TransparencyChecker.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.modifier +package ru.tech.imageresizershrinker.core.ui.widget.modifier import androidx.compose.material3.ColorScheme import androidx.compose.material3.MaterialTheme diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/WithModifier.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/WithModifier.kt similarity index 81% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/WithModifier.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/WithModifier.kt index 14bee88fd..c54174c50 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/modifier/WithModifier.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/modifier/WithModifier.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.modifier +package ru.tech.imageresizershrinker.core.ui.widget.modifier import androidx.compose.foundation.layout.Box import androidx.compose.runtime.Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/DrawLockScreenOrientation.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/DrawLockScreenOrientation.kt similarity index 81% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/DrawLockScreenOrientation.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/DrawLockScreenOrientation.kt index ba202579b..6cdb5d322 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/DrawLockScreenOrientation.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/DrawLockScreenOrientation.kt @@ -1,10 +1,10 @@ -package ru.tech.imageresizershrinker.coreui.widget.other +package ru.tech.imageresizershrinker.core.ui.widget.other import android.app.Activity import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.ui.platform.LocalContext -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun DrawLockScreenOrientation(orientation: Int) { diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/ExpandableItem.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/ExpandableItem.kt similarity index 94% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/ExpandableItem.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/ExpandableItem.kt index accd3a615..b3dae5ef8 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/ExpandableItem.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/ExpandableItem.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.other +package ru.tech.imageresizershrinker.core.ui.widget.other import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.animateContentSize @@ -32,8 +32,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.unit.dp -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container @Composable fun ExpandableItem( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/FontSelectionItem.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/FontSelectionItem.kt similarity index 87% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/FontSelectionItem.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/FontSelectionItem.kt index 283d54510..617964e8c 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/FontSelectionItem.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/FontSelectionItem.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.other +package ru.tech.imageresizershrinker.core.ui.widget.other import android.content.Context import androidx.compose.animation.animateColorAsState @@ -17,10 +17,10 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.model.UiFontFam -import ru.tech.imageresizershrinker.coreui.theme.Typography -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.model.UiFontFam +import ru.tech.imageresizershrinker.core.ui.theme.Typography +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun FontSelectionItem( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/GradientEdge.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/GradientEdge.kt similarity index 95% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/GradientEdge.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/GradientEdge.kt index 55c467dfd..85543f32e 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/GradientEdge.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/GradientEdge.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.other +package ru.tech.imageresizershrinker.core.ui.widget.other import androidx.compose.foundation.background import androidx.compose.foundation.gestures.Orientation diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/KeepScreenOn.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/KeepScreenOn.kt similarity index 80% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/KeepScreenOn.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/KeepScreenOn.kt index 8a0236dd5..36063e6e0 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/KeepScreenOn.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/KeepScreenOn.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.other +package ru.tech.imageresizershrinker.core.ui.widget.other import android.view.View import androidx.compose.runtime.Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/Loading.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/Loading.kt similarity index 93% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/Loading.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/Loading.kt index b0b307380..74d54a5de 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/Loading.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/Loading.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.other +package ru.tech.imageresizershrinker.core.ui.widget.other import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.background @@ -22,10 +22,10 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.gigamole.composeshadowsplus.rsblur.rsBlurShadow -import ru.tech.imageresizershrinker.coreui.shapes.MaterialStarShape -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.shapes.MaterialStarShape +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/LoadingDialog.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/LoadingDialog.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/LoadingDialog.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/LoadingDialog.kt index 0d1b81ede..2ecc908f5 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/LoadingDialog.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/LoadingDialog.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.other +package ru.tech.imageresizershrinker.core.ui.widget.other import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.layout.Box diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/PathPaintPreview.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/PathPaintPreview.kt similarity index 95% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/PathPaintPreview.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/PathPaintPreview.kt index 0788cd164..4ab506eeb 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/PathPaintPreview.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/PathPaintPreview.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.other +package ru.tech.imageresizershrinker.core.ui.widget.other import android.graphics.BlurMaskFilter import androidx.compose.foundation.border @@ -29,9 +29,9 @@ import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.domain.image.draw.DrawPathMode import ru.tech.imageresizershrinker.core.domain.image.draw.PathPaint import ru.tech.imageresizershrinker.core.domain.model.IntegerSize -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.utils.helper.scaleToFitCanvas -import ru.tech.imageresizershrinker.coreui.widget.modifier.transparencyChecker +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.utils.helper.scaleToFitCanvas +import ru.tech.imageresizershrinker.core.ui.widget.modifier.transparencyChecker @Composable fun PathPaintPreview( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/SearchBar.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/SearchBar.kt similarity index 92% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/SearchBar.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/SearchBar.kt index 25425ba10..26d07b148 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/SearchBar.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/SearchBar.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.other +package ru.tech.imageresizershrinker.core.ui.widget.other import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.fillMaxWidth @@ -22,8 +22,8 @@ import androidx.compose.ui.platform.LocalWindowInfo import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.modifier.fadingEdges -import ru.tech.imageresizershrinker.coreui.widget.text.KeyboardFocusHandler +import ru.tech.imageresizershrinker.core.ui.widget.modifier.fadingEdges +import ru.tech.imageresizershrinker.core.ui.widget.text.KeyboardFocusHandler @Composable fun SearchBar( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/SwipeToReveal.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/SwipeToReveal.kt similarity index 99% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/SwipeToReveal.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/SwipeToReveal.kt index c20448c25..300733838 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/SwipeToReveal.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/SwipeToReveal.kt @@ -1,6 +1,6 @@ @file:Suppress("TYPEALIAS_EXPANSION_DEPRECATION", "DEPRECATION") -package ru.tech.imageresizershrinker.coreui.widget.other +package ru.tech.imageresizershrinker.core.ui.widget.other import androidx.compose.animation.core.CubicBezierEasing import androidx.compose.animation.core.Easing diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/ToastHost.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/ToastHost.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/ToastHost.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/ToastHost.kt index 3f7c45ec0..99a8d1a61 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/ToastHost.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/ToastHost.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.other +package ru.tech.imageresizershrinker.core.ui.widget.other import android.content.Context import androidx.compose.animation.AnimatedContent @@ -59,10 +59,10 @@ import kotlinx.coroutines.suspendCancellableCoroutine import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.theme.harmonizeWithPrimary -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.modifier.autoElevatedBorder -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.theme.harmonizeWithPrimary +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.modifier.autoElevatedBorder +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState import kotlin.coroutines.resume @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/TopAppBarEmoji.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/TopAppBarEmoji.kt similarity index 84% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/TopAppBarEmoji.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/TopAppBarEmoji.kt index 31d843a61..f288db5fe 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/TopAppBarEmoji.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/TopAppBarEmoji.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.other +package ru.tech.imageresizershrinker.core.ui.widget.other import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.fadeIn @@ -16,10 +16,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch -import ru.tech.imageresizershrinker.coreui.icons.emoji.EmojiItem -import ru.tech.imageresizershrinker.coreui.utils.confetti.LocalConfettiController -import ru.tech.imageresizershrinker.coreui.widget.modifier.scaleOnTap -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.emoji.EmojiItem +import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiController +import ru.tech.imageresizershrinker.core.ui.widget.modifier.scaleOnTap +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun TopAppBarEmoji() { diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/WantCancelLoadingDialog.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/WantCancelLoadingDialog.kt similarity index 89% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/WantCancelLoadingDialog.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/WantCancelLoadingDialog.kt index ab0582391..79d3d0669 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/other/WantCancelLoadingDialog.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/other/WantCancelLoadingDialog.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.other +package ru.tech.imageresizershrinker.core.ui.widget.other import androidx.compose.foundation.layout.size import androidx.compose.material3.AlertDialog @@ -11,8 +11,8 @@ import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.alertDialogBorder +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.alertDialogBorder @Composable fun WantCancelLoadingDialog( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/palette_selection/PaletteMappings.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/palette_selection/PaletteMappings.kt similarity index 95% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/palette_selection/PaletteMappings.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/palette_selection/PaletteMappings.kt index bfc1563d7..27ed825d2 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/palette_selection/PaletteMappings.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/palette_selection/PaletteMappings.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.palette_selection +package ru.tech.imageresizershrinker.core.ui.widget.palette_selection import android.content.Context import com.t8rin.dynamic.theme.PaletteStyle diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/palette_selection/PaletteStyleSelection.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/palette_selection/PaletteStyleSelection.kt similarity index 84% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/palette_selection/PaletteStyleSelection.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/palette_selection/PaletteStyleSelection.kt index 0c64bcc7a..cc535cb5a 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/palette_selection/PaletteStyleSelection.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/palette_selection/PaletteStyleSelection.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.palette_selection +package ru.tech.imageresizershrinker.core.ui.widget.palette_selection import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues @@ -22,13 +22,13 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.t8rin.dynamic.theme.PaletteStyle import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.CreateAlt -import ru.tech.imageresizershrinker.coreui.icons.material.Swatch -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.CreateAlt +import ru.tech.imageresizershrinker.core.ui.icons.material.Swatch +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun PaletteStyleSelection( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/palette_selection/PaletteStyleSelectionItem.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/palette_selection/PaletteStyleSelectionItem.kt similarity index 89% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/palette_selection/PaletteStyleSelectionItem.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/palette_selection/PaletteStyleSelectionItem.kt index 4536256d3..6120451dc 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/palette_selection/PaletteStyleSelectionItem.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/palette_selection/PaletteStyleSelectionItem.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.palette_selection +package ru.tech.imageresizershrinker.core.ui.widget.palette_selection import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.animateFloatAsState @@ -15,8 +15,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp import com.t8rin.dynamic.theme.PaletteStyle -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun PaletteStyleSelectionItem(style: PaletteStyle, onClick: () -> Unit) { diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/PreferenceItem.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/PreferenceItem.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/PreferenceItem.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/PreferenceItem.kt index 26cd92eb5..2278a7cea 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/PreferenceItem.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/PreferenceItem.kt @@ -1,6 +1,6 @@ @file:Suppress("LocalVariableName") -package ru.tech.imageresizershrinker.coreui.widget.preferences +package ru.tech.imageresizershrinker.core.ui.widget.preferences import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/PreferenceItemOverload.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/PreferenceItemOverload.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/PreferenceItemOverload.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/PreferenceItemOverload.kt index 73cfd4bd4..e042a3c41 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/PreferenceItemOverload.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/PreferenceItemOverload.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences +package ru.tech.imageresizershrinker.core.ui.widget.preferences import androidx.compose.animation.AnimatedContent import androidx.compose.animation.core.animateFloatAsState @@ -39,8 +39,8 @@ 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 -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.utils.ProvideContainerShape +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.utils.ProvideContainerShape @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/PreferenceRow.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/PreferenceRow.kt similarity index 95% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/PreferenceRow.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/PreferenceRow.kt index 815d46301..4f23440ce 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/PreferenceRow.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/PreferenceRow.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences +package ru.tech.imageresizershrinker.core.ui.widget.preferences import androidx.compose.animation.AnimatedContent import androidx.compose.animation.core.animateFloatAsState @@ -31,8 +31,8 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.utils.ProvideContainerShape +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.utils.ProvideContainerShape @Composable fun PreferenceRow( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/PreferenceRowSwitch.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/PreferenceRowSwitch.kt similarity index 95% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/PreferenceRowSwitch.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/PreferenceRowSwitch.kt index c60d5cf38..536acec17 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/PreferenceRowSwitch.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/PreferenceRowSwitch.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences +package ru.tech.imageresizershrinker.core.ui.widget.preferences import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape @@ -17,8 +17,8 @@ import androidx.compose.ui.hapticfeedback.HapticFeedbackType import androidx.compose.ui.platform.LocalHapticFeedback import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import ru.tech.imageresizershrinker.coreui.theme.blend -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSwitch +import ru.tech.imageresizershrinker.core.ui.theme.blend +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSwitch @Composable fun PreferenceRowSwitch( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/BackgroundRemoverPreference.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/BackgroundRemoverPreference.kt similarity index 82% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/BackgroundRemoverPreference.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/BackgroundRemoverPreference.kt index 6749a81c5..56cdb3845 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/BackgroundRemoverPreference.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/BackgroundRemoverPreference.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences.screens +package ru.tech.imageresizershrinker.core.ui.widget.preferences.screens import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -11,8 +11,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.Transparency -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.icons.material.Transparency +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun BackgroundRemoverPreference( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/BasicFilterPreference.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/BasicFilterPreference.kt similarity index 87% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/BasicFilterPreference.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/BasicFilterPreference.kt index d14421b49..06b0bdfc7 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/BasicFilterPreference.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/BasicFilterPreference.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences.screens +package ru.tech.imageresizershrinker.core.ui.widget.preferences.screens import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -12,7 +12,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun BasicFilterPreference( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/BytesResizePreference.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/BytesResizePreference.kt similarity index 82% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/BytesResizePreference.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/BytesResizePreference.kt index c8b327ac7..339ea9f47 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/BytesResizePreference.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/BytesResizePreference.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences.screens +package ru.tech.imageresizershrinker.core.ui.widget.preferences.screens import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -11,8 +11,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.Interface -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.icons.material.Interface +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun BytesResizePreference( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/CipherPreference.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/CipherPreference.kt similarity index 87% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/CipherPreference.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/CipherPreference.kt index f929bfa4d..de87a2c43 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/CipherPreference.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/CipherPreference.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences.screens +package ru.tech.imageresizershrinker.core.ui.widget.preferences.screens import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -12,7 +12,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun CipherPreference( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/ComparePreference.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/ComparePreference.kt similarity index 87% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/ComparePreference.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/ComparePreference.kt index 69c55424a..3e6b7d3df 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/ComparePreference.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/ComparePreference.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences.screens +package ru.tech.imageresizershrinker.core.ui.widget.preferences.screens import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -12,7 +12,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun ComparePreference( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/CropPreference.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/CropPreference.kt similarity index 87% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/CropPreference.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/CropPreference.kt index c3670a2fa..a057d1212 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/CropPreference.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/CropPreference.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences.screens +package ru.tech.imageresizershrinker.core.ui.widget.preferences.screens import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -12,7 +12,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun CropPreference( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/DeleteExifPreference.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/DeleteExifPreference.kt similarity index 81% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/DeleteExifPreference.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/DeleteExifPreference.kt index dd4beee9f..5ac4b4f90 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/DeleteExifPreference.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/DeleteExifPreference.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences.screens +package ru.tech.imageresizershrinker.core.ui.widget.preferences.screens import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -11,8 +11,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.FingerprintOff -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.icons.material.FingerprintOff +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun DeleteExifPreference( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/DrawPreference.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/DrawPreference.kt similarity index 87% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/DrawPreference.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/DrawPreference.kt index d206724e9..8b99a6142 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/DrawPreference.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/DrawPreference.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences.screens +package ru.tech.imageresizershrinker.core.ui.widget.preferences.screens import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -12,7 +12,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun DrawPreference( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/GeneratePalettePreference.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/GeneratePalettePreference.kt similarity index 81% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/GeneratePalettePreference.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/GeneratePalettePreference.kt index 52e72be7b..ab7a85dc9 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/GeneratePalettePreference.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/GeneratePalettePreference.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences.screens +package ru.tech.imageresizershrinker.core.ui.widget.preferences.screens import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -11,8 +11,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.PaletteSwatch -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.icons.material.PaletteSwatch +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun GeneratePalettePreference( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/ImagePreviewPreference.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/ImagePreviewPreference.kt similarity index 87% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/ImagePreviewPreference.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/ImagePreviewPreference.kt index c0d7cfc5f..8e6f29632 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/ImagePreviewPreference.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/ImagePreviewPreference.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences.screens +package ru.tech.imageresizershrinker.core.ui.widget.preferences.screens import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -12,7 +12,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun ImagePreviewPreference( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/ImageStitchingPreference.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/ImageStitchingPreference.kt similarity index 82% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/ImageStitchingPreference.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/ImageStitchingPreference.kt index e741eeeb3..a2518e03d 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/ImageStitchingPreference.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/ImageStitchingPreference.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences.screens +package ru.tech.imageresizershrinker.core.ui.widget.preferences.screens import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -11,8 +11,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.Puzzle -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.icons.material.Puzzle +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/ImagesToPdfPreference.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/ImagesToPdfPreference.kt similarity index 87% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/ImagesToPdfPreference.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/ImagesToPdfPreference.kt index 461a9512d..23b6db1fc 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/ImagesToPdfPreference.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/ImagesToPdfPreference.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences.screens +package ru.tech.imageresizershrinker.core.ui.widget.preferences.screens import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -12,7 +12,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun ImagesToPdfPreference( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/LimitsPreference.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/LimitsPreference.kt similarity index 87% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/LimitsPreference.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/LimitsPreference.kt index 9cff90b02..02480953a 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/LimitsPreference.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/LimitsPreference.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences.screens +package ru.tech.imageresizershrinker.core.ui.widget.preferences.screens import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -12,7 +12,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun LimitsPreference( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/MaskFilterPreference.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/MaskFilterPreference.kt similarity index 87% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/MaskFilterPreference.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/MaskFilterPreference.kt index d84c65be7..faecfa0e8 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/MaskFilterPreference.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/MaskFilterPreference.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences.screens +package ru.tech.imageresizershrinker.core.ui.widget.preferences.screens import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -12,7 +12,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun MaskFilterPreference( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/PdfToImagesPreference.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/PdfToImagesPreference.kt similarity index 87% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/PdfToImagesPreference.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/PdfToImagesPreference.kt index 60c814424..7d74c411f 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/PdfToImagesPreference.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/PdfToImagesPreference.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences.screens +package ru.tech.imageresizershrinker.core.ui.widget.preferences.screens import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -12,7 +12,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun PdfToImagesPreference( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/PickColorPreference.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/PickColorPreference.kt similarity index 87% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/PickColorPreference.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/PickColorPreference.kt index 4d90921fb..3d47fc4f5 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/PickColorPreference.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/PickColorPreference.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences.screens +package ru.tech.imageresizershrinker.core.ui.widget.preferences.screens import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -12,7 +12,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun PickColorPreference( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/PreviewPdfPreference.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/PreviewPdfPreference.kt similarity index 87% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/PreviewPdfPreference.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/PreviewPdfPreference.kt index 1674a39f8..963d41b3e 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/PreviewPdfPreference.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/PreviewPdfPreference.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences.screens +package ru.tech.imageresizershrinker.core.ui.widget.preferences.screens import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -12,7 +12,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun PreviewPdfPreference( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/ResizeAndConvertPreference.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/ResizeAndConvertPreference.kt similarity index 82% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/ResizeAndConvertPreference.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/ResizeAndConvertPreference.kt index a65c2358a..e4482f665 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/ResizeAndConvertPreference.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/ResizeAndConvertPreference.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences.screens +package ru.tech.imageresizershrinker.core.ui.widget.preferences.screens import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -11,8 +11,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.Resize -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.icons.material.Resize +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun ResizeAndConvertPreference( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/SingleEditPreference.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/SingleEditPreference.kt similarity index 82% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/SingleEditPreference.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/SingleEditPreference.kt index a042836e8..06942473f 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/preferences/screens/SingleEditPreference.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/preferences/screens/SingleEditPreference.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.preferences.screens +package ru.tech.imageresizershrinker.core.ui.widget.preferences.screens import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding @@ -11,8 +11,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.CreateAlt -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.icons.material.CreateAlt +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun SingleEditPreference( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/saver/ColorSaver.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/saver/ColorSaver.kt similarity index 79% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/saver/ColorSaver.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/saver/ColorSaver.kt index e1962f2b4..0e70860de 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/saver/ColorSaver.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/saver/ColorSaver.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.saver +package ru.tech.imageresizershrinker.core.ui.widget.saver import androidx.compose.runtime.saveable.Saver import androidx.compose.ui.graphics.Color diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/saver/DrawModeSaver.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/saver/DrawModeSaver.kt similarity index 79% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/saver/DrawModeSaver.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/saver/DrawModeSaver.kt index ade5c4c61..ff2bda24a 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/saver/DrawModeSaver.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/saver/DrawModeSaver.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.saver +package ru.tech.imageresizershrinker.core.ui.widget.saver import androidx.compose.runtime.saveable.Saver import ru.tech.imageresizershrinker.core.domain.image.draw.DrawMode diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/saver/DrawPathModeSaver.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/saver/DrawPathModeSaver.kt similarity index 80% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/saver/DrawPathModeSaver.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/saver/DrawPathModeSaver.kt index 9fc07877e..b784351e3 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/saver/DrawPathModeSaver.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/saver/DrawPathModeSaver.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.saver +package ru.tech.imageresizershrinker.core.ui.widget.saver import androidx.compose.runtime.saveable.Saver import ru.tech.imageresizershrinker.core.domain.image.draw.DrawPathMode diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/CompareSheet.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/CompareSheet.kt similarity index 91% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/CompareSheet.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/CompareSheet.kt index 61255a875..a15201e91 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/CompareSheet.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/CompareSheet.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.sheets +package ru.tech.imageresizershrinker.core.ui.widget.sheets import android.graphics.Bitmap import androidx.compose.animation.core.animateFloatAsState @@ -35,12 +35,12 @@ import androidx.compose.ui.unit.dp import com.smarttoolfactory.beforeafter.BeforeAfterImage import com.smarttoolfactory.beforeafter.OverlayStyle import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.transparencyChecker -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.transparencyChecker +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/EditExifSheet.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/EditExifSheet.kt similarity index 95% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/EditExifSheet.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/EditExifSheet.kt index 3e1e0ffcf..dbdac044e 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/EditExifSheet.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/EditExifSheet.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.sheets +package ru.tech.imageresizershrinker.core.ui.widget.sheets import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -47,15 +47,15 @@ import androidx.compose.ui.unit.sp import androidx.exifinterface.media.ExifInterface import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.image.Metadata -import ru.tech.imageresizershrinker.coreui.utils.helper.ImageUtils.toMap -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.alertDialogBorder -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItemOverload -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.RoundedTextField -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.utils.helper.ImageUtils.toMap +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.alertDialogBorder +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItemOverload +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.RoundedTextField +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem @Composable fun EditExifSheet( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/PickFontFamilySheet.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/PickFontFamilySheet.kt similarity index 82% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/PickFontFamilySheet.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/PickFontFamilySheet.kt index fc1d9ddb5..fa913a80d 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/PickFontFamilySheet.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/PickFontFamilySheet.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.sheets +package ru.tech.imageresizershrinker.core.ui.widget.sheets import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues @@ -13,11 +13,11 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.model.UiFontFam -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.other.FontSelectionItem -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.model.UiFontFam +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.other.FontSelectionItem +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem @Composable fun PickFontFamilySheet( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/PickImageFromUrisSheet.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/PickImageFromUrisSheet.kt similarity index 93% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/PickImageFromUrisSheet.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/PickImageFromUrisSheet.kt index 40b402755..7683bd493 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/PickImageFromUrisSheet.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/PickImageFromUrisSheet.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.sheets +package ru.tech.imageresizershrinker.core.ui.widget.sheets import android.net.Uri import androidx.compose.animation.animateColorAsState @@ -35,12 +35,12 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import coil.transform.Transformation import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.image.Picture -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.image.Picture +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/ProcessImagesPreferenceSheet.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/ProcessImagesPreferenceSheet.kt similarity index 89% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/ProcessImagesPreferenceSheet.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/ProcessImagesPreferenceSheet.kt index 3cebd8559..8ba83fde1 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/ProcessImagesPreferenceSheet.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/ProcessImagesPreferenceSheet.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.sheets +package ru.tech.imageresizershrinker.core.ui.widget.sheets import android.net.Uri import androidx.compose.foundation.background @@ -33,33 +33,33 @@ import androidx.compose.ui.unit.sp import dev.olshevski.navigation.reimagined.NavController import dev.olshevski.navigation.reimagined.navigate import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.theme.White -import ru.tech.imageresizershrinker.coreui.utils.navigation.LocalNavController -import ru.tech.imageresizershrinker.coreui.utils.navigation.Screen -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.image.Picture -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.BackgroundRemoverPreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.BasicFilterPreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.BytesResizePreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.CipherPreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.ComparePreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.CropPreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.DeleteExifPreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.DrawPreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.GeneratePalettePreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.ImagePreviewPreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.ImageStitchingPreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.ImagesToPdfPreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.LimitsPreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.MaskFilterPreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.PdfToImagesPreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.PickColorPreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.PreviewPdfPreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.ResizeAndConvertPreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.SingleEditPreference -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.theme.White +import ru.tech.imageresizershrinker.core.ui.utils.navigation.LocalNavController +import ru.tech.imageresizershrinker.core.ui.utils.navigation.Screen +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.image.Picture +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.BackgroundRemoverPreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.BasicFilterPreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.BytesResizePreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.CipherPreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.ComparePreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.CropPreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.DeleteExifPreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.DrawPreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.GeneratePalettePreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.ImagePreviewPreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.ImageStitchingPreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.ImagesToPdfPreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.LimitsPreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.MaskFilterPreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.PdfToImagesPreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.PickColorPreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.PreviewPdfPreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.ResizeAndConvertPreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.SingleEditPreference +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem @Composable fun ProcessImagesPreferenceSheet( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/SimpleDragHandle.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/SimpleDragHandle.kt similarity index 91% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/SimpleDragHandle.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/SimpleDragHandle.kt index ee12d49a3..97750b05b 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/SimpleDragHandle.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/SimpleDragHandle.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.sheets +package ru.tech.imageresizershrinker.core.ui.widget.sheets import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -16,7 +16,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/SimpleSheet.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/SimpleSheet.kt similarity index 95% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/SimpleSheet.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/SimpleSheet.kt index f9bf93ad1..35e21e2c7 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/SimpleSheet.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/SimpleSheet.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.sheets +package ru.tech.imageresizershrinker.core.ui.widget.sheets import androidx.activity.compose.BackHandler import androidx.compose.animation.animateContentSize @@ -29,10 +29,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.t8rin.modalsheet.ModalSheet -import ru.tech.imageresizershrinker.coreui.widget.modifier.autoElevatedBorder -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.ProvideContainerShape +import ru.tech.imageresizershrinker.core.ui.widget.modifier.autoElevatedBorder +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.ProvideContainerShape @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/ZoomModalSheet.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/ZoomModalSheet.kt similarity index 90% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/ZoomModalSheet.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/ZoomModalSheet.kt index 947598edc..7a4598a7d 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/sheets/ZoomModalSheet.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/ZoomModalSheet.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.sheets +package ru.tech.imageresizershrinker.core.ui.widget.sheets import android.graphics.Bitmap import androidx.compose.foundation.Image @@ -32,12 +32,12 @@ import com.smarttoolfactory.image.zoom.ZoomLevel import com.smarttoolfactory.image.zoom.animatedZoom import com.smarttoolfactory.image.zoom.rememberAnimatedZoomState import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.transparencyChecker -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.transparencyChecker +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/AutoSizeText.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/AutoSizeText.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/AutoSizeText.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/AutoSizeText.kt index 7d0d5ac7f..3b196dc7c 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/AutoSizeText.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/AutoSizeText.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.text +package ru.tech.imageresizershrinker.core.ui.widget.text import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.Text diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/HtmlText.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/HtmlText.kt similarity index 95% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/HtmlText.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/HtmlText.kt index 86d46f25d..5696f0067 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/HtmlText.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/HtmlText.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.text +package ru.tech.imageresizershrinker.core.ui.widget.text import android.graphics.Typeface import android.text.style.StyleSpan @@ -21,8 +21,8 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.style.TextOverflow import androidx.core.text.HtmlCompat -import ru.tech.imageresizershrinker.coreui.theme.blend -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.theme.blend +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun HtmlText( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/IsKeyboardVisibleAsState.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/IsKeyboardVisibleAsState.kt similarity index 93% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/IsKeyboardVisibleAsState.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/IsKeyboardVisibleAsState.kt index e728b6b6b..7fd535617 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/IsKeyboardVisibleAsState.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/IsKeyboardVisibleAsState.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.text +package ru.tech.imageresizershrinker.core.ui.widget.text import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.ime diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/Marquee.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/Marquee.kt similarity index 97% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/Marquee.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/Marquee.kt index b78a37e4c..7d8c8d091 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/Marquee.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/Marquee.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.text +package ru.tech.imageresizershrinker.core.ui.widget.text import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.basicMarquee diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/RoundedTextField.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/RoundedTextField.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/RoundedTextField.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/RoundedTextField.kt index 897abe6ad..3b115ccb8 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/RoundedTextField.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/RoundedTextField.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.text +package ru.tech.imageresizershrinker.core.ui.widget.text import android.annotation.SuppressLint import androidx.compose.animation.Animatable @@ -46,8 +46,8 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import kotlinx.coroutines.cancel import kotlinx.coroutines.launch -import ru.tech.imageresizershrinker.coreui.theme.blend -import ru.tech.imageresizershrinker.coreui.theme.inverse +import ru.tech.imageresizershrinker.core.ui.theme.blend +import ru.tech.imageresizershrinker.core.ui.theme.inverse @Composable fun RoundedTextField( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/TitleItem.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/TitleItem.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/TitleItem.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/TitleItem.kt index d057acedc..cc2e34350 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/TitleItem.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/TitleItem.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.text +package ru.tech.imageresizershrinker.core.ui.widget.text import android.annotation.SuppressLint import androidx.compose.foundation.layout.Row diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/TopAppBarTitle.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/TopAppBarTitle.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/TopAppBarTitle.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/TopAppBarTitle.kt index fff6aadf9..77e20f6ea 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/text/TopAppBarTitle.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/text/TopAppBarTitle.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.text +package ru.tech.imageresizershrinker.core.ui.widget.text import androidx.compose.animation.AnimatedContent import androidx.compose.animation.fadeIn diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/AvailableHeight.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/AvailableHeight.kt similarity index 94% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/AvailableHeight.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/AvailableHeight.kt index 327a6a793..259a2cfc9 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/AvailableHeight.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/AvailableHeight.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.utils +package ru.tech.imageresizershrinker.core.ui.widget.utils import androidx.compose.animation.core.animateDpAsState import androidx.compose.foundation.layout.Column @@ -23,7 +23,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.t8rin.dynamic.theme.observeAsState import com.t8rin.modalsheet.FullscreenPopup -import ru.tech.imageresizershrinker.coreui.widget.image.ImageHeaderState +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageHeaderState @Composable fun rememberAvailableHeight( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/LazyUtils.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/LazyUtils.kt similarity index 98% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/LazyUtils.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/LazyUtils.kt index aad265e92..a3c0d7d6a 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/LazyUtils.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/LazyUtils.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.utils +package ru.tech.imageresizershrinker.core.ui.widget.utils import androidx.compose.foundation.ScrollState import androidx.compose.foundation.lazy.LazyListState diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/LocalContainerShape.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/LocalContainerShape.kt similarity index 88% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/LocalContainerShape.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/LocalContainerShape.kt index c37f56a34..f91cfc043 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/LocalContainerShape.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/LocalContainerShape.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.utils +package ru.tech.imageresizershrinker.core.ui.widget.utils import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/LocalImageLoader.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/LocalImageLoader.kt similarity index 62% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/LocalImageLoader.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/LocalImageLoader.kt index b6fc8706a..fe37af134 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/LocalImageLoader.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/LocalImageLoader.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.utils +package ru.tech.imageresizershrinker.core.ui.widget.utils import androidx.compose.runtime.compositionLocalOf import coil.ImageLoader diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/LocalSettingsState.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/LocalSettingsState.kt similarity index 66% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/LocalSettingsState.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/LocalSettingsState.kt index bdeb8a786..203b8b9c9 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/LocalSettingsState.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/LocalSettingsState.kt @@ -1,8 +1,8 @@ -package ru.tech.imageresizershrinker.coreui.widget.utils +package ru.tech.imageresizershrinker.core.ui.widget.utils import androidx.compose.runtime.compositionLocalOf import androidx.compose.runtime.mutableStateOf -import ru.tech.imageresizershrinker.coreui.model.UiSettingsState +import ru.tech.imageresizershrinker.core.ui.model.UiSettingsState val LocalSettingsState = compositionLocalOf { error("SettingsState not present") } diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/ScopedViewModelContainer.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/ScopedViewModelContainer.kt similarity index 88% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/ScopedViewModelContainer.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/ScopedViewModelContainer.kt index db55f1619..79641587d 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/ScopedViewModelContainer.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/ScopedViewModelContainer.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.utils +package ru.tech.imageresizershrinker.core.ui.widget.utils import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect @@ -8,7 +8,7 @@ import dev.olshevski.navigation.reimagined.NavHost import dev.olshevski.navigation.reimagined.hilt.hiltViewModel import dev.olshevski.navigation.reimagined.navigate import dev.olshevski.navigation.reimagined.rememberNavController -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.findActivity +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.findActivity @Composable inline fun ScopedViewModelContainer( diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/SizeClass.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/SizeClass.kt similarity index 94% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/SizeClass.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/SizeClass.kt index 02ed28c9d..fa7619e80 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/utils/SizeClass.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/utils/SizeClass.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.utils +package ru.tech.imageresizershrinker.core.ui.widget.utils import android.app.Activity import androidx.activity.ComponentActivity diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/value/ValueDialog.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/value/ValueDialog.kt similarity index 94% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/value/ValueDialog.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/value/ValueDialog.kt index 9a480ebda..77117b589 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/value/ValueDialog.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/value/ValueDialog.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.value +package ru.tech.imageresizershrinker.core.ui.widget.value import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.layout.Arrangement @@ -28,9 +28,9 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.utils.trimTrailingZero -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.alertDialogBorder -import ru.tech.imageresizershrinker.coreui.widget.text.KeyboardFocusHandler +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.alertDialogBorder +import ru.tech.imageresizershrinker.core.ui.widget.text.KeyboardFocusHandler import kotlin.math.pow import kotlin.math.roundToInt diff --git a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/value/ValueText.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/value/ValueText.kt similarity index 96% rename from core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/value/ValueText.kt rename to core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/value/ValueText.kt index 713dc3691..ad162ea1e 100644 --- a/core-ui/src/main/kotlin/ru/tech/imageresizershrinker/coreui/widget/value/ValueText.kt +++ b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/value/ValueText.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget.value +package ru.tech.imageresizershrinker.core.ui.widget.value import androidx.compose.animation.AnimatedContent import androidx.compose.animation.core.tween diff --git a/core-ui/src/market/java/ru/tech/imageresizershrinker/coreui/utils/helper/ReviewUtils.kt b/core/ui/src/market/java/ru/tech/imageresizershrinker/core/ui/utils/helper/ReviewUtils.kt similarity index 90% rename from core-ui/src/market/java/ru/tech/imageresizershrinker/coreui/utils/helper/ReviewUtils.kt rename to core/ui/src/market/java/ru/tech/imageresizershrinker/core/ui/utils/helper/ReviewUtils.kt index 445b162f4..da11ed816 100644 --- a/core-ui/src/market/java/ru/tech/imageresizershrinker/coreui/utils/helper/ReviewUtils.kt +++ b/core/ui/src/market/java/ru/tech/imageresizershrinker/core/ui/utils/helper/ReviewUtils.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.utils.helper +package ru.tech.imageresizershrinker.core.ui.utils.helper import android.app.Activity import android.content.Context diff --git a/core-ui/src/market/java/ru/tech/imageresizershrinker/coreui/widget/UpdateSheet.kt b/core/ui/src/market/java/ru/tech/imageresizershrinker/core/ui/widget/UpdateSheet.kt similarity index 90% rename from core-ui/src/market/java/ru/tech/imageresizershrinker/coreui/widget/UpdateSheet.kt rename to core/ui/src/market/java/ru/tech/imageresizershrinker/core/ui/widget/UpdateSheet.kt index 8e2a296a1..cc6887e9b 100644 --- a/core-ui/src/market/java/ru/tech/imageresizershrinker/coreui/widget/UpdateSheet.kt +++ b/core/ui/src/market/java/ru/tech/imageresizershrinker/core/ui/widget/UpdateSheet.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.coreui.widget +package ru.tech.imageresizershrinker.core.ui.widget import android.app.Activity import android.content.Intent @@ -35,14 +35,14 @@ import com.google.android.play.core.install.model.UpdateAvailability import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.APP_RELEASES -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.isInstalledFromPlayStore -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleDragHandle -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.HtmlText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.isInstalledFromPlayStore +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleDragHandle +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.HtmlText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem @Composable fun UpdateSheet(changelog: String, tag: String, visible: MutableState) { diff --git a/feature/bytes-resize/build.gradle.kts b/feature/bytes-resize/build.gradle.kts index acc73bfdc..179d5921c 100644 --- a/feature/bytes-resize/build.gradle.kts +++ b/feature/bytes-resize/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { implementation(project(":core:domain")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) implementation(project(":core:data")) implementation(project(":core:resources")) diff --git a/feature/bytes-resize/src/main/java/ru/tech/imageresizershrinker/feature/bytes_resize/presentation/BytesResizeScreen.kt b/feature/bytes-resize/src/main/java/ru/tech/imageresizershrinker/feature/bytes_resize/presentation/BytesResizeScreen.kt index 8ae90f835..af192bfcd 100644 --- a/feature/bytes-resize/src/main/java/ru/tech/imageresizershrinker/feature/bytes_resize/presentation/BytesResizeScreen.kt +++ b/feature/bytes-resize/src/main/java/ru/tech/imageresizershrinker/feature/bytes_resize/presentation/BytesResizeScreen.kt @@ -77,40 +77,40 @@ import ru.tech.imageresizershrinker.core.domain.model.ImageInfo import ru.tech.imageresizershrinker.core.domain.model.Preset import ru.tech.imageresizershrinker.feature.bytes_resize.presentation.components.ImageFormatAlert import ru.tech.imageresizershrinker.feature.bytes_resize.presentation.viewModel.BytesResizeViewModel -import ru.tech.imageresizershrinker.coreui.transformation.ImageInfoTransformation -import ru.tech.imageresizershrinker.coreui.utils.confetti.LocalConfettiController -import ru.tech.imageresizershrinker.coreui.utils.helper.ImageUtils.restrict -import ru.tech.imageresizershrinker.coreui.utils.helper.Picker -import ru.tech.imageresizershrinker.coreui.utils.helper.failedToSaveImages -import ru.tech.imageresizershrinker.coreui.utils.helper.localImagePickerMode -import ru.tech.imageresizershrinker.coreui.utils.helper.rememberImagePicker -import ru.tech.imageresizershrinker.coreui.widget.buttons.BottomButtonsBlock -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSwitch -import ru.tech.imageresizershrinker.coreui.widget.controls.ExtensionGroup -import ru.tech.imageresizershrinker.coreui.widget.controls.PresetWidget -import ru.tech.imageresizershrinker.coreui.widget.controls.SaveExifWidget -import ru.tech.imageresizershrinker.coreui.widget.dialogs.ExitWithoutSavingDialog -import ru.tech.imageresizershrinker.coreui.widget.image.ImageContainer -import ru.tech.imageresizershrinker.coreui.widget.image.ImageCounter -import ru.tech.imageresizershrinker.coreui.widget.image.ImageNotPickedWidget -import ru.tech.imageresizershrinker.coreui.widget.image.imageStickyHeader -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.modifier.navBarsLandscapePadding -import ru.tech.imageresizershrinker.coreui.widget.other.LoadingDialog -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.TopAppBarEmoji -import ru.tech.imageresizershrinker.coreui.widget.other.showError -import ru.tech.imageresizershrinker.coreui.widget.sheets.PickImageFromUrisSheet -import ru.tech.imageresizershrinker.coreui.widget.sheets.ZoomModalSheet -import ru.tech.imageresizershrinker.coreui.widget.text.RoundedTextField -import ru.tech.imageresizershrinker.coreui.widget.text.TopAppBarTitle -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass -import ru.tech.imageresizershrinker.coreui.widget.utils.isExpanded -import ru.tech.imageresizershrinker.coreui.widget.utils.middleImageState -import ru.tech.imageresizershrinker.coreui.widget.utils.rememberAvailableHeight +import ru.tech.imageresizershrinker.core.ui.transformation.ImageInfoTransformation +import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiController +import ru.tech.imageresizershrinker.core.ui.utils.helper.ImageUtils.restrict +import ru.tech.imageresizershrinker.core.ui.utils.helper.Picker +import ru.tech.imageresizershrinker.core.ui.utils.helper.failedToSaveImages +import ru.tech.imageresizershrinker.core.ui.utils.helper.localImagePickerMode +import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberImagePicker +import ru.tech.imageresizershrinker.core.ui.widget.buttons.BottomButtonsBlock +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSwitch +import ru.tech.imageresizershrinker.core.ui.widget.controls.ExtensionGroup +import ru.tech.imageresizershrinker.core.ui.widget.controls.PresetWidget +import ru.tech.imageresizershrinker.core.ui.widget.controls.SaveExifWidget +import ru.tech.imageresizershrinker.core.ui.widget.dialogs.ExitWithoutSavingDialog +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageContainer +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageCounter +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageNotPickedWidget +import ru.tech.imageresizershrinker.core.ui.widget.image.imageStickyHeader +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.modifier.navBarsLandscapePadding +import ru.tech.imageresizershrinker.core.ui.widget.other.LoadingDialog +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.TopAppBarEmoji +import ru.tech.imageresizershrinker.core.ui.widget.other.showError +import ru.tech.imageresizershrinker.core.ui.widget.sheets.PickImageFromUrisSheet +import ru.tech.imageresizershrinker.core.ui.widget.sheets.ZoomModalSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.RoundedTextField +import ru.tech.imageresizershrinker.core.ui.widget.text.TopAppBarTitle +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.widget.utils.isExpanded +import ru.tech.imageresizershrinker.core.ui.widget.utils.middleImageState +import ru.tech.imageresizershrinker.core.ui.widget.utils.rememberAvailableHeight @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/feature/bytes-resize/src/main/java/ru/tech/imageresizershrinker/feature/bytes_resize/presentation/components/ImageFormatAlert.kt b/feature/bytes-resize/src/main/java/ru/tech/imageresizershrinker/feature/bytes_resize/presentation/components/ImageFormatAlert.kt index aef588451..71896bae7 100644 --- a/feature/bytes-resize/src/main/java/ru/tech/imageresizershrinker/feature/bytes_resize/presentation/components/ImageFormatAlert.kt +++ b/feature/bytes-resize/src/main/java/ru/tech/imageresizershrinker/feature/bytes_resize/presentation/components/ImageFormatAlert.kt @@ -22,7 +22,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.model.ImageFormat -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun ImageFormatAlert(format: ImageFormat) { diff --git a/feature/cipher/build.gradle.kts b/feature/cipher/build.gradle.kts index e0ef47e95..03487f321 100644 --- a/feature/cipher/build.gradle.kts +++ b/feature/cipher/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { implementation(project(":core:domain")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) implementation(project(":core:data")) implementation(project(":core:resources")) diff --git a/feature/cipher/src/main/java/ru/tech/imageresizershrinker/feature/cipher/presentation/FileCipherScreen.kt b/feature/cipher/src/main/java/ru/tech/imageresizershrinker/feature/cipher/presentation/FileCipherScreen.kt index 6aa8e4b38..7bad21fe0 100644 --- a/feature/cipher/src/main/java/ru/tech/imageresizershrinker/feature/cipher/presentation/FileCipherScreen.kt +++ b/feature/cipher/src/main/java/ru/tech/imageresizershrinker/feature/cipher/presentation/FileCipherScreen.kt @@ -96,32 +96,32 @@ import dev.olshevski.navigation.reimagined.hilt.hiltViewModel import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.utils.readableByteCount -import ru.tech.imageresizershrinker.coreui.widget.modifier.materialShadow -import ru.tech.imageresizershrinker.coreui.icons.material.ShieldKey -import ru.tech.imageresizershrinker.coreui.icons.material.ShieldOpen -import ru.tech.imageresizershrinker.coreui.shapes.CloverShape -import ru.tech.imageresizershrinker.coreui.theme.Green -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.utils.confetti.LocalConfettiController -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.getFileName -import ru.tech.imageresizershrinker.coreui.utils.helper.ImageUtils.fileSize -import ru.tech.imageresizershrinker.coreui.utils.helper.showReview -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedFloatingActionButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.dialogs.ExitWithoutSavingDialog -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.other.LoadingDialog -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.TopAppBarEmoji -import ru.tech.imageresizershrinker.coreui.widget.other.showError -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRow -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.Marquee -import ru.tech.imageresizershrinker.coreui.widget.text.RoundedTextField -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.isScrollingUp +import ru.tech.imageresizershrinker.core.ui.widget.modifier.materialShadow +import ru.tech.imageresizershrinker.core.ui.icons.material.ShieldKey +import ru.tech.imageresizershrinker.core.ui.icons.material.ShieldOpen +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.confetti.LocalConfettiController +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.getFileName +import ru.tech.imageresizershrinker.core.ui.utils.helper.ImageUtils.fileSize +import ru.tech.imageresizershrinker.core.ui.utils.helper.showReview +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedFloatingActionButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.dialogs.ExitWithoutSavingDialog +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.other.LoadingDialog +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.TopAppBarEmoji +import ru.tech.imageresizershrinker.core.ui.widget.other.showError +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRow +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.Marquee +import ru.tech.imageresizershrinker.core.ui.widget.text.RoundedTextField +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.isScrollingUp import ru.tech.imageresizershrinker.feature.cipher.presentation.components.CipherTipSheet import ru.tech.imageresizershrinker.feature.cipher.presentation.viewModel.FileCipherViewModel import java.io.DataInputStream diff --git a/feature/cipher/src/main/java/ru/tech/imageresizershrinker/feature/cipher/presentation/components/CipherTipSheet.kt b/feature/cipher/src/main/java/ru/tech/imageresizershrinker/feature/cipher/presentation/components/CipherTipSheet.kt index 90e19058b..8f0ef5e67 100644 --- a/feature/cipher/src/main/java/ru/tech/imageresizershrinker/feature/cipher/presentation/components/CipherTipSheet.kt +++ b/feature/cipher/src/main/java/ru/tech/imageresizershrinker/feature/cipher/presentation/components/CipherTipSheet.kt @@ -17,10 +17,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem @Composable fun CipherTipSheet( diff --git a/feature/compare/build.gradle.kts b/feature/compare/build.gradle.kts index eaa93f207..546d0ee7a 100644 --- a/feature/compare/build.gradle.kts +++ b/feature/compare/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { implementation(project(":core:domain")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) implementation(project(":core:data")) implementation(project(":core:resources")) diff --git a/feature/compare/src/main/java/ru/tech/imageresizershrinker/feature/compare/presentation/CompareScreen.kt b/feature/compare/src/main/java/ru/tech/imageresizershrinker/feature/compare/presentation/CompareScreen.kt index 4c8b5aea2..1816d72f6 100644 --- a/feature/compare/src/main/java/ru/tech/imageresizershrinker/feature/compare/presentation/CompareScreen.kt +++ b/feature/compare/src/main/java/ru/tech/imageresizershrinker/feature/compare/presentation/CompareScreen.kt @@ -78,33 +78,33 @@ import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.model.ImageFormat import ru.tech.imageresizershrinker.feature.compare.presentation.viewModel.CompareViewModel -import ru.tech.imageresizershrinker.coreui.theme.blend -import ru.tech.imageresizershrinker.coreui.utils.confetti.LocalConfettiController -import ru.tech.imageresizershrinker.coreui.utils.helper.Picker -import ru.tech.imageresizershrinker.coreui.utils.helper.localImagePickerMode -import ru.tech.imageresizershrinker.coreui.utils.helper.parseSaveResult -import ru.tech.imageresizershrinker.coreui.utils.helper.rememberImagePicker -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedFloatingActionButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSlider -import ru.tech.imageresizershrinker.coreui.widget.controls.ExtensionGroup -import ru.tech.imageresizershrinker.coreui.widget.image.ImageNotPickedWidget -import ru.tech.imageresizershrinker.coreui.widget.image.Picture -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.modifier.navBarsPaddingOnlyIfTheyAtTheBottom -import ru.tech.imageresizershrinker.coreui.widget.modifier.transparencyChecker -import ru.tech.imageresizershrinker.coreui.widget.other.LoadingDialog -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.TopAppBarEmoji -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.Marquee -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.theme.blend +import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiController +import ru.tech.imageresizershrinker.core.ui.utils.helper.Picker +import ru.tech.imageresizershrinker.core.ui.utils.helper.localImagePickerMode +import ru.tech.imageresizershrinker.core.ui.utils.helper.parseSaveResult +import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberImagePicker +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedFloatingActionButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSlider +import ru.tech.imageresizershrinker.core.ui.widget.controls.ExtensionGroup +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageNotPickedWidget +import ru.tech.imageresizershrinker.core.ui.widget.image.Picture +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.modifier.navBarsPaddingOnlyIfTheyAtTheBottom +import ru.tech.imageresizershrinker.core.ui.widget.modifier.transparencyChecker +import ru.tech.imageresizershrinker.core.ui.widget.other.LoadingDialog +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.TopAppBarEmoji +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.Marquee +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass private val topShape = RoundedCornerShape( diff --git a/feature/compare/src/main/java/ru/tech/imageresizershrinker/feature/compare/presentation/viewModel/CompareViewModel.kt b/feature/compare/src/main/java/ru/tech/imageresizershrinker/feature/compare/presentation/viewModel/CompareViewModel.kt index cbd63e522..776276291 100644 --- a/feature/compare/src/main/java/ru/tech/imageresizershrinker/feature/compare/presentation/viewModel/CompareViewModel.kt +++ b/feature/compare/src/main/java/ru/tech/imageresizershrinker/feature/compare/presentation/viewModel/CompareViewModel.kt @@ -22,7 +22,7 @@ import ru.tech.imageresizershrinker.core.domain.model.ResizeType import ru.tech.imageresizershrinker.core.domain.saving.FileController import ru.tech.imageresizershrinker.core.domain.saving.SaveResult import ru.tech.imageresizershrinker.core.domain.saving.model.ImageSaveTarget -import ru.tech.imageresizershrinker.coreui.utils.helper.ImageUtils.createScaledBitmap +import ru.tech.imageresizershrinker.core.ui.utils.helper.ImageUtils.createScaledBitmap import javax.inject.Inject import kotlin.math.roundToInt diff --git a/feature/crop/build.gradle.kts b/feature/crop/build.gradle.kts index 82bff4f43..71446179d 100644 --- a/feature/crop/build.gradle.kts +++ b/feature/crop/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { implementation(project(":core:domain")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) implementation(project(":core:data")) implementation(project(":core:resources")) diff --git a/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/CropScreen.kt b/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/CropScreen.kt index 620f5a54c..29aa577b8 100644 --- a/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/CropScreen.kt +++ b/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/CropScreen.kt @@ -81,28 +81,28 @@ import ru.tech.imageresizershrinker.feature.crop.presentation.components.AspectR import ru.tech.imageresizershrinker.feature.crop.presentation.components.CropMaskSelection import ru.tech.imageresizershrinker.feature.crop.presentation.components.Cropper import ru.tech.imageresizershrinker.feature.crop.presentation.viewModel.CropViewModel -import ru.tech.imageresizershrinker.coreui.utils.confetti.LocalConfettiController -import ru.tech.imageresizershrinker.coreui.utils.helper.Picker -import ru.tech.imageresizershrinker.coreui.utils.helper.localImagePickerMode -import ru.tech.imageresizershrinker.coreui.utils.helper.parseSaveResult -import ru.tech.imageresizershrinker.coreui.utils.helper.rememberImagePicker -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedFloatingActionButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.controls.ExtensionGroup -import ru.tech.imageresizershrinker.coreui.widget.dialogs.ExitWithoutSavingDialog -import ru.tech.imageresizershrinker.coreui.widget.image.ImageNotPickedWidget -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.modifier.navBarsPaddingOnlyIfTheyAtTheEnd -import ru.tech.imageresizershrinker.coreui.widget.other.LoadingDialog -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.TopAppBarEmoji -import ru.tech.imageresizershrinker.coreui.widget.other.showError -import ru.tech.imageresizershrinker.coreui.widget.text.Marquee -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass -import ru.tech.imageresizershrinker.coreui.widget.utils.isScrollingUp +import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiController +import ru.tech.imageresizershrinker.core.ui.utils.helper.Picker +import ru.tech.imageresizershrinker.core.ui.utils.helper.localImagePickerMode +import ru.tech.imageresizershrinker.core.ui.utils.helper.parseSaveResult +import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberImagePicker +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedFloatingActionButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.ExtensionGroup +import ru.tech.imageresizershrinker.core.ui.widget.dialogs.ExitWithoutSavingDialog +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageNotPickedWidget +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.modifier.navBarsPaddingOnlyIfTheyAtTheEnd +import ru.tech.imageresizershrinker.core.ui.widget.other.LoadingDialog +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.TopAppBarEmoji +import ru.tech.imageresizershrinker.core.ui.widget.other.showError +import ru.tech.imageresizershrinker.core.ui.widget.text.Marquee +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.widget.utils.isScrollingUp @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/components/AspectRatioSelection.kt b/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/components/AspectRatioSelection.kt index a622b3295..847d7a3a5 100644 --- a/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/components/AspectRatioSelection.kt +++ b/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/components/AspectRatioSelection.kt @@ -38,9 +38,9 @@ import com.smarttoolfactory.cropper.widget.AspectRatioSelectionCard import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.utils.trimTrailingZero import ru.tech.imageresizershrinker.core.domain.model.DomainAspectRatio -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.fadingEdges +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.fadingEdges @Composable fun AspectRatioSelection( diff --git a/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/components/CropMaskSelection.kt b/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/components/CropMaskSelection.kt index 37184efad..93cd4475e 100644 --- a/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/components/CropMaskSelection.kt +++ b/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/components/CropMaskSelection.kt @@ -43,12 +43,12 @@ import com.smarttoolfactory.cropper.settings.CropOutlineProperty import com.smarttoolfactory.cropper.widget.CropFrameDisplayCard import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.utils.helper.Picker -import ru.tech.imageresizershrinker.coreui.utils.helper.localImagePickerMode -import ru.tech.imageresizershrinker.coreui.utils.helper.rememberImagePicker -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSliderItem -import ru.tech.imageresizershrinker.coreui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.utils.helper.Picker +import ru.tech.imageresizershrinker.core.ui.utils.helper.localImagePickerMode +import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberImagePicker +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSliderItem +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container import kotlin.math.roundToInt @Composable diff --git a/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/components/Cropper.kt b/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/components/Cropper.kt index bdfe48d4f..314c07cab 100644 --- a/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/components/Cropper.kt +++ b/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/components/Cropper.kt @@ -17,7 +17,7 @@ import com.smarttoolfactory.cropper.ImageCropper import com.smarttoolfactory.cropper.model.AspectRatio import com.smarttoolfactory.cropper.settings.CropDefaults import com.smarttoolfactory.cropper.settings.CropProperties -import ru.tech.imageresizershrinker.coreui.widget.modifier.transparencyChecker +import ru.tech.imageresizershrinker.core.ui.widget.modifier.transparencyChecker @Composable fun Cropper( diff --git a/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/components/OutlineProperties.kt b/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/components/OutlineProperties.kt index c19336e3a..03c22f624 100644 --- a/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/components/OutlineProperties.kt +++ b/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/components/OutlineProperties.kt @@ -14,13 +14,13 @@ import com.smarttoolfactory.cropper.model.RectCropShape import com.smarttoolfactory.cropper.model.RoundedCornerCropShape import com.smarttoolfactory.cropper.settings.CropOutlineProperty import com.smarttoolfactory.cropper.settings.Paths -import ru.tech.imageresizershrinker.coreui.shapes.CloverShape -import ru.tech.imageresizershrinker.coreui.shapes.KotlinShape -import ru.tech.imageresizershrinker.coreui.shapes.MaterialStarShape -import ru.tech.imageresizershrinker.coreui.shapes.OctagonShape -import ru.tech.imageresizershrinker.coreui.shapes.OvalShape -import ru.tech.imageresizershrinker.coreui.shapes.PentagonShape -import ru.tech.imageresizershrinker.coreui.shapes.SquircleShape +import ru.tech.imageresizershrinker.core.ui.shapes.CloverShape +import ru.tech.imageresizershrinker.core.ui.shapes.KotlinShape +import ru.tech.imageresizershrinker.core.ui.shapes.MaterialStarShape +import ru.tech.imageresizershrinker.core.ui.shapes.OctagonShape +import ru.tech.imageresizershrinker.core.ui.shapes.OvalShape +import ru.tech.imageresizershrinker.core.ui.shapes.PentagonShape +import ru.tech.imageresizershrinker.core.ui.shapes.SquircleShape @Composable fun outlineProperties(): List = remember { diff --git a/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/viewModel/CropViewModel.kt b/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/viewModel/CropViewModel.kt index 40e19c4d6..8b9c6b559 100644 --- a/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/viewModel/CropViewModel.kt +++ b/feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/viewModel/CropViewModel.kt @@ -26,7 +26,7 @@ import ru.tech.imageresizershrinker.core.domain.model.ImageInfo import ru.tech.imageresizershrinker.core.domain.saving.FileController import ru.tech.imageresizershrinker.core.domain.saving.SaveResult import ru.tech.imageresizershrinker.core.domain.saving.model.ImageSaveTarget -import ru.tech.imageresizershrinker.coreui.utils.state.update +import ru.tech.imageresizershrinker.core.ui.utils.state.update import javax.inject.Inject @HiltViewModel diff --git a/feature/delete-exif/build.gradle.kts b/feature/delete-exif/build.gradle.kts index b819c78a4..432498243 100644 --- a/feature/delete-exif/build.gradle.kts +++ b/feature/delete-exif/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { implementation(project(":core:domain")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) implementation(project(":core:data")) implementation(project(":core:resources")) diff --git a/feature/delete-exif/src/main/java/ru/tech/imageresizershrinker/feature/delete_exif/presentation/DeleteExifScreen.kt b/feature/delete-exif/src/main/java/ru/tech/imageresizershrinker/feature/delete_exif/presentation/DeleteExifScreen.kt index 5d17275bc..576a62f60 100644 --- a/feature/delete-exif/src/main/java/ru/tech/imageresizershrinker/feature/delete_exif/presentation/DeleteExifScreen.kt +++ b/feature/delete-exif/src/main/java/ru/tech/imageresizershrinker/feature/delete_exif/presentation/DeleteExifScreen.kt @@ -65,30 +65,30 @@ import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.model.ImageInfo import ru.tech.imageresizershrinker.feature.delete_exif.presentation.viewModel.DeleteExifViewModel -import ru.tech.imageresizershrinker.coreui.transformation.ImageInfoTransformation -import ru.tech.imageresizershrinker.coreui.utils.confetti.LocalConfettiController -import ru.tech.imageresizershrinker.coreui.utils.helper.ImageUtils.fileSize -import ru.tech.imageresizershrinker.coreui.utils.helper.Picker -import ru.tech.imageresizershrinker.coreui.utils.helper.failedToSaveImages -import ru.tech.imageresizershrinker.coreui.utils.helper.localImagePickerMode -import ru.tech.imageresizershrinker.coreui.utils.helper.rememberImagePicker -import ru.tech.imageresizershrinker.coreui.widget.buttons.BottomButtonsBlock -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.dialogs.ExitWithoutSavingDialog -import ru.tech.imageresizershrinker.coreui.widget.image.ImageContainer -import ru.tech.imageresizershrinker.coreui.widget.image.ImageCounter -import ru.tech.imageresizershrinker.coreui.widget.image.ImageNotPickedWidget -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.modifier.navBarsLandscapePadding -import ru.tech.imageresizershrinker.coreui.widget.other.LoadingDialog -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.TopAppBarEmoji -import ru.tech.imageresizershrinker.coreui.widget.other.showError -import ru.tech.imageresizershrinker.coreui.widget.sheets.PickImageFromUrisSheet -import ru.tech.imageresizershrinker.coreui.widget.sheets.ZoomModalSheet -import ru.tech.imageresizershrinker.coreui.widget.text.TopAppBarTitle -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.transformation.ImageInfoTransformation +import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiController +import ru.tech.imageresizershrinker.core.ui.utils.helper.ImageUtils.fileSize +import ru.tech.imageresizershrinker.core.ui.utils.helper.Picker +import ru.tech.imageresizershrinker.core.ui.utils.helper.failedToSaveImages +import ru.tech.imageresizershrinker.core.ui.utils.helper.localImagePickerMode +import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberImagePicker +import ru.tech.imageresizershrinker.core.ui.widget.buttons.BottomButtonsBlock +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.dialogs.ExitWithoutSavingDialog +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageContainer +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageCounter +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageNotPickedWidget +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.modifier.navBarsLandscapePadding +import ru.tech.imageresizershrinker.core.ui.widget.other.LoadingDialog +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.TopAppBarEmoji +import ru.tech.imageresizershrinker.core.ui.widget.other.showError +import ru.tech.imageresizershrinker.core.ui.widget.sheets.PickImageFromUrisSheet +import ru.tech.imageresizershrinker.core.ui.widget.sheets.ZoomModalSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.TopAppBarTitle +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/feature/draw/build.gradle.kts b/feature/draw/build.gradle.kts index 561d1671a..0780440db 100644 --- a/feature/draw/build.gradle.kts +++ b/feature/draw/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { implementation(project(":core:domain")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) implementation(project(":core:data")) implementation(project(":core:resources")) diff --git a/feature/draw/src/main/java/ru/tech/imageresizershrinker/feature/draw/presentation/DrawScreen.kt b/feature/draw/src/main/java/ru/tech/imageresizershrinker/feature/draw/presentation/DrawScreen.kt index 90840e856..677bd9c85 100644 --- a/feature/draw/src/main/java/ru/tech/imageresizershrinker/feature/draw/presentation/DrawScreen.kt +++ b/feature/draw/src/main/java/ru/tech/imageresizershrinker/feature/draw/presentation/DrawScreen.kt @@ -118,52 +118,52 @@ import ru.tech.imageresizershrinker.core.domain.image.draw.DrawMode import ru.tech.imageresizershrinker.core.domain.image.draw.DrawPathMode import ru.tech.imageresizershrinker.core.domain.image.draw.pt import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.Eraser -import ru.tech.imageresizershrinker.coreui.model.PtSaver -import ru.tech.imageresizershrinker.coreui.theme.mixedContainer -import ru.tech.imageresizershrinker.coreui.theme.onMixedContainer -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.utils.confetti.LocalConfettiController -import ru.tech.imageresizershrinker.coreui.utils.helper.ImageUtils.restrict -import ru.tech.imageresizershrinker.coreui.utils.helper.Picker -import ru.tech.imageresizershrinker.coreui.utils.helper.localImagePickerMode -import ru.tech.imageresizershrinker.coreui.utils.helper.parseSaveResult -import ru.tech.imageresizershrinker.coreui.utils.helper.rememberImagePicker -import ru.tech.imageresizershrinker.coreui.widget.controls.DrawBackgroundSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedFloatingActionButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSwitch -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSwitchDefaults -import ru.tech.imageresizershrinker.coreui.widget.controls.ExtensionGroup -import ru.tech.imageresizershrinker.coreui.widget.controls.SaveExifWidget -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.BrushSoftnessSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.DrawAlphaSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.DrawColorSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.DrawModeSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.DrawPathModeSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.LineWidthSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.OpenColorPickerCard -import ru.tech.imageresizershrinker.coreui.widget.dialogs.ExitWithoutSavingDialog -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.modifier.navBarsPaddingOnlyIfTheyAtTheEnd -import ru.tech.imageresizershrinker.coreui.widget.other.DrawLockScreenOrientation -import ru.tech.imageresizershrinker.coreui.widget.other.LoadingDialog -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.TopAppBarEmoji -import ru.tech.imageresizershrinker.coreui.widget.other.showError -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem -import ru.tech.imageresizershrinker.coreui.widget.saver.ColorSaver -import ru.tech.imageresizershrinker.coreui.widget.saver.DrawModeSaver -import ru.tech.imageresizershrinker.coreui.widget.saver.DrawPathModeSaver -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.Marquee -import ru.tech.imageresizershrinker.coreui.widget.text.RoundedTextField -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.icons.material.Eraser +import ru.tech.imageresizershrinker.core.ui.model.PtSaver +import ru.tech.imageresizershrinker.core.ui.theme.mixedContainer +import ru.tech.imageresizershrinker.core.ui.theme.onMixedContainer +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiController +import ru.tech.imageresizershrinker.core.ui.utils.helper.ImageUtils.restrict +import ru.tech.imageresizershrinker.core.ui.utils.helper.Picker +import ru.tech.imageresizershrinker.core.ui.utils.helper.localImagePickerMode +import ru.tech.imageresizershrinker.core.ui.utils.helper.parseSaveResult +import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberImagePicker +import ru.tech.imageresizershrinker.core.ui.widget.controls.DrawBackgroundSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedFloatingActionButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSwitch +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSwitchDefaults +import ru.tech.imageresizershrinker.core.ui.widget.controls.ExtensionGroup +import ru.tech.imageresizershrinker.core.ui.widget.controls.SaveExifWidget +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.BrushSoftnessSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.DrawAlphaSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.DrawColorSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.DrawModeSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.DrawPathModeSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.LineWidthSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.OpenColorPickerCard +import ru.tech.imageresizershrinker.core.ui.widget.dialogs.ExitWithoutSavingDialog +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.modifier.navBarsPaddingOnlyIfTheyAtTheEnd +import ru.tech.imageresizershrinker.core.ui.widget.other.DrawLockScreenOrientation +import ru.tech.imageresizershrinker.core.ui.widget.other.LoadingDialog +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.TopAppBarEmoji +import ru.tech.imageresizershrinker.core.ui.widget.other.showError +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.saver.ColorSaver +import ru.tech.imageresizershrinker.core.ui.widget.saver.DrawModeSaver +import ru.tech.imageresizershrinker.core.ui.widget.saver.DrawPathModeSaver +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.Marquee +import ru.tech.imageresizershrinker.core.ui.widget.text.RoundedTextField +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass import ru.tech.imageresizershrinker.feature.draw.presentation.components.BitmapDrawer import ru.tech.imageresizershrinker.feature.draw.presentation.viewModel.DrawViewModel import ru.tech.imageresizershrinker.feature.pick_color.presentation.components.PickColorFromImageSheet diff --git a/feature/draw/src/main/java/ru/tech/imageresizershrinker/feature/draw/presentation/components/BitmapDrawer.kt b/feature/draw/src/main/java/ru/tech/imageresizershrinker/feature/draw/presentation/components/BitmapDrawer.kt index 0aeda2963..c94ad8a95 100644 --- a/feature/draw/src/main/java/ru/tech/imageresizershrinker/feature/draw/presentation/components/BitmapDrawer.kt +++ b/feature/draw/src/main/java/ru/tech/imageresizershrinker/feature/draw/presentation/components/BitmapDrawer.kt @@ -61,12 +61,12 @@ import ru.tech.imageresizershrinker.core.domain.image.draw.DrawPathMode import ru.tech.imageresizershrinker.core.domain.image.draw.Pt import ru.tech.imageresizershrinker.core.domain.image.filters.Filter import ru.tech.imageresizershrinker.core.domain.model.IntegerSize -import ru.tech.imageresizershrinker.coreui.model.UiPathPaint -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.utils.helper.ImageUtils.createScaledBitmap -import ru.tech.imageresizershrinker.coreui.utils.helper.rotateVector -import ru.tech.imageresizershrinker.coreui.utils.helper.scaleToFitCanvas -import ru.tech.imageresizershrinker.coreui.widget.modifier.transparencyChecker +import ru.tech.imageresizershrinker.core.ui.model.UiPathPaint +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.utils.helper.ImageUtils.createScaledBitmap +import ru.tech.imageresizershrinker.core.ui.utils.helper.rotateVector +import ru.tech.imageresizershrinker.core.ui.utils.helper.scaleToFitCanvas +import ru.tech.imageresizershrinker.core.ui.widget.modifier.transparencyChecker import kotlin.math.abs import kotlin.math.max import kotlin.math.min diff --git a/feature/draw/src/main/java/ru/tech/imageresizershrinker/feature/draw/presentation/viewModel/DrawViewModel.kt b/feature/draw/src/main/java/ru/tech/imageresizershrinker/feature/draw/presentation/viewModel/DrawViewModel.kt index 32dfb4887..37ed865a8 100644 --- a/feature/draw/src/main/java/ru/tech/imageresizershrinker/feature/draw/presentation/viewModel/DrawViewModel.kt +++ b/feature/draw/src/main/java/ru/tech/imageresizershrinker/feature/draw/presentation/viewModel/DrawViewModel.kt @@ -29,8 +29,8 @@ import ru.tech.imageresizershrinker.core.domain.model.ImageInfo import ru.tech.imageresizershrinker.core.domain.saving.FileController import ru.tech.imageresizershrinker.core.domain.saving.SaveResult import ru.tech.imageresizershrinker.core.domain.saving.model.ImageSaveTarget -import ru.tech.imageresizershrinker.coreui.model.UiPathPaint -import ru.tech.imageresizershrinker.coreui.utils.state.update +import ru.tech.imageresizershrinker.core.ui.model.UiPathPaint +import ru.tech.imageresizershrinker.core.ui.utils.state.update import javax.inject.Inject @HiltViewModel diff --git a/feature/erase-background/build.gradle.kts b/feature/erase-background/build.gradle.kts index dc16e019a..ae2805495 100644 --- a/feature/erase-background/build.gradle.kts +++ b/feature/erase-background/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { implementation(project(":core:domain")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) implementation(project(":core:data")) implementation(project(":core:resources")) diff --git a/feature/erase-background/src/main/java/ru/tech/imageresizershrinker/feature/erase_background/presentation/EraseBackgroundScreen.kt b/feature/erase-background/src/main/java/ru/tech/imageresizershrinker/feature/erase_background/presentation/EraseBackgroundScreen.kt index ec5743e90..eda81e468 100644 --- a/feature/erase-background/src/main/java/ru/tech/imageresizershrinker/feature/erase_background/presentation/EraseBackgroundScreen.kt +++ b/feature/erase-background/src/main/java/ru/tech/imageresizershrinker/feature/erase_background/presentation/EraseBackgroundScreen.kt @@ -88,40 +88,40 @@ import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.image.draw.pt import ru.tech.imageresizershrinker.core.domain.model.ImageFormat -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.BrushSoftnessSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.LineWidthSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.AutoEraseBackgroundCard +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.BrushSoftnessSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.LineWidthSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.AutoEraseBackgroundCard import ru.tech.imageresizershrinker.feature.erase_background.presentation.components.BitmapEraser -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.EraseModeButton -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.EraseModeCard -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.TrimImageToggle +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.EraseModeButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.EraseModeCard +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.TrimImageToggle import ru.tech.imageresizershrinker.feature.erase_background.presentation.viewModel.EraseBackgroundViewModel -import ru.tech.imageresizershrinker.coreui.icons.material.Transparency -import ru.tech.imageresizershrinker.coreui.model.PtSaver -import ru.tech.imageresizershrinker.coreui.utils.confetti.LocalConfettiController -import ru.tech.imageresizershrinker.coreui.utils.helper.Picker -import ru.tech.imageresizershrinker.coreui.utils.helper.localImagePickerMode -import ru.tech.imageresizershrinker.coreui.utils.helper.parseSaveResult -import ru.tech.imageresizershrinker.coreui.utils.helper.rememberImagePicker -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedFloatingActionButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSwitch -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSwitchDefaults -import ru.tech.imageresizershrinker.coreui.widget.controls.ExtensionGroup -import ru.tech.imageresizershrinker.coreui.widget.controls.SaveExifWidget -import ru.tech.imageresizershrinker.coreui.widget.dialogs.ExitWithoutSavingDialog -import ru.tech.imageresizershrinker.coreui.widget.image.ImageNotPickedWidget -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.modifier.navBarsPaddingOnlyIfTheyAtTheEnd -import ru.tech.imageresizershrinker.coreui.widget.other.DrawLockScreenOrientation -import ru.tech.imageresizershrinker.coreui.widget.other.LoadingDialog -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.TopAppBarEmoji -import ru.tech.imageresizershrinker.coreui.widget.other.showError -import ru.tech.imageresizershrinker.coreui.widget.text.Marquee -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.icons.material.Transparency +import ru.tech.imageresizershrinker.core.ui.model.PtSaver +import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiController +import ru.tech.imageresizershrinker.core.ui.utils.helper.Picker +import ru.tech.imageresizershrinker.core.ui.utils.helper.localImagePickerMode +import ru.tech.imageresizershrinker.core.ui.utils.helper.parseSaveResult +import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberImagePicker +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedFloatingActionButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSwitch +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSwitchDefaults +import ru.tech.imageresizershrinker.core.ui.widget.controls.ExtensionGroup +import ru.tech.imageresizershrinker.core.ui.widget.controls.SaveExifWidget +import ru.tech.imageresizershrinker.core.ui.widget.dialogs.ExitWithoutSavingDialog +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageNotPickedWidget +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.modifier.navBarsPaddingOnlyIfTheyAtTheEnd +import ru.tech.imageresizershrinker.core.ui.widget.other.DrawLockScreenOrientation +import ru.tech.imageresizershrinker.core.ui.widget.other.LoadingDialog +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.TopAppBarEmoji +import ru.tech.imageresizershrinker.core.ui.widget.other.showError +import ru.tech.imageresizershrinker.core.ui.widget.text.Marquee +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/feature/erase-background/src/main/java/ru/tech/imageresizershrinker/feature/erase_background/presentation/components/BitmapEraser.kt b/feature/erase-background/src/main/java/ru/tech/imageresizershrinker/feature/erase_background/presentation/components/BitmapEraser.kt index a3ada82ee..173f13466 100644 --- a/feature/erase-background/src/main/java/ru/tech/imageresizershrinker/feature/erase_background/presentation/components/BitmapEraser.kt +++ b/feature/erase-background/src/main/java/ru/tech/imageresizershrinker/feature/erase_background/presentation/components/BitmapEraser.kt @@ -53,11 +53,11 @@ import com.smarttoolfactory.image.zoom.rememberAnimatedZoomState import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.domain.image.draw.Pt import ru.tech.imageresizershrinker.core.domain.model.IntegerSize -import ru.tech.imageresizershrinker.coreui.model.UiPathPaint -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.utils.helper.ImageUtils.createScaledBitmap -import ru.tech.imageresizershrinker.coreui.utils.helper.scaleToFitCanvas -import ru.tech.imageresizershrinker.coreui.widget.modifier.transparencyChecker +import ru.tech.imageresizershrinker.core.ui.model.UiPathPaint +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.utils.helper.ImageUtils.createScaledBitmap +import ru.tech.imageresizershrinker.core.ui.utils.helper.scaleToFitCanvas +import ru.tech.imageresizershrinker.core.ui.widget.modifier.transparencyChecker @Composable fun BitmapEraser( diff --git a/feature/erase-background/src/main/java/ru/tech/imageresizershrinker/feature/erase_background/presentation/viewModel/EraseBackgroundViewModel.kt b/feature/erase-background/src/main/java/ru/tech/imageresizershrinker/feature/erase_background/presentation/viewModel/EraseBackgroundViewModel.kt index df672b584..c5cad25ea 100644 --- a/feature/erase-background/src/main/java/ru/tech/imageresizershrinker/feature/erase_background/presentation/viewModel/EraseBackgroundViewModel.kt +++ b/feature/erase-background/src/main/java/ru/tech/imageresizershrinker/feature/erase_background/presentation/viewModel/EraseBackgroundViewModel.kt @@ -25,8 +25,8 @@ import ru.tech.imageresizershrinker.core.domain.model.ImageInfo import ru.tech.imageresizershrinker.core.domain.saving.FileController import ru.tech.imageresizershrinker.core.domain.saving.SaveResult import ru.tech.imageresizershrinker.core.domain.saving.model.ImageSaveTarget -import ru.tech.imageresizershrinker.coreui.model.UiPathPaint -import ru.tech.imageresizershrinker.coreui.utils.state.update +import ru.tech.imageresizershrinker.core.ui.model.UiPathPaint +import ru.tech.imageresizershrinker.core.ui.utils.state.update import javax.inject.Inject @HiltViewModel diff --git a/feature/filters/build.gradle.kts b/feature/filters/build.gradle.kts index 767eb65b3..a08dcd6c8 100644 --- a/feature/filters/build.gradle.kts +++ b/feature/filters/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { implementation(project(":core:domain")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) implementation(project(":core:data")) implementation(project(":core:resources")) diff --git a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/FiltersScreen.kt b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/FiltersScreen.kt index b60c6720e..4e488c9ec 100644 --- a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/FiltersScreen.kt +++ b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/FiltersScreen.kt @@ -101,47 +101,47 @@ import dev.olshevski.navigation.reimagined.hilt.hiltViewModel import kotlinx.coroutines.delay import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.theme.mixedContainer -import ru.tech.imageresizershrinker.coreui.transformation.ImageInfoTransformation -import ru.tech.imageresizershrinker.coreui.utils.confetti.LocalConfettiController -import ru.tech.imageresizershrinker.coreui.utils.helper.Picker -import ru.tech.imageresizershrinker.coreui.utils.helper.failedToSaveImages -import ru.tech.imageresizershrinker.coreui.utils.helper.localImagePickerMode -import ru.tech.imageresizershrinker.coreui.utils.helper.parseSaveResult -import ru.tech.imageresizershrinker.coreui.utils.helper.rememberImagePicker -import ru.tech.imageresizershrinker.coreui.utils.navigation.Screen -import ru.tech.imageresizershrinker.coreui.widget.buttons.BottomButtonsBlock -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedFloatingActionButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.controls.ExtensionGroup -import ru.tech.imageresizershrinker.coreui.widget.controls.QualityWidget -import ru.tech.imageresizershrinker.coreui.widget.controls.SaveExifWidget -import ru.tech.imageresizershrinker.coreui.widget.dialogs.ExitWithoutSavingDialog -import ru.tech.imageresizershrinker.coreui.widget.image.ImageContainer -import ru.tech.imageresizershrinker.coreui.widget.image.ImageCounter -import ru.tech.imageresizershrinker.coreui.widget.image.imageStickyHeader -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.modifier.navBarsLandscapePadding -import ru.tech.imageresizershrinker.coreui.widget.other.LoadingDialog -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.TopAppBarEmoji -import ru.tech.imageresizershrinker.coreui.widget.other.showError -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.BasicFilterPreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.MaskFilterPreference -import ru.tech.imageresizershrinker.coreui.widget.sheets.CompareSheet -import ru.tech.imageresizershrinker.coreui.widget.sheets.PickImageFromUrisSheet -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.sheets.ZoomModalSheet -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem -import ru.tech.imageresizershrinker.coreui.widget.text.TopAppBarTitle -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass -import ru.tech.imageresizershrinker.coreui.widget.utils.isExpanded -import ru.tech.imageresizershrinker.coreui.widget.utils.middleImageState -import ru.tech.imageresizershrinker.coreui.widget.utils.rememberAvailableHeight +import ru.tech.imageresizershrinker.core.ui.theme.mixedContainer +import ru.tech.imageresizershrinker.core.ui.transformation.ImageInfoTransformation +import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiController +import ru.tech.imageresizershrinker.core.ui.utils.helper.Picker +import ru.tech.imageresizershrinker.core.ui.utils.helper.failedToSaveImages +import ru.tech.imageresizershrinker.core.ui.utils.helper.localImagePickerMode +import ru.tech.imageresizershrinker.core.ui.utils.helper.parseSaveResult +import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberImagePicker +import ru.tech.imageresizershrinker.core.ui.utils.navigation.Screen +import ru.tech.imageresizershrinker.core.ui.widget.buttons.BottomButtonsBlock +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedFloatingActionButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.ExtensionGroup +import ru.tech.imageresizershrinker.core.ui.widget.controls.QualityWidget +import ru.tech.imageresizershrinker.core.ui.widget.controls.SaveExifWidget +import ru.tech.imageresizershrinker.core.ui.widget.dialogs.ExitWithoutSavingDialog +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageContainer +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageCounter +import ru.tech.imageresizershrinker.core.ui.widget.image.imageStickyHeader +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.modifier.navBarsLandscapePadding +import ru.tech.imageresizershrinker.core.ui.widget.other.LoadingDialog +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.TopAppBarEmoji +import ru.tech.imageresizershrinker.core.ui.widget.other.showError +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.BasicFilterPreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.MaskFilterPreference +import ru.tech.imageresizershrinker.core.ui.widget.sheets.CompareSheet +import ru.tech.imageresizershrinker.core.ui.widget.sheets.PickImageFromUrisSheet +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.sheets.ZoomModalSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.text.TopAppBarTitle +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.widget.utils.isExpanded +import ru.tech.imageresizershrinker.core.ui.widget.utils.middleImageState +import ru.tech.imageresizershrinker.core.ui.widget.utils.rememberAvailableHeight import ru.tech.imageresizershrinker.feature.filters.presentation.components.AddEditMaskSheet import ru.tech.imageresizershrinker.feature.filters.presentation.components.AddFilterButton import ru.tech.imageresizershrinker.feature.filters.presentation.components.AddFiltersSheet diff --git a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/AddEditMaskSheet.kt b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/AddEditMaskSheet.kt index 9178f453b..10df987df 100644 --- a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/AddEditMaskSheet.kt +++ b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/AddEditMaskSheet.kt @@ -76,38 +76,38 @@ import ru.tech.imageresizershrinker.core.domain.image.filters.FilterMaskApplier import ru.tech.imageresizershrinker.core.domain.model.ImageFormat import ru.tech.imageresizershrinker.core.domain.model.ImageInfo import ru.tech.imageresizershrinker.feature.draw.presentation.components.BitmapDrawer -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.BrushSoftnessSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.DrawColorSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.DrawPathModeSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.LineWidthSelector -import ru.tech.imageresizershrinker.coreui.icons.material.Eraser -import ru.tech.imageresizershrinker.coreui.model.PtSaver -import ru.tech.imageresizershrinker.coreui.model.UiPathPaint -import ru.tech.imageresizershrinker.coreui.model.toUiPathPaint -import ru.tech.imageresizershrinker.coreui.theme.mixedContainer -import ru.tech.imageresizershrinker.coreui.theme.onMixedContainer -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.BrushSoftnessSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.DrawColorSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.DrawPathModeSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.LineWidthSelector +import ru.tech.imageresizershrinker.core.ui.icons.material.Eraser +import ru.tech.imageresizershrinker.core.ui.model.PtSaver +import ru.tech.imageresizershrinker.core.ui.model.UiPathPaint +import ru.tech.imageresizershrinker.core.ui.model.toUiPathPaint +import ru.tech.imageresizershrinker.core.ui.theme.mixedContainer +import ru.tech.imageresizershrinker.core.ui.theme.onMixedContainer +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant import ru.tech.imageresizershrinker.core.filters.presentation.model.UiFilter import ru.tech.imageresizershrinker.core.filters.presentation.model.toUiFilter -import ru.tech.imageresizershrinker.coreui.utils.state.update -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSwitch -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSwitchDefaults -import ru.tech.imageresizershrinker.coreui.widget.dialogs.ExitWithoutSavingDialog -import ru.tech.imageresizershrinker.coreui.widget.image.ImageHeaderState -import ru.tech.imageresizershrinker.coreui.widget.image.imageStickyHeader -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.other.Loading -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.showError -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.saver.DrawPathModeSaver -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass -import ru.tech.imageresizershrinker.coreui.widget.utils.ScopedViewModelContainer -import ru.tech.imageresizershrinker.coreui.widget.utils.rememberAvailableHeight +import ru.tech.imageresizershrinker.core.ui.utils.state.update +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSwitch +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSwitchDefaults +import ru.tech.imageresizershrinker.core.ui.widget.dialogs.ExitWithoutSavingDialog +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageHeaderState +import ru.tech.imageresizershrinker.core.ui.widget.image.imageStickyHeader +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.other.Loading +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.showError +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.saver.DrawPathModeSaver +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.widget.utils.ScopedViewModelContainer +import ru.tech.imageresizershrinker.core.ui.widget.utils.rememberAvailableHeight import javax.inject.Inject @Composable diff --git a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/AddFilterButton.kt b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/AddFilterButton.kt index f0c44b1ff..a72ae9a9b 100644 --- a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/AddFilterButton.kt +++ b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/AddFilterButton.kt @@ -13,8 +13,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.theme.mixedContainer -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.theme.mixedContainer +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton @Composable fun AddFilterButton( diff --git a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/AddFiltersSheet.kt b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/AddFiltersSheet.kt index fd599c259..6c32b5cff 100644 --- a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/AddFiltersSheet.kt +++ b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/AddFiltersSheet.kt @@ -72,24 +72,24 @@ import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.domain.image.ImageManager import ru.tech.imageresizershrinker.core.domain.model.IntegerSize import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.Cube -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.icons.material.Cube +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant import ru.tech.imageresizershrinker.core.filters.presentation.model.UiFilter -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.image.SimplePicture -import ru.tech.imageresizershrinker.coreui.widget.image.imageStickyHeader -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItemOverload -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleDragHandle -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.Marquee -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass -import ru.tech.imageresizershrinker.coreui.widget.utils.middleImageState -import ru.tech.imageresizershrinker.coreui.widget.utils.rememberAvailableHeight +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.image.SimplePicture +import ru.tech.imageresizershrinker.core.ui.widget.image.imageStickyHeader +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItemOverload +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleDragHandle +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.Marquee +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.widget.utils.middleImageState +import ru.tech.imageresizershrinker.core.ui.widget.utils.rememberAvailableHeight private object FilterHolder { diff --git a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/FilterItem.kt b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/FilterItem.kt index 569a9b258..7abd033e8 100644 --- a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/FilterItem.kt +++ b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/FilterItem.kt @@ -40,19 +40,19 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant import ru.tech.imageresizershrinker.core.filters.presentation.model.UiColorFilter import ru.tech.imageresizershrinker.core.filters.presentation.model.UiFilter import ru.tech.imageresizershrinker.core.filters.presentation.model.UiRGBFilter -import ru.tech.imageresizershrinker.coreui.widget.color_picker.ColorSelectionRow -import ru.tech.imageresizershrinker.coreui.widget.color_picker.ColorSelectionRowDefaults -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSlider -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.text.RoundedTextField -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.value.ValueDialog -import ru.tech.imageresizershrinker.coreui.widget.value.ValueText +import ru.tech.imageresizershrinker.core.ui.widget.color_picker.ColorSelectionRow +import ru.tech.imageresizershrinker.core.ui.widget.color_picker.ColorSelectionRowDefaults +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSlider +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.text.RoundedTextField +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.value.ValueDialog +import ru.tech.imageresizershrinker.core.ui.widget.value.ValueText import kotlin.math.absoluteValue import kotlin.math.pow import kotlin.math.roundToInt diff --git a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/FilterReorderSheet.kt b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/FilterReorderSheet.kt index 11bdf9d47..b02edb6b4 100644 --- a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/FilterReorderSheet.kt +++ b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/FilterReorderSheet.kt @@ -27,10 +27,10 @@ import org.burnoutcrew.reorderable.rememberReorderableLazyListState import org.burnoutcrew.reorderable.reorderable import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.filters.presentation.model.UiFilter -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem @Composable fun FilterReorderSheet( diff --git a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/MaskItem.kt b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/MaskItem.kt index 84c5ab08c..bd7147751 100644 --- a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/MaskItem.kt +++ b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/MaskItem.kt @@ -41,17 +41,17 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.image.ImageManager -import ru.tech.imageresizershrinker.coreui.icons.material.CreateAlt -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.icons.material.CreateAlt +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant import ru.tech.imageresizershrinker.core.filters.presentation.model.toUiFilter -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.alertDialogBorder -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.other.ExpandableItem -import ru.tech.imageresizershrinker.coreui.widget.other.PathPaintPreview -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.alertDialogBorder +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.other.ExpandableItem +import ru.tech.imageresizershrinker.core.ui.widget.other.PathPaintPreview +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun MaskItem( diff --git a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/MaskReorderSheet.kt b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/MaskReorderSheet.kt index a7cd2eecc..fd95cc767 100644 --- a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/MaskReorderSheet.kt +++ b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/components/MaskReorderSheet.kt @@ -26,10 +26,10 @@ import org.burnoutcrew.reorderable.detectReorderAfterLongPress import org.burnoutcrew.reorderable.rememberReorderableLazyListState import org.burnoutcrew.reorderable.reorderable import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem @Composable fun MaskReorderSheet( diff --git a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/viewModel/FilterViewModel.kt b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/viewModel/FilterViewModel.kt index 85a56fad5..b2d64bb91 100644 --- a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/viewModel/FilterViewModel.kt +++ b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/viewModel/FilterViewModel.kt @@ -30,8 +30,8 @@ import ru.tech.imageresizershrinker.feature.filters.presentation.components.Basi import ru.tech.imageresizershrinker.feature.filters.presentation.components.MaskingFilterState import ru.tech.imageresizershrinker.feature.filters.presentation.components.UiFilterMask import ru.tech.imageresizershrinker.core.filters.presentation.model.UiFilter -import ru.tech.imageresizershrinker.coreui.utils.navigation.Screen -import ru.tech.imageresizershrinker.coreui.utils.state.update +import ru.tech.imageresizershrinker.core.ui.utils.navigation.Screen +import ru.tech.imageresizershrinker.core.ui.utils.state.update import javax.inject.Inject @HiltViewModel diff --git a/feature/generate-palette/build.gradle.kts b/feature/generate-palette/build.gradle.kts index 95ed2a229..3fc8da487 100644 --- a/feature/generate-palette/build.gradle.kts +++ b/feature/generate-palette/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { implementation(project(":core:domain")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) implementation(project(":core:data")) implementation(project(":core:resources")) diff --git a/feature/generate-palette/src/main/java/ru/tech/imageresizershrinker/feature/generate_palette/presentation/GeneratePaletteScreen.kt b/feature/generate-palette/src/main/java/ru/tech/imageresizershrinker/feature/generate_palette/presentation/GeneratePaletteScreen.kt index 116b07bb4..71c37d8cf 100644 --- a/feature/generate-palette/src/main/java/ru/tech/imageresizershrinker/feature/generate_palette/presentation/GeneratePaletteScreen.kt +++ b/feature/generate-palette/src/main/java/ru/tech/imageresizershrinker/feature/generate_palette/presentation/GeneratePaletteScreen.kt @@ -78,30 +78,30 @@ import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.feature.generate_palette.presentation.components.PaletteColorsCountSelector import ru.tech.imageresizershrinker.feature.generate_palette.presentation.viewModel.GeneratePaletteViewModel -import ru.tech.imageresizershrinker.coreui.icons.material.PaletteSwatch -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.copyToClipboard -import ru.tech.imageresizershrinker.coreui.utils.helper.Picker -import ru.tech.imageresizershrinker.coreui.utils.helper.localImagePickerMode -import ru.tech.imageresizershrinker.coreui.utils.helper.rememberImagePicker -import ru.tech.imageresizershrinker.coreui.utils.helper.toHex -import ru.tech.imageresizershrinker.coreui.utils.navigation.LocalNavController -import ru.tech.imageresizershrinker.coreui.utils.navigation.Screen -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedFloatingActionButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.image.ImageNotPickedWidget -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.modifier.navBarsPaddingOnlyIfTheyAtTheBottom -import ru.tech.imageresizershrinker.coreui.widget.modifier.transparencyChecker -import ru.tech.imageresizershrinker.coreui.widget.other.LoadingDialog -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.TopAppBarEmoji -import ru.tech.imageresizershrinker.coreui.widget.other.showError -import ru.tech.imageresizershrinker.coreui.widget.sheets.ZoomModalSheet -import ru.tech.imageresizershrinker.coreui.widget.text.Marquee -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass -import ru.tech.imageresizershrinker.coreui.widget.utils.isScrollingUp +import ru.tech.imageresizershrinker.core.ui.icons.material.PaletteSwatch +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.copyToClipboard +import ru.tech.imageresizershrinker.core.ui.utils.helper.Picker +import ru.tech.imageresizershrinker.core.ui.utils.helper.localImagePickerMode +import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberImagePicker +import ru.tech.imageresizershrinker.core.ui.utils.helper.toHex +import ru.tech.imageresizershrinker.core.ui.utils.navigation.LocalNavController +import ru.tech.imageresizershrinker.core.ui.utils.navigation.Screen +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedFloatingActionButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageNotPickedWidget +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.modifier.navBarsPaddingOnlyIfTheyAtTheBottom +import ru.tech.imageresizershrinker.core.ui.widget.modifier.transparencyChecker +import ru.tech.imageresizershrinker.core.ui.widget.other.LoadingDialog +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.TopAppBarEmoji +import ru.tech.imageresizershrinker.core.ui.widget.other.showError +import ru.tech.imageresizershrinker.core.ui.widget.sheets.ZoomModalSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.Marquee +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.widget.utils.isScrollingUp @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/feature/generate-palette/src/main/java/ru/tech/imageresizershrinker/feature/generate_palette/presentation/components/PaletteColorsCountSelector.kt b/feature/generate-palette/src/main/java/ru/tech/imageresizershrinker/feature/generate_palette/presentation/components/PaletteColorsCountSelector.kt index ca889336d..0fbd19cc6 100644 --- a/feature/generate-palette/src/main/java/ru/tech/imageresizershrinker/feature/generate_palette/presentation/components/PaletteColorsCountSelector.kt +++ b/feature/generate-palette/src/main/java/ru/tech/imageresizershrinker/feature/generate_palette/presentation/components/PaletteColorsCountSelector.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSliderItem +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSliderItem import kotlin.math.roundToInt @Composable diff --git a/feature/image-preview/build.gradle.kts b/feature/image-preview/build.gradle.kts index 17705f4b8..cafa25ac2 100644 --- a/feature/image-preview/build.gradle.kts +++ b/feature/image-preview/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { implementation(project(":core:domain")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) implementation(project(":core:data")) implementation(project(":core:resources")) diff --git a/feature/image-preview/src/main/java/ru/tech/imageresizershrinker/feature/image_preview/presentation/ImagePreviewScreen.kt b/feature/image-preview/src/main/java/ru/tech/imageresizershrinker/feature/image_preview/presentation/ImagePreviewScreen.kt index 85eb74cff..496506a37 100644 --- a/feature/image-preview/src/main/java/ru/tech/imageresizershrinker/feature/image_preview/presentation/ImagePreviewScreen.kt +++ b/feature/image-preview/src/main/java/ru/tech/imageresizershrinker/feature/image_preview/presentation/ImagePreviewScreen.kt @@ -40,17 +40,17 @@ import androidx.compose.ui.unit.dp import dev.olshevski.navigation.reimagined.hilt.hiltViewModel import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.feature.image_preview.presentation.viewModel.ImagePreviewViewModel -import ru.tech.imageresizershrinker.coreui.utils.helper.Picker -import ru.tech.imageresizershrinker.coreui.utils.helper.localImagePickerMode -import ru.tech.imageresizershrinker.coreui.utils.helper.rememberImagePicker -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedFloatingActionButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.image.ImageNotPickedWidget -import ru.tech.imageresizershrinker.coreui.widget.image.LazyImagesGrid -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.other.TopAppBarEmoji -import ru.tech.imageresizershrinker.coreui.widget.text.Marquee -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.utils.helper.Picker +import ru.tech.imageresizershrinker.core.ui.utils.helper.localImagePickerMode +import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberImagePicker +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedFloatingActionButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageNotPickedWidget +import ru.tech.imageresizershrinker.core.ui.widget.image.LazyImagesGrid +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.other.TopAppBarEmoji +import ru.tech.imageresizershrinker.core.ui.widget.text.Marquee +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/feature/image-stitch/build.gradle.kts b/feature/image-stitch/build.gradle.kts index 1a605fe7c..68c20a274 100644 --- a/feature/image-stitch/build.gradle.kts +++ b/feature/image-stitch/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { implementation(project(":core:domain")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) implementation(project(":core:data")) implementation(project(":core:resources")) diff --git a/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/ImageStitchingScreen.kt b/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/ImageStitchingScreen.kt index fd6825885..0a276acc0 100644 --- a/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/ImageStitchingScreen.kt +++ b/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/ImageStitchingScreen.kt @@ -69,40 +69,40 @@ import dev.olshevski.navigation.reimagined.hilt.hiltViewModel import kotlinx.coroutines.delay import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.controls.DrawBackgroundSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.DrawBackgroundSelector import ru.tech.imageresizershrinker.feature.image_stitch.presentation.components.ImageFadingEdgesSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.ImageReorderCarousel +import ru.tech.imageresizershrinker.core.ui.widget.controls.ImageReorderCarousel import ru.tech.imageresizershrinker.feature.image_stitch.presentation.components.ImageScaleSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.ScaleSmallImagesToLargeToggle +import ru.tech.imageresizershrinker.core.ui.widget.controls.ScaleSmallImagesToLargeToggle import ru.tech.imageresizershrinker.feature.image_stitch.presentation.components.SpacingSelector import ru.tech.imageresizershrinker.feature.image_stitch.presentation.components.StitchModeSelector import ru.tech.imageresizershrinker.feature.image_stitch.presentation.viewModel.ImageStitchingViewModel -import ru.tech.imageresizershrinker.coreui.utils.confetti.LocalConfettiController -import ru.tech.imageresizershrinker.coreui.utils.helper.Picker -import ru.tech.imageresizershrinker.coreui.utils.helper.localImagePickerMode -import ru.tech.imageresizershrinker.coreui.utils.helper.parseSaveResult -import ru.tech.imageresizershrinker.coreui.utils.helper.rememberImagePicker -import ru.tech.imageresizershrinker.coreui.widget.buttons.BottomButtonsBlock -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.controls.ExtensionGroup -import ru.tech.imageresizershrinker.coreui.widget.controls.QualityWidget -import ru.tech.imageresizershrinker.coreui.widget.dialogs.ExitWithoutSavingDialog -import ru.tech.imageresizershrinker.coreui.widget.image.ImageContainer -import ru.tech.imageresizershrinker.coreui.widget.image.ImageNotPickedWidget -import ru.tech.imageresizershrinker.coreui.widget.image.imageStickyHeader -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.modifier.navBarsLandscapePadding -import ru.tech.imageresizershrinker.coreui.widget.other.LoadingDialog -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.TopAppBarEmoji -import ru.tech.imageresizershrinker.coreui.widget.sheets.ZoomModalSheet -import ru.tech.imageresizershrinker.coreui.widget.text.TopAppBarTitle -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass -import ru.tech.imageresizershrinker.coreui.widget.utils.isExpanded -import ru.tech.imageresizershrinker.coreui.widget.utils.middleImageState -import ru.tech.imageresizershrinker.coreui.widget.utils.rememberAvailableHeight +import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiController +import ru.tech.imageresizershrinker.core.ui.utils.helper.Picker +import ru.tech.imageresizershrinker.core.ui.utils.helper.localImagePickerMode +import ru.tech.imageresizershrinker.core.ui.utils.helper.parseSaveResult +import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberImagePicker +import ru.tech.imageresizershrinker.core.ui.widget.buttons.BottomButtonsBlock +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.ExtensionGroup +import ru.tech.imageresizershrinker.core.ui.widget.controls.QualityWidget +import ru.tech.imageresizershrinker.core.ui.widget.dialogs.ExitWithoutSavingDialog +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageContainer +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageNotPickedWidget +import ru.tech.imageresizershrinker.core.ui.widget.image.imageStickyHeader +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.modifier.navBarsLandscapePadding +import ru.tech.imageresizershrinker.core.ui.widget.other.LoadingDialog +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.TopAppBarEmoji +import ru.tech.imageresizershrinker.core.ui.widget.sheets.ZoomModalSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.TopAppBarTitle +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.widget.utils.isExpanded +import ru.tech.imageresizershrinker.core.ui.widget.utils.middleImageState +import ru.tech.imageresizershrinker.core.ui.widget.utils.rememberAvailableHeight import kotlin.math.roundToLong @OptIn(ExperimentalMaterial3Api::class) diff --git a/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/components/ImageFadingEdgesSelector.kt b/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/components/ImageFadingEdgesSelector.kt index ff4fc9d08..daeb85888 100644 --- a/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/components/ImageFadingEdgesSelector.kt +++ b/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/components/ImageFadingEdgesSelector.kt @@ -11,8 +11,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.buttons.ToggleGroupButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.buttons.ToggleGroupButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container @Composable fun ImageFadingEdgesSelector( diff --git a/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/components/ImageScaleSelector.kt b/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/components/ImageScaleSelector.kt index 626f6b08b..abb0c0529 100644 --- a/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/components/ImageScaleSelector.kt +++ b/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/components/ImageScaleSelector.kt @@ -31,9 +31,9 @@ import androidx.compose.ui.unit.sp import com.smarttoolfactory.colordetector.util.ColorUtil.roundToTwoDigits import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.model.IntegerSize -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSliderItem -import ru.tech.imageresizershrinker.coreui.widget.controls.OOMWarning -import ru.tech.imageresizershrinker.coreui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSliderItem +import ru.tech.imageresizershrinker.core.ui.widget.controls.OOMWarning +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container @Composable fun ImageScaleSelector( diff --git a/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/components/SpacingSelector.kt b/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/components/SpacingSelector.kt index 994c617c9..9bdf8fb0f 100644 --- a/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/components/SpacingSelector.kt +++ b/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/components/SpacingSelector.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSliderItem +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSliderItem import kotlin.math.roundToInt @Composable diff --git a/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/components/StitchModeSelector.kt b/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/components/StitchModeSelector.kt index 0485f0ad6..2939f5677 100644 --- a/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/components/StitchModeSelector.kt +++ b/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/components/StitchModeSelector.kt @@ -24,9 +24,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.model.StitchMode -import ru.tech.imageresizershrinker.coreui.widget.buttons.ToggleGroupButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSliderItem -import ru.tech.imageresizershrinker.coreui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.buttons.ToggleGroupButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSliderItem +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container import kotlin.math.roundToInt @Composable diff --git a/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/viewModel/ImageStitchingViewModel.kt b/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/viewModel/ImageStitchingViewModel.kt index 7ad36626d..f120a68b8 100644 --- a/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/viewModel/ImageStitchingViewModel.kt +++ b/feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/presentation/viewModel/ImageStitchingViewModel.kt @@ -25,7 +25,7 @@ import ru.tech.imageresizershrinker.core.domain.model.StitchMode import ru.tech.imageresizershrinker.core.domain.saving.FileController import ru.tech.imageresizershrinker.core.domain.saving.SaveResult import ru.tech.imageresizershrinker.core.domain.saving.model.ImageSaveTarget -import ru.tech.imageresizershrinker.coreui.utils.state.update +import ru.tech.imageresizershrinker.core.ui.utils.state.update import javax.inject.Inject @HiltViewModel diff --git a/feature/limits-resize/build.gradle.kts b/feature/limits-resize/build.gradle.kts index 4a12f6c91..73c36d486 100644 --- a/feature/limits-resize/build.gradle.kts +++ b/feature/limits-resize/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { implementation(project(":core:domain")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) implementation(project(":core:data")) implementation(project(":core:resources")) diff --git a/feature/limits-resize/src/main/java/ru/tech/imageresizershrinker/feature/limits_resize/presentation/LimitsResizeScreen.kt b/feature/limits-resize/src/main/java/ru/tech/imageresizershrinker/feature/limits_resize/presentation/LimitsResizeScreen.kt index 903eb3beb..ee69980d9 100644 --- a/feature/limits-resize/src/main/java/ru/tech/imageresizershrinker/feature/limits_resize/presentation/LimitsResizeScreen.kt +++ b/feature/limits-resize/src/main/java/ru/tech/imageresizershrinker/feature/limits_resize/presentation/LimitsResizeScreen.kt @@ -69,39 +69,39 @@ import ru.tech.imageresizershrinker.core.domain.model.ImageInfo import ru.tech.imageresizershrinker.feature.limits_resize.presentation.components.AutoRotateLimitBoxToggle import ru.tech.imageresizershrinker.feature.limits_resize.presentation.components.LimitsResizeSelector import ru.tech.imageresizershrinker.feature.limits_resize.presentation.viewModel.LimitsResizeViewModel -import ru.tech.imageresizershrinker.coreui.transformation.ImageInfoTransformation -import ru.tech.imageresizershrinker.coreui.utils.confetti.LocalConfettiController -import ru.tech.imageresizershrinker.coreui.utils.helper.ImageUtils.fileSize -import ru.tech.imageresizershrinker.coreui.utils.helper.Picker -import ru.tech.imageresizershrinker.coreui.utils.helper.failedToSaveImages -import ru.tech.imageresizershrinker.coreui.utils.helper.localImagePickerMode -import ru.tech.imageresizershrinker.coreui.utils.helper.rememberImagePicker -import ru.tech.imageresizershrinker.coreui.widget.buttons.BottomButtonsBlock -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.controls.ExtensionGroup -import ru.tech.imageresizershrinker.coreui.widget.controls.QualityWidget -import ru.tech.imageresizershrinker.coreui.widget.controls.ResizeImageField -import ru.tech.imageresizershrinker.coreui.widget.controls.SaveExifWidget -import ru.tech.imageresizershrinker.coreui.widget.dialogs.ExitWithoutSavingDialog -import ru.tech.imageresizershrinker.coreui.widget.image.ImageContainer -import ru.tech.imageresizershrinker.coreui.widget.image.ImageCounter -import ru.tech.imageresizershrinker.coreui.widget.image.ImageNotPickedWidget -import ru.tech.imageresizershrinker.coreui.widget.image.imageStickyHeader -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.modifier.navBarsLandscapePadding -import ru.tech.imageresizershrinker.coreui.widget.other.LoadingDialog -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.TopAppBarEmoji -import ru.tech.imageresizershrinker.coreui.widget.other.showError -import ru.tech.imageresizershrinker.coreui.widget.sheets.PickImageFromUrisSheet -import ru.tech.imageresizershrinker.coreui.widget.sheets.ZoomModalSheet -import ru.tech.imageresizershrinker.coreui.widget.text.TopAppBarTitle -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass -import ru.tech.imageresizershrinker.coreui.widget.utils.isExpanded -import ru.tech.imageresizershrinker.coreui.widget.utils.middleImageState -import ru.tech.imageresizershrinker.coreui.widget.utils.rememberAvailableHeight +import ru.tech.imageresizershrinker.core.ui.transformation.ImageInfoTransformation +import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiController +import ru.tech.imageresizershrinker.core.ui.utils.helper.ImageUtils.fileSize +import ru.tech.imageresizershrinker.core.ui.utils.helper.Picker +import ru.tech.imageresizershrinker.core.ui.utils.helper.failedToSaveImages +import ru.tech.imageresizershrinker.core.ui.utils.helper.localImagePickerMode +import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberImagePicker +import ru.tech.imageresizershrinker.core.ui.widget.buttons.BottomButtonsBlock +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.ExtensionGroup +import ru.tech.imageresizershrinker.core.ui.widget.controls.QualityWidget +import ru.tech.imageresizershrinker.core.ui.widget.controls.ResizeImageField +import ru.tech.imageresizershrinker.core.ui.widget.controls.SaveExifWidget +import ru.tech.imageresizershrinker.core.ui.widget.dialogs.ExitWithoutSavingDialog +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageContainer +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageCounter +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageNotPickedWidget +import ru.tech.imageresizershrinker.core.ui.widget.image.imageStickyHeader +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.modifier.navBarsLandscapePadding +import ru.tech.imageresizershrinker.core.ui.widget.other.LoadingDialog +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.TopAppBarEmoji +import ru.tech.imageresizershrinker.core.ui.widget.other.showError +import ru.tech.imageresizershrinker.core.ui.widget.sheets.PickImageFromUrisSheet +import ru.tech.imageresizershrinker.core.ui.widget.sheets.ZoomModalSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.TopAppBarTitle +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.widget.utils.isExpanded +import ru.tech.imageresizershrinker.core.ui.widget.utils.middleImageState +import ru.tech.imageresizershrinker.core.ui.widget.utils.rememberAvailableHeight @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/feature/limits-resize/src/main/java/ru/tech/imageresizershrinker/feature/limits_resize/presentation/components/AutoRotateLimitBoxToggle.kt b/feature/limits-resize/src/main/java/ru/tech/imageresizershrinker/feature/limits_resize/presentation/components/AutoRotateLimitBoxToggle.kt index 48adbef90..70388e58f 100644 --- a/feature/limits-resize/src/main/java/ru/tech/imageresizershrinker/feature/limits_resize/presentation/components/AutoRotateLimitBoxToggle.kt +++ b/feature/limits-resize/src/main/java/ru/tech/imageresizershrinker/feature/limits_resize/presentation/components/AutoRotateLimitBoxToggle.kt @@ -8,7 +8,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch @Composable fun AutoRotateLimitBoxToggle( diff --git a/feature/limits-resize/src/main/java/ru/tech/imageresizershrinker/feature/limits_resize/presentation/components/LimitResizeGroup.kt b/feature/limits-resize/src/main/java/ru/tech/imageresizershrinker/feature/limits_resize/presentation/components/LimitResizeGroup.kt index e8d5a5093..352d4710b 100644 --- a/feature/limits-resize/src/main/java/ru/tech/imageresizershrinker/feature/limits_resize/presentation/components/LimitResizeGroup.kt +++ b/feature/limits-resize/src/main/java/ru/tech/imageresizershrinker/feature/limits_resize/presentation/components/LimitResizeGroup.kt @@ -17,8 +17,8 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.model.ResizeType -import ru.tech.imageresizershrinker.coreui.widget.buttons.ToggleGroupButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.buttons.ToggleGroupButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container @Composable fun LimitsResizeSelector( diff --git a/feature/limits-resize/src/main/java/ru/tech/imageresizershrinker/feature/limits_resize/presentation/viewModel/LimitsResizeViewModel.kt b/feature/limits-resize/src/main/java/ru/tech/imageresizershrinker/feature/limits_resize/presentation/viewModel/LimitsResizeViewModel.kt index 5eef64670..67f46c668 100644 --- a/feature/limits-resize/src/main/java/ru/tech/imageresizershrinker/feature/limits_resize/presentation/viewModel/LimitsResizeViewModel.kt +++ b/feature/limits-resize/src/main/java/ru/tech/imageresizershrinker/feature/limits_resize/presentation/viewModel/LimitsResizeViewModel.kt @@ -24,7 +24,7 @@ import ru.tech.imageresizershrinker.core.domain.model.ResizeType import ru.tech.imageresizershrinker.core.domain.saving.FileController import ru.tech.imageresizershrinker.core.domain.saving.SaveResult import ru.tech.imageresizershrinker.core.domain.saving.model.ImageSaveTarget -import ru.tech.imageresizershrinker.coreui.utils.state.update +import ru.tech.imageresizershrinker.core.ui.utils.state.update import javax.inject.Inject @HiltViewModel diff --git a/feature/load-net-image/build.gradle.kts b/feature/load-net-image/build.gradle.kts index ef064e01c..e37322790 100644 --- a/feature/load-net-image/build.gradle.kts +++ b/feature/load-net-image/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { implementation(project(":core:domain")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) implementation(project(":core:data")) implementation(project(":core:resources")) diff --git a/feature/load-net-image/src/main/java/ru/tech/imageresizershrinker/feature/load_net_image/presentation/LoadNetImageScreen.kt b/feature/load-net-image/src/main/java/ru/tech/imageresizershrinker/feature/load_net_image/presentation/LoadNetImageScreen.kt index 410fd88aa..493fe3660 100644 --- a/feature/load-net-image/src/main/java/ru/tech/imageresizershrinker/feature/load_net_image/presentation/LoadNetImageScreen.kt +++ b/feature/load-net-image/src/main/java/ru/tech/imageresizershrinker/feature/load_net_image/presentation/LoadNetImageScreen.kt @@ -81,28 +81,28 @@ import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.model.ImageInfo import ru.tech.imageresizershrinker.feature.load_net_image.presentation.viewModel.LoadNetImageViewModel -import ru.tech.imageresizershrinker.coreui.icons.material.CreateAlt -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.utils.confetti.LocalConfettiController -import ru.tech.imageresizershrinker.coreui.utils.helper.ImageUtils.toBitmap -import ru.tech.imageresizershrinker.coreui.utils.helper.parseSaveResult -import ru.tech.imageresizershrinker.coreui.utils.navigation.LocalNavController -import ru.tech.imageresizershrinker.coreui.widget.buttons.ToggleGroupButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedFloatingActionButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.image.Picture -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.modifier.navBarsLandscapePadding -import ru.tech.imageresizershrinker.coreui.widget.other.LoadingDialog -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.TopAppBarEmoji -import ru.tech.imageresizershrinker.coreui.widget.sheets.ProcessImagesPreferenceSheet -import ru.tech.imageresizershrinker.coreui.widget.sheets.ZoomModalSheet -import ru.tech.imageresizershrinker.coreui.widget.text.Marquee -import ru.tech.imageresizershrinker.coreui.widget.text.RoundedTextField -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.icons.material.CreateAlt +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiController +import ru.tech.imageresizershrinker.core.ui.utils.helper.ImageUtils.toBitmap +import ru.tech.imageresizershrinker.core.ui.utils.helper.parseSaveResult +import ru.tech.imageresizershrinker.core.ui.utils.navigation.LocalNavController +import ru.tech.imageresizershrinker.core.ui.widget.buttons.ToggleGroupButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedFloatingActionButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.image.Picture +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.modifier.navBarsLandscapePadding +import ru.tech.imageresizershrinker.core.ui.widget.other.LoadingDialog +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.TopAppBarEmoji +import ru.tech.imageresizershrinker.core.ui.widget.sheets.ProcessImagesPreferenceSheet +import ru.tech.imageresizershrinker.core.ui.widget.sheets.ZoomModalSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.Marquee +import ru.tech.imageresizershrinker.core.ui.widget.text.RoundedTextField +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/feature/main/build.gradle.kts b/feature/main/build.gradle.kts index dcaa6515e..2cb134a21 100644 --- a/feature/main/build.gradle.kts +++ b/feature/main/build.gradle.kts @@ -46,7 +46,7 @@ android { } dependencies { implementation(project(":core:domain")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) implementation(project(":core:data")) implementation(project(":core:resources")) diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/AppExitDialog.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/AppExitDialog.kt index 73b6b9cf8..697380d91 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/AppExitDialog.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/AppExitDialog.kt @@ -12,9 +12,9 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.findActivity -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.alertDialogBorder +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.findActivity +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.alertDialogBorder @Composable fun AppExitDialog( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/AuthorLinksSheet.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/AuthorLinksSheet.kt index 15e2cf388..c8c2ceefa 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/AuthorLinksSheet.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/AuthorLinksSheet.kt @@ -24,13 +24,13 @@ import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.AUTHOR_LINK import ru.tech.imageresizershrinker.core.domain.AUTHOR_TG -import ru.tech.imageresizershrinker.coreui.icons.material.Github -import ru.tech.imageresizershrinker.coreui.icons.material.Telegram -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.icons.material.Github +import ru.tech.imageresizershrinker.core.ui.icons.material.Telegram +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem private val topShape = RoundedCornerShape( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/DonateSheet.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/DonateSheet.kt index 69d14fe52..8cf76f75e 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/DonateSheet.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/DonateSheet.kt @@ -35,24 +35,24 @@ import ru.tech.imageresizershrinker.core.domain.BitcoinWallet import ru.tech.imageresizershrinker.core.domain.TONSpaceWallet import ru.tech.imageresizershrinker.core.domain.TONWallet import ru.tech.imageresizershrinker.core.domain.USDTWallet -import ru.tech.imageresizershrinker.coreui.icons.material.Bitcoin -import ru.tech.imageresizershrinker.coreui.icons.material.Ton -import ru.tech.imageresizershrinker.coreui.icons.material.USDT -import ru.tech.imageresizershrinker.coreui.theme.BitcoinColor -import ru.tech.imageresizershrinker.coreui.theme.TONColor -import ru.tech.imageresizershrinker.coreui.theme.TONSpaceColor -import ru.tech.imageresizershrinker.coreui.theme.USDTColor -import ru.tech.imageresizershrinker.coreui.theme.inverse -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.copyToClipboard -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItemOverload -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.Bitcoin +import ru.tech.imageresizershrinker.core.ui.icons.material.Ton +import ru.tech.imageresizershrinker.core.ui.icons.material.USDT +import ru.tech.imageresizershrinker.core.ui.theme.BitcoinColor +import ru.tech.imageresizershrinker.core.ui.theme.TONColor +import ru.tech.imageresizershrinker.core.ui.theme.TONSpaceColor +import ru.tech.imageresizershrinker.core.ui.theme.USDTColor +import ru.tech.imageresizershrinker.core.ui.theme.inverse +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.copyToClipboard +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItemOverload +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState private val topShape = RoundedCornerShape( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/EditPresetsSheet.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/EditPresetsSheet.kt index 84ee8ae02..7e5b90a97 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/EditPresetsSheet.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/EditPresetsSheet.kt @@ -47,14 +47,14 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.core.text.isDigitsOnly import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.alertDialogBorder -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.alertDialogBorder +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @OptIn(ExperimentalLayoutApi::class) @Composable diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/EmojiSheet.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/EmojiSheet.kt index 17c181134..1e2e0be08 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/EmojiSheet.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/EmojiSheet.kt @@ -41,18 +41,18 @@ import androidx.compose.ui.unit.dp import kotlinx.collections.immutable.ImmutableList import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.emoji.EmojiData -import ru.tech.imageresizershrinker.coreui.icons.emoji.EmojiItem -import ru.tech.imageresizershrinker.coreui.shapes.CloverShape -import ru.tech.imageresizershrinker.coreui.theme.blend -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSwitch -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleDragHandle -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.icons.emoji.EmojiData +import ru.tech.imageresizershrinker.core.ui.icons.emoji.EmojiItem +import ru.tech.imageresizershrinker.core.ui.shapes.CloverShape +import ru.tech.imageresizershrinker.core.ui.theme.blend +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSwitch +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleDragHandle +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem import kotlin.random.Random @Composable diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/FabPreview.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/FabPreview.kt index 0bfa4c62c..f497ed818 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/FabPreview.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/FabPreview.kt @@ -36,11 +36,11 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.shapes.CloverShape -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.autoElevatedBorder -import ru.tech.imageresizershrinker.coreui.widget.modifier.containerFabBorder -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.shapes.CloverShape +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.autoElevatedBorder +import ru.tech.imageresizershrinker.core.ui.widget.modifier.containerFabBorder +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun FabPreview( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/FirstLaunchSetupDialog.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/FirstLaunchSetupDialog.kt index c796a9367..e127edab0 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/FirstLaunchSetupDialog.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/FirstLaunchSetupDialog.kt @@ -30,14 +30,14 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.BuildConfig import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.Beta -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.isInstalledFromPlayStore -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.alertDialogBorder -import ru.tech.imageresizershrinker.coreui.widget.modifier.fadingEdges -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.Beta +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.isInstalledFromPlayStore +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.alertDialogBorder +import ru.tech.imageresizershrinker.core.ui.widget.modifier.fadingEdges +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Suppress("KotlinConstantConditions") @Composable diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/JxlWarning.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/JxlWarning.kt index ed3dd804e..b88b48e3f 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/JxlWarning.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/JxlWarning.kt @@ -13,10 +13,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import ru.tech.imageresizershrinker.core.resources.BuildConfig import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.Jxl -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.alertDialogBorder -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.Jxl +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.alertDialogBorder +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun JxlWarning() { diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/MainScreen.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/MainScreen.kt index 480dc2332..db0bd45fd 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/MainScreen.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/MainScreen.kt @@ -119,30 +119,30 @@ import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.domain.APP_LINK import ru.tech.imageresizershrinker.core.resources.BuildConfig import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.Github -import ru.tech.imageresizershrinker.coreui.icons.material.GooglePlay -import ru.tech.imageresizershrinker.coreui.model.isFirstLaunch -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.isInstalledFromPlayStore -import ru.tech.imageresizershrinker.coreui.utils.navigation.LocalNavController -import ru.tech.imageresizershrinker.coreui.utils.navigation.Screen -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedFloatingActionButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.modifier.pulsate -import ru.tech.imageresizershrinker.coreui.widget.modifier.rotateAnimation -import ru.tech.imageresizershrinker.coreui.widget.modifier.scaleOnTap -import ru.tech.imageresizershrinker.coreui.widget.modifier.withModifier -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.SearchBar -import ru.tech.imageresizershrinker.coreui.widget.other.TopAppBarEmoji -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItemOverload -import ru.tech.imageresizershrinker.coreui.widget.text.Marquee -import ru.tech.imageresizershrinker.coreui.widget.text.RoundedTextField -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.icons.material.Github +import ru.tech.imageresizershrinker.core.ui.icons.material.GooglePlay +import ru.tech.imageresizershrinker.core.ui.model.isFirstLaunch +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.isInstalledFromPlayStore +import ru.tech.imageresizershrinker.core.ui.utils.navigation.LocalNavController +import ru.tech.imageresizershrinker.core.ui.utils.navigation.Screen +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedFloatingActionButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.modifier.pulsate +import ru.tech.imageresizershrinker.core.ui.widget.modifier.rotateAnimation +import ru.tech.imageresizershrinker.core.ui.widget.modifier.scaleOnTap +import ru.tech.imageresizershrinker.core.ui.widget.modifier.withModifier +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.SearchBar +import ru.tech.imageresizershrinker.core.ui.widget.other.TopAppBarEmoji +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItemOverload +import ru.tech.imageresizershrinker.core.ui.widget.text.Marquee +import ru.tech.imageresizershrinker.core.ui.widget.text.RoundedTextField +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass import ru.tech.imageresizershrinker.feature.main.presentation.components.settings.SettingsBlock import ru.tech.imageresizershrinker.feature.main.presentation.viewModel.MainViewModel diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/NavigationItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/NavigationItem.kt index d4317f39a..a2f27b519 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/NavigationItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/NavigationItem.kt @@ -46,9 +46,9 @@ import androidx.compose.ui.semantics.clearAndSetSemantics import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.dp import kotlinx.coroutines.flow.map -import ru.tech.imageresizershrinker.coreui.theme.inverse -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.theme.inverse +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState import kotlin.math.roundToInt @Composable diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/Particles.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/Particles.kt index 36b21f112..22a26d9de 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/Particles.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/Particles.kt @@ -6,7 +6,7 @@ import nl.dionsegijn.konfetti.core.Party import nl.dionsegijn.konfetti.core.Position import nl.dionsegijn.konfetti.core.Spread import nl.dionsegijn.konfetti.core.emitter.Emitter -import ru.tech.imageresizershrinker.coreui.theme.blend +import ru.tech.imageresizershrinker.core.ui.theme.blend import java.util.concurrent.TimeUnit fun particles(primary: Color) = listOf( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/PermissionDialog.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/PermissionDialog.kt index 2a23e5a05..eac7a2525 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/PermissionDialog.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/PermissionDialog.kt @@ -17,12 +17,12 @@ import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.res.stringResource import com.t8rin.dynamic.theme.observeAsState import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.findActivity -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.needToShowStoragePermissionRequest -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.requestStoragePermission -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.alertDialogBorder -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.findActivity +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.needToShowStoragePermissionRequest +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.requestStoragePermission +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.alertDialogBorder +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun PermissionDialog() { diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/ScreenSelector.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/ScreenSelector.kt index 9c8afc65c..819d27b7c 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/ScreenSelector.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/ScreenSelector.kt @@ -17,9 +17,9 @@ import dev.olshevski.navigation.reimagined.AnimatedNavHost import dev.olshevski.navigation.reimagined.NavAction import dev.olshevski.navigation.reimagined.pop import kotlinx.coroutines.launch -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.findActivity -import ru.tech.imageresizershrinker.coreui.utils.navigation.Screen -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.findActivity +import ru.tech.imageresizershrinker.core.ui.utils.navigation.Screen +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState import ru.tech.imageresizershrinker.feature.bytes_resize.presentation.BytesResizeScreen import ru.tech.imageresizershrinker.feature.cipher.presentation.FileCipherScreen import ru.tech.imageresizershrinker.feature.compare.presentation.CompareScreen diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AddFileSizeSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AddFileSizeSettingItem.kt index 168b12b1a..dc2c42216 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AddFileSizeSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AddFileSizeSettingItem.kt @@ -10,9 +10,9 @@ 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.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun AddFileSizeSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AddOriginalFilenameSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AddOriginalFilenameSettingItem.kt index 2de4732e9..aba293f7f 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AddOriginalFilenameSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AddOriginalFilenameSettingItem.kt @@ -16,10 +16,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun AddOriginalFilenameSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AllowBetasSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AllowBetasSettingItem.kt index 16c6ad27b..4e1983255 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AllowBetasSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AllowBetasSettingItem.kt @@ -9,10 +9,10 @@ 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.coreui.icons.material.Beta -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.Beta +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun AllowBetasSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AllowImageMonetSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AllowImageMonetSettingItem.kt index 0113402ff..80823b9cf 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AllowImageMonetSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AllowImageMonetSettingItem.kt @@ -10,9 +10,9 @@ 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.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun AllowImageMonetSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AmoledModeSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AmoledModeSettingItem.kt index 10d9490bc..a4a114264 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AmoledModeSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AmoledModeSettingItem.kt @@ -10,9 +10,9 @@ 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.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun AmoledModeSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AnalyticsSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AnalyticsSettingItem.kt index f803b84f1..1fe949047 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AnalyticsSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AnalyticsSettingItem.kt @@ -10,10 +10,10 @@ 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.coreui.icons.material.Analytics -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.Analytics +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun AnalyticsSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AppBarShadowsSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AppBarShadowsSettingItem.kt index d2d6222f3..2ecc9d393 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AppBarShadowsSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AppBarShadowsSettingItem.kt @@ -9,9 +9,9 @@ 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.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun AppBarShadowsSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AuthorSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AuthorSettingItem.kt index 03b8dbfc8..e81c54b59 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AuthorSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AuthorSettingItem.kt @@ -20,11 +20,11 @@ import ru.tech.imageresizershrinker.core.domain.AUTHOR_AVATAR import ru.tech.imageresizershrinker.core.domain.FOSS_LINK import ru.tech.imageresizershrinker.core.resources.BuildConfig import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.shapes.CloverShape -import ru.tech.imageresizershrinker.coreui.widget.image.Picture -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRow +import ru.tech.imageresizershrinker.core.ui.shapes.CloverShape +import ru.tech.imageresizershrinker.core.ui.widget.image.Picture +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRow import ru.tech.imageresizershrinker.feature.main.presentation.components.AuthorLinksSheet @Composable diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AutoCacheClearSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AutoCacheClearSettingItem.kt index 22c617ea1..b3b762be8 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AutoCacheClearSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AutoCacheClearSettingItem.kt @@ -10,9 +10,9 @@ 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.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun AutoCacheClearSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AutoCheckUpdatesSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AutoCheckUpdatesSettingItem.kt index 51894084c..6f2c15826 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AutoCheckUpdatesSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AutoCheckUpdatesSettingItem.kt @@ -11,10 +11,10 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.isInstalledFromPlayStore -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.isInstalledFromPlayStore +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun AutoCheckUpdatesSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AutoPinClipboardSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AutoPinClipboardSettingItem.kt index b7d33509d..046f97341 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AutoPinClipboardSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/AutoPinClipboardSettingItem.kt @@ -9,9 +9,9 @@ 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.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/BackupSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/BackupSettingItem.kt index f439f2783..55d1580a7 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/BackupSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/BackupSettingItem.kt @@ -15,8 +15,8 @@ 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.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun BackupSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/BorderThicknessSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/BorderThicknessSettingItem.kt index 4afe62f5c..a3786087a 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/BorderThicknessSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/BorderThicknessSettingItem.kt @@ -11,9 +11,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.smarttoolfactory.colordetector.util.ColorUtil.round import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSliderItem -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSliderItem +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun BorderThicknessSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ButtonShadowsSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ButtonShadowsSettingItem.kt index 79420a9d0..0b9029036 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ButtonShadowsSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ButtonShadowsSettingItem.kt @@ -9,9 +9,9 @@ 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.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun ButtonShadowsSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ChangeFontSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ChangeFontSettingItem.kt index 53cf95b01..30495680e 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ChangeFontSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ChangeFontSettingItem.kt @@ -12,13 +12,13 @@ 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.coreui.icons.material.CreateAlt -import ru.tech.imageresizershrinker.coreui.icons.material.FontFamily -import ru.tech.imageresizershrinker.coreui.model.UiFontFam -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem -import ru.tech.imageresizershrinker.coreui.widget.sheets.PickFontFamilySheet -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.CreateAlt +import ru.tech.imageresizershrinker.core.ui.icons.material.FontFamily +import ru.tech.imageresizershrinker.core.ui.model.UiFontFam +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.sheets.PickFontFamilySheet +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun ChangeFontSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ChangeLanguageSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ChangeLanguageSettingItem.kt index c2e1bdca0..e72ae1576 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ChangeLanguageSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ChangeLanguageSettingItem.kt @@ -39,13 +39,13 @@ import androidx.compose.ui.unit.dp import androidx.core.os.LocaleListCompat import org.xmlpull.v1.XmlPullParser import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.CreateAlt -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRow -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.icons.material.CreateAlt +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRow +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem import java.util.Locale @Composable diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ClearCacheSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ClearCacheSettingItem.kt index fd27a0ebb..d696b1567 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ClearCacheSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ClearCacheSettingItem.kt @@ -18,8 +18,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.t8rin.dynamic.theme.observeAsState import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun ClearCacheSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ColorSchemeSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ColorSchemeSettingItem.kt index 3e27abe0e..11729efc7 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ColorSchemeSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ColorSchemeSettingItem.kt @@ -32,18 +32,18 @@ import com.t8rin.dynamic.theme.PaletteStyle import com.t8rin.dynamic.theme.rememberAppColorTuple import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.CreateAlt -import ru.tech.imageresizershrinker.coreui.icons.material.Theme -import ru.tech.imageresizershrinker.coreui.shapes.MaterialStarShape -import ru.tech.imageresizershrinker.coreui.theme.inverse -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.color_picker.AvailableColorTuplesSheet -import ru.tech.imageresizershrinker.coreui.widget.color_picker.ColorTuplePicker -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRow -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.CreateAlt +import ru.tech.imageresizershrinker.core.ui.icons.material.Theme +import ru.tech.imageresizershrinker.core.ui.shapes.MaterialStarShape +import ru.tech.imageresizershrinker.core.ui.theme.inverse +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.color_picker.AvailableColorTuplesSheet +import ru.tech.imageresizershrinker.core.ui.widget.color_picker.ColorTuplePicker +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRow +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ContainerShadowsSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ContainerShadowsSettingItem.kt index ff5f1612f..a0d17b346 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ContainerShadowsSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ContainerShadowsSettingItem.kt @@ -9,9 +9,9 @@ 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.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun ContainerShadowsSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/CrashlyticsSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/CrashlyticsSettingItem.kt index 649569a87..1269b912a 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/CrashlyticsSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/CrashlyticsSettingItem.kt @@ -10,10 +10,10 @@ 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.coreui.icons.material.Crashlytics -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.Crashlytics +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun CrashlyticsSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/CurrentVersionCodeSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/CurrentVersionCodeSettingItem.kt index 1eefd9705..9c15f99a3 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/CurrentVersionCodeSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/CurrentVersionCodeSettingItem.kt @@ -20,14 +20,14 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.BuildConfig import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.shapes.MaterialStarShape -import ru.tech.imageresizershrinker.coreui.theme.blend -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.pulsate -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRow -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.shapes.MaterialStarShape +import ru.tech.imageresizershrinker.core.ui.theme.blend +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.pulsate +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRow +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun CurrentVersionCodeSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/DonateSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/DonateSettingItem.kt index 6d3379693..7901575f0 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/DonateSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/DonateSettingItem.kt @@ -13,11 +13,11 @@ 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.coreui.model.isFirstLaunch -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.modifier.pulsate -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRow -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.model.isFirstLaunch +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.modifier.pulsate +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRow +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState import ru.tech.imageresizershrinker.feature.main.presentation.components.DonateSheet @Composable diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/DynamicColorsSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/DynamicColorsSettingItem.kt index b40c28dcd..175750579 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/DynamicColorsSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/DynamicColorsSettingItem.kt @@ -10,9 +10,9 @@ 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.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun DynamicColorsSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/EmojiSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/EmojiSettingItem.kt index 0a0e61f02..d27ff7d41 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/EmojiSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/EmojiSettingItem.kt @@ -20,20 +20,20 @@ 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.coreui.icons.emoji.Emoji -import ru.tech.imageresizershrinker.coreui.icons.emoji.EmojiItem -import ru.tech.imageresizershrinker.coreui.icons.emoji.allIcons -import ru.tech.imageresizershrinker.coreui.icons.emoji.allIconsCategorized -import ru.tech.imageresizershrinker.coreui.icons.material.Cool -import ru.tech.imageresizershrinker.coreui.shapes.CloverShape -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.modifier.alertDialogBorder -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.scaleOnTap -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRow -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.emoji.Emoji +import ru.tech.imageresizershrinker.core.ui.icons.emoji.EmojiItem +import ru.tech.imageresizershrinker.core.ui.icons.emoji.allIcons +import ru.tech.imageresizershrinker.core.ui.icons.emoji.allIconsCategorized +import ru.tech.imageresizershrinker.core.ui.icons.material.Cool +import ru.tech.imageresizershrinker.core.ui.shapes.CloverShape +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.modifier.alertDialogBorder +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.preferences.PreferenceRow +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState import ru.tech.imageresizershrinker.feature.main.presentation.components.EmojiSheet @Composable diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/EmojisCountSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/EmojisCountSettingItem.kt index 37ab415c7..10c8f196b 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/EmojisCountSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/EmojisCountSettingItem.kt @@ -10,9 +10,9 @@ 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.coreui.widget.controls.EnhancedSliderItem -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSliderItem +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun EmojisCountSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FabAlignmentSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FabAlignmentSettingItem.kt index e3268364e..03bb6b441 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FabAlignmentSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FabAlignmentSettingItem.kt @@ -32,10 +32,10 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSlider -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSlider +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState import ru.tech.imageresizershrinker.feature.main.presentation.components.FabPreview import kotlin.math.roundToInt diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FabShadowsSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FabShadowsSettingItem.kt index bb9f4cde4..c3b8fdbef 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FabShadowsSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FabShadowsSettingItem.kt @@ -8,10 +8,10 @@ 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.coreui.icons.material.FloatingActionButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.FloatingActionButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun FabShadowsSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FilenamePrefixSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FilenamePrefixSettingItem.kt index 0fbf15ba2..290ec4db1 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FilenamePrefixSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FilenamePrefixSettingItem.kt @@ -26,14 +26,14 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.CreateAlt -import ru.tech.imageresizershrinker.coreui.icons.material.Prefix -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.modifier.alertDialogBorder -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.CreateAlt +import ru.tech.imageresizershrinker.core.ui.icons.material.Prefix +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.modifier.alertDialogBorder +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun FilenamePrefixSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FilenameSuffixSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FilenameSuffixSettingItem.kt index 6652d5637..76b53879c 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FilenameSuffixSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FilenameSuffixSettingItem.kt @@ -26,14 +26,14 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.CreateAlt -import ru.tech.imageresizershrinker.coreui.icons.material.Suffix -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.modifier.alertDialogBorder -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.CreateAlt +import ru.tech.imageresizershrinker.core.ui.icons.material.Suffix +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.modifier.alertDialogBorder +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun FilenameSuffixSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FontScaleSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FontScaleSettingItem.kt index ab1caf210..87f898cb5 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FontScaleSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/FontScaleSettingItem.kt @@ -29,10 +29,10 @@ import androidx.compose.ui.unit.sp import com.smarttoolfactory.colordetector.util.ColorUtil.roundToTwoDigits import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.utils.trimTrailingZero -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSlider -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSlider +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun FontScaleSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/GroupOptionsSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/GroupOptionsSettingItem.kt index 748a38a31..85246389b 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/GroupOptionsSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/GroupOptionsSettingItem.kt @@ -10,9 +10,9 @@ 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.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun GroupOptionsSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/HelpTranslateSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/HelpTranslateSettingItem.kt index d08719626..7ee9d04d7 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/HelpTranslateSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/HelpTranslateSettingItem.kt @@ -14,8 +14,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.WEBLATE_LINK -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun HelpTranslateSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ImagePickerModeSettingItemGroup.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ImagePickerModeSettingItemGroup.kt index 381be3766..47456b9fa 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ImagePickerModeSettingItemGroup.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ImagePickerModeSettingItemGroup.kt @@ -21,9 +21,9 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun ImagePickerModeSettingItemGroup( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/IssueTrackerSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/IssueTrackerSettingItem.kt index 891ce1ef6..dc8b7a333 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/IssueTrackerSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/IssueTrackerSettingItem.kt @@ -14,8 +14,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.ISSUE_TRACKER -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun IssueTrackerSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/LockDrawOrientationSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/LockDrawOrientationSettingItem.kt index dee153e17..28ebcd545 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/LockDrawOrientationSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/LockDrawOrientationSettingItem.kt @@ -9,9 +9,9 @@ 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.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun LockDrawOrientationSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/NightModeSettingItemGroup.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/NightModeSettingItemGroup.kt index 5e9da0577..5ca4af7dd 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/NightModeSettingItemGroup.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/NightModeSettingItemGroup.kt @@ -21,9 +21,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.model.NightMode -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun NightModeSettingItemGroup( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/OverwriteFilesSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/OverwriteFilesSettingItem.kt index da9c5eea6..97618dc77 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/OverwriteFilesSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/OverwriteFilesSettingItem.kt @@ -10,9 +10,9 @@ 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.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun OverwriteFilesSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/PresetsSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/PresetsSettingItem.kt index 9395bf5f2..60e2588f3 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/PresetsSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/PresetsSettingItem.kt @@ -10,11 +10,11 @@ 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.coreui.icons.material.CreateAlt -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalEditPresetsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.CreateAlt +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalEditPresetsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun PresetsSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/RandomizeFilenameSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/RandomizeFilenameSettingItem.kt index e84cbe42f..87a22bdbd 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/RandomizeFilenameSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/RandomizeFilenameSettingItem.kt @@ -9,10 +9,10 @@ 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.coreui.icons.material.Symbol -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.Symbol +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun RandomizeFilenameSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ReplaceSequenceNumberSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ReplaceSequenceNumberSettingItem.kt index 52e74ec00..c98bf9228 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ReplaceSequenceNumberSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ReplaceSequenceNumberSettingItem.kt @@ -9,10 +9,10 @@ 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.coreui.icons.material.Numeric -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.Numeric +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun ReplaceSequenceNumberSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ResetSettingsSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ResetSettingsSettingItem.kt index 9ddc148ce..97a779958 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ResetSettingsSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ResetSettingsSettingItem.kt @@ -14,9 +14,9 @@ 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.coreui.widget.dialogs.ResetDialog -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.dialogs.ResetDialog +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun ResetSettingsSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/RestoreSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/RestoreSettingItem.kt index d78d970ef..15d8878a6 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/RestoreSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/RestoreSettingItem.kt @@ -12,9 +12,9 @@ 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.coreui.icons.material.DownloadFile -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.icons.material.DownloadFile +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable fun RestoreSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SavingFolderSettingItemGroup.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SavingFolderSettingItemGroup.kt index 1b8339bde..2a6b3a319 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SavingFolderSettingItemGroup.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SavingFolderSettingItemGroup.kt @@ -27,13 +27,13 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.CreateAlt -import ru.tech.imageresizershrinker.coreui.utils.helper.toUiPath -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.ToastDuration -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.CreateAlt +import ru.tech.imageresizershrinker.core.ui.utils.helper.toUiPath +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.ToastDuration +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun SavingFolderSettingItemGroup( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ScreenOrderSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ScreenOrderSettingItem.kt index 7426929b1..0a7239ec6 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ScreenOrderSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ScreenOrderSettingItem.kt @@ -35,17 +35,17 @@ import org.burnoutcrew.reorderable.detectReorderAfterLongPress import org.burnoutcrew.reorderable.rememberReorderableLazyListState import org.burnoutcrew.reorderable.reorderable import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.CreateAlt -import ru.tech.imageresizershrinker.coreui.icons.material.Stacks -import ru.tech.imageresizershrinker.coreui.utils.navigation.Screen -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.CreateAlt +import ru.tech.imageresizershrinker.core.ui.icons.material.Stacks +import ru.tech.imageresizershrinker.core.ui.utils.navigation.Screen +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun ScreenOrderSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ScreenSearchSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ScreenSearchSettingItem.kt index 9b4cf93de..b65100460 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ScreenSearchSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/ScreenSearchSettingItem.kt @@ -10,9 +10,9 @@ 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.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun ScreenSearchSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SearchableSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SearchableSettingItem.kt index 7c16684a3..ac32af20f 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SearchableSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SearchableSettingItem.kt @@ -17,8 +17,8 @@ import androidx.compose.ui.graphics.Shape import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.utils.ProvideContainerShape +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.utils.ProvideContainerShape import ru.tech.imageresizershrinker.feature.main.presentation.viewModel.MainViewModel @Composable diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SettingGroupItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SettingGroupItem.kt index feabb0242..0e557d80a 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SettingGroupItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SettingGroupItem.kt @@ -7,8 +7,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.dp -import ru.tech.imageresizershrinker.coreui.widget.other.ExpandableItem -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.other.ExpandableItem +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem @Composable fun SettingGroupItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SettingItem.kt index ecfa06596..b78b3d232 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SettingItem.kt @@ -17,13 +17,13 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.utils.confetti.LocalConfettiController -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.isInstalledFromPlayStore -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.showError -import ru.tech.imageresizershrinker.coreui.widget.text.AutoSizeText +import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiController +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.isInstalledFromPlayStore +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.showError +import ru.tech.imageresizershrinker.core.ui.widget.text.AutoSizeText import ru.tech.imageresizershrinker.feature.main.presentation.viewModel.MainViewModel @Composable diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SettingsBlock.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SettingsBlock.kt index 84d5a16aa..a3d573e3b 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SettingsBlock.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SettingsBlock.kt @@ -50,10 +50,10 @@ import androidx.compose.ui.unit.sp import kotlinx.coroutines.delay import ru.tech.imageresizershrinker.core.resources.BuildConfig import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.utils.helper.plus -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.other.Loading -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.utils.helper.plus +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.other.Loading +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState import ru.tech.imageresizershrinker.feature.main.presentation.viewModel.MainViewModel diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SettingsGroup.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SettingsGroup.kt index a17f45b2c..bd595bed0 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SettingsGroup.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SettingsGroup.kt @@ -18,10 +18,10 @@ import androidx.compose.material.icons.rounded.Vibration import androidx.compose.material.icons.twotone.Palette import androidx.compose.ui.graphics.vector.ImageVector import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.Firebase -import ru.tech.imageresizershrinker.coreui.icons.material.FolderOpen -import ru.tech.imageresizershrinker.coreui.icons.material.Shadow -import ru.tech.imageresizershrinker.coreui.icons.material.Stacks +import ru.tech.imageresizershrinker.core.ui.icons.material.Firebase +import ru.tech.imageresizershrinker.core.ui.icons.material.FolderOpen +import ru.tech.imageresizershrinker.core.ui.icons.material.Shadow +import ru.tech.imageresizershrinker.core.ui.icons.material.Stacks sealed class SettingsGroup( val titleId: Int, diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SliderShadowsSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SliderShadowsSettingItem.kt index fd4ea7499..43af8725d 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SliderShadowsSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SliderShadowsSettingItem.kt @@ -8,10 +8,10 @@ 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.coreui.icons.material.Slider -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.Slider +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun SliderShadowsSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SourceCodeSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SourceCodeSettingItem.kt index 0a7b33545..7c17a285b 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SourceCodeSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SourceCodeSettingItem.kt @@ -16,8 +16,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.APP_LINK -import ru.tech.imageresizershrinker.coreui.icons.material.Github -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.icons.material.Github +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem @Composable diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SwitchShadowsSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SwitchShadowsSettingItem.kt index d7a46a999..54edd4b95 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SwitchShadowsSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/SwitchShadowsSettingItem.kt @@ -9,9 +9,9 @@ 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.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRowSwitch -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRowSwitch +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun SwitchShadowsSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/TelegramSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/TelegramSettingItem.kt index 23f9a4f68..c175a3247 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/TelegramSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/TelegramSettingItem.kt @@ -14,9 +14,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.core.domain.CHAT_LINK -import ru.tech.imageresizershrinker.coreui.icons.material.Telegram -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceRow +import ru.tech.imageresizershrinker.core.ui.icons.material.Telegram +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceRow @Composable fun TelegramSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/VibrationStrengthSettingItem.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/VibrationStrengthSettingItem.kt index 8504da34d..be86cf6db 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/VibrationStrengthSettingItem.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/components/settings/VibrationStrengthSettingItem.kt @@ -28,10 +28,10 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSlider -import ru.tech.imageresizershrinker.coreui.widget.modifier.ContainerShapeDefaults -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSlider +import ru.tech.imageresizershrinker.core.ui.widget.modifier.ContainerShapeDefaults +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun VibrationStrengthSettingItem( diff --git a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/viewModel/MainViewModel.kt b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/viewModel/MainViewModel.kt index a594a1d99..d8f2f2577 100644 --- a/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/viewModel/MainViewModel.kt +++ b/feature/main/src/main/java/ru/tech/imageresizershrinker/feature/main/presentation/viewModel/MainViewModel.kt @@ -80,8 +80,8 @@ import ru.tech.imageresizershrinker.core.domain.use_case.get_settings_state.GetS import ru.tech.imageresizershrinker.core.domain.use_case.get_settings_state.GetSettingsStateUseCase import ru.tech.imageresizershrinker.core.domain.use_case.reset_settings.ResetSettingsUseCase import ru.tech.imageresizershrinker.core.resources.BuildConfig -import ru.tech.imageresizershrinker.coreui.utils.navigation.Screen -import ru.tech.imageresizershrinker.coreui.widget.other.ToastHostState +import ru.tech.imageresizershrinker.core.ui.utils.navigation.Screen +import ru.tech.imageresizershrinker.core.ui.widget.other.ToastHostState import java.io.OutputStream import java.net.URL import javax.inject.Inject diff --git a/feature/pdf-tools/build.gradle.kts b/feature/pdf-tools/build.gradle.kts index 2c15a2129..685baebb5 100644 --- a/feature/pdf-tools/build.gradle.kts +++ b/feature/pdf-tools/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { implementation(project(":core:domain")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) implementation(project(":core:data")) implementation(project(":core:resources")) diff --git a/feature/pdf-tools/src/main/java/ru/tech/imageresizershrinker/feature/pdf_tools/presentation/PdfToolsScreen.kt b/feature/pdf-tools/src/main/java/ru/tech/imageresizershrinker/feature/pdf_tools/presentation/PdfToolsScreen.kt index e10a4bbf0..33b28d7c1 100644 --- a/feature/pdf-tools/src/main/java/ru/tech/imageresizershrinker/feature/pdf_tools/presentation/PdfToolsScreen.kt +++ b/feature/pdf-tools/src/main/java/ru/tech/imageresizershrinker/feature/pdf_tools/presentation/PdfToolsScreen.kt @@ -104,36 +104,36 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.domain.model.Preset import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.utils.confetti.LocalConfettiController -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.getFileName -import ru.tech.imageresizershrinker.coreui.utils.helper.Picker -import ru.tech.imageresizershrinker.coreui.utils.helper.localImagePickerMode -import ru.tech.imageresizershrinker.coreui.utils.helper.rememberImagePicker -import ru.tech.imageresizershrinker.coreui.utils.helper.showReview -import ru.tech.imageresizershrinker.coreui.utils.navigation.Screen -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedFloatingActionButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.controls.ExtensionGroup -import ru.tech.imageresizershrinker.coreui.widget.controls.ImageReorderCarousel -import ru.tech.imageresizershrinker.coreui.widget.controls.PresetWidget -import ru.tech.imageresizershrinker.coreui.widget.controls.QualityWidget -import ru.tech.imageresizershrinker.coreui.widget.controls.ScaleSmallImagesToLargeToggle -import ru.tech.imageresizershrinker.coreui.widget.dialogs.ExitWithoutSavingDialog -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.modifier.navBarsPaddingOnlyIfTheyAtTheEnd -import ru.tech.imageresizershrinker.coreui.widget.other.LoadingDialog -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.TopAppBarEmoji -import ru.tech.imageresizershrinker.coreui.widget.other.showError -import ru.tech.imageresizershrinker.coreui.widget.preferences.PreferenceItem -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.PdfToImagesPreference -import ru.tech.imageresizershrinker.coreui.widget.preferences.screens.PreviewPdfPreference -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.text.Marquee -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiController +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.getFileName +import ru.tech.imageresizershrinker.core.ui.utils.helper.Picker +import ru.tech.imageresizershrinker.core.ui.utils.helper.localImagePickerMode +import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberImagePicker +import ru.tech.imageresizershrinker.core.ui.utils.helper.showReview +import ru.tech.imageresizershrinker.core.ui.utils.navigation.Screen +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedFloatingActionButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.ExtensionGroup +import ru.tech.imageresizershrinker.core.ui.widget.controls.ImageReorderCarousel +import ru.tech.imageresizershrinker.core.ui.widget.controls.PresetWidget +import ru.tech.imageresizershrinker.core.ui.widget.controls.QualityWidget +import ru.tech.imageresizershrinker.core.ui.widget.controls.ScaleSmallImagesToLargeToggle +import ru.tech.imageresizershrinker.core.ui.widget.dialogs.ExitWithoutSavingDialog +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.modifier.navBarsPaddingOnlyIfTheyAtTheEnd +import ru.tech.imageresizershrinker.core.ui.widget.other.LoadingDialog +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.TopAppBarEmoji +import ru.tech.imageresizershrinker.core.ui.widget.other.showError +import ru.tech.imageresizershrinker.core.ui.widget.preferences.PreferenceItem +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.PdfToImagesPreference +import ru.tech.imageresizershrinker.core.ui.widget.preferences.screens.PreviewPdfPreference +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.Marquee +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass import ru.tech.imageresizershrinker.feature.pdf_tools.presentation.components.PdfViewer import ru.tech.imageresizershrinker.feature.pdf_tools.presentation.components.PdfViewerOrientation import ru.tech.imageresizershrinker.feature.pdf_tools.presentation.viewModel.PdfToolsViewModel diff --git a/feature/pdf-tools/src/main/java/ru/tech/imageresizershrinker/feature/pdf_tools/presentation/components/PdfViewer.kt b/feature/pdf-tools/src/main/java/ru/tech/imageresizershrinker/feature/pdf_tools/presentation/components/PdfViewer.kt index 7d45b1e79..3879329b8 100644 --- a/feature/pdf-tools/src/main/java/ru/tech/imageresizershrinker/feature/pdf_tools/presentation/components/PdfViewer.kt +++ b/feature/pdf-tools/src/main/java/ru/tech/imageresizershrinker/feature/pdf_tools/presentation/components/PdfViewer.kt @@ -96,12 +96,12 @@ import kotlinx.coroutines.sync.withLock import my.nanihadesuka.compose.LazyColumnScrollbar import my.nanihadesuka.compose.ScrollbarSelectionMode import ru.tech.imageresizershrinker.core.domain.model.IntegerSize -import ru.tech.imageresizershrinker.coreui.utils.state.update -import ru.tech.imageresizershrinker.coreui.widget.image.Picture -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.other.Loading -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalImageLoader -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.utils.state.update +import ru.tech.imageresizershrinker.core.ui.widget.image.Picture +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.other.Loading +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalImageLoader +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass import kotlin.math.max import kotlin.math.sqrt diff --git a/feature/pdf-tools/src/main/java/ru/tech/imageresizershrinker/feature/pdf_tools/presentation/viewModel/PdfToolsViewModel.kt b/feature/pdf-tools/src/main/java/ru/tech/imageresizershrinker/feature/pdf_tools/presentation/viewModel/PdfToolsViewModel.kt index 51c8d9708..e63e81134 100644 --- a/feature/pdf-tools/src/main/java/ru/tech/imageresizershrinker/feature/pdf_tools/presentation/viewModel/PdfToolsViewModel.kt +++ b/feature/pdf-tools/src/main/java/ru/tech/imageresizershrinker/feature/pdf_tools/presentation/viewModel/PdfToolsViewModel.kt @@ -23,8 +23,8 @@ import ru.tech.imageresizershrinker.core.domain.saving.FileController import ru.tech.imageresizershrinker.core.domain.saving.SaveResult import ru.tech.imageresizershrinker.core.domain.saving.model.ImageSaveTarget import ru.tech.imageresizershrinker.feature.pdf_tools.presentation.components.PdfToImageState -import ru.tech.imageresizershrinker.coreui.utils.navigation.Screen -import ru.tech.imageresizershrinker.coreui.utils.state.update +import ru.tech.imageresizershrinker.core.ui.utils.navigation.Screen +import ru.tech.imageresizershrinker.core.ui.utils.state.update import java.io.OutputStream import java.text.SimpleDateFormat import java.util.Date diff --git a/feature/pick-color/build.gradle.kts b/feature/pick-color/build.gradle.kts index 10da25f49..a4ac6e2bf 100644 --- a/feature/pick-color/build.gradle.kts +++ b/feature/pick-color/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { implementation(project(":core:domain")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) implementation(project(":core:data")) implementation(project(":core:resources")) diff --git a/feature/pick-color/src/main/java/ru/tech/imageresizershrinker/feature/pick_color/presentation/PickColorFromImageScreen.kt b/feature/pick-color/src/main/java/ru/tech/imageresizershrinker/feature/pick_color/presentation/PickColorFromImageScreen.kt index c019af5b7..723c6fae7 100644 --- a/feature/pick-color/src/main/java/ru/tech/imageresizershrinker/feature/pick_color/presentation/PickColorFromImageScreen.kt +++ b/feature/pick-color/src/main/java/ru/tech/imageresizershrinker/feature/pick_color/presentation/PickColorFromImageScreen.kt @@ -79,32 +79,32 @@ import dev.olshevski.navigation.reimagined.pop import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R import ru.tech.imageresizershrinker.feature.pick_color.presentation.viewModel.PickColorViewModel -import ru.tech.imageresizershrinker.coreui.icons.material.PaletteSwatch -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.copyToClipboard -import ru.tech.imageresizershrinker.coreui.utils.helper.Picker -import ru.tech.imageresizershrinker.coreui.utils.helper.localImagePickerMode -import ru.tech.imageresizershrinker.coreui.utils.helper.rememberImagePicker -import ru.tech.imageresizershrinker.coreui.utils.helper.toHex -import ru.tech.imageresizershrinker.coreui.utils.navigation.LocalNavController -import ru.tech.imageresizershrinker.coreui.utils.navigation.Screen -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedFloatingActionButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSwitch -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSwitchDefaults -import ru.tech.imageresizershrinker.coreui.widget.image.ImageNotPickedWidget -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.modifier.navBarsPaddingOnlyIfTheyAtTheBottom -import ru.tech.imageresizershrinker.coreui.widget.modifier.navBarsPaddingOnlyIfTheyAtTheEnd -import ru.tech.imageresizershrinker.coreui.widget.modifier.transparencyChecker -import ru.tech.imageresizershrinker.coreui.widget.other.LoadingDialog -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.TopAppBarEmoji -import ru.tech.imageresizershrinker.coreui.widget.other.showError -import ru.tech.imageresizershrinker.coreui.widget.text.Marquee -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.icons.material.PaletteSwatch +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.copyToClipboard +import ru.tech.imageresizershrinker.core.ui.utils.helper.Picker +import ru.tech.imageresizershrinker.core.ui.utils.helper.localImagePickerMode +import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberImagePicker +import ru.tech.imageresizershrinker.core.ui.utils.helper.toHex +import ru.tech.imageresizershrinker.core.ui.utils.navigation.LocalNavController +import ru.tech.imageresizershrinker.core.ui.utils.navigation.Screen +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedFloatingActionButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSwitch +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSwitchDefaults +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageNotPickedWidget +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.modifier.navBarsPaddingOnlyIfTheyAtTheBottom +import ru.tech.imageresizershrinker.core.ui.widget.modifier.navBarsPaddingOnlyIfTheyAtTheEnd +import ru.tech.imageresizershrinker.core.ui.widget.modifier.transparencyChecker +import ru.tech.imageresizershrinker.core.ui.widget.other.LoadingDialog +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.TopAppBarEmoji +import ru.tech.imageresizershrinker.core.ui.widget.other.showError +import ru.tech.imageresizershrinker.core.ui.widget.text.Marquee +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/feature/pick-color/src/main/java/ru/tech/imageresizershrinker/feature/pick_color/presentation/components/PickColorFromImageSheet.kt b/feature/pick-color/src/main/java/ru/tech/imageresizershrinker/feature/pick_color/presentation/components/PickColorFromImageSheet.kt index 71edf7646..0337018f1 100644 --- a/feature/pick-color/src/main/java/ru/tech/imageresizershrinker/feature/pick_color/presentation/components/PickColorFromImageSheet.kt +++ b/feature/pick-color/src/main/java/ru/tech/imageresizershrinker/feature/pick_color/presentation/components/PickColorFromImageSheet.kt @@ -39,17 +39,17 @@ import androidx.compose.ui.unit.dp import com.smarttoolfactory.colordetector.ImageColorDetector import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.utils.helper.ContextUtils.copyToClipboard -import ru.tech.imageresizershrinker.coreui.utils.helper.toHex -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSwitch -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSwitchDefaults -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.shimmer -import ru.tech.imageresizershrinker.coreui.widget.modifier.transparencyChecker -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.sheets.SimpleSheet -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.utils.helper.ContextUtils.copyToClipboard +import ru.tech.imageresizershrinker.core.ui.utils.helper.toHex +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSwitch +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSwitchDefaults +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.shimmer +import ru.tech.imageresizershrinker.core.ui.widget.modifier.transparencyChecker +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.sheets.SimpleSheet +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @Composable fun PickColorFromImageSheet( diff --git a/feature/resize-convert/build.gradle.kts b/feature/resize-convert/build.gradle.kts index 25be63f5a..4849f9232 100644 --- a/feature/resize-convert/build.gradle.kts +++ b/feature/resize-convert/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { implementation(project(":core:domain")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) implementation(project(":core:data")) implementation(project(":core:resources")) diff --git a/feature/resize-convert/src/main/java/ru/tech/imageresizershrinker/feature/resize_convert/presentation/ResizeAndConvertScreen.kt b/feature/resize-convert/src/main/java/ru/tech/imageresizershrinker/feature/resize_convert/presentation/ResizeAndConvertScreen.kt index f99cd3658..4c8cd3c73 100644 --- a/feature/resize-convert/src/main/java/ru/tech/imageresizershrinker/feature/resize_convert/presentation/ResizeAndConvertScreen.kt +++ b/feature/resize-convert/src/main/java/ru/tech/imageresizershrinker/feature/resize_convert/presentation/ResizeAndConvertScreen.kt @@ -78,43 +78,43 @@ import dev.olshevski.navigation.reimagined.hilt.hiltViewModel import kotlinx.coroutines.delay import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.transformation.ImageInfoTransformation -import ru.tech.imageresizershrinker.coreui.utils.confetti.LocalConfettiController -import ru.tech.imageresizershrinker.coreui.utils.helper.Picker -import ru.tech.imageresizershrinker.coreui.utils.helper.localImagePickerMode -import ru.tech.imageresizershrinker.coreui.utils.helper.rememberImagePicker -import ru.tech.imageresizershrinker.coreui.widget.buttons.BottomButtonsBlock -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.controls.ExtensionGroup -import ru.tech.imageresizershrinker.coreui.widget.controls.ImageTransformBar -import ru.tech.imageresizershrinker.coreui.widget.controls.PresetWidget -import ru.tech.imageresizershrinker.coreui.widget.controls.QualityWidget -import ru.tech.imageresizershrinker.coreui.widget.controls.ResizeImageField -import ru.tech.imageresizershrinker.coreui.widget.controls.SaveExifWidget -import ru.tech.imageresizershrinker.coreui.widget.controls.resize_group.ResizeTypeSelector -import ru.tech.imageresizershrinker.coreui.widget.dialogs.ExitWithoutSavingDialog -import ru.tech.imageresizershrinker.coreui.widget.dialogs.ResetDialog -import ru.tech.imageresizershrinker.coreui.widget.image.ImageContainer -import ru.tech.imageresizershrinker.coreui.widget.image.ImageCounter -import ru.tech.imageresizershrinker.coreui.widget.image.ImageNotPickedWidget -import ru.tech.imageresizershrinker.coreui.widget.image.imageStickyHeader -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.modifier.navBarsLandscapePadding -import ru.tech.imageresizershrinker.coreui.widget.other.LoadingDialog -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.TopAppBarEmoji -import ru.tech.imageresizershrinker.coreui.widget.other.showError -import ru.tech.imageresizershrinker.coreui.widget.sheets.CompareSheet -import ru.tech.imageresizershrinker.coreui.widget.sheets.EditExifSheet -import ru.tech.imageresizershrinker.coreui.widget.sheets.PickImageFromUrisSheet -import ru.tech.imageresizershrinker.coreui.widget.sheets.ZoomModalSheet -import ru.tech.imageresizershrinker.coreui.widget.text.TopAppBarTitle -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass -import ru.tech.imageresizershrinker.coreui.widget.utils.isExpanded -import ru.tech.imageresizershrinker.coreui.widget.utils.middleImageState -import ru.tech.imageresizershrinker.coreui.widget.utils.rememberAvailableHeight +import ru.tech.imageresizershrinker.core.ui.transformation.ImageInfoTransformation +import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiController +import ru.tech.imageresizershrinker.core.ui.utils.helper.Picker +import ru.tech.imageresizershrinker.core.ui.utils.helper.localImagePickerMode +import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberImagePicker +import ru.tech.imageresizershrinker.core.ui.widget.buttons.BottomButtonsBlock +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.ExtensionGroup +import ru.tech.imageresizershrinker.core.ui.widget.controls.ImageTransformBar +import ru.tech.imageresizershrinker.core.ui.widget.controls.PresetWidget +import ru.tech.imageresizershrinker.core.ui.widget.controls.QualityWidget +import ru.tech.imageresizershrinker.core.ui.widget.controls.ResizeImageField +import ru.tech.imageresizershrinker.core.ui.widget.controls.SaveExifWidget +import ru.tech.imageresizershrinker.core.ui.widget.controls.resize_group.ResizeTypeSelector +import ru.tech.imageresizershrinker.core.ui.widget.dialogs.ExitWithoutSavingDialog +import ru.tech.imageresizershrinker.core.ui.widget.dialogs.ResetDialog +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageContainer +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageCounter +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageNotPickedWidget +import ru.tech.imageresizershrinker.core.ui.widget.image.imageStickyHeader +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.modifier.navBarsLandscapePadding +import ru.tech.imageresizershrinker.core.ui.widget.other.LoadingDialog +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.TopAppBarEmoji +import ru.tech.imageresizershrinker.core.ui.widget.other.showError +import ru.tech.imageresizershrinker.core.ui.widget.sheets.CompareSheet +import ru.tech.imageresizershrinker.core.ui.widget.sheets.EditExifSheet +import ru.tech.imageresizershrinker.core.ui.widget.sheets.PickImageFromUrisSheet +import ru.tech.imageresizershrinker.core.ui.widget.sheets.ZoomModalSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.TopAppBarTitle +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.widget.utils.isExpanded +import ru.tech.imageresizershrinker.core.ui.widget.utils.middleImageState +import ru.tech.imageresizershrinker.core.ui.widget.utils.rememberAvailableHeight import ru.tech.imageresizershrinker.feature.resize_convert.presentation.viewModel.ResizeAndConvertViewModel @OptIn(ExperimentalMaterial3Api::class) diff --git a/feature/single-edit/build.gradle.kts b/feature/single-edit/build.gradle.kts index cd632baea..ce3bb4f9f 100644 --- a/feature/single-edit/build.gradle.kts +++ b/feature/single-edit/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { implementation(project(":core:domain")) - implementation(project(":core-ui")) + implementation(project(":core:ui")) implementation(project(":core:data")) implementation(project(":core:resources")) diff --git a/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/SingeEditScreen.kt b/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/SingeEditScreen.kt index 274f0206d..219df9314 100644 --- a/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/SingeEditScreen.kt +++ b/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/SingeEditScreen.kt @@ -74,43 +74,43 @@ import dev.olshevski.navigation.reimagined.hilt.hiltViewModel import kotlinx.coroutines.delay import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.utils.confetti.LocalConfettiController -import ru.tech.imageresizershrinker.coreui.utils.helper.Picker -import ru.tech.imageresizershrinker.coreui.utils.helper.localImagePickerMode -import ru.tech.imageresizershrinker.coreui.utils.helper.parseSaveResult -import ru.tech.imageresizershrinker.coreui.utils.helper.rememberImagePicker -import ru.tech.imageresizershrinker.coreui.widget.buttons.BottomButtonsBlock -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.controls.ExtensionGroup -import ru.tech.imageresizershrinker.coreui.widget.controls.ImageExtraTransformBar -import ru.tech.imageresizershrinker.coreui.widget.controls.ImageTransformBar -import ru.tech.imageresizershrinker.coreui.widget.controls.PresetWidget -import ru.tech.imageresizershrinker.coreui.widget.controls.QualityWidget -import ru.tech.imageresizershrinker.coreui.widget.controls.ResizeImageField -import ru.tech.imageresizershrinker.coreui.widget.controls.resize_group.ResizeTypeSelector -import ru.tech.imageresizershrinker.coreui.widget.dialogs.ExitWithoutSavingDialog -import ru.tech.imageresizershrinker.coreui.widget.dialogs.ResetDialog -import ru.tech.imageresizershrinker.coreui.widget.image.ImageContainer -import ru.tech.imageresizershrinker.coreui.widget.image.ImageNotPickedWidget -import ru.tech.imageresizershrinker.coreui.widget.image.imageStickyHeader -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.modifier.navBarsLandscapePadding -import ru.tech.imageresizershrinker.coreui.widget.other.LoadingDialog -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.TopAppBarEmoji -import ru.tech.imageresizershrinker.coreui.widget.other.showError -import ru.tech.imageresizershrinker.coreui.widget.sheets.CompareSheet -import ru.tech.imageresizershrinker.coreui.widget.sheets.ZoomModalSheet -import ru.tech.imageresizershrinker.coreui.widget.text.TopAppBarTitle -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalWindowSizeClass -import ru.tech.imageresizershrinker.coreui.widget.utils.isExpanded -import ru.tech.imageresizershrinker.coreui.widget.utils.middleImageState -import ru.tech.imageresizershrinker.coreui.widget.utils.rememberAvailableHeight +import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiController +import ru.tech.imageresizershrinker.core.ui.utils.helper.Picker +import ru.tech.imageresizershrinker.core.ui.utils.helper.localImagePickerMode +import ru.tech.imageresizershrinker.core.ui.utils.helper.parseSaveResult +import ru.tech.imageresizershrinker.core.ui.utils.helper.rememberImagePicker +import ru.tech.imageresizershrinker.core.ui.widget.buttons.BottomButtonsBlock +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.ExtensionGroup +import ru.tech.imageresizershrinker.core.ui.widget.controls.ImageExtraTransformBar +import ru.tech.imageresizershrinker.core.ui.widget.controls.ImageTransformBar +import ru.tech.imageresizershrinker.core.ui.widget.controls.PresetWidget +import ru.tech.imageresizershrinker.core.ui.widget.controls.QualityWidget +import ru.tech.imageresizershrinker.core.ui.widget.controls.ResizeImageField +import ru.tech.imageresizershrinker.core.ui.widget.controls.resize_group.ResizeTypeSelector +import ru.tech.imageresizershrinker.core.ui.widget.dialogs.ExitWithoutSavingDialog +import ru.tech.imageresizershrinker.core.ui.widget.dialogs.ResetDialog +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageContainer +import ru.tech.imageresizershrinker.core.ui.widget.image.ImageNotPickedWidget +import ru.tech.imageresizershrinker.core.ui.widget.image.imageStickyHeader +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.modifier.navBarsLandscapePadding +import ru.tech.imageresizershrinker.core.ui.widget.other.LoadingDialog +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.TopAppBarEmoji +import ru.tech.imageresizershrinker.core.ui.widget.other.showError +import ru.tech.imageresizershrinker.core.ui.widget.sheets.CompareSheet +import ru.tech.imageresizershrinker.core.ui.widget.sheets.ZoomModalSheet +import ru.tech.imageresizershrinker.core.ui.widget.text.TopAppBarTitle +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalWindowSizeClass +import ru.tech.imageresizershrinker.core.ui.widget.utils.isExpanded +import ru.tech.imageresizershrinker.core.ui.widget.utils.middleImageState +import ru.tech.imageresizershrinker.core.ui.widget.utils.rememberAvailableHeight import ru.tech.imageresizershrinker.feature.single_edit.presentation.components.CropEditOption import ru.tech.imageresizershrinker.feature.single_edit.presentation.components.DrawEditOption -import ru.tech.imageresizershrinker.coreui.widget.sheets.EditExifSheet +import ru.tech.imageresizershrinker.core.ui.widget.sheets.EditExifSheet import ru.tech.imageresizershrinker.feature.single_edit.presentation.components.EraseBackgroundEditOption import ru.tech.imageresizershrinker.feature.single_edit.presentation.components.FilterEditOption import ru.tech.imageresizershrinker.feature.single_edit.presentation.viewModel.SingleEditViewModel diff --git a/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/CropEditOption.kt b/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/CropEditOption.kt index 5d487cc00..a4609b63d 100644 --- a/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/CropEditOption.kt +++ b/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/CropEditOption.kt @@ -42,11 +42,11 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.domain.model.DomainAspectRatio import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.modifier.autoElevatedBorder -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.other.Loading -import ru.tech.imageresizershrinker.coreui.widget.text.Marquee +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.modifier.autoElevatedBorder +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.other.Loading +import ru.tech.imageresizershrinker.core.ui.widget.text.Marquee import ru.tech.imageresizershrinker.feature.crop.presentation.components.AspectRatioSelection import ru.tech.imageresizershrinker.feature.crop.presentation.components.CropMaskSelection import ru.tech.imageresizershrinker.feature.crop.presentation.components.Cropper diff --git a/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/DrawEditOption.kt b/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/DrawEditOption.kt index dde0326a3..b7d6b84aa 100644 --- a/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/DrawEditOption.kt +++ b/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/DrawEditOption.kt @@ -52,30 +52,30 @@ import ru.tech.imageresizershrinker.core.domain.image.draw.DrawMode import ru.tech.imageresizershrinker.core.domain.image.draw.DrawPathMode import ru.tech.imageresizershrinker.core.domain.image.draw.pt import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.Eraser -import ru.tech.imageresizershrinker.coreui.model.PtSaver -import ru.tech.imageresizershrinker.coreui.model.UiPathPaint -import ru.tech.imageresizershrinker.coreui.theme.mixedContainer -import ru.tech.imageresizershrinker.coreui.theme.onMixedContainer -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSwitch -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSwitchDefaults -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.BrushSoftnessSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.DrawAlphaSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.DrawColorSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.DrawModeSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.DrawPathModeSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.LineWidthSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.OpenColorPickerCard -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.other.DrawLockScreenOrientation -import ru.tech.imageresizershrinker.coreui.widget.saver.ColorSaver -import ru.tech.imageresizershrinker.coreui.widget.saver.DrawModeSaver -import ru.tech.imageresizershrinker.coreui.widget.saver.DrawPathModeSaver -import ru.tech.imageresizershrinker.coreui.widget.text.Marquee -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.Eraser +import ru.tech.imageresizershrinker.core.ui.model.PtSaver +import ru.tech.imageresizershrinker.core.ui.model.UiPathPaint +import ru.tech.imageresizershrinker.core.ui.theme.mixedContainer +import ru.tech.imageresizershrinker.core.ui.theme.onMixedContainer +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSwitch +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSwitchDefaults +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.BrushSoftnessSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.DrawAlphaSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.DrawColorSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.DrawModeSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.DrawPathModeSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.LineWidthSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.OpenColorPickerCard +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.other.DrawLockScreenOrientation +import ru.tech.imageresizershrinker.core.ui.widget.saver.ColorSaver +import ru.tech.imageresizershrinker.core.ui.widget.saver.DrawModeSaver +import ru.tech.imageresizershrinker.core.ui.widget.saver.DrawPathModeSaver +import ru.tech.imageresizershrinker.core.ui.widget.text.Marquee +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState import ru.tech.imageresizershrinker.feature.draw.presentation.components.BitmapDrawer import ru.tech.imageresizershrinker.feature.pick_color.presentation.components.PickColorFromImageSheet diff --git a/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/EraseBackgroundEditOption.kt b/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/EraseBackgroundEditOption.kt index 6f766f27e..ee0653f20 100644 --- a/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/EraseBackgroundEditOption.kt +++ b/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/EraseBackgroundEditOption.kt @@ -50,28 +50,28 @@ import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.domain.image.ImageManager import ru.tech.imageresizershrinker.core.domain.image.draw.pt import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.icons.material.Transparency -import ru.tech.imageresizershrinker.coreui.model.PtSaver -import ru.tech.imageresizershrinker.coreui.model.UiPathPaint -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.utils.confetti.LocalConfettiController -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSwitch -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedSwitchDefaults -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.AutoEraseBackgroundCard -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.BrushSoftnessSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.EraseModeButton -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.EraseModeCard -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.LineWidthSelector -import ru.tech.imageresizershrinker.coreui.widget.controls.draw.TrimImageToggle -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.other.DrawLockScreenOrientation -import ru.tech.imageresizershrinker.coreui.widget.other.Loading -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.showError -import ru.tech.imageresizershrinker.coreui.widget.text.Marquee -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.icons.material.Transparency +import ru.tech.imageresizershrinker.core.ui.model.PtSaver +import ru.tech.imageresizershrinker.core.ui.model.UiPathPaint +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.utils.confetti.LocalConfettiController +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSwitch +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedSwitchDefaults +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.AutoEraseBackgroundCard +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.BrushSoftnessSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.EraseModeButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.EraseModeCard +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.LineWidthSelector +import ru.tech.imageresizershrinker.core.ui.widget.controls.draw.TrimImageToggle +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.other.DrawLockScreenOrientation +import ru.tech.imageresizershrinker.core.ui.widget.other.Loading +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.showError +import ru.tech.imageresizershrinker.core.ui.widget.text.Marquee +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState import ru.tech.imageresizershrinker.feature.erase_background.presentation.components.BitmapEraser @OptIn(ExperimentalMaterial3Api::class) diff --git a/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/FilterEditOption.kt b/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/FilterEditOption.kt index 3bdde19cb..b9fbdd090 100644 --- a/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/FilterEditOption.kt +++ b/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/FilterEditOption.kt @@ -55,19 +55,19 @@ import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.core.domain.image.ImageManager import ru.tech.imageresizershrinker.core.domain.image.Transformation import ru.tech.imageresizershrinker.core.resources.R -import ru.tech.imageresizershrinker.coreui.theme.mixedContainer -import ru.tech.imageresizershrinker.coreui.utils.helper.ImageUtils.toBitmap -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedButton -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.image.Picture -import ru.tech.imageresizershrinker.coreui.widget.modifier.autoElevatedBorder -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.modifier.transparencyChecker -import ru.tech.imageresizershrinker.coreui.widget.other.LocalToastHost -import ru.tech.imageresizershrinker.coreui.widget.other.showError -import ru.tech.imageresizershrinker.coreui.widget.text.Marquee -import ru.tech.imageresizershrinker.coreui.widget.text.TitleItem +import ru.tech.imageresizershrinker.core.ui.theme.mixedContainer +import ru.tech.imageresizershrinker.core.ui.utils.helper.ImageUtils.toBitmap +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedButton +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.image.Picture +import ru.tech.imageresizershrinker.core.ui.widget.modifier.autoElevatedBorder +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.modifier.transparencyChecker +import ru.tech.imageresizershrinker.core.ui.widget.other.LocalToastHost +import ru.tech.imageresizershrinker.core.ui.widget.other.showError +import ru.tech.imageresizershrinker.core.ui.widget.text.Marquee +import ru.tech.imageresizershrinker.core.ui.widget.text.TitleItem import ru.tech.imageresizershrinker.feature.filters.presentation.components.FilterItem @OptIn(ExperimentalMaterial3Api::class) diff --git a/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/FullscreenEditOption.kt b/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/FullscreenEditOption.kt index 5dc5458a8..0142fb22c 100644 --- a/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/FullscreenEditOption.kt +++ b/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/components/FullscreenEditOption.kt @@ -44,13 +44,13 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.RectangleShape import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch -import ru.tech.imageresizershrinker.coreui.theme.outlineVariant -import ru.tech.imageresizershrinker.coreui.widget.controls.EnhancedIconButton -import ru.tech.imageresizershrinker.coreui.widget.dialogs.ExitWithoutSavingDialog -import ru.tech.imageresizershrinker.coreui.widget.modifier.container -import ru.tech.imageresizershrinker.coreui.widget.modifier.drawHorizontalStroke -import ru.tech.imageresizershrinker.coreui.widget.modifier.navBarsPaddingOnlyIfTheyAtTheEnd -import ru.tech.imageresizershrinker.coreui.widget.utils.LocalSettingsState +import ru.tech.imageresizershrinker.core.ui.theme.outlineVariant +import ru.tech.imageresizershrinker.core.ui.widget.controls.EnhancedIconButton +import ru.tech.imageresizershrinker.core.ui.widget.dialogs.ExitWithoutSavingDialog +import ru.tech.imageresizershrinker.core.ui.widget.modifier.container +import ru.tech.imageresizershrinker.core.ui.widget.modifier.drawHorizontalStroke +import ru.tech.imageresizershrinker.core.ui.widget.modifier.navBarsPaddingOnlyIfTheyAtTheEnd +import ru.tech.imageresizershrinker.core.ui.widget.utils.LocalSettingsState @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/viewModel/SingleEditViewModel.kt b/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/viewModel/SingleEditViewModel.kt index 802ce888c..3ed8204cd 100644 --- a/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/viewModel/SingleEditViewModel.kt +++ b/feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/viewModel/SingleEditViewModel.kt @@ -32,8 +32,8 @@ import ru.tech.imageresizershrinker.core.domain.model.ResizeType import ru.tech.imageresizershrinker.core.domain.saving.FileController import ru.tech.imageresizershrinker.core.domain.saving.SaveResult import ru.tech.imageresizershrinker.core.domain.saving.model.ImageSaveTarget -import ru.tech.imageresizershrinker.coreui.model.UiPathPaint -import ru.tech.imageresizershrinker.coreui.utils.state.update +import ru.tech.imageresizershrinker.core.ui.model.UiPathPaint +import ru.tech.imageresizershrinker.core.ui.utils.state.update import javax.inject.Inject @HiltViewModel diff --git a/settings.gradle.kts b/settings.gradle.kts index f1787ce9b..9d432e79b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -49,8 +49,9 @@ include(":feature:cipher") include(":feature:limits-resize") include(":feature:crop") include(":feature:load-net-image") -include(":core-ui") + include(":feature:main") include(":core:resources") include(":core:data") -include(":core:domain") \ No newline at end of file +include(":core:domain") +include(":core:ui") \ No newline at end of file