From 9fe7a497e87caeac9961fab32dcf518bab58ec07 Mon Sep 17 00:00:00 2001 From: Acclorite <140836141+Acclorite@users.noreply.github.com> Date: Sun, 9 Mar 2025 10:04:49 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20Move=20Browse=20"General"=20subc?= =?UTF-8?q?ategory=20to=20"Display"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Moved Browse "General" subcategory to "Display" subcategory --- .../data/repository/FileSystemRepositoryImpl.kt | 2 +- .../domain/browse/{ => display}/BrowseLayout.kt | 2 +- .../domain/browse/{ => display}/BrowseSortOrder.kt | 2 +- .../domain/browse/{ => file}/GroupedFiles.kt | 2 +- .../domain/browse/{ => file}/SelectableFile.kt | 2 +- .../domain/repository/FileSystemRepository.kt | 2 +- .../book_story/domain/use_case/file_system/GetFiles.kt | 2 +- .../book_story/presentation/browse/BrowseContent.kt | 4 ++-- .../presentation/browse/BrowseFilterBottomSheet.kt | 8 ++++---- .../browse/BrowseFilterBottomSheetTabRow.kt | 4 ++-- .../presentation/browse/BrowseGridFileItem.kt | 2 +- .../book_story/presentation/browse/BrowseGridItem.kt | 2 +- .../book_story/presentation/browse/BrowseGridLayout.kt | 4 ++-- .../book_story/presentation/browse/BrowseItem.kt | 4 ++-- .../book_story/presentation/browse/BrowseLayout.kt | 6 +++--- .../presentation/browse/BrowseListFileItem.kt | 2 +- .../book_story/presentation/browse/BrowseListItem.kt | 2 +- .../book_story/presentation/browse/BrowseListLayout.kt | 4 ++-- .../book_story/presentation/browse/BrowseScaffold.kt | 4 ++-- .../book_story/presentation/browse/BrowseTopBar.kt | 4 ++-- .../settings/browse/BrowseSettingsCategory.kt | 4 ++-- .../BrowseDisplaySubcategory.kt} | 10 +++++----- .../components/BrowseGridSizeOption.kt | 4 ++-- .../components/BrowseLayoutOption.kt | 4 ++-- .../browse/sort/components/BrowseSortOption.kt | 2 +- .../ua/acclorite/book_story/ui/browse/BrowseEvent.kt | 2 +- .../ua/acclorite/book_story/ui/browse/BrowseModel.kt | 4 ++-- .../ua/acclorite/book_story/ui/browse/BrowseScreen.kt | 2 +- .../ua/acclorite/book_story/ui/browse/BrowseState.kt | 2 +- .../java/ua/acclorite/book_story/ui/main/MainModel.kt | 4 ++-- .../java/ua/acclorite/book_story/ui/main/MainState.kt | 8 ++++---- app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-ta/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 7 ++++--- app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values/strings.xml | 3 ++- 45 files changed, 61 insertions(+), 71 deletions(-) rename app/src/main/java/ua/acclorite/book_story/domain/browse/{ => display}/BrowseLayout.kt (86%) rename app/src/main/java/ua/acclorite/book_story/domain/browse/{ => display}/BrowseSortOrder.kt (90%) rename app/src/main/java/ua/acclorite/book_story/domain/browse/{ => file}/GroupedFiles.kt (86%) rename app/src/main/java/ua/acclorite/book_story/domain/browse/{ => file}/SelectableFile.kt (88%) rename app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/{general/BrowseGeneralSubcategory.kt => display/BrowseDisplaySubcategory.kt} (74%) rename app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/{general => display}/components/BrowseGridSizeOption.kt (91%) rename app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/{general => display}/components/BrowseLayoutOption.kt (91%) diff --git a/app/src/main/java/ua/acclorite/book_story/data/repository/FileSystemRepositoryImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/repository/FileSystemRepositoryImpl.kt index 2e005dfb..5e2afeb2 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/repository/FileSystemRepositoryImpl.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/repository/FileSystemRepositoryImpl.kt @@ -11,7 +11,7 @@ import android.util.Log import ua.acclorite.book_story.R import ua.acclorite.book_story.data.local.room.BookDao import ua.acclorite.book_story.data.parser.FileParser -import ua.acclorite.book_story.domain.browse.SelectableFile +import ua.acclorite.book_story.domain.browse.file.SelectableFile import ua.acclorite.book_story.domain.file.CachedFile import ua.acclorite.book_story.domain.file.CachedFileCompat import ua.acclorite.book_story.domain.library.book.NullableBook diff --git a/app/src/main/java/ua/acclorite/book_story/domain/browse/BrowseLayout.kt b/app/src/main/java/ua/acclorite/book_story/domain/browse/display/BrowseLayout.kt similarity index 86% rename from app/src/main/java/ua/acclorite/book_story/domain/browse/BrowseLayout.kt rename to app/src/main/java/ua/acclorite/book_story/domain/browse/display/BrowseLayout.kt index 23c5b58b..bfbf9ce2 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/browse/BrowseLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/browse/display/BrowseLayout.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.browse +package ua.acclorite.book_story.domain.browse.display import androidx.compose.runtime.Immutable diff --git a/app/src/main/java/ua/acclorite/book_story/domain/browse/BrowseSortOrder.kt b/app/src/main/java/ua/acclorite/book_story/domain/browse/display/BrowseSortOrder.kt similarity index 90% rename from app/src/main/java/ua/acclorite/book_story/domain/browse/BrowseSortOrder.kt rename to app/src/main/java/ua/acclorite/book_story/domain/browse/display/BrowseSortOrder.kt index 8711542b..bbb7bd30 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/browse/BrowseSortOrder.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/browse/display/BrowseSortOrder.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.browse +package ua.acclorite.book_story.domain.browse.display import androidx.compose.runtime.Immutable diff --git a/app/src/main/java/ua/acclorite/book_story/domain/browse/GroupedFiles.kt b/app/src/main/java/ua/acclorite/book_story/domain/browse/file/GroupedFiles.kt similarity index 86% rename from app/src/main/java/ua/acclorite/book_story/domain/browse/GroupedFiles.kt rename to app/src/main/java/ua/acclorite/book_story/domain/browse/file/GroupedFiles.kt index 3d46d1c3..ceda0bd5 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/browse/GroupedFiles.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/browse/file/GroupedFiles.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.browse +package ua.acclorite.book_story.domain.browse.file import androidx.compose.runtime.Immutable diff --git a/app/src/main/java/ua/acclorite/book_story/domain/browse/SelectableFile.kt b/app/src/main/java/ua/acclorite/book_story/domain/browse/file/SelectableFile.kt similarity index 88% rename from app/src/main/java/ua/acclorite/book_story/domain/browse/SelectableFile.kt rename to app/src/main/java/ua/acclorite/book_story/domain/browse/file/SelectableFile.kt index d0550bb2..8bd0a292 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/browse/SelectableFile.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/browse/file/SelectableFile.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.domain.browse +package ua.acclorite.book_story.domain.browse.file import androidx.compose.runtime.Immutable import ua.acclorite.book_story.domain.file.CachedFile diff --git a/app/src/main/java/ua/acclorite/book_story/domain/repository/FileSystemRepository.kt b/app/src/main/java/ua/acclorite/book_story/domain/repository/FileSystemRepository.kt index 5e4a31eb..610c45e3 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/repository/FileSystemRepository.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/repository/FileSystemRepository.kt @@ -6,7 +6,7 @@ package ua.acclorite.book_story.domain.repository -import ua.acclorite.book_story.domain.browse.SelectableFile +import ua.acclorite.book_story.domain.browse.file.SelectableFile import ua.acclorite.book_story.domain.file.CachedFile import ua.acclorite.book_story.domain.library.book.NullableBook diff --git a/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetFiles.kt b/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetFiles.kt index a108be05..901b6f4a 100644 --- a/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetFiles.kt +++ b/app/src/main/java/ua/acclorite/book_story/domain/use_case/file_system/GetFiles.kt @@ -6,7 +6,7 @@ package ua.acclorite.book_story.domain.use_case.file_system -import ua.acclorite.book_story.domain.browse.SelectableFile +import ua.acclorite.book_story.domain.browse.file.SelectableFile import ua.acclorite.book_story.domain.repository.FileSystemRepository import javax.inject.Inject diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseContent.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseContent.kt index 730bde61..5e6be7ac 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseContent.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseContent.kt @@ -12,8 +12,8 @@ import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.pullrefresh.PullRefreshState import androidx.compose.runtime.Composable import androidx.compose.ui.focus.FocusRequester -import ua.acclorite.book_story.domain.browse.BrowseLayout -import ua.acclorite.book_story.domain.browse.SelectableFile +import ua.acclorite.book_story.domain.browse.display.BrowseLayout +import ua.acclorite.book_story.domain.browse.file.SelectableFile import ua.acclorite.book_story.domain.library.book.SelectableNullableBook import ua.acclorite.book_story.domain.util.BottomSheet import ua.acclorite.book_story.domain.util.Dialog diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheet.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheet.kt index 00022240..a95ecdb9 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheet.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheet.kt @@ -18,8 +18,8 @@ import androidx.compose.ui.Modifier import kotlinx.coroutines.launch import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar import ua.acclorite.book_story.presentation.core.components.modal_bottom_sheet.ModalBottomSheet +import ua.acclorite.book_story.presentation.settings.browse.display.BrowseDisplaySubcategory import ua.acclorite.book_story.presentation.settings.browse.filter.BrowseFilterSubcategory -import ua.acclorite.book_story.presentation.settings.browse.general.BrowseGeneralSubcategory import ua.acclorite.book_story.presentation.settings.browse.sort.BrowseSortSubcategory import ua.acclorite.book_story.ui.browse.BrowseEvent @@ -57,7 +57,7 @@ fun BrowseFilterBottomSheet( when (page) { 0 -> { LazyColumnWithScrollbar(modifier = Modifier.fillMaxSize()) { - BrowseGeneralSubcategory( + BrowseFilterSubcategory( showTitle = false, showDivider = false ) @@ -66,7 +66,7 @@ fun BrowseFilterBottomSheet( 1 -> { LazyColumnWithScrollbar(modifier = Modifier.fillMaxSize()) { - BrowseFilterSubcategory( + BrowseSortSubcategory( showTitle = false, showDivider = false ) @@ -75,7 +75,7 @@ fun BrowseFilterBottomSheet( 2 -> { LazyColumnWithScrollbar(modifier = Modifier.fillMaxSize()) { - BrowseSortSubcategory( + BrowseDisplaySubcategory( showTitle = false, showDivider = false ) diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheetTabRow.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheetTabRow.kt index 3537d793..eda4e7bc 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheetTabRow.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseFilterBottomSheetTabRow.kt @@ -17,9 +17,9 @@ fun BrowseFilterBottomSheetTabRow( scrollToPage: (Int) -> Unit ) { val tabItems = listOf( - stringResource(id = R.string.general_tab), stringResource(id = R.string.filter_tab), - stringResource(id = R.string.sort_tab) + stringResource(id = R.string.sort_tab), + stringResource(id = R.string.display_tab) ) ModalBottomSheetTabRow( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridFileItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridFileItem.kt index 5221186a..ba702843 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridFileItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridFileItem.kt @@ -28,7 +28,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.browse.SelectableFile +import ua.acclorite.book_story.domain.browse.file.SelectableFile import ua.acclorite.book_story.presentation.core.components.common.CircularCheckbox import ua.acclorite.book_story.presentation.core.components.common.StyledText import ua.acclorite.book_story.ui.theme.DefaultTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridItem.kt index 98927c05..969da09c 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridItem.kt @@ -19,7 +19,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.browse.SelectableFile +import ua.acclorite.book_story.domain.browse.file.SelectableFile @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridLayout.kt index 1bfddbd7..8059b50c 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseGridLayout.kt @@ -17,8 +17,8 @@ import androidx.compose.foundation.lazy.grid.items import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.browse.GroupedFiles -import ua.acclorite.book_story.domain.browse.SelectableFile +import ua.acclorite.book_story.domain.browse.file.GroupedFiles +import ua.acclorite.book_story.domain.browse.file.SelectableFile import ua.acclorite.book_story.presentation.core.components.common.LazyVerticalGridWithScrollbar import ua.acclorite.book_story.presentation.core.components.common.header import ua.acclorite.book_story.presentation.core.constants.Constants diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseItem.kt index 35685ae1..91128c16 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseItem.kt @@ -8,8 +8,8 @@ package ua.acclorite.book_story.presentation.browse import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import ua.acclorite.book_story.domain.browse.BrowseLayout -import ua.acclorite.book_story.domain.browse.SelectableFile +import ua.acclorite.book_story.domain.browse.display.BrowseLayout +import ua.acclorite.book_story.domain.browse.file.SelectableFile @Composable fun BrowseItem( diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseLayout.kt index 070a9ffc..ba5edc53 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseLayout.kt @@ -10,9 +10,9 @@ import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.grid.LazyGridState import androidx.compose.runtime.Composable import androidx.compose.runtime.remember -import ua.acclorite.book_story.domain.browse.BrowseLayout -import ua.acclorite.book_story.domain.browse.GroupedFiles -import ua.acclorite.book_story.domain.browse.SelectableFile +import ua.acclorite.book_story.domain.browse.display.BrowseLayout +import ua.acclorite.book_story.domain.browse.file.GroupedFiles +import ua.acclorite.book_story.domain.browse.file.SelectableFile import java.io.File @Composable diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListFileItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListFileItem.kt index 45c62322..ec0a1644 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListFileItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListFileItem.kt @@ -31,7 +31,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.browse.SelectableFile +import ua.acclorite.book_story.domain.browse.file.SelectableFile import ua.acclorite.book_story.presentation.core.components.common.StyledText import java.text.SimpleDateFormat import java.util.Date diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListItem.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListItem.kt index 517d1dad..4a4e1b9d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListItem.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListItem.kt @@ -22,7 +22,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.browse.SelectableFile +import ua.acclorite.book_story.domain.browse.file.SelectableFile import ua.acclorite.book_story.presentation.core.components.common.CircularCheckbox import ua.acclorite.book_story.ui.theme.FadeTransitionPreservingSpace diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListLayout.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListLayout.kt index 0c3def2e..b8c9a3ab 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListLayout.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseListLayout.kt @@ -16,8 +16,8 @@ import androidx.compose.foundation.lazy.items import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import ua.acclorite.book_story.domain.browse.GroupedFiles -import ua.acclorite.book_story.domain.browse.SelectableFile +import ua.acclorite.book_story.domain.browse.file.GroupedFiles +import ua.acclorite.book_story.domain.browse.file.SelectableFile import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar import ua.acclorite.book_story.presentation.core.constants.Constants import ua.acclorite.book_story.presentation.core.constants.providePrimaryScrollbar diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseScaffold.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseScaffold.kt index d4d3ae91..50605bcb 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseScaffold.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseScaffold.kt @@ -19,8 +19,8 @@ import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.focus.FocusRequester -import ua.acclorite.book_story.domain.browse.BrowseLayout -import ua.acclorite.book_story.domain.browse.SelectableFile +import ua.acclorite.book_story.domain.browse.display.BrowseLayout +import ua.acclorite.book_story.domain.browse.file.SelectableFile import ua.acclorite.book_story.ui.browse.BrowseEvent import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.theme.DefaultTransition diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseTopBar.kt b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseTopBar.kt index 593df2e9..6f8fd30d 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseTopBar.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/browse/BrowseTopBar.kt @@ -26,8 +26,8 @@ import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.layout.onGloballyPositioned import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.browse.BrowseLayout -import ua.acclorite.book_story.domain.browse.SelectableFile +import ua.acclorite.book_story.domain.browse.display.BrowseLayout +import ua.acclorite.book_story.domain.browse.file.SelectableFile import ua.acclorite.book_story.presentation.core.components.common.IconButton import ua.acclorite.book_story.presentation.core.components.common.SearchTextField import ua.acclorite.book_story.presentation.core.components.common.StyledText diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsCategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsCategory.kt index c1524218..9b268724 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsCategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/BrowseSettingsCategory.kt @@ -9,14 +9,14 @@ package ua.acclorite.book_story.presentation.settings.browse import androidx.compose.foundation.lazy.LazyListScope +import ua.acclorite.book_story.presentation.settings.browse.display.BrowseDisplaySubcategory import ua.acclorite.book_story.presentation.settings.browse.filter.BrowseFilterSubcategory -import ua.acclorite.book_story.presentation.settings.browse.general.BrowseGeneralSubcategory import ua.acclorite.book_story.presentation.settings.browse.scan.BrowseScanSubcategory import ua.acclorite.book_story.presentation.settings.browse.sort.BrowseSortSubcategory fun LazyListScope.BrowseSettingsCategory() { BrowseScanSubcategory() - BrowseGeneralSubcategory() + BrowseDisplaySubcategory() BrowseFilterSubcategory() BrowseSortSubcategory( showDivider = false diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/general/BrowseGeneralSubcategory.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/BrowseDisplaySubcategory.kt similarity index 74% rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/general/BrowseGeneralSubcategory.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/BrowseDisplaySubcategory.kt index 962f1e18..aae44751 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/general/BrowseGeneralSubcategory.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/BrowseDisplaySubcategory.kt @@ -6,7 +6,7 @@ @file:Suppress("FunctionName") -package ua.acclorite.book_story.presentation.settings.browse.general +package ua.acclorite.book_story.presentation.settings.browse.display import androidx.compose.foundation.lazy.LazyListScope import androidx.compose.material3.MaterialTheme @@ -14,13 +14,13 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import ua.acclorite.book_story.R -import ua.acclorite.book_story.presentation.settings.browse.general.components.BrowseGridSizeOption -import ua.acclorite.book_story.presentation.settings.browse.general.components.BrowseLayoutOption +import ua.acclorite.book_story.presentation.settings.browse.display.components.BrowseGridSizeOption +import ua.acclorite.book_story.presentation.settings.browse.display.components.BrowseLayoutOption import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory -fun LazyListScope.BrowseGeneralSubcategory( +fun LazyListScope.BrowseDisplaySubcategory( titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }, - title: @Composable () -> String = { stringResource(id = R.string.general_browse_settings) }, + title: @Composable () -> String = { stringResource(id = R.string.display_browse_settings) }, showTitle: Boolean = true, showDivider: Boolean = true ) { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/general/components/BrowseGridSizeOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseGridSizeOption.kt similarity index 91% rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/general/components/BrowseGridSizeOption.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseGridSizeOption.kt index 45838a74..e76e3682 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/general/components/BrowseGridSizeOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseGridSizeOption.kt @@ -4,14 +4,14 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.settings.browse.general.components +package ua.acclorite.book_story.presentation.settings.browse.display.components import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.browse.BrowseLayout +import ua.acclorite.book_story.domain.browse.display.BrowseLayout import ua.acclorite.book_story.presentation.core.components.settings.SliderWithTitle import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/general/components/BrowseLayoutOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseLayoutOption.kt similarity index 91% rename from app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/general/components/BrowseLayoutOption.kt rename to app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseLayoutOption.kt index 1d140bbf..22f7d111 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/general/components/BrowseLayoutOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/display/components/BrowseLayoutOption.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package ua.acclorite.book_story.presentation.settings.browse.general.components +package ua.acclorite.book_story.presentation.settings.browse.display.components import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable @@ -12,7 +12,7 @@ import androidx.compose.ui.res.stringResource import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.browse.BrowseLayout +import ua.acclorite.book_story.domain.browse.display.BrowseLayout import ua.acclorite.book_story.domain.ui.ButtonItem import ua.acclorite.book_story.presentation.core.components.settings.SegmentedButtonWithTitle import ua.acclorite.book_story.ui.main.MainEvent diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/sort/components/BrowseSortOption.kt b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/sort/components/BrowseSortOption.kt index abafe0f1..a2b2e0f9 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/sort/components/BrowseSortOption.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/settings/browse/sort/components/BrowseSortOption.kt @@ -31,7 +31,7 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.browse.BrowseSortOrder +import ua.acclorite.book_story.domain.browse.display.BrowseSortOrder import ua.acclorite.book_story.presentation.core.components.common.StyledText import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainModel diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEvent.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEvent.kt index 5b07e12b..f4ff8cf7 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEvent.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseEvent.kt @@ -9,7 +9,7 @@ package ua.acclorite.book_story.ui.browse import android.content.Context import androidx.compose.runtime.Immutable import androidx.compose.ui.focus.FocusRequester -import ua.acclorite.book_story.domain.browse.SelectableFile +import ua.acclorite.book_story.domain.browse.file.SelectableFile import ua.acclorite.book_story.domain.library.book.SelectableNullableBook @Immutable diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseModel.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseModel.kt index e7ab5b62..d5c1153d 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseModel.kt @@ -22,8 +22,8 @@ import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext import kotlinx.coroutines.yield import ua.acclorite.book_story.R -import ua.acclorite.book_story.domain.browse.BrowseSortOrder -import ua.acclorite.book_story.domain.browse.SelectableFile +import ua.acclorite.book_story.domain.browse.display.BrowseSortOrder +import ua.acclorite.book_story.domain.browse.file.SelectableFile import ua.acclorite.book_story.domain.library.book.NullableBook import ua.acclorite.book_story.domain.library.book.SelectableNullableBook import ua.acclorite.book_story.domain.use_case.book.InsertBook diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScreen.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScreen.kt index 148414d2..64e53bde 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScreen.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseScreen.kt @@ -24,7 +24,7 @@ import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize -import ua.acclorite.book_story.domain.browse.BrowseLayout +import ua.acclorite.book_story.domain.browse.display.BrowseLayout import ua.acclorite.book_story.domain.navigator.Screen import ua.acclorite.book_story.presentation.browse.BrowseContent import ua.acclorite.book_story.presentation.navigator.LocalNavigator diff --git a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseState.kt b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseState.kt index 5cee0b2e..08d5c324 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseState.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/browse/BrowseState.kt @@ -7,7 +7,7 @@ package ua.acclorite.book_story.ui.browse import androidx.compose.runtime.Immutable -import ua.acclorite.book_story.domain.browse.SelectableFile +import ua.acclorite.book_story.domain.browse.file.SelectableFile import ua.acclorite.book_story.domain.library.book.SelectableNullableBook import ua.acclorite.book_story.domain.util.BottomSheet import ua.acclorite.book_story.domain.util.Dialog diff --git a/app/src/main/java/ua/acclorite/book_story/ui/main/MainModel.kt b/app/src/main/java/ua/acclorite/book_story/ui/main/MainModel.kt index 35475650..216e9057 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/main/MainModel.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/main/MainModel.kt @@ -22,8 +22,8 @@ import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext import kotlinx.coroutines.yield -import ua.acclorite.book_story.domain.browse.toBrowseLayout -import ua.acclorite.book_story.domain.browse.toBrowseSortOrder +import ua.acclorite.book_story.domain.browse.display.toBrowseLayout +import ua.acclorite.book_story.domain.browse.display.toBrowseSortOrder import ua.acclorite.book_story.domain.reader.toColorEffects import ua.acclorite.book_story.domain.reader.toFontThickness import ua.acclorite.book_story.domain.reader.toHorizontalGesture diff --git a/app/src/main/java/ua/acclorite/book_story/ui/main/MainState.kt b/app/src/main/java/ua/acclorite/book_story/ui/main/MainState.kt index 0da9971a..94d24102 100644 --- a/app/src/main/java/ua/acclorite/book_story/ui/main/MainState.kt +++ b/app/src/main/java/ua/acclorite/book_story/ui/main/MainState.kt @@ -13,10 +13,10 @@ 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.browse.BrowseLayout -import ua.acclorite.book_story.domain.browse.BrowseSortOrder -import ua.acclorite.book_story.domain.browse.toBrowseLayout -import ua.acclorite.book_story.domain.browse.toBrowseSortOrder +import ua.acclorite.book_story.domain.browse.display.BrowseLayout +import ua.acclorite.book_story.domain.browse.display.BrowseSortOrder +import ua.acclorite.book_story.domain.browse.display.toBrowseLayout +import ua.acclorite.book_story.domain.browse.display.toBrowseSortOrder import ua.acclorite.book_story.domain.reader.ReaderColorEffects import ua.acclorite.book_story.domain.reader.ReaderFontThickness import ua.acclorite.book_story.domain.reader.ReaderHorizontalGesture diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index c1d19aa4..6740217d 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -94,7 +94,6 @@ تصفية رتّب عام، تصفية، ترتيب - عام تصفية نمط الخط ارتفاع الخط diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 4f862cfa..b4ace900 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -45,7 +45,6 @@ Filtr Dvojitým zpětným klepnutím ukončíte Přesunout knihy? - Obecné Ikony Nápady Smazat historii čtení? diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 09874d20..d24c9170 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -236,7 +236,6 @@ Keine Wörterbuch-App gefunden. Websuche Teilen - Allgemein Zuletzt geändert Dateigröße Textausrichtung diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index ee2f2b08..5e6921e5 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -218,7 +218,6 @@ Ve a la configuración de Apariencia (consulta: ¿Cómo personalizo Reader?). Puede elegir qué colores preestablecidos usar en la configuración «Ajuste preestablecido de color». Haz clic en el ajuste preestablecido de color deseado para seleccionarlo; esto también cambiará tus colores en Reader. Si deseas reordenar el ajuste preestablecido de color, selecciona lo y manten presionado el botón con el ícono «Manejar»; luego, muévelo a la posición deseada. Puedes cambiar rápidamente los ajustes preestablecidos de color habilitando la configuración correspondiente en la subcategoría «Colores» de la configuración de Apariencia y luego deslizando la barra superior hacia la izquierda o la derecha en Reader para cambiar rápidamente el ajuste preestablecido de color. Tryzub Clasificar - General Tamaño de la cuadrícula Cuadrícula por fila diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 33ad01e9..3ad29ddb 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -217,7 +217,6 @@ Couleurs Paramètres généraux Trier - Général Langue de l\'application Thème sombre Noir pur (OLED) diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 474fbf8c..2bac4e77 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -63,7 +63,6 @@ पढ़ने की गति थीम सेटिंग्स रंगों - सामान्य क्रमबद्ध करना ऐप भाषा किताबें हटाएँ? diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 1a545fa2..c2162c72 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -146,7 +146,6 @@ Oggi Lingua applicazione Tema scuro - Generale Filtro Normale Elimina tutta la cronologia diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index dbf9c311..a27bb3ec 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -24,7 +24,6 @@ Sortuj Czcionka Kolory - Ogólne Filtr Zielony Niebieski diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 515eed9d..c140c3c1 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -20,7 +20,6 @@ Itálico Lista Não - Geral Histórico Explorar Tela cheia diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index d3f9e776..99b81d85 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -122,7 +122,6 @@ திணிப்பு இதர நிறங்கள் - பொது வெளியேற டபுள் பேக் பிரச் பயன்பாட்டிலிருந்து வெளியேற இரண்டு முறை மீண்டும் அழுத்தவும் எழுத்துரு குடும்பம் diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 1c47e51e..5182fbc1 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -153,7 +153,6 @@ İlerleme Tema tercihleri Renkler - Genel Filtre Sırala diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 3bad3c19..8d347c9b 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -96,9 +96,10 @@ Планую Кинуто Головні + Вигляд Кольори Фільтр - Сортування + Сортувати Читач @@ -126,9 +127,9 @@ Налаштування теми Кольори Сканування - Головні + Вигляд Фільтр - Сотрування + Сотрувати diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index a5661674..1e1a9a83 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -134,7 +134,6 @@ 专注于中心以提升你的阅读速度 行高度 绿色 - 常规 中等 高 火星 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4adb84cb..9484fa12 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -125,6 +125,7 @@ Planning Dropped General + Display Colors Filter Sort @@ -155,7 +156,7 @@ Theme preferences Colors Scan - General + Display Filter Sort