diff --git a/app/src/main/java/ua/acclorite/book_story/Activity.kt b/app/src/main/java/ua/acclorite/book_story/Activity.kt index 894ced5b..8219d8bd 100644 --- a/app/src/main/java/ua/acclorite/book_story/Activity.kt +++ b/app/src/main/java/ua/acclorite/book_story/Activity.kt @@ -19,12 +19,12 @@ import androidx.compose.ui.platform.LocalFocusManager import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.core.view.WindowCompat import dagger.hilt.android.AndroidEntryPoint -import ua.acclorite.book_story.presentation.components.LocalMainViewModel -import ua.acclorite.book_story.presentation.components.bottom_navigation_bar.BottomNavigationBar -import ua.acclorite.book_story.presentation.components.custom_navigation_rail.CustomNavigationRail +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.bottom_navigation_bar.BottomNavigationBar +import ua.acclorite.book_story.presentation.core.components.custom_navigation_rail.CustomNavigationRail +import ua.acclorite.book_story.presentation.core.navigation.NavigationHost +import ua.acclorite.book_story.presentation.core.navigation.Screen import ua.acclorite.book_story.presentation.data.MainViewModel -import ua.acclorite.book_story.presentation.data.NavigationHost -import ua.acclorite.book_story.presentation.data.Screen import ua.acclorite.book_story.presentation.screens.about.AboutScreenRoot import ua.acclorite.book_story.presentation.screens.about.nested.credits.CreditsScreenRoot import ua.acclorite.book_story.presentation.screens.about.nested.license_info.LicenseInfoScreenRoot diff --git a/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt index fd38b66d..b958ca04 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt @@ -35,10 +35,10 @@ import ua.acclorite.book_story.domain.model.History import ua.acclorite.book_story.domain.model.NullableBook import ua.acclorite.book_story.domain.model.SelectableFile import ua.acclorite.book_story.domain.repository.BookRepository -import ua.acclorite.book_story.domain.util.Constants import ua.acclorite.book_story.domain.util.CoverImage import ua.acclorite.book_story.domain.util.Resource import ua.acclorite.book_story.domain.util.UIText +import ua.acclorite.book_story.presentation.core.constants.Constants import ua.acclorite.book_story.presentation.data.MainState import java.io.ByteArrayOutputStream import java.io.File diff --git a/app/src/main/java/ua/acclorite/book_story/domain/model/NavigationItem.kt b/app/src/main/java/ua/acclorite/book_story/domain/model/NavigationItem.kt index a68105f9..a2aa9518 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/model/NavigationItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/model/NavigationItem.kt @@ -3,7 +3,7 @@ package ua.acclorite.book_story.domain.model import androidx.annotation.DrawableRes import androidx.annotation.StringRes import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.presentation.data.Screen +import ua.acclorite.book_story.presentation.core.navigation.Screen @Immutable data class NavigationItem( diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/ChangeLanguage.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/ChangeLanguage.kt index c7799c12..8f2d63b1 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/ChangeLanguage.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/ChangeLanguage.kt @@ -3,7 +3,7 @@ package ua.acclorite.book_story.domain.use_case import androidx.appcompat.app.AppCompatDelegate import androidx.core.os.LocaleListCompat import ua.acclorite.book_story.domain.repository.BookRepository -import ua.acclorite.book_story.domain.util.DataStoreConstants +import ua.acclorite.book_story.presentation.core.constants.DataStoreConstants import javax.inject.Inject class ChangeLanguage @Inject constructor(private val repository: BookRepository) { diff --git a/app/src/main/java/ua/acclorite/book_story/domain/util/Typealias.kt b/app/src/main/java/ua/acclorite/book_story/domain/util/Typealias.kt index 9f8b0176..305e8b5b 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/util/Typealias.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/util/Typealias.kt @@ -1,7 +1,7 @@ package ua.acclorite.book_story.domain.util import android.graphics.Bitmap -import ua.acclorite.book_story.presentation.data.Navigator +import ua.acclorite.book_story.presentation.core.navigation.Navigator typealias CoverImage = Bitmap typealias Selected = Boolean diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/AnimatedTopAppBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/AnimatedTopAppBar.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/AnimatedTopAppBar.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/AnimatedTopAppBar.kt index d6042259..7ac1a41d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/AnimatedTopAppBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/AnimatedTopAppBar.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components +package ua.acclorite.book_story.presentation.core.components import androidx.compose.animation.core.Spring import androidx.compose.animation.core.animateFloatAsState diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/CategoryTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CategoryTitle.kt similarity index 94% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/CategoryTitle.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/CategoryTitle.kt index be7079a7..4f89ad39 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/CategoryTitle.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CategoryTitle.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components +package ua.acclorite.book_story.presentation.core.components import androidx.compose.foundation.layout.padding import androidx.compose.material3.MaterialTheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/CollapsibleUntilExitScrollBehavior.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CollapsibleUntilExitScrollBehavior.kt similarity index 95% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/CollapsibleUntilExitScrollBehavior.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/CollapsibleUntilExitScrollBehavior.kt index 5e23d57e..4718eba5 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/CollapsibleUntilExitScrollBehavior.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CollapsibleUntilExitScrollBehavior.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components +package ua.acclorite.book_story.presentation.core.components import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.rememberLazyListState diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomAnimatedVisibility.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomAnimatedVisibility.kt similarity index 95% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/CustomAnimatedVisibility.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomAnimatedVisibility.kt index 50d9c201..fd45619c 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomAnimatedVisibility.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomAnimatedVisibility.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components +package ua.acclorite.book_story.presentation.core.components import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.EnterTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomBottomSheet.kt similarity index 97% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/CustomBottomSheet.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomBottomSheet.kt index 9c17e0ef..6fd78744 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomBottomSheet.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components +package ua.acclorite.book_story.presentation.core.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.ColumnScope diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomCheckbox.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomCheckbox.kt similarity index 96% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/CustomCheckbox.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomCheckbox.kt index 602167b9..cf253a96 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomCheckbox.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomCheckbox.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components +package ua.acclorite.book_story.presentation.core.components import androidx.compose.foundation.background import androidx.compose.foundation.border diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomCoverImage.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomCoverImage.kt similarity index 93% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/CustomCoverImage.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomCoverImage.kt index 7483ced1..fcbb222f 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomCoverImage.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomCoverImage.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components +package ua.acclorite.book_story.presentation.core.components import android.net.Uri import androidx.compose.runtime.Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDropDownMenuItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomDropDownMenuItem.kt similarity index 95% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDropDownMenuItem.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomDropDownMenuItem.kt index b6dc35b1..07e773cd 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomDropDownMenuItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomDropDownMenuItem.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components +package ua.acclorite.book_story.presentation.core.components import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.size diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomIconButton.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomIconButton.kt similarity index 98% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/CustomIconButton.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomIconButton.kt index b2c20ae1..ffbc6ae9 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomIconButton.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomIconButton.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components +package ua.acclorite.book_story.presentation.core.components import androidx.annotation.DrawableRes import androidx.annotation.StringRes diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomLazyColumn.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomLazyColumn.kt similarity index 94% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/CustomLazyColumn.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomLazyColumn.kt index ecacfe7f..b84885e9 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomLazyColumn.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomLazyColumn.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components +package ua.acclorite.book_story.presentation.core.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -14,7 +14,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import my.nanihadesuka.compose.InternalLazyColumnScrollbar import my.nanihadesuka.compose.ScrollbarSettings -import ua.acclorite.book_story.domain.util.Constants +import ua.acclorite.book_story.presentation.core.constants.Constants /** * Custom Lazy Column. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomSearchTextField.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomSearchTextField.kt similarity index 97% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/CustomSearchTextField.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomSearchTextField.kt index 4572256c..24c8ac93 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomSearchTextField.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomSearchTextField.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components +package ua.acclorite.book_story.presentation.core.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxHeight diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomSelectionContainer.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomSelectionContainer.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/CustomSelectionContainer.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomSelectionContainer.kt index 3944725f..80c9236b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomSelectionContainer.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomSelectionContainer.kt @@ -1,6 +1,6 @@ @file:Suppress("DEPRECATION") -package ua.acclorite.book_story.presentation.components +package ua.acclorite.book_story.presentation.core.components import android.content.ClipData import android.content.ClipboardManager diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomSnackbar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomSnackbar.kt similarity index 98% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/CustomSnackbar.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomSnackbar.kt index 8034730b..3fc3a35f 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomSnackbar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomSnackbar.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components +package ua.acclorite.book_story.presentation.core.components import androidx.compose.animation.core.tween import androidx.compose.animation.fadeIn diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomTooltip.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomTooltip.kt similarity index 93% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/CustomTooltip.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomTooltip.kt index 98b4933b..4f90e4c2 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomTooltip.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/CustomTooltip.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components +package ua.acclorite.book_story.presentation.core.components import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.PlainTooltip diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/GoBackButton.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/GoBackButton.kt similarity index 93% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/GoBackButton.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/GoBackButton.kt index aa5d2ff0..aa6cfce0 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/GoBackButton.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/GoBackButton.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components +package ua.acclorite.book_story.presentation.core.components import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/LazyGridHeader.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/LazyGridHeader.kt similarity index 86% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/LazyGridHeader.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/LazyGridHeader.kt index fea50b3f..ea7791b2 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/LazyGridHeader.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/LazyGridHeader.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components +package ua.acclorite.book_story.presentation.core.components import androidx.compose.foundation.lazy.grid.GridItemSpan import androidx.compose.foundation.lazy.grid.LazyGridItemScope diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/LazyListItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/LazyListItem.kt similarity index 94% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/LazyListItem.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/LazyListItem.kt index e67339ec..b37a82bc 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/LazyListItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/LazyListItem.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components +package ua.acclorite.book_story.presentation.core.components import androidx.compose.foundation.lazy.LazyItemScope import androidx.compose.foundation.lazy.LazyListScope diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/MoreDropDown.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/MoreDropDown.kt similarity index 93% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/MoreDropDown.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/MoreDropDown.kt index 71972dde..26986749 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/MoreDropDown.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/MoreDropDown.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components +package ua.acclorite.book_story.presentation.core.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.PaddingValues @@ -17,8 +17,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.data.LocalNavigator -import ua.acclorite.book_story.presentation.data.Screen +import ua.acclorite.book_story.presentation.core.navigation.LocalNavigator +import ua.acclorite.book_story.presentation.core.navigation.Screen /** * More drop down. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/ViewModelCompositionProvider.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/ViewModelCompositionProvider.kt similarity index 97% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/ViewModelCompositionProvider.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/ViewModelCompositionProvider.kt index 58c66107..188abb14 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/ViewModelCompositionProvider.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/ViewModelCompositionProvider.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components +package ua.acclorite.book_story.presentation.core.components import androidx.compose.runtime.Composable import androidx.compose.runtime.ProvidableCompositionLocal @@ -6,7 +6,7 @@ import androidx.compose.runtime.State import androidx.compose.runtime.collectAsState import androidx.compose.runtime.compositionLocalOf import androidx.hilt.navigation.compose.hiltViewModel -import ua.acclorite.book_story.domain.util.BaseViewModel +import ua.acclorite.book_story.presentation.core.util.BaseViewModel import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.data.MainState import ua.acclorite.book_story.presentation.data.MainViewModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/bottom_navigation_bar/BottomNavigationBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/bottom_navigation_bar/BottomNavigationBar.kt similarity index 84% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/bottom_navigation_bar/BottomNavigationBar.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/bottom_navigation_bar/BottomNavigationBar.kt index 0761654d..ccedaa5d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/bottom_navigation_bar/BottomNavigationBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/bottom_navigation_bar/BottomNavigationBar.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components.bottom_navigation_bar +package ua.acclorite.book_story.presentation.core.components.bottom_navigation_bar import androidx.compose.material3.NavigationBar import androidx.compose.runtime.Composable @@ -7,9 +7,9 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue -import ua.acclorite.book_story.domain.util.Constants import ua.acclorite.book_story.domain.util.Route -import ua.acclorite.book_story.presentation.data.LocalNavigator +import ua.acclorite.book_story.presentation.core.constants.Constants +import ua.acclorite.book_story.presentation.core.navigation.LocalNavigator /** * Bottom navigation bar, uses default [NavigationBar]. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/bottom_navigation_bar/BottomNavigationItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/bottom_navigation_bar/BottomNavigationItem.kt similarity index 94% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/bottom_navigation_bar/BottomNavigationItem.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/bottom_navigation_bar/BottomNavigationItem.kt index 6fef657b..2a19034b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/bottom_navigation_bar/BottomNavigationItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/bottom_navigation_bar/BottomNavigationItem.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components.bottom_navigation_bar +package ua.acclorite.book_story.presentation.core.components.bottom_navigation_bar import androidx.compose.animation.Crossfade import androidx.compose.animation.core.tween @@ -14,7 +14,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import ua.acclorite.book_story.domain.model.NavigationItem -import ua.acclorite.book_story.presentation.components.CustomTooltip +import ua.acclorite.book_story.presentation.core.components.CustomTooltip /** * Bottom Navigation Bar Item, uses default [NavigationBarItem]. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/custom_dialog/CustomDialogWithContent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_dialog/CustomDialogWithContent.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/custom_dialog/CustomDialogWithContent.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_dialog/CustomDialogWithContent.kt index 2fa53529..cdf5aec1 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/custom_dialog/CustomDialogWithContent.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_dialog/CustomDialogWithContent.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components.custom_dialog +package ua.acclorite.book_story.presentation.core.components.custom_dialog import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/custom_dialog/CustomDialogWithLazyColumn.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_dialog/CustomDialogWithLazyColumn.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/custom_dialog/CustomDialogWithLazyColumn.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_dialog/CustomDialogWithLazyColumn.kt index 00dde813..58e1d507 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/custom_dialog/CustomDialogWithLazyColumn.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_dialog/CustomDialogWithLazyColumn.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components.custom_dialog +package ua.acclorite.book_story.presentation.core.components.custom_dialog import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/custom_dialog/SelectableDialogItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_dialog/SelectableDialogItem.kt similarity index 96% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/custom_dialog/SelectableDialogItem.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_dialog/SelectableDialogItem.kt index 7a197c98..cf2efe48 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/custom_dialog/SelectableDialogItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_dialog/SelectableDialogItem.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components.custom_dialog +package ua.acclorite.book_story.presentation.core.components.custom_dialog import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Row diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/custom_navigation_rail/CustomNavigationRail.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_navigation_rail/CustomNavigationRail.kt similarity index 92% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/custom_navigation_rail/CustomNavigationRail.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_navigation_rail/CustomNavigationRail.kt index c4e07399..6cb44224 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/custom_navigation_rail/CustomNavigationRail.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_navigation_rail/CustomNavigationRail.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components.custom_navigation_rail +package ua.acclorite.book_story.presentation.core.components.custom_navigation_rail import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -23,9 +23,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.util.Constants import ua.acclorite.book_story.domain.util.Route -import ua.acclorite.book_story.presentation.data.LocalNavigator +import ua.acclorite.book_story.presentation.core.constants.Constants +import ua.acclorite.book_story.presentation.core.navigation.LocalNavigator /** * Custom Navigation Rail. It is used to be shown on Tablets. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/custom_navigation_rail/CustomNavigationRailItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_navigation_rail/CustomNavigationRailItem.kt similarity index 93% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/custom_navigation_rail/CustomNavigationRailItem.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_navigation_rail/CustomNavigationRailItem.kt index 243c897f..47652e97 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/custom_navigation_rail/CustomNavigationRailItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/custom_navigation_rail/CustomNavigationRailItem.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components.custom_navigation_rail +package ua.acclorite.book_story.presentation.core.components.custom_navigation_rail import androidx.compose.animation.Crossfade import androidx.compose.animation.core.tween @@ -13,7 +13,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import ua.acclorite.book_story.domain.model.NavigationItem -import ua.acclorite.book_story.presentation.components.CustomTooltip +import ua.acclorite.book_story.presentation.core.components.CustomTooltip /** * Custom Navigation Rail item. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/is_messages/IsEmpty.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/is_messages/IsEmpty.kt similarity index 97% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/is_messages/IsEmpty.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/is_messages/IsEmpty.kt index 3e99d4ad..b110036b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/is_messages/IsEmpty.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/is_messages/IsEmpty.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components.is_messages +package ua.acclorite.book_story.presentation.core.components.is_messages import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/components/is_messages/IsError.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/is_messages/IsError.kt similarity index 97% rename from app/src/main/java/ua/acclorite/book_story/presentation/components/is_messages/IsError.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/components/is_messages/IsError.kt index e4964cac..5b334f5b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/is_messages/IsError.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/is_messages/IsError.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.components.is_messages +package ua.acclorite.book_story.presentation.core.components.is_messages import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/app/src/main/java/ua/acclorite/book_story/domain/util/Constants.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/Constants.kt similarity index 99% rename from app/src/main/java/ua/acclorite/book_story/domain/util/Constants.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/constants/Constants.kt index a17d8bb8..1d69a040 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/util/Constants.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/Constants.kt @@ -1,6 +1,6 @@ @file:Suppress("unused") -package ua.acclorite.book_story.domain.util +package ua.acclorite.book_story.presentation.core.constants import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Person @@ -24,7 +24,8 @@ import ua.acclorite.book_story.domain.model.Credit import ua.acclorite.book_story.domain.model.FontWithName import ua.acclorite.book_story.domain.model.HelpTip import ua.acclorite.book_story.domain.model.NavigationItem -import ua.acclorite.book_story.presentation.data.Screen +import ua.acclorite.book_story.domain.util.UIText +import ua.acclorite.book_story.presentation.core.navigation.Screen import ua.acclorite.book_story.presentation.screens.help.components.HelpAnnotation import ua.acclorite.book_story.presentation.ui.Theme diff --git a/app/src/main/java/ua/acclorite/book_story/domain/util/DataStoreConstants.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/DataStoreConstants.kt similarity index 97% rename from app/src/main/java/ua/acclorite/book_story/domain/util/DataStoreConstants.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/constants/DataStoreConstants.kt index eee4310b..21f36f90 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/util/DataStoreConstants.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/constants/DataStoreConstants.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.domain.util +package ua.acclorite.book_story.presentation.core.constants import androidx.datastore.preferences.core.booleanPreferencesKey import androidx.datastore.preferences.core.intPreferencesKey diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/data/Navigation.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/navigation/Navigation.kt similarity index 98% rename from app/src/main/java/ua/acclorite/book_story/presentation/data/Navigation.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/navigation/Navigation.kt index 839fbd6d..5212b898 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/data/Navigation.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/navigation/Navigation.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.presentation.data +package ua.acclorite.book_story.presentation.core.navigation import android.annotation.SuppressLint import android.os.Parcelable @@ -46,7 +46,7 @@ import kotlinx.parcelize.Parcelize import kotlinx.serialization.Serializable import ua.acclorite.book_story.domain.util.OnNavigate import ua.acclorite.book_story.domain.util.Route -import ua.acclorite.book_story.presentation.components.CustomAnimatedVisibility +import ua.acclorite.book_story.presentation.core.components.CustomAnimatedVisibility import ua.acclorite.book_story.presentation.ui.Transitions private const val CURRENT_SCREEN = "current_screen" diff --git a/app/src/main/java/ua/acclorite/book_story/domain/util/BaseViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/util/BaseViewModel.kt similarity index 78% rename from app/src/main/java/ua/acclorite/book_story/domain/util/BaseViewModel.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/util/BaseViewModel.kt index 40d764a2..40a3508b 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/util/BaseViewModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/util/BaseViewModel.kt @@ -1,4 +1,4 @@ -package ua.acclorite.book_story.domain.util +package ua.acclorite.book_story.presentation.core.util import androidx.lifecycle.ViewModel import kotlinx.coroutines.flow.StateFlow diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/data/Functions.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/util/Functions.kt similarity index 70% rename from app/src/main/java/ua/acclorite/book_story/presentation/data/Functions.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/core/util/Functions.kt index ee4ec1d0..fc89f4f5 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/data/Functions.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/util/Functions.kt @@ -1,12 +1,8 @@ -package ua.acclorite.book_story.presentation.data +package ua.acclorite.book_story.presentation.core.util -import android.content.Context import android.content.Intent -import android.widget.Toast import androidx.activity.ComponentActivity -var toast: Toast? = null - fun String.removeTrailingZero(): String { if (!this.contains('.')) return this @@ -37,12 +33,4 @@ fun Intent.launchActivity( } success?.invoke() -} - -fun String.showToast(context: Context, longToast: Boolean = true) { - toast?.cancel() - toast = null - - toast = Toast.makeText(context, this, if (longToast) Toast.LENGTH_LONG else Toast.LENGTH_SHORT) - toast?.show() } \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/util/Toast.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/util/Toast.kt new file mode 100644 index 00000000..760a81ba --- /dev/null +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/util/Toast.kt @@ -0,0 +1,14 @@ +package ua.acclorite.book_story.presentation.core.util + +import android.content.Context +import android.widget.Toast + +var toast: Toast? = null + +fun String.showToast(context: Context, longToast: Boolean = true) { + toast?.cancel() + toast = null + + toast = Toast.makeText(context, this, if (longToast) Toast.LENGTH_LONG else Toast.LENGTH_SHORT) + toast?.show() +} \ No newline at end of file diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/data/MainState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/data/MainState.kt index eb6081e2..68dfdb12 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/data/MainState.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/data/MainState.kt @@ -8,8 +8,8 @@ import androidx.annotation.Keep import androidx.compose.runtime.Immutable import androidx.datastore.preferences.core.Preferences import kotlinx.parcelize.Parcelize -import ua.acclorite.book_story.domain.util.Constants -import ua.acclorite.book_story.domain.util.DataStoreConstants +import ua.acclorite.book_story.presentation.core.constants.Constants +import ua.acclorite.book_story.presentation.core.constants.DataStoreConstants import ua.acclorite.book_story.presentation.screens.settings.nested.browse.data.BrowseFilesStructure import ua.acclorite.book_story.presentation.screens.settings.nested.browse.data.BrowseLayout import ua.acclorite.book_story.presentation.screens.settings.nested.browse.data.BrowseSortOrder diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/data/MainViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/data/MainViewModel.kt index 447eae89..75411e15 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/data/MainViewModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/data/MainViewModel.kt @@ -15,9 +15,9 @@ import ua.acclorite.book_story.domain.use_case.ChangeLanguage import ua.acclorite.book_story.domain.use_case.CheckForUpdates import ua.acclorite.book_story.domain.use_case.GetAllSettings import ua.acclorite.book_story.domain.use_case.SetDatastore -import ua.acclorite.book_story.domain.util.BaseViewModel -import ua.acclorite.book_story.domain.util.Constants -import ua.acclorite.book_story.domain.util.DataStoreConstants +import ua.acclorite.book_story.presentation.core.constants.Constants +import ua.acclorite.book_story.presentation.core.constants.DataStoreConstants +import ua.acclorite.book_story.presentation.core.util.BaseViewModel import ua.acclorite.book_story.presentation.screens.library.data.LibraryViewModel import ua.acclorite.book_story.presentation.screens.settings.data.SettingsViewModel import ua.acclorite.book_story.presentation.screens.settings.nested.browse.data.toBrowseLayout diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/AboutScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/AboutScreen.kt index 7191dc2b..68b28047 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/AboutScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/AboutScreen.kt @@ -28,13 +28,13 @@ 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.components.CustomLazyColumn -import ua.acclorite.book_story.presentation.components.GoBackButton -import ua.acclorite.book_story.presentation.components.LocalAboutViewModel -import ua.acclorite.book_story.presentation.components.collapsibleUntilExitScrollBehaviorWithLazyListState -import ua.acclorite.book_story.presentation.data.LocalOnNavigate -import ua.acclorite.book_story.presentation.data.Screen -import ua.acclorite.book_story.presentation.data.showToast +import ua.acclorite.book_story.presentation.core.components.CustomLazyColumn +import ua.acclorite.book_story.presentation.core.components.GoBackButton +import ua.acclorite.book_story.presentation.core.components.LocalAboutViewModel +import ua.acclorite.book_story.presentation.core.components.collapsibleUntilExitScrollBehaviorWithLazyListState +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.navigation.Screen +import ua.acclorite.book_story.presentation.core.util.showToast import ua.acclorite.book_story.presentation.screens.about.components.AboutItem import ua.acclorite.book_story.presentation.screens.about.components.AboutUpdateDialog import ua.acclorite.book_story.presentation.screens.about.components.badges.AboutBadges diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/components/AboutUpdateDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/components/AboutUpdateDialog.kt index 8452af7f..a9a3c456 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/components/AboutUpdateDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/components/AboutUpdateDialog.kt @@ -7,9 +7,9 @@ import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalAboutViewModel -import ua.acclorite.book_story.presentation.components.custom_dialog.CustomDialogWithContent -import ua.acclorite.book_story.presentation.data.showToast +import ua.acclorite.book_story.presentation.core.components.LocalAboutViewModel +import ua.acclorite.book_story.presentation.core.components.custom_dialog.CustomDialogWithContent +import ua.acclorite.book_story.presentation.core.util.showToast import ua.acclorite.book_story.presentation.screens.about.data.AboutEvent /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/components/badges/AboutBadgeItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/components/badges/AboutBadgeItem.kt index bb93ce94..e92f79fc 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/components/badges/AboutBadgeItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/components/badges/AboutBadgeItem.kt @@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import ua.acclorite.book_story.domain.model.Badge -import ua.acclorite.book_story.presentation.components.CustomIconButton +import ua.acclorite.book_story.presentation.core.components.CustomIconButton /** * About Badge Item. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/components/badges/AboutBadges.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/components/badges/AboutBadges.kt index 359221df..965865f4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/components/badges/AboutBadges.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/components/badges/AboutBadges.kt @@ -12,10 +12,10 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.util.Constants -import ua.acclorite.book_story.presentation.components.LocalAboutViewModel -import ua.acclorite.book_story.presentation.components.customItems -import ua.acclorite.book_story.presentation.data.showToast +import ua.acclorite.book_story.presentation.core.components.LocalAboutViewModel +import ua.acclorite.book_story.presentation.core.components.customItems +import ua.acclorite.book_story.presentation.core.constants.Constants +import ua.acclorite.book_story.presentation.core.util.showToast import ua.acclorite.book_story.presentation.screens.about.data.AboutEvent /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/data/AboutViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/data/AboutViewModel.kt index d20ac4d2..e5fd09ae 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/data/AboutViewModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/data/AboutViewModel.kt @@ -11,8 +11,8 @@ import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.use_case.CheckForUpdates -import ua.acclorite.book_story.domain.util.BaseViewModel -import ua.acclorite.book_story.presentation.data.launchActivity +import ua.acclorite.book_story.presentation.core.util.BaseViewModel +import ua.acclorite.book_story.presentation.core.util.launchActivity import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/credits/CreditsScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/credits/CreditsScreen.kt index 3effecd4..14ef6eb6 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/credits/CreditsScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/credits/CreditsScreen.kt @@ -17,14 +17,14 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.util.Constants -import ua.acclorite.book_story.presentation.components.CustomLazyColumn -import ua.acclorite.book_story.presentation.components.GoBackButton -import ua.acclorite.book_story.presentation.components.LocalAboutViewModel -import ua.acclorite.book_story.presentation.components.collapsibleUntilExitScrollBehaviorWithLazyListState -import ua.acclorite.book_story.presentation.components.customItems -import ua.acclorite.book_story.presentation.data.LocalOnNavigate -import ua.acclorite.book_story.presentation.data.showToast +import ua.acclorite.book_story.presentation.core.components.CustomLazyColumn +import ua.acclorite.book_story.presentation.core.components.GoBackButton +import ua.acclorite.book_story.presentation.core.components.LocalAboutViewModel +import ua.acclorite.book_story.presentation.core.components.collapsibleUntilExitScrollBehaviorWithLazyListState +import ua.acclorite.book_story.presentation.core.components.customItems +import ua.acclorite.book_story.presentation.core.constants.Constants +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.util.showToast import ua.acclorite.book_story.presentation.screens.about.data.AboutEvent import ua.acclorite.book_story.presentation.screens.about.nested.credits.components.CreditItem diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/license_info/LicenseInfoScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/license_info/LicenseInfoScreen.kt index 325d5257..20f64192 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/license_info/LicenseInfoScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/license_info/LicenseInfoScreen.kt @@ -32,15 +32,15 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CustomIconButton -import ua.acclorite.book_story.presentation.components.CustomLazyColumn -import ua.acclorite.book_story.presentation.components.GoBackButton -import ua.acclorite.book_story.presentation.components.LocalLicenseInfoViewModel -import ua.acclorite.book_story.presentation.components.collapsibleUntilExitScrollBehaviorWithLazyListState -import ua.acclorite.book_story.presentation.components.customItems -import ua.acclorite.book_story.presentation.data.LocalOnNavigate -import ua.acclorite.book_story.presentation.data.Screen -import ua.acclorite.book_story.presentation.data.showToast +import ua.acclorite.book_story.presentation.core.components.CustomIconButton +import ua.acclorite.book_story.presentation.core.components.CustomLazyColumn +import ua.acclorite.book_story.presentation.core.components.GoBackButton +import ua.acclorite.book_story.presentation.core.components.LocalLicenseInfoViewModel +import ua.acclorite.book_story.presentation.core.components.collapsibleUntilExitScrollBehaviorWithLazyListState +import ua.acclorite.book_story.presentation.core.components.customItems +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.navigation.Screen +import ua.acclorite.book_story.presentation.core.util.showToast import ua.acclorite.book_story.presentation.screens.about.nested.license_info.data.LicenseInfoEvent import ua.acclorite.book_story.presentation.ui.DefaultTransition import ua.acclorite.book_story.presentation.ui.SlidingTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/license_info/data/LicenseInfoViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/license_info/data/LicenseInfoViewModel.kt index c2b4b9f0..7d1c629b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/license_info/data/LicenseInfoViewModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/license_info/data/LicenseInfoViewModel.kt @@ -13,10 +13,10 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import ua.acclorite.book_story.domain.util.BaseViewModel import ua.acclorite.book_story.domain.util.OnNavigate -import ua.acclorite.book_story.presentation.data.Screen -import ua.acclorite.book_story.presentation.data.launchActivity +import ua.acclorite.book_story.presentation.core.navigation.Screen +import ua.acclorite.book_story.presentation.core.util.BaseViewModel +import ua.acclorite.book_story.presentation.core.util.launchActivity import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/licenses/LicensesScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/licenses/LicensesScreen.kt index ce89a1da..1a6987d5 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/licenses/LicensesScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/licenses/LicensesScreen.kt @@ -24,14 +24,14 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CustomAnimatedVisibility -import ua.acclorite.book_story.presentation.components.CustomLazyColumn -import ua.acclorite.book_story.presentation.components.GoBackButton -import ua.acclorite.book_story.presentation.components.LocalLicensesViewModel -import ua.acclorite.book_story.presentation.components.collapsibleUntilExitScrollBehaviorWithLazyListState -import ua.acclorite.book_story.presentation.components.customItems -import ua.acclorite.book_story.presentation.data.LocalOnNavigate -import ua.acclorite.book_story.presentation.data.Screen +import ua.acclorite.book_story.presentation.core.components.CustomAnimatedVisibility +import ua.acclorite.book_story.presentation.core.components.CustomLazyColumn +import ua.acclorite.book_story.presentation.core.components.GoBackButton +import ua.acclorite.book_story.presentation.core.components.LocalLicensesViewModel +import ua.acclorite.book_story.presentation.core.components.collapsibleUntilExitScrollBehaviorWithLazyListState +import ua.acclorite.book_story.presentation.core.components.customItems +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.navigation.Screen import ua.acclorite.book_story.presentation.screens.about.nested.licenses.components.LicenseItem @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/licenses/data/LicensesViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/licenses/data/LicensesViewModel.kt index bbe0d1dc..23283eac 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/licenses/data/LicensesViewModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/about/nested/licenses/data/LicensesViewModel.kt @@ -11,7 +11,7 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.util.BaseViewModel +import ua.acclorite.book_story.presentation.core.util.BaseViewModel import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/BookInfoScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/BookInfoScreen.kt index 6461b0bd..c7f3a0c5 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/BookInfoScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/BookInfoScreen.kt @@ -44,11 +44,11 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CustomAnimatedVisibility -import ua.acclorite.book_story.presentation.components.CustomSnackbar -import ua.acclorite.book_story.presentation.components.LocalBookInfoViewModel -import ua.acclorite.book_story.presentation.data.LocalOnNavigate -import ua.acclorite.book_story.presentation.data.Screen +import ua.acclorite.book_story.presentation.core.components.CustomAnimatedVisibility +import ua.acclorite.book_story.presentation.core.components.CustomSnackbar +import ua.acclorite.book_story.presentation.core.components.LocalBookInfoViewModel +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.navigation.Screen import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoBackground import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoDescriptionSection import ua.acclorite.book_story.presentation.screens.book_info.components.BookInfoInfoSection diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoBackground.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoBackground.kt index 3fb3b866..22715939 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoBackground.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoBackground.kt @@ -12,7 +12,7 @@ import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.components.CustomCoverImage +import ua.acclorite.book_story.presentation.core.components.CustomCoverImage /** * Background of the BookInfoScreen. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDescriptionSection.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDescriptionSection.kt index ff8910fa..fe6d23d3 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDescriptionSection.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoDescriptionSection.kt @@ -25,7 +25,7 @@ import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalBookInfoViewModel +import ua.acclorite.book_story.presentation.core.components.LocalBookInfoViewModel import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoInfoSection.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoInfoSection.kt index fec6e90c..ec88e03c 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoInfoSection.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoInfoSection.kt @@ -38,8 +38,8 @@ import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CustomCoverImage -import ua.acclorite.book_story.presentation.components.LocalBookInfoViewModel +import ua.acclorite.book_story.presentation.core.components.CustomCoverImage +import ua.acclorite.book_story.presentation.core.components.LocalBookInfoViewModel import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoreDropDown.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoreDropDown.kt index 1568dbb7..79fae51e 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoreDropDown.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoMoreDropDown.kt @@ -17,9 +17,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CustomDropDownMenuItem -import ua.acclorite.book_story.presentation.components.CustomIconButton -import ua.acclorite.book_story.presentation.components.LocalBookInfoViewModel +import ua.acclorite.book_story.presentation.core.components.CustomDropDownMenuItem +import ua.acclorite.book_story.presentation.core.components.CustomIconButton +import ua.acclorite.book_story.presentation.core.components.LocalBookInfoViewModel import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoStatisticSection.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoStatisticSection.kt index 33f61059..78e911a7 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoStatisticSection.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoStatisticSection.kt @@ -16,9 +16,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalBookInfoViewModel -import ua.acclorite.book_story.presentation.data.removeDigits -import ua.acclorite.book_story.presentation.data.removeTrailingZero +import ua.acclorite.book_story.presentation.core.components.LocalBookInfoViewModel +import ua.acclorite.book_story.presentation.core.util.removeDigits +import ua.acclorite.book_story.presentation.core.util.removeTrailingZero /** * Statistic section. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoTopBar.kt index 51595d07..a7ba124d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/BookInfoTopBar.kt @@ -19,14 +19,14 @@ import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.style.TextOverflow import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.AnimatedTopAppBar -import ua.acclorite.book_story.presentation.components.CustomAnimatedVisibility -import ua.acclorite.book_story.presentation.components.CustomIconButton -import ua.acclorite.book_story.presentation.components.GoBackButton -import ua.acclorite.book_story.presentation.components.LocalBookInfoViewModel -import ua.acclorite.book_story.presentation.components.LocalHistoryViewModel -import ua.acclorite.book_story.presentation.components.LocalLibraryViewModel -import ua.acclorite.book_story.presentation.data.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.components.AnimatedTopAppBar +import ua.acclorite.book_story.presentation.core.components.CustomAnimatedVisibility +import ua.acclorite.book_story.presentation.core.components.CustomIconButton +import ua.acclorite.book_story.presentation.core.components.GoBackButton +import ua.acclorite.book_story.presentation.core.components.LocalBookInfoViewModel +import ua.acclorite.book_story.presentation.core.components.LocalHistoryViewModel +import ua.acclorite.book_story.presentation.core.components.LocalLibraryViewModel +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/change_cover_bottom_sheet/BookInfoChangeCoverBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/change_cover_bottom_sheet/BookInfoChangeCoverBottomSheet.kt index 8af2906d..c0bb6bad 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/change_cover_bottom_sheet/BookInfoChangeCoverBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/change_cover_bottom_sheet/BookInfoChangeCoverBottomSheet.kt @@ -18,11 +18,11 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CustomBottomSheet -import ua.acclorite.book_story.presentation.components.LocalBookInfoViewModel -import ua.acclorite.book_story.presentation.components.LocalHistoryViewModel -import ua.acclorite.book_story.presentation.components.LocalLibraryViewModel -import ua.acclorite.book_story.presentation.data.showToast +import ua.acclorite.book_story.presentation.core.components.CustomBottomSheet +import ua.acclorite.book_story.presentation.core.components.LocalBookInfoViewModel +import ua.acclorite.book_story.presentation.core.components.LocalHistoryViewModel +import ua.acclorite.book_story.presentation.core.components.LocalLibraryViewModel +import ua.acclorite.book_story.presentation.core.util.showToast import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/confirm_update_dialog/BookInfoConfirmUpateDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/confirm_update_dialog/BookInfoConfirmUpateDialog.kt index 20078617..584ae621 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/confirm_update_dialog/BookInfoConfirmUpateDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/confirm_update_dialog/BookInfoConfirmUpateDialog.kt @@ -7,10 +7,10 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalBookInfoViewModel -import ua.acclorite.book_story.presentation.components.LocalHistoryViewModel -import ua.acclorite.book_story.presentation.components.LocalLibraryViewModel -import ua.acclorite.book_story.presentation.components.custom_dialog.CustomDialogWithContent +import ua.acclorite.book_story.presentation.core.components.LocalBookInfoViewModel +import ua.acclorite.book_story.presentation.core.components.LocalHistoryViewModel +import ua.acclorite.book_story.presentation.core.components.LocalLibraryViewModel +import ua.acclorite.book_story.presentation.core.components.custom_dialog.CustomDialogWithContent import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/details_bottom_sheet/BookInfoDetailsBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/details_bottom_sheet/BookInfoDetailsBottomSheet.kt index 31ea6cfb..8e4b42a5 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/details_bottom_sheet/BookInfoDetailsBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/details_bottom_sheet/BookInfoDetailsBottomSheet.kt @@ -10,9 +10,9 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CustomBottomSheet -import ua.acclorite.book_story.presentation.components.LocalBookInfoViewModel -import ua.acclorite.book_story.presentation.data.showToast +import ua.acclorite.book_story.presentation.core.components.CustomBottomSheet +import ua.acclorite.book_story.presentation.core.components.LocalBookInfoViewModel +import ua.acclorite.book_story.presentation.core.util.showToast import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent import java.io.File import java.text.SimpleDateFormat diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/dialog/BookInfoDeleteDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/dialog/BookInfoDeleteDialog.kt index 30d53e82..bf30fcfb 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/dialog/BookInfoDeleteDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/dialog/BookInfoDeleteDialog.kt @@ -6,13 +6,13 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalBookInfoViewModel -import ua.acclorite.book_story.presentation.components.LocalBrowseViewModel -import ua.acclorite.book_story.presentation.components.LocalHistoryViewModel -import ua.acclorite.book_story.presentation.components.LocalLibraryViewModel -import ua.acclorite.book_story.presentation.components.custom_dialog.CustomDialogWithContent -import ua.acclorite.book_story.presentation.data.LocalOnNavigate -import ua.acclorite.book_story.presentation.data.showToast +import ua.acclorite.book_story.presentation.core.components.LocalBookInfoViewModel +import ua.acclorite.book_story.presentation.core.components.LocalBrowseViewModel +import ua.acclorite.book_story.presentation.core.components.LocalHistoryViewModel +import ua.acclorite.book_story.presentation.core.components.LocalLibraryViewModel +import ua.acclorite.book_story.presentation.core.components.custom_dialog.CustomDialogWithContent +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.util.showToast import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/dialog/BookInfoMoveDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/dialog/BookInfoMoveDialog.kt index 8a7d3f60..d177ce60 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/dialog/BookInfoMoveDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/components/dialog/BookInfoMoveDialog.kt @@ -9,14 +9,14 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.Category -import ua.acclorite.book_story.presentation.components.LocalBookInfoViewModel -import ua.acclorite.book_story.presentation.components.LocalHistoryViewModel -import ua.acclorite.book_story.presentation.components.LocalLibraryViewModel -import ua.acclorite.book_story.presentation.components.customItems -import ua.acclorite.book_story.presentation.components.custom_dialog.CustomDialogWithLazyColumn -import ua.acclorite.book_story.presentation.components.custom_dialog.SelectableDialogItem -import ua.acclorite.book_story.presentation.data.LocalOnNavigate -import ua.acclorite.book_story.presentation.data.showToast +import ua.acclorite.book_story.presentation.core.components.LocalBookInfoViewModel +import ua.acclorite.book_story.presentation.core.components.LocalHistoryViewModel +import ua.acclorite.book_story.presentation.core.components.LocalLibraryViewModel +import ua.acclorite.book_story.presentation.core.components.customItems +import ua.acclorite.book_story.presentation.core.components.custom_dialog.CustomDialogWithLazyColumn +import ua.acclorite.book_story.presentation.core.components.custom_dialog.SelectableDialogItem +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.util.showToast import ua.acclorite.book_story.presentation.screens.book_info.data.BookInfoEvent import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoState.kt index 3fb63329..4f3c26ef 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoState.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoState.kt @@ -3,7 +3,7 @@ package ua.acclorite.book_story.presentation.screens.book_info.data import androidx.compose.runtime.Immutable import ua.acclorite.book_story.domain.model.Book import ua.acclorite.book_story.domain.model.Category -import ua.acclorite.book_story.domain.util.Constants +import ua.acclorite.book_story.presentation.core.constants.Constants @Immutable data class BookInfoState( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoViewModel.kt index 6658787d..70fa217a 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoViewModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/book_info/data/BookInfoViewModel.kt @@ -33,10 +33,10 @@ import ua.acclorite.book_story.domain.use_case.ResetCoverImage import ua.acclorite.book_story.domain.use_case.UpdateBookWithText import ua.acclorite.book_story.domain.use_case.UpdateBooks import ua.acclorite.book_story.domain.use_case.UpdateCoverImageOfBook -import ua.acclorite.book_story.domain.util.BaseViewModel import ua.acclorite.book_story.domain.util.OnNavigate import ua.acclorite.book_story.domain.util.UIText -import ua.acclorite.book_story.presentation.data.Screen +import ua.acclorite.book_story.presentation.core.navigation.Screen +import ua.acclorite.book_story.presentation.core.util.BaseViewModel import java.io.File import java.util.Date import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/BrowseScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/BrowseScreen.kt index 4f344d85..e1993b2c 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/BrowseScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/BrowseScreen.kt @@ -24,11 +24,11 @@ import com.google.accompanist.permissions.PermissionState import com.google.accompanist.permissions.rememberPermissionState import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.SelectableFile -import ua.acclorite.book_story.presentation.components.LocalBrowseViewModel -import ua.acclorite.book_story.presentation.components.LocalMainViewModel -import ua.acclorite.book_story.presentation.data.LocalOnNavigate -import ua.acclorite.book_story.presentation.data.Screen -import ua.acclorite.book_story.presentation.data.showToast +import ua.acclorite.book_story.presentation.core.components.LocalBrowseViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.navigation.Screen +import ua.acclorite.book_story.presentation.core.util.showToast import ua.acclorite.book_story.presentation.screens.browse.components.BrowseEmptyPlaceholder import ua.acclorite.book_story.presentation.screens.browse.components.BrowseStoragePermissionDialog import ua.acclorite.book_story.presentation.screens.browse.components.adding_dialog.BrowseAddingDialog diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseEmptyPlaceholder.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseEmptyPlaceholder.kt index 6fad53ae..7a6f1964 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseEmptyPlaceholder.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseEmptyPlaceholder.kt @@ -9,12 +9,12 @@ import androidx.compose.ui.res.stringResource import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.PermissionState import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CustomAnimatedVisibility -import ua.acclorite.book_story.presentation.components.LocalBrowseViewModel -import ua.acclorite.book_story.presentation.components.is_messages.IsEmpty -import ua.acclorite.book_story.presentation.components.is_messages.IsError -import ua.acclorite.book_story.presentation.data.LocalOnNavigate -import ua.acclorite.book_story.presentation.data.Screen +import ua.acclorite.book_story.presentation.core.components.CustomAnimatedVisibility +import ua.acclorite.book_story.presentation.core.components.LocalBrowseViewModel +import ua.acclorite.book_story.presentation.core.components.is_messages.IsEmpty +import ua.acclorite.book_story.presentation.core.components.is_messages.IsError +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.navigation.Screen import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent import ua.acclorite.book_story.presentation.ui.Transitions diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseStoragePermissionDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseStoragePermissionDialog.kt index 7bdfc834..89c949df 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseStoragePermissionDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/BrowseStoragePermissionDialog.kt @@ -9,8 +9,8 @@ import androidx.compose.ui.res.stringResource import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.PermissionState import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalBrowseViewModel -import ua.acclorite.book_story.presentation.components.custom_dialog.CustomDialogWithContent +import ua.acclorite.book_story.presentation.core.components.LocalBrowseViewModel +import ua.acclorite.book_story.presentation.core.components.custom_dialog.CustomDialogWithContent import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/adding_dialog/BrowseAddingDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/adding_dialog/BrowseAddingDialog.kt index b4508220..b7ef85f4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/adding_dialog/BrowseAddingDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/adding_dialog/BrowseAddingDialog.kt @@ -17,12 +17,12 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.NullableBook -import ua.acclorite.book_story.presentation.components.LocalBrowseViewModel -import ua.acclorite.book_story.presentation.components.LocalLibraryViewModel -import ua.acclorite.book_story.presentation.components.customItems -import ua.acclorite.book_story.presentation.components.custom_dialog.CustomDialogWithLazyColumn -import ua.acclorite.book_story.presentation.data.LocalOnNavigate -import ua.acclorite.book_story.presentation.data.showToast +import ua.acclorite.book_story.presentation.core.components.LocalBrowseViewModel +import ua.acclorite.book_story.presentation.core.components.LocalLibraryViewModel +import ua.acclorite.book_story.presentation.core.components.customItems +import ua.acclorite.book_story.presentation.core.components.custom_dialog.CustomDialogWithLazyColumn +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.util.showToast import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/adding_dialog/BrowseAddingDialogItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/adding_dialog/BrowseAddingDialogItem.kt index 64ff5e0f..c56c5b0a 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/adding_dialog/BrowseAddingDialogItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/adding_dialog/BrowseAddingDialogItem.kt @@ -22,7 +22,7 @@ import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.NullableBook import ua.acclorite.book_story.domain.util.Selected -import ua.acclorite.book_story.presentation.components.CustomCheckbox +import ua.acclorite.book_story.presentation.core.components.CustomCheckbox /** * Adding dialog item. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/filter_bottom_sheet/BrowseFilterBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/filter_bottom_sheet/BrowseFilterBottomSheet.kt index b18050b5..4216e99d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/filter_bottom_sheet/BrowseFilterBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/filter_bottom_sheet/BrowseFilterBottomSheet.kt @@ -10,8 +10,8 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.components.CustomBottomSheet -import ua.acclorite.book_story.presentation.components.LocalBrowseViewModel +import ua.acclorite.book_story.presentation.core.components.CustomBottomSheet +import ua.acclorite.book_story.presentation.core.components.LocalBrowseViewModel import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent import ua.acclorite.book_story.presentation.screens.settings.nested.browse.components.subcategories.BrowseFilterSubcategory import ua.acclorite.book_story.presentation.screens.settings.nested.browse.components.subcategories.BrowseGeneralSubcategory diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/BrowseLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/BrowseLayout.kt index 26971cdb..3d1d305a 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/BrowseLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/BrowseLayout.kt @@ -2,7 +2,7 @@ package ua.acclorite.book_story.presentation.screens.browse.components.layout import androidx.compose.runtime.Composable import ua.acclorite.book_story.domain.model.SelectableFile -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel import ua.acclorite.book_story.presentation.screens.browse.components.layout.grid.BrowseGridLayout import ua.acclorite.book_story.presentation.screens.browse.components.layout.list.BrowseListLayout import ua.acclorite.book_story.presentation.screens.settings.nested.browse.data.BrowseLayout diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/grid/BrowseGridDirectoryItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/grid/BrowseGridDirectoryItem.kt index 873ecdac..af6cd5a2 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/grid/BrowseGridDirectoryItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/grid/BrowseGridDirectoryItem.kt @@ -28,7 +28,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.SelectableFile -import ua.acclorite.book_story.presentation.components.CustomCheckbox +import ua.acclorite.book_story.presentation.core.components.CustomCheckbox import ua.acclorite.book_story.presentation.ui.DefaultTransition import java.text.SimpleDateFormat import java.util.Date diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/grid/BrowseGridFileItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/grid/BrowseGridFileItem.kt index 34aa1d28..212b3cf3 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/grid/BrowseGridFileItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/grid/BrowseGridFileItem.kt @@ -24,7 +24,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.SelectableFile -import ua.acclorite.book_story.presentation.components.CustomCheckbox +import ua.acclorite.book_story.presentation.core.components.CustomCheckbox import ua.acclorite.book_story.presentation.ui.DefaultTransition import java.text.SimpleDateFormat import java.util.Date diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/grid/BrowseGridLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/grid/BrowseGridLayout.kt index f00c55d4..a90d3551 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/grid/BrowseGridLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/grid/BrowseGridLayout.kt @@ -10,9 +10,9 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import ua.acclorite.book_story.domain.model.SelectableFile -import ua.acclorite.book_story.presentation.components.LocalBrowseViewModel -import ua.acclorite.book_story.presentation.components.customItems -import ua.acclorite.book_story.presentation.components.header +import ua.acclorite.book_story.presentation.core.components.LocalBrowseViewModel +import ua.acclorite.book_story.presentation.core.components.customItems +import ua.acclorite.book_story.presentation.core.components.header import ua.acclorite.book_story.presentation.screens.browse.components.layout.BrowseItem import ua.acclorite.book_story.presentation.screens.settings.nested.browse.data.BrowseLayout diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/list/BrowseListItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/list/BrowseListItem.kt index 80ee3878..06cb80b4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/list/BrowseListItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/list/BrowseListItem.kt @@ -27,7 +27,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.SelectableFile -import ua.acclorite.book_story.presentation.components.CustomCheckbox +import ua.acclorite.book_story.presentation.core.components.CustomCheckbox import ua.acclorite.book_story.presentation.ui.FadeTransitionPreservingSpace @OptIn(ExperimentalFoundationApi::class) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/list/BrowseListLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/list/BrowseListLayout.kt index a3af424a..50eab3f5 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/list/BrowseListLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/layout/list/BrowseListLayout.kt @@ -8,8 +8,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import ua.acclorite.book_story.domain.model.SelectableFile -import ua.acclorite.book_story.presentation.components.LocalBrowseViewModel -import ua.acclorite.book_story.presentation.components.customItems +import ua.acclorite.book_story.presentation.core.components.LocalBrowseViewModel +import ua.acclorite.book_story.presentation.core.components.customItems import ua.acclorite.book_story.presentation.screens.browse.components.layout.BrowseItem import ua.acclorite.book_story.presentation.screens.settings.nested.browse.data.BrowseLayout diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/top_bar/BrowseTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/top_bar/BrowseTopBar.kt index 262b52e6..b6041e98 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/top_bar/BrowseTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/top_bar/BrowseTopBar.kt @@ -34,13 +34,13 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.SelectableFile -import ua.acclorite.book_story.presentation.components.AnimatedTopAppBar -import ua.acclorite.book_story.presentation.components.CustomAnimatedVisibility -import ua.acclorite.book_story.presentation.components.CustomIconButton -import ua.acclorite.book_story.presentation.components.CustomSearchTextField -import ua.acclorite.book_story.presentation.components.LocalBrowseViewModel -import ua.acclorite.book_story.presentation.components.LocalMainViewModel -import ua.acclorite.book_story.presentation.components.MoreDropDown +import ua.acclorite.book_story.presentation.core.components.AnimatedTopAppBar +import ua.acclorite.book_story.presentation.core.components.CustomAnimatedVisibility +import ua.acclorite.book_story.presentation.core.components.CustomIconButton +import ua.acclorite.book_story.presentation.core.components.CustomSearchTextField +import ua.acclorite.book_story.presentation.core.components.LocalBrowseViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.MoreDropDown import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent import ua.acclorite.book_story.presentation.screens.settings.nested.browse.data.BrowseFilesStructure import ua.acclorite.book_story.presentation.screens.settings.nested.browse.data.BrowseLayout diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/top_bar/BrowseTopBarDirectoryPath.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/top_bar/BrowseTopBarDirectoryPath.kt index c84a66f6..eee47093 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/top_bar/BrowseTopBarDirectoryPath.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/components/top_bar/BrowseTopBarDirectoryPath.kt @@ -26,10 +26,10 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CustomAnimatedVisibility -import ua.acclorite.book_story.presentation.components.LocalBrowseViewModel -import ua.acclorite.book_story.presentation.components.LocalMainViewModel -import ua.acclorite.book_story.presentation.components.customItemsIndexed +import ua.acclorite.book_story.presentation.core.components.CustomAnimatedVisibility +import ua.acclorite.book_story.presentation.core.components.LocalBrowseViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.customItemsIndexed import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent import ua.acclorite.book_story.presentation.screens.settings.nested.browse.data.BrowseFilesStructure import java.io.File diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseViewModel.kt index 6fc6bdd1..3ef8cce9 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseViewModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/browse/data/BrowseViewModel.kt @@ -28,10 +28,10 @@ import ua.acclorite.book_story.domain.use_case.GetBookFromFile import ua.acclorite.book_story.domain.use_case.GetFilesFromDevice import ua.acclorite.book_story.domain.use_case.InsertBook import ua.acclorite.book_story.domain.use_case.UpdateFavoriteDirectory -import ua.acclorite.book_story.domain.util.BaseViewModel +import ua.acclorite.book_story.presentation.core.navigation.Screen +import ua.acclorite.book_story.presentation.core.util.BaseViewModel +import ua.acclorite.book_story.presentation.core.util.launchActivity import ua.acclorite.book_story.presentation.data.MainState -import ua.acclorite.book_story.presentation.data.Screen -import ua.acclorite.book_story.presentation.data.launchActivity import ua.acclorite.book_story.presentation.screens.settings.nested.browse.data.BrowseFilesStructure import ua.acclorite.book_story.presentation.screens.settings.nested.browse.data.BrowseSortOrder import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/HelpScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/HelpScreen.kt index 30a29157..67d900af 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/HelpScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/HelpScreen.kt @@ -27,19 +27,19 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.util.Constants -import ua.acclorite.book_story.presentation.components.CustomIconButton -import ua.acclorite.book_story.presentation.components.CustomLazyColumn -import ua.acclorite.book_story.presentation.components.GoBackButton -import ua.acclorite.book_story.presentation.components.LocalBrowseViewModel -import ua.acclorite.book_story.presentation.components.LocalHelpViewModel -import ua.acclorite.book_story.presentation.components.LocalMainViewModel -import ua.acclorite.book_story.presentation.components.LocalStartViewModel -import ua.acclorite.book_story.presentation.components.collapsibleUntilExitScrollBehaviorWithLazyListState -import ua.acclorite.book_story.presentation.components.customItems -import ua.acclorite.book_story.presentation.data.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.components.CustomIconButton +import ua.acclorite.book_story.presentation.core.components.CustomLazyColumn +import ua.acclorite.book_story.presentation.core.components.GoBackButton +import ua.acclorite.book_story.presentation.core.components.LocalBrowseViewModel +import ua.acclorite.book_story.presentation.core.components.LocalHelpViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalStartViewModel +import ua.acclorite.book_story.presentation.core.components.collapsibleUntilExitScrollBehaviorWithLazyListState +import ua.acclorite.book_story.presentation.core.components.customItems +import ua.acclorite.book_story.presentation.core.constants.Constants +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.navigation.Screen import ua.acclorite.book_story.presentation.data.MainEvent -import ua.acclorite.book_story.presentation.data.Screen import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent import ua.acclorite.book_story.presentation.screens.help.components.HelpItem import ua.acclorite.book_story.presentation.screens.help.components.items.HelpClickMeNoteItem diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/components/HelpClickableNote.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/components/HelpClickableNote.kt index 43b02668..b64eac73 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/components/HelpClickableNote.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/components/HelpClickableNote.kt @@ -19,7 +19,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CustomTooltip +import ua.acclorite.book_story.presentation.core.components.CustomTooltip import ua.acclorite.book_story.presentation.ui.ExpandingTransition /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/components/HelpItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/components/HelpItem.kt index 40cd6330..bb1b7407 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/components/HelpItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/components/HelpItem.kt @@ -31,7 +31,7 @@ import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.HelpTip -import ua.acclorite.book_story.presentation.data.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate import ua.acclorite.book_story.presentation.ui.ExpandingTransition /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/components/items/HelpClickMeNoteItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/components/items/HelpClickMeNoteItem.kt index 6b064bf9..039932ec 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/components/items/HelpClickMeNoteItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/components/items/HelpClickMeNoteItem.kt @@ -5,7 +5,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.buildAnnotatedString import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.data.showToast +import ua.acclorite.book_story.presentation.core.util.showToast import ua.acclorite.book_story.presentation.screens.help.components.HelpAnnotation import ua.acclorite.book_story.presentation.screens.help.components.HelpClickableNote diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/data/HelpViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/data/HelpViewModel.kt index b0955e3f..56aa1f60 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/data/HelpViewModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/help/data/HelpViewModel.kt @@ -6,8 +6,8 @@ import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import ua.acclorite.book_story.domain.util.BaseViewModel -import ua.acclorite.book_story.presentation.data.Screen +import ua.acclorite.book_story.presentation.core.navigation.Screen +import ua.acclorite.book_story.presentation.core.util.BaseViewModel import javax.inject.Inject @HiltViewModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryDeleteWholeHistoryDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryDeleteWholeHistoryDialog.kt index e0cdf01e..410aec7f 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryDeleteWholeHistoryDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryDeleteWholeHistoryDialog.kt @@ -6,10 +6,10 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalHistoryViewModel -import ua.acclorite.book_story.presentation.components.LocalLibraryViewModel -import ua.acclorite.book_story.presentation.components.custom_dialog.CustomDialogWithContent -import ua.acclorite.book_story.presentation.data.showToast +import ua.acclorite.book_story.presentation.core.components.LocalHistoryViewModel +import ua.acclorite.book_story.presentation.core.components.LocalLibraryViewModel +import ua.acclorite.book_story.presentation.core.components.custom_dialog.CustomDialogWithContent +import ua.acclorite.book_story.presentation.core.util.showToast import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryItem.kt index 796e379e..ac88361c 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/components/HistoryItem.kt @@ -32,8 +32,8 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.History -import ua.acclorite.book_story.presentation.components.CustomCoverImage -import ua.acclorite.book_story.presentation.components.CustomIconButton +import ua.acclorite.book_story.presentation.core.components.CustomCoverImage +import ua.acclorite.book_story.presentation.core.components.CustomIconButton import java.text.SimpleDateFormat import java.util.Date import java.util.Locale diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryViewModel.kt index 8ad3a9ec..dcb6877f 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryViewModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/data/HistoryViewModel.kt @@ -20,9 +20,9 @@ import ua.acclorite.book_story.domain.use_case.DeleteWholeHistory import ua.acclorite.book_story.domain.use_case.GetBooksById import ua.acclorite.book_story.domain.use_case.GetHistory import ua.acclorite.book_story.domain.use_case.InsertHistory -import ua.acclorite.book_story.domain.util.BaseViewModel import ua.acclorite.book_story.domain.util.Resource -import ua.acclorite.book_story.presentation.data.Screen +import ua.acclorite.book_story.presentation.core.navigation.Screen +import ua.acclorite.book_story.presentation.core.util.BaseViewModel import java.text.SimpleDateFormat import java.util.Calendar import java.util.Date diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/LibraryScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/LibraryScreen.kt index 607ef92e..cf19e3a4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/LibraryScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/LibraryScreen.kt @@ -45,15 +45,15 @@ import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.Book import ua.acclorite.book_story.domain.model.Category import ua.acclorite.book_story.domain.util.Selected -import ua.acclorite.book_story.presentation.components.CustomAnimatedVisibility -import ua.acclorite.book_story.presentation.components.LocalLibraryViewModel -import ua.acclorite.book_story.presentation.components.LocalMainViewModel -import ua.acclorite.book_story.presentation.components.customItems -import ua.acclorite.book_story.presentation.components.header -import ua.acclorite.book_story.presentation.components.is_messages.IsEmpty -import ua.acclorite.book_story.presentation.data.LocalOnNavigate -import ua.acclorite.book_story.presentation.data.Screen -import ua.acclorite.book_story.presentation.data.showToast +import ua.acclorite.book_story.presentation.core.components.CustomAnimatedVisibility +import ua.acclorite.book_story.presentation.core.components.LocalLibraryViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.customItems +import ua.acclorite.book_story.presentation.core.components.header +import ua.acclorite.book_story.presentation.core.components.is_messages.IsEmpty +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.navigation.Screen +import ua.acclorite.book_story.presentation.core.util.showToast import ua.acclorite.book_story.presentation.screens.library.components.LibraryBookItem import ua.acclorite.book_story.presentation.screens.library.components.LibraryTopBar import ua.acclorite.book_story.presentation.screens.library.components.dialog.LibraryDeleteDialog diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryBookItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryBookItem.kt index 222b5290..e6ebcc57 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryBookItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryBookItem.kt @@ -34,9 +34,9 @@ import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.Book import ua.acclorite.book_story.domain.util.Selected -import ua.acclorite.book_story.presentation.components.CustomCoverImage -import ua.acclorite.book_story.presentation.data.removeDigits -import ua.acclorite.book_story.presentation.data.removeTrailingZero +import ua.acclorite.book_story.presentation.core.components.CustomCoverImage +import ua.acclorite.book_story.presentation.core.util.removeDigits +import ua.acclorite.book_story.presentation.core.util.removeTrailingZero /** * Library list element item. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryTopBar.kt index 3424ab8c..d0838038 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/LibraryTopBar.kt @@ -31,11 +31,11 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.AnimatedTopAppBar -import ua.acclorite.book_story.presentation.components.CustomIconButton -import ua.acclorite.book_story.presentation.components.CustomSearchTextField -import ua.acclorite.book_story.presentation.components.LocalLibraryViewModel -import ua.acclorite.book_story.presentation.components.MoreDropDown +import ua.acclorite.book_story.presentation.core.components.AnimatedTopAppBar +import ua.acclorite.book_story.presentation.core.components.CustomIconButton +import ua.acclorite.book_story.presentation.core.components.CustomSearchTextField +import ua.acclorite.book_story.presentation.core.components.LocalLibraryViewModel +import ua.acclorite.book_story.presentation.core.components.MoreDropDown import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/dialog/LibraryDeleteDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/dialog/LibraryDeleteDialog.kt index 78717cdc..899d7fa0 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/dialog/LibraryDeleteDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/dialog/LibraryDeleteDialog.kt @@ -6,11 +6,11 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalBrowseViewModel -import ua.acclorite.book_story.presentation.components.LocalHistoryViewModel -import ua.acclorite.book_story.presentation.components.LocalLibraryViewModel -import ua.acclorite.book_story.presentation.components.custom_dialog.CustomDialogWithContent -import ua.acclorite.book_story.presentation.data.showToast +import ua.acclorite.book_story.presentation.core.components.LocalBrowseViewModel +import ua.acclorite.book_story.presentation.core.components.LocalHistoryViewModel +import ua.acclorite.book_story.presentation.core.components.LocalLibraryViewModel +import ua.acclorite.book_story.presentation.core.components.custom_dialog.CustomDialogWithContent +import ua.acclorite.book_story.presentation.core.util.showToast import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/dialog/LibraryMoveDialog.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/dialog/LibraryMoveDialog.kt index 284eb85f..51d36611 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/dialog/LibraryMoveDialog.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/components/dialog/LibraryMoveDialog.kt @@ -8,12 +8,12 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.Category -import ua.acclorite.book_story.presentation.components.LocalHistoryViewModel -import ua.acclorite.book_story.presentation.components.LocalLibraryViewModel -import ua.acclorite.book_story.presentation.components.customItems -import ua.acclorite.book_story.presentation.components.custom_dialog.CustomDialogWithLazyColumn -import ua.acclorite.book_story.presentation.components.custom_dialog.SelectableDialogItem -import ua.acclorite.book_story.presentation.data.showToast +import ua.acclorite.book_story.presentation.core.components.LocalHistoryViewModel +import ua.acclorite.book_story.presentation.core.components.LocalLibraryViewModel +import ua.acclorite.book_story.presentation.core.components.customItems +import ua.acclorite.book_story.presentation.core.components.custom_dialog.CustomDialogWithLazyColumn +import ua.acclorite.book_story.presentation.core.components.custom_dialog.SelectableDialogItem +import ua.acclorite.book_story.presentation.core.util.showToast import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryViewModel.kt index d3cd81b7..bc46cb4d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryViewModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/library/data/LibraryViewModel.kt @@ -17,8 +17,8 @@ import ua.acclorite.book_story.domain.use_case.DeleteBooks import ua.acclorite.book_story.domain.use_case.GetBooks import ua.acclorite.book_story.domain.use_case.InsertHistory import ua.acclorite.book_story.domain.use_case.UpdateBooks -import ua.acclorite.book_story.domain.util.BaseViewModel -import ua.acclorite.book_story.presentation.data.Screen +import ua.acclorite.book_story.presentation.core.navigation.Screen +import ua.acclorite.book_story.presentation.core.util.BaseViewModel import java.util.Date import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/ReaderScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/ReaderScreen.kt index d3e6982b..e508046e 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/ReaderScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/ReaderScreen.kt @@ -48,19 +48,19 @@ import androidx.compose.ui.unit.sp import androidx.core.view.WindowCompat import androidx.core.view.WindowInsetsCompat import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.util.Constants -import ua.acclorite.book_story.presentation.components.CustomAnimatedVisibility -import ua.acclorite.book_story.presentation.components.CustomSelectionContainer -import ua.acclorite.book_story.presentation.components.LocalHistoryViewModel -import ua.acclorite.book_story.presentation.components.LocalLibraryViewModel -import ua.acclorite.book_story.presentation.components.LocalMainViewModel -import ua.acclorite.book_story.presentation.components.LocalReaderViewModel -import ua.acclorite.book_story.presentation.components.LocalSettingsViewModel -import ua.acclorite.book_story.presentation.components.customItemsIndexed -import ua.acclorite.book_story.presentation.components.is_messages.IsError -import ua.acclorite.book_story.presentation.data.LocalOnNavigate -import ua.acclorite.book_story.presentation.data.Screen -import ua.acclorite.book_story.presentation.data.showToast +import ua.acclorite.book_story.presentation.core.components.CustomAnimatedVisibility +import ua.acclorite.book_story.presentation.core.components.CustomSelectionContainer +import ua.acclorite.book_story.presentation.core.components.LocalHistoryViewModel +import ua.acclorite.book_story.presentation.core.components.LocalLibraryViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalReaderViewModel +import ua.acclorite.book_story.presentation.core.components.LocalSettingsViewModel +import ua.acclorite.book_story.presentation.core.components.customItemsIndexed +import ua.acclorite.book_story.presentation.core.components.is_messages.IsError +import ua.acclorite.book_story.presentation.core.constants.Constants +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.navigation.Screen +import ua.acclorite.book_story.presentation.core.util.showToast import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent import ua.acclorite.book_story.presentation.screens.reader.components.ReaderEndItem diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderEndItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderEndItem.kt index ad7eee46..7e2efee6 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderEndItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderEndItem.kt @@ -28,12 +28,12 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.Category -import ua.acclorite.book_story.presentation.components.LocalHistoryViewModel -import ua.acclorite.book_story.presentation.components.LocalLibraryViewModel -import ua.acclorite.book_story.presentation.components.LocalReaderViewModel -import ua.acclorite.book_story.presentation.data.LocalOnNavigate -import ua.acclorite.book_story.presentation.data.Screen -import ua.acclorite.book_story.presentation.data.showToast +import ua.acclorite.book_story.presentation.core.components.LocalHistoryViewModel +import ua.acclorite.book_story.presentation.core.components.LocalLibraryViewModel +import ua.acclorite.book_story.presentation.core.components.LocalReaderViewModel +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.navigation.Screen +import ua.acclorite.book_story.presentation.core.util.showToast import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderFastColorPresetChange.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderFastColorPresetChange.kt index b75d395d..7a5b4cf6 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderFastColorPresetChange.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderFastColorPresetChange.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.input.pointer.pointerInput import ua.acclorite.book_story.domain.util.UIText -import ua.acclorite.book_story.presentation.components.LocalSettingsViewModel +import ua.acclorite.book_story.presentation.core.components.LocalSettingsViewModel import ua.acclorite.book_story.presentation.screens.settings.data.SettingsEvent /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderTextParagraph.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderTextParagraph.kt index 6b28b079..ad4895fd 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderTextParagraph.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/ReaderTextParagraph.kt @@ -23,8 +23,8 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.TextUnit import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.FontWithName -import ua.acclorite.book_story.presentation.components.LocalReaderViewModel -import ua.acclorite.book_story.presentation.data.showToast +import ua.acclorite.book_story.presentation.core.components.LocalReaderViewModel +import ua.acclorite.book_story.presentation.core.util.showToast import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent import ua.acclorite.book_story.presentation.screens.settings.nested.reader.data.ReaderTextAlignment diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/app_bar/ReaderBottomBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/app_bar/ReaderBottomBar.kt index 309f450b..72ae1645 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/app_bar/ReaderBottomBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/app_bar/ReaderBottomBar.kt @@ -20,11 +20,11 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.components.LocalHistoryViewModel -import ua.acclorite.book_story.presentation.components.LocalLibraryViewModel -import ua.acclorite.book_story.presentation.components.LocalReaderViewModel -import ua.acclorite.book_story.presentation.data.removeDigits -import ua.acclorite.book_story.presentation.data.removeTrailingZero +import ua.acclorite.book_story.presentation.core.components.LocalHistoryViewModel +import ua.acclorite.book_story.presentation.core.components.LocalLibraryViewModel +import ua.acclorite.book_story.presentation.core.components.LocalReaderViewModel +import ua.acclorite.book_story.presentation.core.util.removeDigits +import ua.acclorite.book_story.presentation.core.util.removeTrailingZero import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/app_bar/ReaderTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/app_bar/ReaderTopBar.kt index ee84ee57..f1706af4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/app_bar/ReaderTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/app_bar/ReaderTopBar.kt @@ -21,12 +21,12 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.sp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CustomIconButton -import ua.acclorite.book_story.presentation.components.LocalHistoryViewModel -import ua.acclorite.book_story.presentation.components.LocalLibraryViewModel -import ua.acclorite.book_story.presentation.components.LocalReaderViewModel -import ua.acclorite.book_story.presentation.data.LocalOnNavigate -import ua.acclorite.book_story.presentation.data.Screen +import ua.acclorite.book_story.presentation.core.components.CustomIconButton +import ua.acclorite.book_story.presentation.core.components.LocalHistoryViewModel +import ua.acclorite.book_story.presentation.core.components.LocalLibraryViewModel +import ua.acclorite.book_story.presentation.core.components.LocalReaderViewModel +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.navigation.Screen import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent import ua.acclorite.book_story.presentation.screens.library.data.LibraryEvent import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/settings_bottom_sheet/ReaderSettingsBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/settings_bottom_sheet/ReaderSettingsBottomSheet.kt index cda87514..c76a5998 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/settings_bottom_sheet/ReaderSettingsBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/settings_bottom_sheet/ReaderSettingsBottomSheet.kt @@ -19,8 +19,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.components.CustomBottomSheet -import ua.acclorite.book_story.presentation.components.LocalReaderViewModel +import ua.acclorite.book_story.presentation.core.components.CustomBottomSheet +import ua.acclorite.book_story.presentation.core.components.LocalReaderViewModel import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent import ua.acclorite.book_story.presentation.screens.settings.nested.appearance.components.subcategories.ColorsSubcategory import ua.acclorite.book_story.presentation.screens.settings.nested.reader.components.ReaderSettingsCategory @@ -78,6 +78,11 @@ fun ReaderSettingsBottomSheet() { HorizontalPager(state = pagerState) { page -> LazyColumn { if (page == 0) { + if (page == 0) { + LazyColumn { + } + } + if (page == 1) { LazyColumn { ReaderSettingsCategory( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/settings_bottom_sheet/ReaderSettingsBottomSheetTabRow.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/settings_bottom_sheet/ReaderSettingsBottomSheetTabRow.kt index b6289a63..0d10d53d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/settings_bottom_sheet/ReaderSettingsBottomSheetTabRow.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/settings_bottom_sheet/ReaderSettingsBottomSheetTabRow.kt @@ -11,8 +11,9 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextOverflow import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalReaderViewModel +import ua.acclorite.book_story.presentation.core.components.LocalReaderViewModel import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent /** @@ -20,11 +21,6 @@ import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent */ @OptIn(ExperimentalMaterial3Api::class) @Composable -fun ReaderSettingsBottomSheetTabRow( - onEvent: (ReaderEvent) -> Unit, - pagerState: PagerState -) { - val tabItems = listOf( fun ReaderSettingsBottomSheetTabRow(pagerState: PagerState) { val onEvent = LocalReaderViewModel.current.onEvent @@ -40,7 +36,6 @@ fun ReaderSettingsBottomSheetTabRow(pagerState: PagerState) { ) { tabItems.forEachIndexed { index, tabItem -> Tab( - modifier = Modifier, selected = pagerState.currentPage == index, onClick = { onEvent(ReaderEvent.OnScrollToSettingsPage(index, pagerState)) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/start_item/ReaderStartItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/start_item/ReaderStartItem.kt index 3fef6ce0..88a8d0b7 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/start_item/ReaderStartItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/start_item/ReaderStartItem.kt @@ -31,8 +31,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CustomCoverImage -import ua.acclorite.book_story.presentation.components.LocalReaderViewModel +import ua.acclorite.book_story.presentation.core.components.CustomCoverImage +import ua.acclorite.book_story.presentation.core.components.LocalReaderViewModel /** * Reader start item. Displays at the beginning of the book. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/start_item/ReaderStartItemBackground.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/start_item/ReaderStartItemBackground.kt index 8787f69f..491a3bca 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/start_item/ReaderStartItemBackground.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/start_item/ReaderStartItemBackground.kt @@ -12,7 +12,7 @@ import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.components.CustomCoverImage +import ua.acclorite.book_story.presentation.core.components.CustomCoverImage /** * Background of the [ReaderStartItem]. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderState.kt index 5ddf0249..64eb9005 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderState.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderState.kt @@ -3,8 +3,8 @@ package ua.acclorite.book_story.presentation.screens.reader.data import androidx.compose.foundation.lazy.LazyListState import androidx.compose.runtime.Immutable import ua.acclorite.book_story.domain.model.Book -import ua.acclorite.book_story.domain.util.Constants import ua.acclorite.book_story.domain.util.UIText +import ua.acclorite.book_story.presentation.core.constants.Constants @Immutable data class ReaderState( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderViewModel.kt index 0513a82f..5b587256 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderViewModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/data/ReaderViewModel.kt @@ -31,11 +31,11 @@ import ua.acclorite.book_story.domain.use_case.GetBookById import ua.acclorite.book_story.domain.use_case.GetLatestHistory import ua.acclorite.book_story.domain.use_case.GetText import ua.acclorite.book_story.domain.use_case.UpdateBooks -import ua.acclorite.book_story.domain.util.BaseViewModel import ua.acclorite.book_story.domain.util.OnNavigate import ua.acclorite.book_story.domain.util.UIText -import ua.acclorite.book_story.presentation.data.Screen -import ua.acclorite.book_story.presentation.data.launchActivity +import ua.acclorite.book_story.presentation.core.navigation.Screen +import ua.acclorite.book_story.presentation.core.util.BaseViewModel +import ua.acclorite.book_story.presentation.core.util.launchActivity import javax.inject.Inject import kotlin.math.roundToInt diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/SettingsScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/SettingsScreen.kt index ab102116..c724e941 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/SettingsScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/SettingsScreen.kt @@ -24,11 +24,11 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CustomLazyColumn -import ua.acclorite.book_story.presentation.components.GoBackButton -import ua.acclorite.book_story.presentation.components.collapsibleUntilExitScrollBehaviorWithLazyListState -import ua.acclorite.book_story.presentation.data.LocalOnNavigate -import ua.acclorite.book_story.presentation.data.Screen +import ua.acclorite.book_story.presentation.core.components.CustomLazyColumn +import ua.acclorite.book_story.presentation.core.components.GoBackButton +import ua.acclorite.book_story.presentation.core.components.collapsibleUntilExitScrollBehaviorWithLazyListState +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.navigation.Screen import ua.acclorite.book_story.presentation.screens.settings.components.SettingsCategoryItem @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ChipsWithTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ChipsWithTitle.kt index ab2d51c6..6fb3713b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ChipsWithTitle.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ChipsWithTitle.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import ua.acclorite.book_story.domain.model.ButtonItem -import ua.acclorite.book_story.presentation.components.CategoryTitle +import ua.acclorite.book_story.presentation.core.components.CategoryTitle /** * Chips with title. Use list of [ButtonItem]s to display chips. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ColorPickerWithTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ColorPickerWithTitle.kt index 4228b375..e448ee32 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ColorPickerWithTitle.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/ColorPickerWithTitle.kt @@ -30,8 +30,8 @@ import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.debounce import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CategoryTitle -import ua.acclorite.book_story.presentation.components.CustomIconButton +import ua.acclorite.book_story.presentation.core.components.CategoryTitle +import ua.acclorite.book_story.presentation.core.components.CustomIconButton /** * Color picker with title. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SegmentedButtonWithTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SegmentedButtonWithTitle.kt index 6fddf8cc..d4db0109 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SegmentedButtonWithTitle.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SegmentedButtonWithTitle.kt @@ -39,8 +39,8 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.ButtonItem -import ua.acclorite.book_story.presentation.components.CategoryTitle -import ua.acclorite.book_story.presentation.components.CustomAnimatedVisibility +import ua.acclorite.book_story.presentation.core.components.CategoryTitle +import ua.acclorite.book_story.presentation.core.components.CustomAnimatedVisibility /** * Segmented Button with Title. diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SliderWithTitle.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SliderWithTitle.kt index 5678649f..e0668730 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SliderWithTitle.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/components/SliderWithTitle.kt @@ -16,7 +16,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.components.CategoryTitle +import ua.acclorite.book_story.presentation.core.components.CategoryTitle import kotlin.math.roundToInt /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/data/SettingsState.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/data/SettingsState.kt index 06e643dd..1dc3559d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/data/SettingsState.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/data/SettingsState.kt @@ -3,7 +3,7 @@ package ua.acclorite.book_story.presentation.screens.settings.data import androidx.compose.foundation.lazy.LazyListState import androidx.compose.runtime.Immutable import ua.acclorite.book_story.domain.model.ColorPreset -import ua.acclorite.book_story.domain.util.Constants +import ua.acclorite.book_story.presentation.core.constants.Constants @Immutable data class SettingsState( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/data/SettingsViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/data/SettingsViewModel.kt index 74a9105a..9bc56220 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/data/SettingsViewModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/data/SettingsViewModel.kt @@ -23,11 +23,11 @@ import ua.acclorite.book_story.domain.use_case.GetColorPresets import ua.acclorite.book_story.domain.use_case.ReorderColorPresets import ua.acclorite.book_story.domain.use_case.SelectColorPreset import ua.acclorite.book_story.domain.use_case.UpdateColorPreset -import ua.acclorite.book_story.domain.util.BaseViewModel -import ua.acclorite.book_story.domain.util.Constants import ua.acclorite.book_story.domain.util.ID import ua.acclorite.book_story.domain.util.UIText -import ua.acclorite.book_story.presentation.data.launchActivity +import ua.acclorite.book_story.presentation.core.constants.Constants +import ua.acclorite.book_story.presentation.core.util.BaseViewModel +import ua.acclorite.book_story.presentation.core.util.launchActivity import javax.inject.Inject import kotlin.random.Random diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/AppearanceSettings.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/AppearanceSettings.kt index 8c379ea4..93a03496 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/AppearanceSettings.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/AppearanceSettings.kt @@ -17,10 +17,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CustomLazyColumn -import ua.acclorite.book_story.presentation.components.GoBackButton -import ua.acclorite.book_story.presentation.components.collapsibleUntilExitScrollBehaviorWithLazyListState -import ua.acclorite.book_story.presentation.data.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.components.CustomLazyColumn +import ua.acclorite.book_story.presentation.core.components.GoBackButton +import ua.acclorite.book_story.presentation.core.components.collapsibleUntilExitScrollBehaviorWithLazyListState +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate import ua.acclorite.book_story.presentation.screens.settings.nested.appearance.components.AppearanceSettingsCategory @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ColorPresetSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ColorPresetSetting.kt index c829af51..2e1b47f3 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ColorPresetSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ColorPresetSetting.kt @@ -60,11 +60,11 @@ import sh.calvin.reorderable.rememberReorderableLazyListState import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.ColorPreset import ua.acclorite.book_story.domain.util.Selected -import ua.acclorite.book_story.presentation.components.CategoryTitle -import ua.acclorite.book_story.presentation.components.CustomAnimatedVisibility -import ua.acclorite.book_story.presentation.components.CustomIconButton -import ua.acclorite.book_story.presentation.components.LocalSettingsViewModel -import ua.acclorite.book_story.presentation.components.customItemsIndexed +import ua.acclorite.book_story.presentation.core.components.CategoryTitle +import ua.acclorite.book_story.presentation.core.components.CustomAnimatedVisibility +import ua.acclorite.book_story.presentation.core.components.CustomIconButton +import ua.acclorite.book_story.presentation.core.components.LocalSettingsViewModel +import ua.acclorite.book_story.presentation.core.components.customItemsIndexed import ua.acclorite.book_story.presentation.screens.settings.components.ColorPickerWithTitle import ua.acclorite.book_story.presentation.screens.settings.data.SettingsEvent import ua.acclorite.book_story.presentation.ui.FadeTransitionPreservingSpace diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/DarkThemeSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/DarkThemeSetting.kt index 4acd4a45..0ebe6626 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/DarkThemeSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/DarkThemeSetting.kt @@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.ButtonItem -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.SegmentedButtonWithTitle import ua.acclorite.book_story.presentation.ui.DarkTheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/FastColorPresetChangeSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/FastColorPresetChangeSetting.kt index b052207f..ee2704e7 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/FastColorPresetChangeSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/FastColorPresetChangeSetting.kt @@ -3,7 +3,7 @@ package ua.acclorite.book_story.presentation.screens.settings.nested.appearance. import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.SwitchWithTitle diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/PureDarkSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/PureDarkSetting.kt index 40b5a411..aebcab9b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/PureDarkSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/PureDarkSetting.kt @@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.ButtonItem -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.SegmentedButtonWithTitle import ua.acclorite.book_story.presentation.ui.ExpandingTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ThemeContrastSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ThemeContrastSetting.kt index 4257171c..10bf2b2e 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ThemeContrastSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ThemeContrastSetting.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.ButtonItem -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.SegmentedButtonWithTitle import ua.acclorite.book_story.presentation.ui.BookStoryTheme diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ThemeSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ThemeSetting.kt index 4e15ce1b..9b2a9647 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ThemeSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/settings/ThemeSetting.kt @@ -37,12 +37,12 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.util.Constants import ua.acclorite.book_story.domain.util.UIText -import ua.acclorite.book_story.presentation.components.CategoryTitle -import ua.acclorite.book_story.presentation.components.CustomAnimatedVisibility -import ua.acclorite.book_story.presentation.components.LocalMainViewModel -import ua.acclorite.book_story.presentation.components.customItemsIndexed +import ua.acclorite.book_story.presentation.core.components.CategoryTitle +import ua.acclorite.book_story.presentation.core.components.CustomAnimatedVisibility +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.customItemsIndexed +import ua.acclorite.book_story.presentation.core.constants.Constants import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.ui.Theme import ua.acclorite.book_story.presentation.ui.ThemeContrast diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/subcategories/ColorsSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/subcategories/ColorsSubcategory.kt index 70159772..47ca5603 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/subcategories/ColorsSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/subcategories/ColorsSubcategory.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.coerceAtLeast import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CategoryTitle +import ua.acclorite.book_story.presentation.core.components.CategoryTitle import ua.acclorite.book_story.presentation.screens.settings.nested.appearance.components.settings.ColorPresetSetting import ua.acclorite.book_story.presentation.screens.settings.nested.appearance.components.settings.FastColorPresetChangeSetting diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/subcategories/ThemePreferencesSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/subcategories/ThemePreferencesSubcategory.kt index edca37a3..6a3d3095 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/subcategories/ThemePreferencesSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/appearance/components/subcategories/ThemePreferencesSubcategory.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.coerceAtLeast import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CategoryTitle +import ua.acclorite.book_story.presentation.core.components.CategoryTitle import ua.acclorite.book_story.presentation.screens.settings.nested.appearance.components.settings.DarkThemeSetting import ua.acclorite.book_story.presentation.screens.settings.nested.appearance.components.settings.PureDarkSetting import ua.acclorite.book_story.presentation.screens.settings.nested.appearance.components.settings.ThemeContrastSetting diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/BrowseSettings.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/BrowseSettings.kt index f58d95ff..31afa646 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/BrowseSettings.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/BrowseSettings.kt @@ -17,10 +17,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CustomLazyColumn -import ua.acclorite.book_story.presentation.components.GoBackButton -import ua.acclorite.book_story.presentation.components.collapsibleUntilExitScrollBehaviorWithLazyListState -import ua.acclorite.book_story.presentation.data.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.components.CustomLazyColumn +import ua.acclorite.book_story.presentation.core.components.GoBackButton +import ua.acclorite.book_story.presentation.core.components.collapsibleUntilExitScrollBehaviorWithLazyListState +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate import ua.acclorite.book_story.presentation.screens.settings.nested.browse.components.BrowseSettingsCategory @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseFilesStructureSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseFilesStructureSetting.kt index f0d1e2ba..0de2c1c7 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseFilesStructureSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseFilesStructureSetting.kt @@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.ButtonItem -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.SegmentedButtonWithTitle import ua.acclorite.book_story.presentation.screens.settings.nested.browse.data.BrowseFilesStructure diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseFilterSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseFilterSetting.kt index 1c32bbdc..8b0803f2 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseFilterSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseFilterSetting.kt @@ -17,9 +17,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.util.Constants -import ua.acclorite.book_story.presentation.components.LocalMainViewModel -import ua.acclorite.book_story.presentation.components.customItems +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.customItems +import ua.acclorite.book_story.presentation.core.constants.Constants import ua.acclorite.book_story.presentation.data.MainEvent /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseGridSizeSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseGridSizeSetting.kt index da9836bd..20be511f 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseGridSizeSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseGridSizeSetting.kt @@ -3,7 +3,7 @@ package ua.acclorite.book_story.presentation.screens.settings.nested.browse.comp import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.SliderWithTitle import ua.acclorite.book_story.presentation.screens.settings.nested.browse.data.BrowseLayout diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseLayoutSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseLayoutSetting.kt index 2aabe781..ad34deda 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseLayoutSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseLayoutSetting.kt @@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.ButtonItem -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.SegmentedButtonWithTitle import ua.acclorite.book_story.presentation.screens.settings.nested.browse.data.BrowseLayout diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowsePinFavoriteDirectoriesSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowsePinFavoriteDirectoriesSetting.kt index e45d3049..c58ae265 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowsePinFavoriteDirectoriesSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowsePinFavoriteDirectoriesSetting.kt @@ -3,7 +3,7 @@ package ua.acclorite.book_story.presentation.screens.settings.nested.browse.comp import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.SwitchWithTitle import ua.acclorite.book_story.presentation.screens.settings.nested.browse.data.BrowseFilesStructure diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseSortOrderSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseSortOrderSetting.kt index f7e49bf5..060831a6 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseSortOrderSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/settings/BrowseSortOrderSetting.kt @@ -24,8 +24,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalMainViewModel -import ua.acclorite.book_story.presentation.components.customItems +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.customItems import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.nested.browse.data.BrowseSortOrder diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/subcategories/BrowseFilterSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/subcategories/BrowseFilterSubcategory.kt index 432b3ec3..4437fa32 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/subcategories/BrowseFilterSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/subcategories/BrowseFilterSubcategory.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.coerceAtLeast import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CategoryTitle +import ua.acclorite.book_story.presentation.core.components.CategoryTitle import ua.acclorite.book_story.presentation.screens.settings.nested.browse.components.settings.BrowseFilterSetting /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/subcategories/BrowseGeneralSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/subcategories/BrowseGeneralSubcategory.kt index fff49040..69febacf 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/subcategories/BrowseGeneralSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/subcategories/BrowseGeneralSubcategory.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.coerceAtLeast import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CategoryTitle +import ua.acclorite.book_story.presentation.core.components.CategoryTitle import ua.acclorite.book_story.presentation.screens.settings.nested.browse.components.settings.BrowseFilesStructureSetting import ua.acclorite.book_story.presentation.screens.settings.nested.browse.components.settings.BrowseGridSizeSetting import ua.acclorite.book_story.presentation.screens.settings.nested.browse.components.settings.BrowseLayoutSetting diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/subcategories/BrowseSortSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/subcategories/BrowseSortSubcategory.kt index 7dcb49ac..f5d92085 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/subcategories/BrowseSortSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/browse/components/subcategories/BrowseSortSubcategory.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.coerceAtLeast import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CategoryTitle +import ua.acclorite.book_story.presentation.core.components.CategoryTitle import ua.acclorite.book_story.presentation.screens.settings.nested.browse.components.settings.BrowseSortOrderSetting /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/GeneralSettings.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/GeneralSettings.kt index 8fbb8a63..aea1f17b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/GeneralSettings.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/GeneralSettings.kt @@ -16,10 +16,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CustomLazyColumn -import ua.acclorite.book_story.presentation.components.GoBackButton -import ua.acclorite.book_story.presentation.components.collapsibleUntilExitScrollBehaviorWithLazyListState -import ua.acclorite.book_story.presentation.data.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.components.CustomLazyColumn +import ua.acclorite.book_story.presentation.core.components.GoBackButton +import ua.acclorite.book_story.presentation.core.components.collapsibleUntilExitScrollBehaviorWithLazyListState +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate import ua.acclorite.book_story.presentation.screens.settings.nested.general.components.GeneralSettingsCategory @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/components/settings/AppLanguageSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/components/settings/AppLanguageSetting.kt index e50674f6..b65d8e72 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/components/settings/AppLanguageSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/components/settings/AppLanguageSetting.kt @@ -5,8 +5,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.ButtonItem -import ua.acclorite.book_story.domain.util.Constants -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.constants.Constants import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.ChipsWithTitle diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/components/settings/CheckForUpdatesSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/components/settings/CheckForUpdatesSetting.kt index ac0dc8b3..950d1775 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/components/settings/CheckForUpdatesSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/components/settings/CheckForUpdatesSetting.kt @@ -13,9 +13,9 @@ import androidx.compose.ui.res.stringResource import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.rememberPermissionState import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalMainViewModel -import ua.acclorite.book_story.presentation.components.LocalSettingsViewModel -import ua.acclorite.book_story.presentation.components.custom_dialog.CustomDialogWithContent +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalSettingsViewModel +import ua.acclorite.book_story.presentation.core.components.custom_dialog.CustomDialogWithContent import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.SwitchWithTitle import ua.acclorite.book_story.presentation.screens.settings.data.SettingsEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/components/settings/DoublePressExitSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/components/settings/DoublePressExitSetting.kt index f2c2542e..d13a81f1 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/components/settings/DoublePressExitSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/general/components/settings/DoublePressExitSetting.kt @@ -4,7 +4,7 @@ import android.annotation.SuppressLint import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.SwitchWithTitle diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/ReaderSettings.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/ReaderSettings.kt index 12b319ad..13c562c3 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/ReaderSettings.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/ReaderSettings.kt @@ -16,10 +16,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CustomLazyColumn -import ua.acclorite.book_story.presentation.components.GoBackButton -import ua.acclorite.book_story.presentation.components.collapsibleUntilExitScrollBehaviorWithLazyListState -import ua.acclorite.book_story.presentation.data.LocalOnNavigate +import ua.acclorite.book_story.presentation.core.components.CustomLazyColumn +import ua.acclorite.book_story.presentation.core.components.GoBackButton +import ua.acclorite.book_story.presentation.core.components.collapsibleUntilExitScrollBehaviorWithLazyListState +import ua.acclorite.book_story.presentation.core.navigation.LocalOnNavigate import ua.acclorite.book_story.presentation.screens.settings.nested.reader.components.ReaderSettingsCategory @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/ReaderSettingsCategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/ReaderSettingsCategory.kt index 63d184cb..b5a961fb 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/ReaderSettingsCategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/ReaderSettingsCategory.kt @@ -8,7 +8,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.components.CategoryTitle +import ua.acclorite.book_story.presentation.core.components.CategoryTitle import ua.acclorite.book_story.presentation.screens.settings.nested.reader.components.subcategories.FontSubcategory import ua.acclorite.book_story.presentation.screens.settings.nested.reader.components.subcategories.TextSubcategory import ua.acclorite.book_story.presentation.screens.settings.nested.reader.components.subcategories.TranslatorSubcategory diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/DoubleClickTranslationSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/DoubleClickTranslationSetting.kt index a34f0fd0..a025ef71 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/DoubleClickTranslationSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/DoubleClickTranslationSetting.kt @@ -3,7 +3,7 @@ package ua.acclorite.book_story.presentation.screens.settings.nested.reader.comp import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.SwitchWithTitle diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/FontFamilySetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/FontFamilySetting.kt index 8c429056..1bdacb78 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/FontFamilySetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/FontFamilySetting.kt @@ -6,8 +6,8 @@ import androidx.compose.runtime.remember import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.ButtonItem -import ua.acclorite.book_story.domain.util.Constants -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.constants.Constants import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.ChipsWithTitle diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/FontSizeSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/FontSizeSetting.kt index a86258c2..9aa74eb6 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/FontSizeSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/FontSizeSetting.kt @@ -3,7 +3,7 @@ package ua.acclorite.book_story.presentation.screens.settings.nested.reader.comp import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.SliderWithTitle diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/FontStyleSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/FontStyleSetting.kt index b0f4b565..75df4870 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/FontStyleSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/FontStyleSetting.kt @@ -7,8 +7,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontStyle import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.ButtonItem -import ua.acclorite.book_story.domain.util.Constants -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.constants.Constants import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.SegmentedButtonWithTitle diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/LetterSpacingSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/LetterSpacingSetting.kt index 4e047be9..60e563e0 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/LetterSpacingSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/LetterSpacingSetting.kt @@ -3,7 +3,7 @@ package ua.acclorite.book_story.presentation.screens.settings.nested.reader.comp import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.SliderWithTitle diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/LineHeightSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/LineHeightSetting.kt index eddf7818..cb55d75c 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/LineHeightSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/LineHeightSetting.kt @@ -3,7 +3,7 @@ package ua.acclorite.book_story.presentation.screens.settings.nested.reader.comp import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.SliderWithTitle diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/ParagraphHeightSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/ParagraphHeightSetting.kt index e53ecfd0..f67e3ea3 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/ParagraphHeightSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/ParagraphHeightSetting.kt @@ -3,7 +3,7 @@ package ua.acclorite.book_story.presentation.screens.settings.nested.reader.comp import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.SliderWithTitle diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/ParagraphIndentationSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/ParagraphIndentationSetting.kt index 8e151e27..9ff2f20e 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/ParagraphIndentationSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/ParagraphIndentationSetting.kt @@ -3,7 +3,7 @@ package ua.acclorite.book_story.presentation.screens.settings.nested.reader.comp import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.SwitchWithTitle diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/SidePaddingSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/SidePaddingSetting.kt index 2c9b9716..25383ae2 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/SidePaddingSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/SidePaddingSetting.kt @@ -3,7 +3,7 @@ package ua.acclorite.book_story.presentation.screens.settings.nested.reader.comp import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.SliderWithTitle diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/TextAlignmentSetting.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/TextAlignmentSetting.kt index 0d4af30d..620deb81 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/TextAlignmentSetting.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/TextAlignmentSetting.kt @@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.ButtonItem -import ua.acclorite.book_story.presentation.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.settings.components.SegmentedButtonWithTitle import ua.acclorite.book_story.presentation.screens.settings.nested.reader.data.ReaderTextAlignment diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/subcategories/FontSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/subcategories/FontSubcategory.kt index 7472e4e5..b559e052 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/subcategories/FontSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/subcategories/FontSubcategory.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.coerceAtLeast import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CategoryTitle +import ua.acclorite.book_story.presentation.core.components.CategoryTitle import ua.acclorite.book_story.presentation.screens.settings.nested.reader.components.settings.FontFamilySetting import ua.acclorite.book_story.presentation.screens.settings.nested.reader.components.settings.FontSizeSetting import ua.acclorite.book_story.presentation.screens.settings.nested.reader.components.settings.FontStyleSetting diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/subcategories/TextSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/subcategories/TextSubcategory.kt index 47506b01..dd9d3b85 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/subcategories/TextSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/subcategories/TextSubcategory.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.coerceAtLeast import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CategoryTitle +import ua.acclorite.book_story.presentation.core.components.CategoryTitle import ua.acclorite.book_story.presentation.screens.settings.nested.reader.components.settings.LineHeightSetting import ua.acclorite.book_story.presentation.screens.settings.nested.reader.components.settings.ParagraphHeightSetting import ua.acclorite.book_story.presentation.screens.settings.nested.reader.components.settings.ParagraphIndentationSetting diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/subcategories/TranslatorSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/subcategories/TranslatorSubcategory.kt index 30f21891..de194a3a 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/subcategories/TranslatorSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/subcategories/TranslatorSubcategory.kt @@ -15,7 +15,7 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.coerceAtLeast import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CategoryTitle +import ua.acclorite.book_story.presentation.core.components.CategoryTitle import ua.acclorite.book_story.presentation.screens.settings.nested.reader.components.settings.DoubleClickTranslationSetting /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/StartScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/StartScreen.kt index 2f253412..445a03c4 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/StartScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/StartScreen.kt @@ -12,7 +12,7 @@ import androidx.compose.ui.platform.LocalContext import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.PermissionState import com.google.accompanist.permissions.rememberPermissionState -import ua.acclorite.book_story.presentation.components.LocalStartViewModel +import ua.acclorite.book_story.presentation.core.components.LocalStartViewModel import ua.acclorite.book_story.presentation.screens.start.components.StartDone import ua.acclorite.book_story.presentation.screens.start.components.StartSettings import ua.acclorite.book_story.presentation.screens.start.data.StartEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartDone.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartDone.kt index a847f31d..964bf077 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartDone.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartDone.kt @@ -27,10 +27,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.LocalBrowseViewModel -import ua.acclorite.book_story.presentation.components.LocalMainViewModel -import ua.acclorite.book_story.presentation.components.LocalStartViewModel -import ua.acclorite.book_story.presentation.data.LocalNavigator +import ua.acclorite.book_story.presentation.core.components.LocalBrowseViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalStartViewModel +import ua.acclorite.book_story.presentation.core.navigation.LocalNavigator import ua.acclorite.book_story.presentation.data.MainEvent import ua.acclorite.book_story.presentation.screens.browse.data.BrowseEvent import ua.acclorite.book_story.presentation.screens.start.data.StartEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartLanguageScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartLanguageScreen.kt index 9e375bf6..3b6841ec 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartLanguageScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartLanguageScreen.kt @@ -9,9 +9,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.ButtonItem -import ua.acclorite.book_story.presentation.components.CategoryTitle -import ua.acclorite.book_story.presentation.components.customItems -import ua.acclorite.book_story.presentation.components.custom_dialog.SelectableDialogItem +import ua.acclorite.book_story.presentation.core.components.CategoryTitle +import ua.acclorite.book_story.presentation.core.components.customItems +import ua.acclorite.book_story.presentation.core.components.custom_dialog.SelectableDialogItem import ua.acclorite.book_story.presentation.data.MainEvent /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartNavigationScreenItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartNavigationScreenItem.kt index 8eafb952..95d4ef45 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartNavigationScreenItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartNavigationScreenItem.kt @@ -7,9 +7,9 @@ import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import ua.acclorite.book_story.presentation.components.CustomAnimatedVisibility -import ua.acclorite.book_story.presentation.components.CustomLazyColumn -import ua.acclorite.book_story.presentation.components.LocalStartViewModel +import ua.acclorite.book_story.presentation.core.components.CustomAnimatedVisibility +import ua.acclorite.book_story.presentation.core.components.CustomLazyColumn +import ua.acclorite.book_story.presentation.core.components.LocalStartViewModel import ua.acclorite.book_story.presentation.screens.start.data.StartNavigationScreen import ua.acclorite.book_story.presentation.ui.Transitions diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartNavigationTransition.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartNavigationTransition.kt index 56c637e7..dab48b0e 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartNavigationTransition.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartNavigationTransition.kt @@ -10,8 +10,8 @@ import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import ua.acclorite.book_story.presentation.components.CustomAnimatedVisibility -import ua.acclorite.book_story.presentation.components.LocalStartViewModel +import ua.acclorite.book_story.presentation.core.components.CustomAnimatedVisibility +import ua.acclorite.book_story.presentation.core.components.LocalStartViewModel import ua.acclorite.book_story.presentation.ui.Transitions /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartSettings.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartSettings.kt index c98d25ad..901414d7 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartSettings.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/StartSettings.kt @@ -30,9 +30,9 @@ import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.PermissionState import ua.acclorite.book_story.R import ua.acclorite.book_story.domain.model.ButtonItem -import ua.acclorite.book_story.domain.util.Constants -import ua.acclorite.book_story.presentation.components.LocalMainViewModel -import ua.acclorite.book_story.presentation.components.LocalStartViewModel +import ua.acclorite.book_story.presentation.core.components.LocalMainViewModel +import ua.acclorite.book_story.presentation.core.components.LocalStartViewModel +import ua.acclorite.book_story.presentation.core.constants.Constants import ua.acclorite.book_story.presentation.screens.start.components.permissions.startPermissionsScreen import ua.acclorite.book_story.presentation.screens.start.data.StartEvent import ua.acclorite.book_story.presentation.screens.start.data.StartNavigationScreen diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/permissions/StartPermissionsScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/permissions/StartPermissionsScreen.kt index 454e6e61..6cef7267 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/permissions/StartPermissionsScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/components/permissions/StartPermissionsScreen.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.components.CategoryTitle +import ua.acclorite.book_story.presentation.core.components.CategoryTitle import ua.acclorite.book_story.presentation.screens.start.data.StartState /** diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/data/StartViewModel.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/data/StartViewModel.kt index 3060b03e..501e54ae 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/data/StartViewModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/start/data/StartViewModel.kt @@ -19,9 +19,9 @@ import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import kotlinx.coroutines.yield -import ua.acclorite.book_story.domain.util.BaseViewModel -import ua.acclorite.book_story.presentation.data.Screen -import ua.acclorite.book_story.presentation.data.launchActivity +import ua.acclorite.book_story.presentation.core.navigation.Screen +import ua.acclorite.book_story.presentation.core.util.BaseViewModel +import ua.acclorite.book_story.presentation.core.util.launchActivity import javax.inject.Inject @OptIn(ExperimentalPermissionsApi::class) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/ui/Transitions.kt b/app/src/main/java/ua/acclorite/book_story/presentation/ui/Transitions.kt index 661832b0..ef5cea82 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/ui/Transitions.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/ui/Transitions.kt @@ -20,7 +20,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.presentation.components.CustomAnimatedVisibility +import ua.acclorite.book_story.presentation.core.components.CustomAnimatedVisibility import kotlin.math.roundToInt object Transitions {