diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/HistoryScreen.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/HistoryScreen.kt index 26d0e1b7..772d3648 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/HistoryScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/history/HistoryScreen.kt @@ -35,19 +35,19 @@ import androidx.compose.ui.res.painterResource 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.AnimatedTopAppBar -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.CustomSearchTextField -import ua.acclorite.book_story.presentation.components.CustomSnackbar -import ua.acclorite.book_story.presentation.components.LocalHistoryViewModel -import ua.acclorite.book_story.presentation.components.LocalLibraryViewModel -import ua.acclorite.book_story.presentation.components.MoreDropDown -import ua.acclorite.book_story.presentation.components.customItems -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.core.components.AnimatedTopAppBar +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.CustomSearchTextField +import ua.acclorite.book_story.presentation.core.components.CustomSnackbar +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.MoreDropDown +import ua.acclorite.book_story.presentation.core.components.customItems +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.screens.history.components.HistoryDeleteWholeHistoryDialog import ua.acclorite.book_story.presentation.screens.history.components.HistoryItem import ua.acclorite.book_story.presentation.screens.history.data.HistoryEvent 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 c76a5998..15f0f2af 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 @@ -76,10 +76,9 @@ fun ReaderSettingsBottomSheet() { ReaderSettingsBottomSheetTabRow(pagerState = pagerState) HorizontalPager(state = pagerState) { page -> - LazyColumn { - if (page == 0) { if (page == 0) { LazyColumn { + } } 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 0d10d53d..4ac1af39 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 @@ -24,6 +24,7 @@ import ua.acclorite.book_story.presentation.screens.reader.data.ReaderEvent fun ReaderSettingsBottomSheetTabRow(pagerState: PagerState) { val onEvent = LocalReaderViewModel.current.onEvent + val tabItems = listOf( stringResource(id = R.string.general_tab), stringResource(id = R.string.color_tab) )