From d1b7376633a1e2ce9de05bee80333a9e7235c2d7 Mon Sep 17 00:00:00 2001 From: Acclorite <2ma0bhpk@anonaddy.com> Date: Tue, 3 Jun 2025 09:48:47 +0300 Subject: [PATCH] refactor: move presentation/theme to ui/theme --- .../presentation/crash/CrashActivity.kt | 4 +- .../presentation/main/MainActivity.kt | 8 ++-- .../book_story/presentation/main/MainModel.kt | 2 +- .../book_story/presentation/main/MainState.kt | 4 +- .../book_story/ui/book_info/BookInfoTopBar.kt | 2 +- .../ui/browse/BrowseEmptyPlaceholder.kt | 2 +- .../ui/browse/BrowseGridFileItem.kt | 2 +- .../book_story/ui/browse/BrowseListItem.kt | 2 +- .../book_story/ui/browse/BrowseScaffold.kt | 2 +- .../acclorite/book_story/ui/help/HelpItem.kt | 2 +- .../ui/history/HistoryEmptyPlaceholder.kt | 2 +- .../book_story/ui/history/HistoryLayout.kt | 2 +- .../ui/library/LibraryEmptyPlaceholder.kt | 2 +- .../book_story/ui/library/LibraryPager.kt | 2 +- .../ui/license_info/LicenseInfoItem.kt | 2 +- .../ui/license_info/LicenseInfoScaffold.kt | 2 +- .../book_story/ui/reader/ReaderBottomBar.kt | 4 +- .../ui/reader/ReaderChaptersDrawer.kt | 2 +- .../book_story/ui/reader/ReaderTopBar.kt | 2 +- .../ui/settings/SettingsLayoutItem.kt | 2 +- .../colors/components/ColorPresetOption.kt | 4 +- .../components/AbsoluteDarkOption.kt | 2 +- .../components/AppThemeOption.kt | 4 +- .../components/PureDarkOption.kt | 2 +- .../components/ThemeContrastOption.kt | 4 +- .../components/BrowseGridSizeOption.kt | 2 +- .../scan/components/BrowseScanOption.kt | 2 +- .../components/LibraryCategoriesOption.kt | 4 +- .../components/LibraryGridSizeOption.kt | 2 +- .../components/LibraryTitlePositionOption.kt | 2 +- .../components/ImagesAlignmentOption.kt | 2 +- .../components/ImagesColorEffectsOption.kt | 2 +- .../ImagesCornersRoundnessOption.kt | 2 +- .../images/components/ImagesWidthOption.kt | 2 +- .../components/ProgressBarAlignmentOption.kt | 2 +- .../components/ProgressBarFontSizeOption.kt | 2 +- .../components/ProgressBarPaddingOption.kt | 2 +- .../HorizontalGestureAlphaAnimOption.kt | 2 +- .../HorizontalGesturePullAnimOption.kt | 2 +- .../HorizontalGestureScrollOption.kt | 2 +- .../HorizontalGestureSensitivityOption.kt | 2 +- .../HighlightedReadingThicknessOption.kt | 2 +- .../PerceptionExpanderPaddingOption.kt | 2 +- .../PerceptionExpanderThicknessOption.kt | 2 +- .../components/ScreenBrightnessOption.kt | 2 +- .../components/ParagraphIndentationOption.kt | 2 +- .../ui/start/StartContentTransition.kt | 2 +- .../{presentation => ui}/theme/Animations.kt | 2 +- .../{presentation => ui}/theme/Color.kt | 40 +++++++++---------- .../{presentation => ui}/theme/Theme.kt | 2 +- .../theme/ThemeExtensions.kt | 2 +- .../{presentation => ui}/theme/ThemeLogger.kt | 2 +- .../{presentation => ui}/theme/Transitions.kt | 2 +- .../theme/color/AquaTheme.kt | 2 +- .../theme/color/BlackTheme.kt | 2 +- .../theme/color/BlueTheme.kt | 2 +- .../theme/color/DynamicTheme.kt | 2 +- .../theme/color/Green2Theme.kt | 2 +- .../theme/color/GreenGrayTheme.kt | 2 +- .../theme/color/GreenTheme.kt | 2 +- .../theme/color/LavenderTheme.kt | 2 +- .../theme/color/MarshTheme.kt | 2 +- .../theme/color/Pink2Theme.kt | 2 +- .../theme/color/PinkTheme.kt | 2 +- .../theme/color/PurpleGrayTheme.kt | 2 +- .../theme/color/PurpleTheme.kt | 2 +- .../theme/color/RedGrayTheme.kt | 2 +- .../theme/color/RedTheme.kt | 2 +- .../theme/color/Yellow2Theme.kt | 2 +- .../theme/color/YellowTheme.kt | 2 +- 70 files changed, 99 insertions(+), 99 deletions(-) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/Animations.kt (98%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/Color.kt (77%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/Theme.kt (97%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/ThemeExtensions.kt (91%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/ThemeLogger.kt (98%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/Transitions.kt (98%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/color/AquaTheme.kt (99%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/color/BlackTheme.kt (96%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/color/BlueTheme.kt (99%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/color/DynamicTheme.kt (97%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/color/Green2Theme.kt (99%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/color/GreenGrayTheme.kt (99%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/color/GreenTheme.kt (99%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/color/LavenderTheme.kt (99%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/color/MarshTheme.kt (99%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/color/Pink2Theme.kt (99%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/color/PinkTheme.kt (99%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/color/PurpleGrayTheme.kt (99%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/color/PurpleTheme.kt (99%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/color/RedGrayTheme.kt (99%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/color/RedTheme.kt (99%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/color/Yellow2Theme.kt (99%) rename app/src/main/java/ua/acclorite/book_story/{presentation => ui}/theme/color/YellowTheme.kt (99%) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashActivity.kt b/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashActivity.kt index 85357319..e9ebadd3 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashActivity.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashActivity.kt @@ -13,8 +13,8 @@ import androidx.appcompat.app.AppCompatActivity import androidx.compose.foundation.isSystemInDarkTheme import androidx.core.view.WindowCompat import ua.acclorite.book_story.presentation.main.model.ThemeContrast -import ua.acclorite.book_story.presentation.theme.BookStoryTheme -import ua.acclorite.book_story.presentation.theme.Theme +import ua.acclorite.book_story.ui.theme.BookStoryTheme +import ua.acclorite.book_story.ui.theme.Theme class CrashActivity : AppCompatActivity() { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/main/MainActivity.kt b/app/src/main/java/ua/acclorite/book_story/presentation/main/MainActivity.kt index 656327e0..6a08d1dd 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/main/MainActivity.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/main/MainActivity.kt @@ -21,7 +21,7 @@ import androidx.core.view.WindowCompat import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import dagger.hilt.android.AndroidEntryPoint -import okhttp3.internal.immutableListOf +import kotlinx.collections.immutable.persistentListOf import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.browse.BrowseModel import ua.acclorite.book_story.presentation.browse.BrowseScreen @@ -35,13 +35,13 @@ import ua.acclorite.book_story.presentation.navigator.NavigatorItem import ua.acclorite.book_story.presentation.navigator.StackEvent import ua.acclorite.book_story.presentation.settings.SettingsModel import ua.acclorite.book_story.presentation.start.StartScreen -import ua.acclorite.book_story.presentation.theme.BookStoryTheme -import ua.acclorite.book_story.presentation.theme.Transitions import ua.acclorite.book_story.ui.common.components.navigation_bar.NavigationBar import ua.acclorite.book_story.ui.common.components.navigation_rail.NavigationRail import ua.acclorite.book_story.ui.main.MainActivityKeyboardManager import ua.acclorite.book_story.ui.navigator.Navigator import ua.acclorite.book_story.ui.navigator.NavigatorTabs +import ua.acclorite.book_story.ui.theme.BookStoryTheme +import ua.acclorite.book_story.ui.theme.Transitions import java.lang.reflect.Field @@ -88,7 +88,7 @@ class MainActivity : AppCompatActivity() { val state = mainModel.state.collectAsStateWithLifecycle() val isLoaded = mainModel.isReady.collectAsStateWithLifecycle() - val tabs = immutableListOf( + val tabs = persistentListOf( NavigatorItem( screen = LibraryScreen, title = R.string.library_screen, diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/main/MainModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/main/MainModel.kt index edfcb092..6122f1e1 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/main/MainModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/main/MainModel.kt @@ -40,10 +40,10 @@ import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture import ua.acclorite.book_story.presentation.reader.model.ReaderProgressCount import ua.acclorite.book_story.presentation.reader.model.ReaderScreenOrientation import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment -import ua.acclorite.book_story.presentation.theme.toTheme import ua.acclorite.book_story.ui.common.constants.DataStoreConstants import ua.acclorite.book_story.ui.common.constants.provideFonts import ua.acclorite.book_story.ui.common.constants.provideMainState +import ua.acclorite.book_story.ui.theme.toTheme import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/main/MainState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/main/MainState.kt index 6d034d55..956c250e 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/main/MainState.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/main/MainState.kt @@ -28,11 +28,11 @@ import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture import ua.acclorite.book_story.presentation.reader.model.ReaderProgressCount import ua.acclorite.book_story.presentation.reader.model.ReaderScreenOrientation import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment -import ua.acclorite.book_story.presentation.theme.Theme -import ua.acclorite.book_story.presentation.theme.toTheme import ua.acclorite.book_story.ui.common.constants.DataStoreConstants import ua.acclorite.book_story.ui.common.constants.provideFonts import ua.acclorite.book_story.ui.common.constants.provideLanguages +import ua.acclorite.book_story.ui.theme.Theme +import ua.acclorite.book_story.ui.theme.toTheme import java.util.Locale /** diff --git a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTopBar.kt index 5c94c1cb..84054847 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTopBar.kt @@ -17,12 +17,12 @@ import androidx.compose.runtime.remember import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.presentation.book_info.BookInfoEvent -import ua.acclorite.book_story.presentation.theme.DefaultTransition import ua.acclorite.book_story.ui.common.components.common.IconButton import ua.acclorite.book_story.ui.common.components.common.StyledText import ua.acclorite.book_story.ui.common.components.top_bar.TopAppBar import ua.acclorite.book_story.ui.common.components.top_bar.TopAppBarData import ua.acclorite.book_story.ui.navigator.NavigatorBackIconButton +import ua.acclorite.book_story.ui.theme.DefaultTransition @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEmptyPlaceholder.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEmptyPlaceholder.kt index 5f0ba6fb..fd688bb0 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEmptyPlaceholder.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEmptyPlaceholder.kt @@ -13,9 +13,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.theme.Transitions import ua.acclorite.book_story.ui.common.components.common.AnimatedVisibility import ua.acclorite.book_story.ui.common.components.placeholder.EmptyPlaceholder +import ua.acclorite.book_story.ui.theme.Transitions @Composable fun BoxScope.BrowseEmptyPlaceholder( diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridFileItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridFileItem.kt index ce8a958e..e29b5fe4 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridFileItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridFileItem.kt @@ -29,9 +29,9 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.browse.model.SelectableFile -import ua.acclorite.book_story.presentation.theme.DefaultTransition import ua.acclorite.book_story.ui.common.components.common.CircularCheckbox import ua.acclorite.book_story.ui.common.components.common.StyledText +import ua.acclorite.book_story.ui.theme.DefaultTransition import java.text.SimpleDateFormat import java.util.Date import java.util.Locale diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListItem.kt index f9d9327c..b3c8fd2e 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListItem.kt @@ -22,8 +22,8 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import ua.acclorite.book_story.presentation.browse.model.SelectableFile -import ua.acclorite.book_story.presentation.theme.FadeTransitionPreservingSpace import ua.acclorite.book_story.ui.common.components.common.CircularCheckbox +import ua.acclorite.book_story.ui.theme.FadeTransitionPreservingSpace @Composable fun BrowseListItem( diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScaffold.kt index bab29ae4..aa7ae5a2 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScaffold.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScaffold.kt @@ -23,7 +23,7 @@ import ua.acclorite.book_story.presentation.browse.BrowseEvent import ua.acclorite.book_story.presentation.browse.model.BrowseLayout import ua.acclorite.book_story.presentation.browse.model.SelectableFile import ua.acclorite.book_story.presentation.main.MainEvent -import ua.acclorite.book_story.presentation.theme.DefaultTransition +import ua.acclorite.book_story.ui.theme.DefaultTransition @OptIn(ExperimentalMaterialApi::class) @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/ui/help/HelpItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/help/HelpItem.kt index 6ec84580..32db97d9 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/help/HelpItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/help/HelpItem.kt @@ -38,11 +38,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.common.StyledText import ua.acclorite.book_story.ui.common.model.Position import ua.acclorite.book_story.ui.common.util.noRippleClickable import ua.acclorite.book_story.ui.help.model.HelpTip +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun HelpItem( diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryEmptyPlaceholder.kt b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryEmptyPlaceholder.kt index 683badf7..52e890b7 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryEmptyPlaceholder.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryEmptyPlaceholder.kt @@ -15,9 +15,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.theme.Transitions import ua.acclorite.book_story.ui.common.components.common.AnimatedVisibility import ua.acclorite.book_story.ui.common.components.placeholder.EmptyPlaceholder +import ua.acclorite.book_story.ui.theme.Transitions @Composable fun BoxScope.HistoryEmptyPlaceholder( diff --git a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryLayout.kt b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryLayout.kt index 0a5d6899..47e13c52 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/history/HistoryLayout.kt @@ -19,11 +19,11 @@ import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.history.HistoryEvent import ua.acclorite.book_story.presentation.history.model.GroupedHistory -import ua.acclorite.book_story.presentation.theme.DefaultTransition import ua.acclorite.book_story.ui.common.components.common.LazyColumnWithScrollbar import ua.acclorite.book_story.ui.common.constants.providePrimaryScrollbar import ua.acclorite.book_story.ui.common.util.LocalActivity import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle +import ua.acclorite.book_story.ui.theme.DefaultTransition @Composable fun HistoryLayout( diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEmptyPlaceholder.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEmptyPlaceholder.kt index 6820d963..c555d342 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEmptyPlaceholder.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEmptyPlaceholder.kt @@ -16,8 +16,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.theme.Transitions import ua.acclorite.book_story.ui.common.components.placeholder.EmptyPlaceholder +import ua.acclorite.book_story.ui.theme.Transitions @Composable fun BoxScope.LibraryEmptyPlaceholder( diff --git a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryPager.kt b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryPager.kt index 33acf03c..7844073e 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryPager.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/library/LibraryPager.kt @@ -21,8 +21,8 @@ import ua.acclorite.book_story.presentation.library.model.LibraryLayout import ua.acclorite.book_story.presentation.library.model.LibrarySortOrder import ua.acclorite.book_story.presentation.library.model.LibraryTitlePosition import ua.acclorite.book_story.presentation.library.model.SelectableBook -import ua.acclorite.book_story.presentation.theme.DefaultTransition import ua.acclorite.book_story.ui.common.util.compareByWithOrder +import ua.acclorite.book_story.ui.theme.DefaultTransition @Composable fun LibraryPager( diff --git a/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoItem.kt index b6e8a67c..5f5b104c 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoItem.kt @@ -22,8 +22,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.dp import com.mikepenz.aboutlibraries.entity.License -import ua.acclorite.book_story.presentation.theme.SlidingTransition import ua.acclorite.book_story.ui.common.components.common.StyledText +import ua.acclorite.book_story.ui.theme.SlidingTransition @Composable fun LazyItemScope.LicenseInfoItem( diff --git a/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoScaffold.kt b/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoScaffold.kt index 79e8c54f..0c490071 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoScaffold.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoScaffold.kt @@ -20,7 +20,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import com.mikepenz.aboutlibraries.entity.Library import ua.acclorite.book_story.presentation.about.AboutEvent -import ua.acclorite.book_story.presentation.theme.DefaultTransition +import ua.acclorite.book_story.ui.theme.DefaultTransition @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBar.kt index 19f9f45d..17ae28d5 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBar.kt @@ -34,12 +34,12 @@ import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.domain.model.reader.ReaderText import ua.acclorite.book_story.presentation.reader.ReaderEvent import ua.acclorite.book_story.presentation.reader.model.Checkpoint -import ua.acclorite.book_story.presentation.theme.HorizontalExpandingTransition -import ua.acclorite.book_story.presentation.theme.readerBarsColor import ua.acclorite.book_story.ui.common.components.common.IconButton import ua.acclorite.book_story.ui.common.components.common.StyledText import ua.acclorite.book_story.ui.common.model.Direction import ua.acclorite.book_story.ui.common.util.noRippleClickable +import ua.acclorite.book_story.ui.theme.HorizontalExpandingTransition +import ua.acclorite.book_story.ui.theme.readerBarsColor @Composable fun ReaderBottomBar( diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderChaptersDrawer.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderChaptersDrawer.kt index 1a609d32..549bf213 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderChaptersDrawer.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderChaptersDrawer.kt @@ -24,7 +24,6 @@ import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter import ua.acclorite.book_story.presentation.reader.ReaderEvent -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.common.StyledText import ua.acclorite.book_story.ui.common.components.modal_drawer.ModalDrawer import ua.acclorite.book_story.ui.common.components.modal_drawer.ModalDrawerSelectableItem @@ -32,6 +31,7 @@ import ua.acclorite.book_story.ui.common.components.modal_drawer.ModalDrawerTitl import ua.acclorite.book_story.ui.common.util.calculateProgress import ua.acclorite.book_story.ui.common.util.noRippleClickable import ua.acclorite.book_story.ui.reader.model.ExpandableChapter +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun ReaderChaptersDrawer( diff --git a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderTopBar.kt b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderTopBar.kt index 1e7c0fa8..74d09ce1 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderTopBar.kt @@ -33,11 +33,11 @@ import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter import ua.acclorite.book_story.presentation.reader.ReaderEvent import ua.acclorite.book_story.presentation.settings.SettingsEvent -import ua.acclorite.book_story.presentation.theme.readerBarsColor import ua.acclorite.book_story.ui.common.components.common.IconButton import ua.acclorite.book_story.ui.common.components.common.StyledText import ua.acclorite.book_story.ui.common.util.LocalActivity import ua.acclorite.book_story.ui.common.util.noRippleClickable +import ua.acclorite.book_story.ui.theme.readerBarsColor @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class) @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsLayoutItem.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsLayoutItem.kt index eb9b5a74..720ea296 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsLayoutItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsLayoutItem.kt @@ -25,8 +25,8 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import ua.acclorite.book_story.presentation.theme.dynamicListItemColor import ua.acclorite.book_story.ui.common.components.common.StyledText +import ua.acclorite.book_story.ui.theme.dynamicListItemColor @Composable fun SettingsLayoutItem( diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/ColorPresetOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/ColorPresetOption.kt index ff051a27..83b257ca 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/ColorPresetOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/ColorPresetOption.kt @@ -67,13 +67,13 @@ import ua.acclorite.book_story.core.Selected import ua.acclorite.book_story.domain.model.reader.ColorPreset import ua.acclorite.book_story.presentation.settings.SettingsEvent import ua.acclorite.book_story.presentation.settings.SettingsModel -import ua.acclorite.book_story.presentation.theme.FadeTransitionPreservingSpace -import ua.acclorite.book_story.presentation.theme.Transitions import ua.acclorite.book_story.ui.common.components.common.AnimatedVisibility import ua.acclorite.book_story.ui.common.components.common.IconButton import ua.acclorite.book_story.ui.common.components.common.StyledText import ua.acclorite.book_story.ui.common.components.settings.ColorPickerWithTitle import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle +import ua.acclorite.book_story.ui.theme.FadeTransitionPreservingSpace +import ua.acclorite.book_story.ui.theme.Transitions @Composable fun ColorPresetOption(backgroundColor: Color) { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt index 57acfa26..4123d93e 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt @@ -16,8 +16,8 @@ import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.main.model.isDark import ua.acclorite.book_story.presentation.main.model.isPureDark -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun AbsoluteDarkOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AppThemeOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AppThemeOption.kt index 4c35ada9..b5f25c61 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AppThemeOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AppThemeOption.kt @@ -47,11 +47,11 @@ import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.main.model.ThemeContrast import ua.acclorite.book_story.presentation.main.model.isDark import ua.acclorite.book_story.presentation.main.model.isPureDark -import ua.acclorite.book_story.presentation.theme.Theme -import ua.acclorite.book_story.presentation.theme.animatedColorScheme import ua.acclorite.book_story.ui.common.components.common.AnimatedVisibility import ua.acclorite.book_story.ui.common.components.common.StyledText import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle +import ua.acclorite.book_story.ui.theme.Theme +import ua.acclorite.book_story.ui.theme.animatedColorScheme @Composable fun AppThemeOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/PureDarkOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/PureDarkOption.kt index 64b5ab1d..d081007f 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/PureDarkOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/PureDarkOption.kt @@ -16,9 +16,9 @@ import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.main.model.PureDark import ua.acclorite.book_story.presentation.main.model.isDark -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle import ua.acclorite.book_story.ui.common.model.ButtonItem +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun PureDarkOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/ThemeContrastOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/ThemeContrastOption.kt index 7d52d05e..39227bcf 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/ThemeContrastOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/ThemeContrastOption.kt @@ -21,10 +21,10 @@ import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.main.model.ThemeContrast import ua.acclorite.book_story.presentation.main.model.isDark import ua.acclorite.book_story.presentation.main.model.isPureDark -import ua.acclorite.book_story.presentation.theme.BookStoryTheme -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle import ua.acclorite.book_story.ui.common.model.ButtonItem +import ua.acclorite.book_story.ui.theme.BookStoryTheme +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun ThemeContrastOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/components/BrowseGridSizeOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/components/BrowseGridSizeOption.kt index 4d297eed..a6d681e5 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/components/BrowseGridSizeOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/components/BrowseGridSizeOption.kt @@ -14,8 +14,8 @@ import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.browse.model.BrowseLayout import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun BrowseGridSizeOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/components/BrowseScanOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/components/BrowseScanOption.kt index 48e2a3fb..b31ec76e 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/components/BrowseScanOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/components/BrowseScanOption.kt @@ -42,11 +42,11 @@ import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.browse.BrowseScreen import ua.acclorite.book_story.presentation.settings.SettingsEvent import ua.acclorite.book_story.presentation.settings.SettingsModel -import ua.acclorite.book_story.presentation.theme.dynamicListItemColor import ua.acclorite.book_story.ui.common.components.common.IconButton import ua.acclorite.book_story.ui.common.components.common.StyledText import ua.acclorite.book_story.ui.common.util.noRippleClickable import ua.acclorite.book_story.ui.common.util.showToast +import ua.acclorite.book_story.ui.theme.dynamicListItemColor @Composable fun BrowseScanOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/components/LibraryCategoriesOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/components/LibraryCategoriesOption.kt index 5b7c1187..decdd88c 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/components/LibraryCategoriesOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/components/LibraryCategoriesOption.kt @@ -51,13 +51,13 @@ import ua.acclorite.book_story.domain.model.library.Category import ua.acclorite.book_story.presentation.library.LibraryScreen import ua.acclorite.book_story.presentation.settings.SettingsEvent import ua.acclorite.book_story.presentation.settings.SettingsModel -import ua.acclorite.book_story.presentation.theme.ExpandingTransition -import ua.acclorite.book_story.presentation.theme.dynamicListItemColor import ua.acclorite.book_story.ui.common.components.common.IconButton import ua.acclorite.book_story.ui.common.components.common.StyledText import ua.acclorite.book_story.ui.common.components.dialog.Dialog import ua.acclorite.book_story.ui.common.components.dialog.DialogWithTextField import ua.acclorite.book_story.ui.common.util.noRippleClickable +import ua.acclorite.book_story.ui.theme.ExpandingTransition +import ua.acclorite.book_story.ui.theme.dynamicListItemColor private const val CREATE_DIALOG = "create_dialog" private const val EDIT_DIALOG = "edit_dialog" diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryGridSizeOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryGridSizeOption.kt index 3fc4f3c5..6a991b11 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryGridSizeOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryGridSizeOption.kt @@ -14,8 +14,8 @@ import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.library.model.LibraryLayout import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun LibraryGridSizeOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryTitlePositionOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryTitlePositionOption.kt index aa926e26..1a8ab0ef 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryTitlePositionOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryTitlePositionOption.kt @@ -16,9 +16,9 @@ import ua.acclorite.book_story.presentation.library.model.LibraryLayout import ua.acclorite.book_story.presentation.library.model.LibraryTitlePosition import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.ChipsWithTitle import ua.acclorite.book_story.ui.common.model.ButtonItem +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun LibraryTitlePositionOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesAlignmentOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesAlignmentOption.kt index 4ddf0e61..f0f96554 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesAlignmentOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesAlignmentOption.kt @@ -15,9 +15,9 @@ import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.main.model.HorizontalAlignment -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle import ua.acclorite.book_story.ui.common.model.ButtonItem +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun ImagesAlignmentOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesColorEffectsOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesColorEffectsOption.kt index f597b76a..f1a7365d 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesColorEffectsOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesColorEffectsOption.kt @@ -15,9 +15,9 @@ import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.reader.model.ReaderColorEffects -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.ChipsWithTitle import ua.acclorite.book_story.ui.common.model.ButtonItem +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun ImagesColorEffectsOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesCornersRoundnessOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesCornersRoundnessOption.kt index 34333ac9..e8760ca5 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesCornersRoundnessOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesCornersRoundnessOption.kt @@ -13,8 +13,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun ImagesCornersRoundnessOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesWidthOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesWidthOption.kt index 53c2c5d8..d7901b6e 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesWidthOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesWidthOption.kt @@ -13,8 +13,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun ImagesWidthOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarAlignmentOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarAlignmentOption.kt index 61a331eb..f8603cd5 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarAlignmentOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarAlignmentOption.kt @@ -15,9 +15,9 @@ import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.main.model.HorizontalAlignment -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SegmentedButtonWithTitle import ua.acclorite.book_story.ui.common.model.ButtonItem +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun ProgressBarAlignmentOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarFontSizeOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarFontSizeOption.kt index 16ec5d34..ac5e39b5 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarFontSizeOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarFontSizeOption.kt @@ -13,8 +13,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun ProgressBarFontSizeOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarPaddingOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarPaddingOption.kt index 6ddca172..9fdf14f7 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarPaddingOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarPaddingOption.kt @@ -13,8 +13,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun ProgressBarPaddingOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt index b6187324..2149107e 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt @@ -14,8 +14,8 @@ import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun HorizontalGestureAlphaAnimOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt index 859b947b..2b27e3e5 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt @@ -14,8 +14,8 @@ import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SwitchWithTitle +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun HorizontalGesturePullAnimOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt index 22fe9875..2c434d2e 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt @@ -14,8 +14,8 @@ import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun HorizontalGestureScrollOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt index 6c114a87..56b42296 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt @@ -14,8 +14,8 @@ import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun HorizontalGestureSensitivityOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt index 82e1b80f..118d8a42 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt @@ -13,8 +13,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun HighlightedReadingThicknessOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt index 5ea59da7..21283fbc 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt @@ -13,8 +13,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun PerceptionExpanderPaddingOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt index bd76133b..ed672440 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt @@ -13,8 +13,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun PerceptionExpanderThicknessOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/ScreenBrightnessOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/ScreenBrightnessOption.kt index e9c5d856..27f422ba 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/ScreenBrightnessOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/ScreenBrightnessOption.kt @@ -13,8 +13,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun ScreenBrightnessOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/ParagraphIndentationOption.kt b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/ParagraphIndentationOption.kt index 9440c911..61933358 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/ParagraphIndentationOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/ParagraphIndentationOption.kt @@ -14,8 +14,8 @@ import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment -import ua.acclorite.book_story.presentation.theme.ExpandingTransition import ua.acclorite.book_story.ui.common.components.settings.SliderWithTitle +import ua.acclorite.book_story.ui.theme.ExpandingTransition @Composable fun ParagraphIndentationOption() { diff --git a/app/src/main/java/ua/acclorite/book_story/ui/start/StartContentTransition.kt b/app/src/main/java/ua/acclorite/book_story/ui/start/StartContentTransition.kt index cee0dbec..d7647555 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/start/StartContentTransition.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/start/StartContentTransition.kt @@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import ua.acclorite.book_story.presentation.navigator.StackEvent -import ua.acclorite.book_story.presentation.theme.Transitions +import ua.acclorite.book_story.ui.theme.Transitions @Composable fun StartContentTransition( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/Animations.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/Animations.kt similarity index 98% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/Animations.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/Animations.kt index 5fb76ddc..20825e89 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/Animations.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/Animations.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme +package ua.acclorite.book_story.ui.theme import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.tween diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/Color.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/Color.kt similarity index 77% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/Color.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/Color.kt index df450833..beb006fb 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/Color.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/Color.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme +package ua.acclorite.book_story.ui.theme import android.os.Build import androidx.annotation.StringRes @@ -13,23 +13,23 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable import ua.acclorite.book_story.R import ua.acclorite.book_story.presentation.main.model.ThemeContrast -import ua.acclorite.book_story.presentation.theme.color.aquaTheme -import ua.acclorite.book_story.presentation.theme.color.blackTheme -import ua.acclorite.book_story.presentation.theme.color.blueTheme -import ua.acclorite.book_story.presentation.theme.color.dynamicTheme -import ua.acclorite.book_story.presentation.theme.color.green2Theme -import ua.acclorite.book_story.presentation.theme.color.greenGrayTheme -import ua.acclorite.book_story.presentation.theme.color.greenTheme -import ua.acclorite.book_story.presentation.theme.color.lavenderTheme -import ua.acclorite.book_story.presentation.theme.color.marshTheme -import ua.acclorite.book_story.presentation.theme.color.pink2Theme -import ua.acclorite.book_story.presentation.theme.color.pinkTheme -import ua.acclorite.book_story.presentation.theme.color.purpleGrayTheme -import ua.acclorite.book_story.presentation.theme.color.purpleTheme -import ua.acclorite.book_story.presentation.theme.color.redGrayTheme -import ua.acclorite.book_story.presentation.theme.color.redTheme -import ua.acclorite.book_story.presentation.theme.color.yellow2Theme -import ua.acclorite.book_story.presentation.theme.color.yellowTheme +import ua.acclorite.book_story.ui.theme.color.aquaTheme +import ua.acclorite.book_story.ui.theme.color.blackTheme +import ua.acclorite.book_story.ui.theme.color.blueTheme +import ua.acclorite.book_story.ui.theme.color.dynamicTheme +import ua.acclorite.book_story.ui.theme.color.green2Theme +import ua.acclorite.book_story.ui.theme.color.greenGrayTheme +import ua.acclorite.book_story.ui.theme.color.greenTheme +import ua.acclorite.book_story.ui.theme.color.lavenderTheme +import ua.acclorite.book_story.ui.theme.color.marshTheme +import ua.acclorite.book_story.ui.theme.color.pink2Theme +import ua.acclorite.book_story.ui.theme.color.pinkTheme +import ua.acclorite.book_story.ui.theme.color.purpleGrayTheme +import ua.acclorite.book_story.ui.theme.color.purpleTheme +import ua.acclorite.book_story.ui.theme.color.redGrayTheme +import ua.acclorite.book_story.ui.theme.color.redTheme +import ua.acclorite.book_story.ui.theme.color.yellow2Theme +import ua.acclorite.book_story.ui.theme.color.yellowTheme @Immutable @@ -57,8 +57,8 @@ enum class Theme( companion object { fun entries(): List { return when { - Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> Theme.entries - else -> Theme.entries.dropWhile { it == DYNAMIC } + Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> entries + else -> entries.dropWhile { it == DYNAMIC } } } } diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/Theme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/Theme.kt similarity index 97% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/Theme.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/Theme.kt index 29a621b9..28e89f25 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/Theme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/Theme.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme +package ua.acclorite.book_story.ui.theme import android.app.Activity import android.os.Build diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/ThemeExtensions.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/ThemeExtensions.kt similarity index 91% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/ThemeExtensions.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/ThemeExtensions.kt index 26119f28..4a6e62ee 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/ThemeExtensions.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/ThemeExtensions.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme +package ua.acclorite.book_story.ui.theme import androidx.compose.material3.ColorScheme import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/ThemeLogger.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/ThemeLogger.kt similarity index 98% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/ThemeLogger.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/ThemeLogger.kt index ae8063be..c1d00151 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/ThemeLogger.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/ThemeLogger.kt @@ -6,7 +6,7 @@ @file:Suppress("unused") -package ua.acclorite.book_story.presentation.theme +package ua.acclorite.book_story.ui.theme import android.util.Log import androidx.compose.material3.ColorScheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/Transitions.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/Transitions.kt similarity index 98% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/Transitions.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/Transitions.kt index 2a999857..6dd4eb0e 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/Transitions.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/Transitions.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme +package ua.acclorite.book_story.ui.theme import androidx.compose.animation.core.AnimationSpec import androidx.compose.animation.core.EaseInOut diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/AquaTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/AquaTheme.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/color/AquaTheme.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/color/AquaTheme.kt index 736c7f7f..ea9482a5 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/AquaTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/AquaTheme.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme.color +package ua.acclorite.book_story.ui.theme.color import androidx.compose.material3.ColorScheme import androidx.compose.material3.darkColorScheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/BlackTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlackTheme.kt similarity index 96% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/color/BlackTheme.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlackTheme.kt index d16e8039..8c8ee40e 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/BlackTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlackTheme.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme.color +package ua.acclorite.book_story.ui.theme.color import androidx.compose.material3.ColorScheme import androidx.compose.runtime.Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/BlueTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlueTheme.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/color/BlueTheme.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlueTheme.kt index b1e5b436..46998191 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/BlueTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlueTheme.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme.color +package ua.acclorite.book_story.ui.theme.color import androidx.compose.material3.ColorScheme import androidx.compose.material3.darkColorScheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/DynamicTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/DynamicTheme.kt similarity index 97% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/color/DynamicTheme.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/color/DynamicTheme.kt index 19bb10c4..3e349ee8 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/DynamicTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/DynamicTheme.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme.color +package ua.acclorite.book_story.ui.theme.color import android.annotation.SuppressLint import androidx.compose.material3.ColorScheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Green2Theme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/Green2Theme.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Green2Theme.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/color/Green2Theme.kt index b08dc43c..ad9e10c7 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Green2Theme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/Green2Theme.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme.color +package ua.acclorite.book_story.ui.theme.color import androidx.compose.material3.ColorScheme import androidx.compose.material3.darkColorScheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/GreenGrayTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenGrayTheme.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/color/GreenGrayTheme.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenGrayTheme.kt index 29c75439..f3c3d1da 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/GreenGrayTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenGrayTheme.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme.color +package ua.acclorite.book_story.ui.theme.color import androidx.compose.material3.ColorScheme import androidx.compose.material3.darkColorScheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/GreenTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenTheme.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/color/GreenTheme.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenTheme.kt index 553ba72d..dd08c049 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/GreenTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenTheme.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme.color +package ua.acclorite.book_story.ui.theme.color import androidx.compose.material3.ColorScheme import androidx.compose.material3.darkColorScheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/LavenderTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/LavenderTheme.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/color/LavenderTheme.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/color/LavenderTheme.kt index 936735f4..eee7d2d8 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/LavenderTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/LavenderTheme.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme.color +package ua.acclorite.book_story.ui.theme.color import androidx.compose.material3.ColorScheme import androidx.compose.material3.darkColorScheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/MarshTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/MarshTheme.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/color/MarshTheme.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/color/MarshTheme.kt index e9196473..5c813abc 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/MarshTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/MarshTheme.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme.color +package ua.acclorite.book_story.ui.theme.color import androidx.compose.material3.ColorScheme import androidx.compose.material3.darkColorScheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Pink2Theme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/Pink2Theme.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Pink2Theme.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/color/Pink2Theme.kt index 62087274..0b15a9f2 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Pink2Theme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/Pink2Theme.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme.color +package ua.acclorite.book_story.ui.theme.color import androidx.compose.material3.ColorScheme import androidx.compose.material3.darkColorScheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PinkTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PinkTheme.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PinkTheme.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/color/PinkTheme.kt index 4a12c4db..26f088fa 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PinkTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PinkTheme.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme.color +package ua.acclorite.book_story.ui.theme.color import androidx.compose.material3.ColorScheme import androidx.compose.material3.darkColorScheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PurpleGrayTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleGrayTheme.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PurpleGrayTheme.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleGrayTheme.kt index 13760f1e..dbf26d70 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PurpleGrayTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleGrayTheme.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme.color +package ua.acclorite.book_story.ui.theme.color import androidx.compose.material3.ColorScheme import androidx.compose.material3.darkColorScheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PurpleTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleTheme.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PurpleTheme.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleTheme.kt index 1f59c330..05e9ab88 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PurpleTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleTheme.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme.color +package ua.acclorite.book_story.ui.theme.color import androidx.compose.material3.ColorScheme import androidx.compose.material3.darkColorScheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/RedGrayTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedGrayTheme.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/color/RedGrayTheme.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedGrayTheme.kt index 51b45f8e..79b240d8 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/RedGrayTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedGrayTheme.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme.color +package ua.acclorite.book_story.ui.theme.color import androidx.compose.material3.ColorScheme import androidx.compose.material3.darkColorScheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/RedTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedTheme.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/color/RedTheme.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedTheme.kt index ed9b52e8..d593368d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/RedTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedTheme.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme.color +package ua.acclorite.book_story.ui.theme.color import androidx.compose.material3.ColorScheme import androidx.compose.material3.darkColorScheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Yellow2Theme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/Yellow2Theme.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Yellow2Theme.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/color/Yellow2Theme.kt index c13c822f..13eddd69 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Yellow2Theme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/Yellow2Theme.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme.color +package ua.acclorite.book_story.ui.theme.color import androidx.compose.material3.ColorScheme import androidx.compose.material3.darkColorScheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/YellowTheme.kt b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/YellowTheme.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/theme/color/YellowTheme.kt rename to app/src/main/java/ua/acclorite/book_story/ui/theme/color/YellowTheme.kt index 2a81b705..81edb962 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/theme/color/YellowTheme.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/theme/color/YellowTheme.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.theme.color +package ua.acclorite.book_story.ui.theme.color import androidx.compose.material3.ColorScheme import androidx.compose.material3.darkColorScheme