Atte149/book-story
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: move presentation/theme to ui/theme

Browse source
This commit is contained in:
Acclorite 2025-06-03 09:48:47 +03:00
parent 1d73fd8a91
commit d1b7376633
No known key found for this signature in database
GPG key ID: 6E54C611F6EE8593
70 changed files with 99 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/ua/acclorite/book_story/presentation/crash/CrashActivity.kt
View file

@ -13,8 +13,8 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.isSystemInDarkTheme
import androidx.core.view.WindowCompat import androidx.core.view.WindowCompat
import ua.acclorite.book_story.presentation.main.model.ThemeContrast import ua.acclorite.book_story.presentation.main.model.ThemeContrast
import ua.acclorite.book_story.presentation.theme.BookStoryTheme import ua.acclorite.book_story.ui.theme.BookStoryTheme
import ua.acclorite.book_story.presentation.theme.Theme import ua.acclorite.book_story.ui.theme.Theme
class CrashActivity : AppCompatActivity() { class CrashActivity : AppCompatActivity() {

8
app/src/main/java/ua/acclorite/book_story/presentation/main/MainActivity.kt
View file

@ -21,7 +21,7 @@ import androidx.core.view.WindowCompat
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import dagger.hilt.android.AndroidEntryPoint 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.R
import ua.acclorite.book_story.presentation.browse.BrowseModel import ua.acclorite.book_story.presentation.browse.BrowseModel
import ua.acclorite.book_story.presentation.browse.BrowseScreen 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.navigator.StackEvent
import ua.acclorite.book_story.presentation.settings.SettingsModel import ua.acclorite.book_story.presentation.settings.SettingsModel
import ua.acclorite.book_story.presentation.start.StartScreen 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_bar.NavigationBar
import ua.acclorite.book_story.ui.common.components.navigation_rail.NavigationRail 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.main.MainActivityKeyboardManager
import ua.acclorite.book_story.ui.navigator.Navigator import ua.acclorite.book_story.ui.navigator.Navigator
import ua.acclorite.book_story.ui.navigator.NavigatorTabs 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 import java.lang.reflect.Field
@ -88,7 +88,7 @@ class MainActivity : AppCompatActivity() {
val state = mainModel.state.collectAsStateWithLifecycle() val state = mainModel.state.collectAsStateWithLifecycle()
val isLoaded = mainModel.isReady.collectAsStateWithLifecycle() val isLoaded = mainModel.isReady.collectAsStateWithLifecycle()
val tabs = immutableListOf( val tabs = persistentListOf(
NavigatorItem( NavigatorItem(
screen = LibraryScreen, screen = LibraryScreen,
title = R.string.library_screen, title = R.string.library_screen,

2
app/src/main/java/ua/acclorite/book_story/presentation/main/MainModel.kt
View file

@ -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.ReaderProgressCount
import ua.acclorite.book_story.presentation.reader.model.ReaderScreenOrientation import ua.acclorite.book_story.presentation.reader.model.ReaderScreenOrientation
import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment 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.DataStoreConstants
import ua.acclorite.book_story.ui.common.constants.provideFonts import ua.acclorite.book_story.ui.common.constants.provideFonts
import ua.acclorite.book_story.ui.common.constants.provideMainState import ua.acclorite.book_story.ui.common.constants.provideMainState
import ua.acclorite.book_story.ui.theme.toTheme
import javax.inject.Inject import javax.inject.Inject

4
app/src/main/java/ua/acclorite/book_story/presentation/main/MainState.kt
View file

@ -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.ReaderProgressCount
import ua.acclorite.book_story.presentation.reader.model.ReaderScreenOrientation import ua.acclorite.book_story.presentation.reader.model.ReaderScreenOrientation
import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment 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.DataStoreConstants
import ua.acclorite.book_story.ui.common.constants.provideFonts import ua.acclorite.book_story.ui.common.constants.provideFonts
import ua.acclorite.book_story.ui.common.constants.provideLanguages 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 import java.util.Locale
/** /**

2
app/src/main/java/ua/acclorite/book_story/ui/book_info/BookInfoTopBar.kt
View file

@ -17,12 +17,12 @@ import androidx.compose.runtime.remember
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.domain.model.library.Book import ua.acclorite.book_story.domain.model.library.Book
import ua.acclorite.book_story.presentation.book_info.BookInfoEvent 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.IconButton
import ua.acclorite.book_story.ui.common.components.common.StyledText 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.TopAppBar
import ua.acclorite.book_story.ui.common.components.top_bar.TopAppBarData 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.navigator.NavigatorBackIconButton
import ua.acclorite.book_story.ui.theme.DefaultTransition
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable

2
app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEmptyPlaceholder.kt
View file

@ -13,9 +13,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import ua.acclorite.book_story.R 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.common.AnimatedVisibility
import ua.acclorite.book_story.ui.common.components.placeholder.EmptyPlaceholder import ua.acclorite.book_story.ui.common.components.placeholder.EmptyPlaceholder
import ua.acclorite.book_story.ui.theme.Transitions
@Composable @Composable
fun BoxScope.BrowseEmptyPlaceholder( fun BoxScope.BrowseEmptyPlaceholder(

2
app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseGridFileItem.kt
View file

@ -29,9 +29,9 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.browse.model.SelectableFile 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.CircularCheckbox
import ua.acclorite.book_story.ui.common.components.common.StyledText import ua.acclorite.book_story.ui.common.components.common.StyledText
import ua.acclorite.book_story.ui.theme.DefaultTransition
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Date import java.util.Date
import java.util.Locale import java.util.Locale

2
app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseListItem.kt
View file

@ -22,8 +22,8 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import ua.acclorite.book_story.presentation.browse.model.SelectableFile 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.common.components.common.CircularCheckbox
import ua.acclorite.book_story.ui.theme.FadeTransitionPreservingSpace
@Composable @Composable
fun BrowseListItem( fun BrowseListItem(

2
app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScaffold.kt
View file

@ -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.BrowseLayout
import ua.acclorite.book_story.presentation.browse.model.SelectableFile import ua.acclorite.book_story.presentation.browse.model.SelectableFile
import ua.acclorite.book_story.presentation.main.MainEvent 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) @OptIn(ExperimentalMaterialApi::class)
@Composable @Composable

2
app/src/main/java/ua/acclorite/book_story/ui/help/HelpItem.kt
View file

@ -38,11 +38,11 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import ua.acclorite.book_story.R 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.components.common.StyledText
import ua.acclorite.book_story.ui.common.model.Position import ua.acclorite.book_story.ui.common.model.Position
import ua.acclorite.book_story.ui.common.util.noRippleClickable import ua.acclorite.book_story.ui.common.util.noRippleClickable
import ua.acclorite.book_story.ui.help.model.HelpTip import ua.acclorite.book_story.ui.help.model.HelpTip
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun HelpItem( fun HelpItem(

2
app/src/main/java/ua/acclorite/book_story/ui/history/HistoryEmptyPlaceholder.kt
View file

@ -15,9 +15,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import ua.acclorite.book_story.R 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.common.AnimatedVisibility
import ua.acclorite.book_story.ui.common.components.placeholder.EmptyPlaceholder import ua.acclorite.book_story.ui.common.components.placeholder.EmptyPlaceholder
import ua.acclorite.book_story.ui.theme.Transitions
@Composable @Composable
fun BoxScope.HistoryEmptyPlaceholder( fun BoxScope.HistoryEmptyPlaceholder(

2
app/src/main/java/ua/acclorite/book_story/ui/history/HistoryLayout.kt
View file

@ -19,11 +19,11 @@ import androidx.compose.ui.unit.dp
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.history.HistoryEvent import ua.acclorite.book_story.presentation.history.HistoryEvent
import ua.acclorite.book_story.presentation.history.model.GroupedHistory 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.components.common.LazyColumnWithScrollbar
import ua.acclorite.book_story.ui.common.constants.providePrimaryScrollbar import ua.acclorite.book_story.ui.common.constants.providePrimaryScrollbar
import ua.acclorite.book_story.ui.common.util.LocalActivity import ua.acclorite.book_story.ui.common.util.LocalActivity
import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle import ua.acclorite.book_story.ui.settings.components.SettingsSubcategoryTitle
import ua.acclorite.book_story.ui.theme.DefaultTransition
@Composable @Composable
fun HistoryLayout( fun HistoryLayout(

2
app/src/main/java/ua/acclorite/book_story/ui/library/LibraryEmptyPlaceholder.kt
View file

@ -16,8 +16,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import ua.acclorite.book_story.R 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.common.components.placeholder.EmptyPlaceholder
import ua.acclorite.book_story.ui.theme.Transitions
@Composable @Composable
fun BoxScope.LibraryEmptyPlaceholder( fun BoxScope.LibraryEmptyPlaceholder(

2
app/src/main/java/ua/acclorite/book_story/ui/library/LibraryPager.kt
View file

@ -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.LibrarySortOrder
import ua.acclorite.book_story.presentation.library.model.LibraryTitlePosition import ua.acclorite.book_story.presentation.library.model.LibraryTitlePosition
import ua.acclorite.book_story.presentation.library.model.SelectableBook 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.common.util.compareByWithOrder
import ua.acclorite.book_story.ui.theme.DefaultTransition
@Composable @Composable
fun LibraryPager( fun LibraryPager(

2
app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoItem.kt
View file

@ -22,8 +22,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.mikepenz.aboutlibraries.entity.License 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.common.components.common.StyledText
import ua.acclorite.book_story.ui.theme.SlidingTransition
@Composable @Composable
fun LazyItemScope.LicenseInfoItem( fun LazyItemScope.LicenseInfoItem(

2
app/src/main/java/ua/acclorite/book_story/ui/license_info/LicenseInfoScaffold.kt
View file

@ -20,7 +20,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.input.nestedscroll.nestedScroll
import com.mikepenz.aboutlibraries.entity.Library import com.mikepenz.aboutlibraries.entity.Library
import ua.acclorite.book_story.presentation.about.AboutEvent 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) @OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable

4
app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderBottomBar.kt
View file

@ -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.domain.model.reader.ReaderText
import ua.acclorite.book_story.presentation.reader.ReaderEvent import ua.acclorite.book_story.presentation.reader.ReaderEvent
import ua.acclorite.book_story.presentation.reader.model.Checkpoint 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.IconButton
import ua.acclorite.book_story.ui.common.components.common.StyledText 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.model.Direction
import ua.acclorite.book_story.ui.common.util.noRippleClickable 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 @Composable
fun ReaderBottomBar( fun ReaderBottomBar(

2
app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderChaptersDrawer.kt
View file

@ -24,7 +24,6 @@ import androidx.compose.ui.unit.dp
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter import ua.acclorite.book_story.domain.model.reader.ReaderText.Chapter
import ua.acclorite.book_story.presentation.reader.ReaderEvent 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.common.StyledText
import ua.acclorite.book_story.ui.common.components.modal_drawer.ModalDrawer import ua.acclorite.book_story.ui.common.components.modal_drawer.ModalDrawer
import ua.acclorite.book_story.ui.common.components.modal_drawer.ModalDrawerSelectableItem 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.calculateProgress
import ua.acclorite.book_story.ui.common.util.noRippleClickable import ua.acclorite.book_story.ui.common.util.noRippleClickable
import ua.acclorite.book_story.ui.reader.model.ExpandableChapter import ua.acclorite.book_story.ui.reader.model.ExpandableChapter
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun ReaderChaptersDrawer( fun ReaderChaptersDrawer(

2
app/src/main/java/ua/acclorite/book_story/ui/reader/ReaderTopBar.kt
View file

@ -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.domain.model.reader.ReaderText.Chapter
import ua.acclorite.book_story.presentation.reader.ReaderEvent import ua.acclorite.book_story.presentation.reader.ReaderEvent
import ua.acclorite.book_story.presentation.settings.SettingsEvent 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.IconButton
import ua.acclorite.book_story.ui.common.components.common.StyledText 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.LocalActivity
import ua.acclorite.book_story.ui.common.util.noRippleClickable import ua.acclorite.book_story.ui.common.util.noRippleClickable
import ua.acclorite.book_story.ui.theme.readerBarsColor
@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class) @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
@Composable @Composable

2
app/src/main/java/ua/acclorite/book_story/ui/settings/SettingsLayoutItem.kt
View file

@ -25,8 +25,8 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp 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.common.components.common.StyledText
import ua.acclorite.book_story.ui.theme.dynamicListItemColor
@Composable @Composable
fun SettingsLayoutItem( fun SettingsLayoutItem(

4
app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/colors/components/ColorPresetOption.kt
View file

@ -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.domain.model.reader.ColorPreset
import ua.acclorite.book_story.presentation.settings.SettingsEvent import ua.acclorite.book_story.presentation.settings.SettingsEvent
import ua.acclorite.book_story.presentation.settings.SettingsModel 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.AnimatedVisibility
import ua.acclorite.book_story.ui.common.components.common.IconButton 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.common.StyledText
import ua.acclorite.book_story.ui.common.components.settings.ColorPickerWithTitle 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.settings.components.SettingsSubcategoryTitle
import ua.acclorite.book_story.ui.theme.FadeTransitionPreservingSpace
import ua.acclorite.book_story.ui.theme.Transitions
@Composable @Composable
fun ColorPresetOption(backgroundColor: Color) { fun ColorPresetOption(backgroundColor: Color) {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AbsoluteDarkOption.kt
View file

@ -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.MainModel
import ua.acclorite.book_story.presentation.main.model.isDark import ua.acclorite.book_story.presentation.main.model.isDark
import ua.acclorite.book_story.presentation.main.model.isPureDark 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.common.components.settings.SwitchWithTitle
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun AbsoluteDarkOption() { fun AbsoluteDarkOption() {

4
app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/AppThemeOption.kt
View file

@ -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.ThemeContrast
import ua.acclorite.book_story.presentation.main.model.isDark import ua.acclorite.book_story.presentation.main.model.isDark
import ua.acclorite.book_story.presentation.main.model.isPureDark 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.AnimatedVisibility
import ua.acclorite.book_story.ui.common.components.common.StyledText 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.settings.components.SettingsSubcategoryTitle
import ua.acclorite.book_story.ui.theme.Theme
import ua.acclorite.book_story.ui.theme.animatedColorScheme
@Composable @Composable
fun AppThemeOption() { fun AppThemeOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/PureDarkOption.kt
View file

@ -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.MainModel
import ua.acclorite.book_story.presentation.main.model.PureDark import ua.acclorite.book_story.presentation.main.model.PureDark
import ua.acclorite.book_story.presentation.main.model.isDark 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.components.settings.SegmentedButtonWithTitle
import ua.acclorite.book_story.ui.common.model.ButtonItem import ua.acclorite.book_story.ui.common.model.ButtonItem
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun PureDarkOption() { fun PureDarkOption() {

4
app/src/main/java/ua/acclorite/book_story/ui/settings/appearance/theme_preferences/components/ThemeContrastOption.kt
View file

@ -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.ThemeContrast
import ua.acclorite.book_story.presentation.main.model.isDark import ua.acclorite.book_story.presentation.main.model.isDark
import ua.acclorite.book_story.presentation.main.model.isPureDark 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.components.settings.SegmentedButtonWithTitle
import ua.acclorite.book_story.ui.common.model.ButtonItem 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 @Composable
fun ThemeContrastOption() { fun ThemeContrastOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/browse/display/components/BrowseGridSizeOption.kt
View file

@ -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.browse.model.BrowseLayout
import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainEvent
import ua.acclorite.book_story.presentation.main.MainModel 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.common.components.settings.SliderWithTitle
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun BrowseGridSizeOption() { fun BrowseGridSizeOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/browse/scan/components/BrowseScanOption.kt
View file

@ -42,11 +42,11 @@ import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.browse.BrowseScreen import ua.acclorite.book_story.presentation.browse.BrowseScreen
import ua.acclorite.book_story.presentation.settings.SettingsEvent import ua.acclorite.book_story.presentation.settings.SettingsEvent
import ua.acclorite.book_story.presentation.settings.SettingsModel 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.IconButton
import ua.acclorite.book_story.ui.common.components.common.StyledText 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.noRippleClickable
import ua.acclorite.book_story.ui.common.util.showToast import ua.acclorite.book_story.ui.common.util.showToast
import ua.acclorite.book_story.ui.theme.dynamicListItemColor
@Composable @Composable
fun BrowseScanOption() { fun BrowseScanOption() {

4
app/src/main/java/ua/acclorite/book_story/ui/settings/library/categories/components/LibraryCategoriesOption.kt
View file

@ -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.library.LibraryScreen
import ua.acclorite.book_story.presentation.settings.SettingsEvent import ua.acclorite.book_story.presentation.settings.SettingsEvent
import ua.acclorite.book_story.presentation.settings.SettingsModel 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.IconButton
import ua.acclorite.book_story.ui.common.components.common.StyledText 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.Dialog
import ua.acclorite.book_story.ui.common.components.dialog.DialogWithTextField 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.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 CREATE_DIALOG = "create_dialog"
private const val EDIT_DIALOG = "edit_dialog" private const val EDIT_DIALOG = "edit_dialog"

2
app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryGridSizeOption.kt
View file

@ -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.library.model.LibraryLayout
import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainEvent
import ua.acclorite.book_story.presentation.main.MainModel 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.common.components.settings.SliderWithTitle
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun LibraryGridSizeOption() { fun LibraryGridSizeOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/library/display/components/LibraryTitlePositionOption.kt
View file

@ -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.library.model.LibraryTitlePosition
import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainEvent
import ua.acclorite.book_story.presentation.main.MainModel 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.components.settings.ChipsWithTitle
import ua.acclorite.book_story.ui.common.model.ButtonItem import ua.acclorite.book_story.ui.common.model.ButtonItem
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun LibraryTitlePositionOption() { fun LibraryTitlePositionOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesAlignmentOption.kt
View file

@ -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.MainEvent
import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.main.MainModel
import ua.acclorite.book_story.presentation.main.model.HorizontalAlignment 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.components.settings.SegmentedButtonWithTitle
import ua.acclorite.book_story.ui.common.model.ButtonItem import ua.acclorite.book_story.ui.common.model.ButtonItem
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun ImagesAlignmentOption() { fun ImagesAlignmentOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesColorEffectsOption.kt
View file

@ -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.MainEvent
import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.main.MainModel
import ua.acclorite.book_story.presentation.reader.model.ReaderColorEffects 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.components.settings.ChipsWithTitle
import ua.acclorite.book_story.ui.common.model.ButtonItem import ua.acclorite.book_story.ui.common.model.ButtonItem
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun ImagesColorEffectsOption() { fun ImagesColorEffectsOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesCornersRoundnessOption.kt
View file

@ -13,8 +13,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainEvent
import ua.acclorite.book_story.presentation.main.MainModel 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.common.components.settings.SliderWithTitle
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun ImagesCornersRoundnessOption() { fun ImagesCornersRoundnessOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/reader/images/components/ImagesWidthOption.kt
View file

@ -13,8 +13,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainEvent
import ua.acclorite.book_story.presentation.main.MainModel 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.common.components.settings.SliderWithTitle
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun ImagesWidthOption() { fun ImagesWidthOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarAlignmentOption.kt
View file

@ -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.MainEvent
import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.main.MainModel
import ua.acclorite.book_story.presentation.main.model.HorizontalAlignment 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.components.settings.SegmentedButtonWithTitle
import ua.acclorite.book_story.ui.common.model.ButtonItem import ua.acclorite.book_story.ui.common.model.ButtonItem
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun ProgressBarAlignmentOption() { fun ProgressBarAlignmentOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarFontSizeOption.kt
View file

@ -13,8 +13,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainEvent
import ua.acclorite.book_story.presentation.main.MainModel 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.common.components.settings.SliderWithTitle
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun ProgressBarFontSizeOption() { fun ProgressBarFontSizeOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/reader/progress/components/ProgressBarPaddingOption.kt
View file

@ -13,8 +13,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainEvent
import ua.acclorite.book_story.presentation.main.MainModel 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.common.components.settings.SliderWithTitle
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun ProgressBarPaddingOption() { fun ProgressBarPaddingOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureAlphaAnimOption.kt
View file

@ -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.MainEvent
import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.main.MainModel
import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture 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.common.components.settings.SwitchWithTitle
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun HorizontalGestureAlphaAnimOption() { fun HorizontalGestureAlphaAnimOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGesturePullAnimOption.kt
View file

@ -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.MainEvent
import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.main.MainModel
import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture 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.common.components.settings.SwitchWithTitle
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun HorizontalGesturePullAnimOption() { fun HorizontalGesturePullAnimOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureScrollOption.kt
View file

@ -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.MainEvent
import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.main.MainModel
import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture 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.common.components.settings.SliderWithTitle
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun HorizontalGestureScrollOption() { fun HorizontalGestureScrollOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_mode/components/HorizontalGestureSensitivityOption.kt
View file

@ -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.MainEvent
import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.main.MainModel
import ua.acclorite.book_story.presentation.reader.model.ReaderHorizontalGesture 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.common.components.settings.SliderWithTitle
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun HorizontalGestureSensitivityOption() { fun HorizontalGestureSensitivityOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/HighlightedReadingThicknessOption.kt
View file

@ -13,8 +13,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainEvent
import ua.acclorite.book_story.presentation.main.MainModel 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.common.components.settings.SliderWithTitle
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun HighlightedReadingThicknessOption() { fun HighlightedReadingThicknessOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderPaddingOption.kt
View file

@ -13,8 +13,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainEvent
import ua.acclorite.book_story.presentation.main.MainModel 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.common.components.settings.SliderWithTitle
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun PerceptionExpanderPaddingOption() { fun PerceptionExpanderPaddingOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/reader/reading_speed/components/PerceptionExpanderThicknessOption.kt
View file

@ -13,8 +13,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainEvent
import ua.acclorite.book_story.presentation.main.MainModel 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.common.components.settings.SliderWithTitle
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun PerceptionExpanderThicknessOption() { fun PerceptionExpanderThicknessOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/reader/system/components/ScreenBrightnessOption.kt
View file

@ -13,8 +13,8 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.main.MainEvent import ua.acclorite.book_story.presentation.main.MainEvent
import ua.acclorite.book_story.presentation.main.MainModel 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.common.components.settings.SliderWithTitle
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun ScreenBrightnessOption() { fun ScreenBrightnessOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/settings/reader/text/components/ParagraphIndentationOption.kt
View file

@ -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.MainEvent
import ua.acclorite.book_story.presentation.main.MainModel import ua.acclorite.book_story.presentation.main.MainModel
import ua.acclorite.book_story.presentation.reader.model.ReaderTextAlignment 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.common.components.settings.SliderWithTitle
import ua.acclorite.book_story.ui.theme.ExpandingTransition
@Composable @Composable
fun ParagraphIndentationOption() { fun ParagraphIndentationOption() {

2
app/src/main/java/ua/acclorite/book_story/ui/start/StartContentTransition.kt
View file

@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import ua.acclorite.book_story.presentation.navigator.StackEvent 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 @Composable
fun StartContentTransition( fun StartContentTransition(

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/Animations.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/Animations.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.animateColorAsState
import androidx.compose.animation.core.tween import androidx.compose.animation.core.tween

40
app/src/main/java/ua/acclorite/book_story/presentation/theme/Color.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/Color.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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 android.os.Build
import androidx.annotation.StringRes import androidx.annotation.StringRes
@ -13,23 +13,23 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable import androidx.compose.runtime.Immutable
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.main.model.ThemeContrast import ua.acclorite.book_story.presentation.main.model.ThemeContrast
import ua.acclorite.book_story.presentation.theme.color.aquaTheme import ua.acclorite.book_story.ui.theme.color.aquaTheme
import ua.acclorite.book_story.presentation.theme.color.blackTheme import ua.acclorite.book_story.ui.theme.color.blackTheme
import ua.acclorite.book_story.presentation.theme.color.blueTheme import ua.acclorite.book_story.ui.theme.color.blueTheme
import ua.acclorite.book_story.presentation.theme.color.dynamicTheme import ua.acclorite.book_story.ui.theme.color.dynamicTheme
import ua.acclorite.book_story.presentation.theme.color.green2Theme import ua.acclorite.book_story.ui.theme.color.green2Theme
import ua.acclorite.book_story.presentation.theme.color.greenGrayTheme import ua.acclorite.book_story.ui.theme.color.greenGrayTheme
import ua.acclorite.book_story.presentation.theme.color.greenTheme import ua.acclorite.book_story.ui.theme.color.greenTheme
import ua.acclorite.book_story.presentation.theme.color.lavenderTheme import ua.acclorite.book_story.ui.theme.color.lavenderTheme
import ua.acclorite.book_story.presentation.theme.color.marshTheme import ua.acclorite.book_story.ui.theme.color.marshTheme
import ua.acclorite.book_story.presentation.theme.color.pink2Theme import ua.acclorite.book_story.ui.theme.color.pink2Theme
import ua.acclorite.book_story.presentation.theme.color.pinkTheme import ua.acclorite.book_story.ui.theme.color.pinkTheme
import ua.acclorite.book_story.presentation.theme.color.purpleGrayTheme import ua.acclorite.book_story.ui.theme.color.purpleGrayTheme
import ua.acclorite.book_story.presentation.theme.color.purpleTheme import ua.acclorite.book_story.ui.theme.color.purpleTheme
import ua.acclorite.book_story.presentation.theme.color.redGrayTheme import ua.acclorite.book_story.ui.theme.color.redGrayTheme
import ua.acclorite.book_story.presentation.theme.color.redTheme import ua.acclorite.book_story.ui.theme.color.redTheme
import ua.acclorite.book_story.presentation.theme.color.yellow2Theme import ua.acclorite.book_story.ui.theme.color.yellow2Theme
import ua.acclorite.book_story.presentation.theme.color.yellowTheme import ua.acclorite.book_story.ui.theme.color.yellowTheme
@Immutable @Immutable
@ -57,8 +57,8 @@ enum class Theme(
companion object { companion object {
fun entries(): List<Theme> { fun entries(): List<Theme> {
return when { return when {
Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> Theme.entries Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> entries
else -> Theme.entries.dropWhile { it == DYNAMIC } else -> entries.dropWhile { it == DYNAMIC }
} }
} }
} }

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/Theme.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/Theme.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.app.Activity
import android.os.Build import android.os.Build

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/ThemeExtensions.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/ThemeExtensions.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.material3.ColorScheme
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/ThemeLogger.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/ThemeLogger.kt
View file

@ -6,7 +6,7 @@
@file:Suppress("unused") @file:Suppress("unused")
package ua.acclorite.book_story.presentation.theme package ua.acclorite.book_story.ui.theme
import android.util.Log import android.util.Log
import androidx.compose.material3.ColorScheme import androidx.compose.material3.ColorScheme

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/Transitions.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/Transitions.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.AnimationSpec
import androidx.compose.animation.core.EaseInOut import androidx.compose.animation.core.EaseInOut

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/color/AquaTheme.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/color/AquaTheme.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.ColorScheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/color/BlackTheme.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlackTheme.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.ColorScheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/color/BlueTheme.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/color/BlueTheme.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.ColorScheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/color/DynamicTheme.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/color/DynamicTheme.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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 android.annotation.SuppressLint
import androidx.compose.material3.ColorScheme import androidx.compose.material3.ColorScheme

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Green2Theme.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/color/Green2Theme.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.ColorScheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/color/GreenGrayTheme.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenGrayTheme.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.ColorScheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/color/GreenTheme.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/color/GreenTheme.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.ColorScheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/color/LavenderTheme.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/color/LavenderTheme.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.ColorScheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/color/MarshTheme.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/color/MarshTheme.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.ColorScheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Pink2Theme.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/color/Pink2Theme.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.ColorScheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PinkTheme.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/color/PinkTheme.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.ColorScheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PurpleGrayTheme.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleGrayTheme.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.ColorScheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/color/PurpleTheme.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/color/PurpleTheme.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.ColorScheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/color/RedGrayTheme.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedGrayTheme.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.ColorScheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/color/RedTheme.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/color/RedTheme.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.ColorScheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/color/Yellow2Theme.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/color/Yellow2Theme.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.ColorScheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme

2
app/src/main/java/ua/acclorite/book_story/presentation/theme/color/YellowTheme.kt → app/src/main/java/ua/acclorite/book_story/ui/theme/color/YellowTheme.kt
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.ColorScheme
import androidx.compose.material3.darkColorScheme import androidx.compose.material3.darkColorScheme