🚀 Move Browse "General" subcategory to "Display"

* Moved Browse "General" subcategory to "Display" subcategory
This commit is contained in:
Acclorite 2025-03-09 10:04:49 +02:00
parent 750c9ffbeb
commit 9fe7a497e8
45 changed files with 61 additions and 71 deletions

View file

@ -11,7 +11,7 @@ import android.util.Log
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.data.local.room.BookDao import ua.acclorite.book_story.data.local.room.BookDao
import ua.acclorite.book_story.data.parser.FileParser 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.CachedFile
import ua.acclorite.book_story.domain.file.CachedFileCompat import ua.acclorite.book_story.domain.file.CachedFileCompat
import ua.acclorite.book_story.domain.library.book.NullableBook import ua.acclorite.book_story.domain.library.book.NullableBook

View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * SPDX-License-Identifier: GPL-3.0-only
*/ */
package ua.acclorite.book_story.domain.browse package ua.acclorite.book_story.domain.browse.display
import androidx.compose.runtime.Immutable import androidx.compose.runtime.Immutable

View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * SPDX-License-Identifier: GPL-3.0-only
*/ */
package ua.acclorite.book_story.domain.browse package ua.acclorite.book_story.domain.browse.display
import androidx.compose.runtime.Immutable import androidx.compose.runtime.Immutable

View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * SPDX-License-Identifier: GPL-3.0-only
*/ */
package ua.acclorite.book_story.domain.browse package ua.acclorite.book_story.domain.browse.file
import androidx.compose.runtime.Immutable import androidx.compose.runtime.Immutable

View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * SPDX-License-Identifier: GPL-3.0-only
*/ */
package ua.acclorite.book_story.domain.browse package ua.acclorite.book_story.domain.browse.file
import androidx.compose.runtime.Immutable import androidx.compose.runtime.Immutable
import ua.acclorite.book_story.domain.file.CachedFile import ua.acclorite.book_story.domain.file.CachedFile

View file

@ -6,7 +6,7 @@
package ua.acclorite.book_story.domain.repository 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.file.CachedFile
import ua.acclorite.book_story.domain.library.book.NullableBook import ua.acclorite.book_story.domain.library.book.NullableBook

View file

@ -6,7 +6,7 @@
package ua.acclorite.book_story.domain.use_case.file_system 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 ua.acclorite.book_story.domain.repository.FileSystemRepository
import javax.inject.Inject import javax.inject.Inject

View file

@ -12,8 +12,8 @@ import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.pullrefresh.PullRefreshState import androidx.compose.material.pullrefresh.PullRefreshState
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.FocusRequester
import ua.acclorite.book_story.domain.browse.BrowseLayout import ua.acclorite.book_story.domain.browse.display.BrowseLayout
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.library.book.SelectableNullableBook
import ua.acclorite.book_story.domain.util.BottomSheet import ua.acclorite.book_story.domain.util.BottomSheet
import ua.acclorite.book_story.domain.util.Dialog import ua.acclorite.book_story.domain.util.Dialog

View file

@ -18,8 +18,8 @@ import androidx.compose.ui.Modifier
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import ua.acclorite.book_story.presentation.core.components.common.LazyColumnWithScrollbar 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.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.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.presentation.settings.browse.sort.BrowseSortSubcategory
import ua.acclorite.book_story.ui.browse.BrowseEvent import ua.acclorite.book_story.ui.browse.BrowseEvent
@ -57,7 +57,7 @@ fun BrowseFilterBottomSheet(
when (page) { when (page) {
0 -> { 0 -> {
LazyColumnWithScrollbar(modifier = Modifier.fillMaxSize()) { LazyColumnWithScrollbar(modifier = Modifier.fillMaxSize()) {
BrowseGeneralSubcategory( BrowseFilterSubcategory(
showTitle = false, showTitle = false,
showDivider = false showDivider = false
) )
@ -66,7 +66,7 @@ fun BrowseFilterBottomSheet(
1 -> { 1 -> {
LazyColumnWithScrollbar(modifier = Modifier.fillMaxSize()) { LazyColumnWithScrollbar(modifier = Modifier.fillMaxSize()) {
BrowseFilterSubcategory( BrowseSortSubcategory(
showTitle = false, showTitle = false,
showDivider = false showDivider = false
) )
@ -75,7 +75,7 @@ fun BrowseFilterBottomSheet(
2 -> { 2 -> {
LazyColumnWithScrollbar(modifier = Modifier.fillMaxSize()) { LazyColumnWithScrollbar(modifier = Modifier.fillMaxSize()) {
BrowseSortSubcategory( BrowseDisplaySubcategory(
showTitle = false, showTitle = false,
showDivider = false showDivider = false
) )

View file

@ -17,9 +17,9 @@ fun BrowseFilterBottomSheetTabRow(
scrollToPage: (Int) -> Unit scrollToPage: (Int) -> Unit
) { ) {
val tabItems = listOf( val tabItems = listOf(
stringResource(id = R.string.general_tab),
stringResource(id = R.string.filter_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( ModalBottomSheetTabRow(

View file

@ -28,7 +28,7 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import ua.acclorite.book_story.R 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.CircularCheckbox
import ua.acclorite.book_story.presentation.core.components.common.StyledText import ua.acclorite.book_story.presentation.core.components.common.StyledText
import ua.acclorite.book_story.ui.theme.DefaultTransition import ua.acclorite.book_story.ui.theme.DefaultTransition

View file

@ -19,7 +19,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import ua.acclorite.book_story.domain.browse.SelectableFile import ua.acclorite.book_story.domain.browse.file.SelectableFile
@OptIn(ExperimentalFoundationApi::class) @OptIn(ExperimentalFoundationApi::class)
@Composable @Composable

View file

@ -17,8 +17,8 @@ import androidx.compose.foundation.lazy.grid.items
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import ua.acclorite.book_story.domain.browse.GroupedFiles import ua.acclorite.book_story.domain.browse.file.GroupedFiles
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.LazyVerticalGridWithScrollbar 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.components.common.header
import ua.acclorite.book_story.presentation.core.constants.Constants import ua.acclorite.book_story.presentation.core.constants.Constants

View file

@ -8,8 +8,8 @@ package ua.acclorite.book_story.presentation.browse
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import ua.acclorite.book_story.domain.browse.BrowseLayout import ua.acclorite.book_story.domain.browse.display.BrowseLayout
import ua.acclorite.book_story.domain.browse.SelectableFile import ua.acclorite.book_story.domain.browse.file.SelectableFile
@Composable @Composable
fun BrowseItem( fun BrowseItem(

View file

@ -10,9 +10,9 @@ import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.lazy.grid.LazyGridState import androidx.compose.foundation.lazy.grid.LazyGridState
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import ua.acclorite.book_story.domain.browse.BrowseLayout import ua.acclorite.book_story.domain.browse.display.BrowseLayout
import ua.acclorite.book_story.domain.browse.GroupedFiles import ua.acclorite.book_story.domain.browse.file.GroupedFiles
import ua.acclorite.book_story.domain.browse.SelectableFile import ua.acclorite.book_story.domain.browse.file.SelectableFile
import java.io.File import java.io.File
@Composable @Composable

View file

@ -31,7 +31,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import ua.acclorite.book_story.R 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 ua.acclorite.book_story.presentation.core.components.common.StyledText
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.Date import java.util.Date

View file

@ -22,7 +22,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import ua.acclorite.book_story.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.CircularCheckbox
import ua.acclorite.book_story.ui.theme.FadeTransitionPreservingSpace import ua.acclorite.book_story.ui.theme.FadeTransitionPreservingSpace

View file

@ -16,8 +16,8 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import ua.acclorite.book_story.domain.browse.GroupedFiles import ua.acclorite.book_story.domain.browse.file.GroupedFiles
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.LazyColumnWithScrollbar 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.Constants
import ua.acclorite.book_story.presentation.core.constants.providePrimaryScrollbar import ua.acclorite.book_story.presentation.core.constants.providePrimaryScrollbar

View file

@ -19,8 +19,8 @@ import androidx.compose.material3.Scaffold
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.FocusRequester
import ua.acclorite.book_story.domain.browse.BrowseLayout import ua.acclorite.book_story.domain.browse.display.BrowseLayout
import ua.acclorite.book_story.domain.browse.SelectableFile import ua.acclorite.book_story.domain.browse.file.SelectableFile
import ua.acclorite.book_story.ui.browse.BrowseEvent import ua.acclorite.book_story.ui.browse.BrowseEvent
import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainEvent
import ua.acclorite.book_story.ui.theme.DefaultTransition import ua.acclorite.book_story.ui.theme.DefaultTransition

View file

@ -26,8 +26,8 @@ import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.layout.onGloballyPositioned import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.domain.browse.BrowseLayout import ua.acclorite.book_story.domain.browse.display.BrowseLayout
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.IconButton 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.SearchTextField
import ua.acclorite.book_story.presentation.core.components.common.StyledText import ua.acclorite.book_story.presentation.core.components.common.StyledText

View file

@ -9,14 +9,14 @@
package ua.acclorite.book_story.presentation.settings.browse package ua.acclorite.book_story.presentation.settings.browse
import androidx.compose.foundation.lazy.LazyListScope 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.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.scan.BrowseScanSubcategory
import ua.acclorite.book_story.presentation.settings.browse.sort.BrowseSortSubcategory import ua.acclorite.book_story.presentation.settings.browse.sort.BrowseSortSubcategory
fun LazyListScope.BrowseSettingsCategory() { fun LazyListScope.BrowseSettingsCategory() {
BrowseScanSubcategory() BrowseScanSubcategory()
BrowseGeneralSubcategory() BrowseDisplaySubcategory()
BrowseFilterSubcategory() BrowseFilterSubcategory()
BrowseSortSubcategory( BrowseSortSubcategory(
showDivider = false showDivider = false

View file

@ -6,7 +6,7 @@
@file:Suppress("FunctionName") @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.foundation.lazy.LazyListScope
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
@ -14,13 +14,13 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import ua.acclorite.book_story.R import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.settings.browse.general.components.BrowseGridSizeOption import ua.acclorite.book_story.presentation.settings.browse.display.components.BrowseGridSizeOption
import ua.acclorite.book_story.presentation.settings.browse.general.components.BrowseLayoutOption import ua.acclorite.book_story.presentation.settings.browse.display.components.BrowseLayoutOption
import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory import ua.acclorite.book_story.presentation.settings.components.SettingsSubcategory
fun LazyListScope.BrowseGeneralSubcategory( fun LazyListScope.BrowseDisplaySubcategory(
titleColor: @Composable () -> Color = { MaterialTheme.colorScheme.primary }, 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, showTitle: Boolean = true,
showDivider: Boolean = true showDivider: Boolean = true
) { ) {

View file

@ -4,14 +4,14 @@
* SPDX-License-Identifier: GPL-3.0-only * 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.runtime.Composable
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import ua.acclorite.book_story.R 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.presentation.core.components.settings.SliderWithTitle
import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainEvent
import ua.acclorite.book_story.ui.main.MainModel import ua.acclorite.book_story.ui.main.MainModel

View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-only * SPDX-License-Identifier: GPL-3.0-only
*/ */
package ua.acclorite.book_story.presentation.settings.browse.general.components package ua.acclorite.book_story.presentation.settings.browse.display.components
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -12,7 +12,7 @@ import androidx.compose.ui.res.stringResource
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import ua.acclorite.book_story.R 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.domain.ui.ButtonItem
import ua.acclorite.book_story.presentation.core.components.settings.SegmentedButtonWithTitle import ua.acclorite.book_story.presentation.core.components.settings.SegmentedButtonWithTitle
import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainEvent

View file

@ -31,7 +31,7 @@ import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import ua.acclorite.book_story.R 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.presentation.core.components.common.StyledText
import ua.acclorite.book_story.ui.main.MainEvent import ua.acclorite.book_story.ui.main.MainEvent
import ua.acclorite.book_story.ui.main.MainModel import ua.acclorite.book_story.ui.main.MainModel

View file

@ -9,7 +9,7 @@ package ua.acclorite.book_story.ui.browse
import android.content.Context import android.content.Context
import androidx.compose.runtime.Immutable import androidx.compose.runtime.Immutable
import androidx.compose.ui.focus.FocusRequester 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 import ua.acclorite.book_story.domain.library.book.SelectableNullableBook
@Immutable @Immutable

View file

@ -22,8 +22,8 @@ import kotlinx.coroutines.sync.withLock
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import kotlinx.coroutines.yield import kotlinx.coroutines.yield
import ua.acclorite.book_story.R 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.domain.browse.SelectableFile 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.NullableBook
import ua.acclorite.book_story.domain.library.book.SelectableNullableBook import ua.acclorite.book_story.domain.library.book.SelectableNullableBook
import ua.acclorite.book_story.domain.use_case.book.InsertBook import ua.acclorite.book_story.domain.use_case.book.InsertBook

View file

@ -24,7 +24,7 @@ import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.flow.receiveAsFlow
import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.IgnoredOnParcel
import kotlinx.parcelize.Parcelize 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.domain.navigator.Screen
import ua.acclorite.book_story.presentation.browse.BrowseContent import ua.acclorite.book_story.presentation.browse.BrowseContent
import ua.acclorite.book_story.presentation.navigator.LocalNavigator import ua.acclorite.book_story.presentation.navigator.LocalNavigator

View file

@ -7,7 +7,7 @@
package ua.acclorite.book_story.ui.browse package ua.acclorite.book_story.ui.browse
import androidx.compose.runtime.Immutable 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.library.book.SelectableNullableBook
import ua.acclorite.book_story.domain.util.BottomSheet import ua.acclorite.book_story.domain.util.BottomSheet
import ua.acclorite.book_story.domain.util.Dialog import ua.acclorite.book_story.domain.util.Dialog

View file

@ -22,8 +22,8 @@ import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.sync.withLock
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import kotlinx.coroutines.yield import kotlinx.coroutines.yield
import ua.acclorite.book_story.domain.browse.toBrowseLayout import ua.acclorite.book_story.domain.browse.display.toBrowseLayout
import ua.acclorite.book_story.domain.browse.toBrowseSortOrder import ua.acclorite.book_story.domain.browse.display.toBrowseSortOrder
import ua.acclorite.book_story.domain.reader.toColorEffects import ua.acclorite.book_story.domain.reader.toColorEffects
import ua.acclorite.book_story.domain.reader.toFontThickness import ua.acclorite.book_story.domain.reader.toFontThickness
import ua.acclorite.book_story.domain.reader.toHorizontalGesture import ua.acclorite.book_story.domain.reader.toHorizontalGesture

View file

@ -13,10 +13,10 @@ import androidx.annotation.Keep
import androidx.compose.runtime.Immutable import androidx.compose.runtime.Immutable
import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.core.Preferences
import kotlinx.parcelize.Parcelize 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.browse.BrowseSortOrder import ua.acclorite.book_story.domain.browse.display.BrowseSortOrder
import ua.acclorite.book_story.domain.browse.toBrowseLayout import ua.acclorite.book_story.domain.browse.display.toBrowseLayout
import ua.acclorite.book_story.domain.browse.toBrowseSortOrder import ua.acclorite.book_story.domain.browse.display.toBrowseSortOrder
import ua.acclorite.book_story.domain.reader.ReaderColorEffects import ua.acclorite.book_story.domain.reader.ReaderColorEffects
import ua.acclorite.book_story.domain.reader.ReaderFontThickness import ua.acclorite.book_story.domain.reader.ReaderFontThickness
import ua.acclorite.book_story.domain.reader.ReaderHorizontalGesture import ua.acclorite.book_story.domain.reader.ReaderHorizontalGesture

View file

@ -94,7 +94,6 @@
<string name="filter_tab">تصفية</string> <string name="filter_tab">تصفية</string>
<string name="sort_tab">رتّب</string> <string name="sort_tab">رتّب</string>
<string name="browse_settings_desc">عام، تصفية، ترتيب</string> <string name="browse_settings_desc">عام، تصفية، ترتيب</string>
<string name="general_browse_settings">عام</string>
<string name="filter_browse_settings">تصفية</string> <string name="filter_browse_settings">تصفية</string>
<string name="font_style_option">نمط الخط</string> <string name="font_style_option">نمط الخط</string>
<string name="line_height_option">ارتفاع الخط</string> <string name="line_height_option">ارتفاع الخط</string>

View file

@ -45,7 +45,6 @@
<string name="filter_browse_settings">Filtr</string> <string name="filter_browse_settings">Filtr</string>
<string name="double_press_exit_option">Dvojitým zpětným klepnutím ukončíte</string> <string name="double_press_exit_option">Dvojitým zpětným klepnutím ukončíte</string>
<string name="move_books">Přesunout knihy?</string> <string name="move_books">Přesunout knihy?</string>
<string name="general_browse_settings">Obecné</string>
<string name="credits_icon">Ikony</string> <string name="credits_icon">Ikony</string>
<string name="credits_ideas">Nápady</string> <string name="credits_ideas">Nápady</string>
<string name="delete_history">Smazat historii čtení?</string> <string name="delete_history">Smazat historii čtení?</string>

View file

@ -236,7 +236,6 @@
<string name="error_no_dictionary">Keine Wörterbuch-App gefunden.</string> <string name="error_no_dictionary">Keine Wörterbuch-App gefunden.</string>
<string name="web_search">Websuche</string> <string name="web_search">Websuche</string>
<string name="share">Teilen</string> <string name="share">Teilen</string>
<string name="general_browse_settings">Allgemein</string>
<string name="browse_sort_order_last_modified">Zuletzt geändert</string> <string name="browse_sort_order_last_modified">Zuletzt geändert</string>
<string name="browse_sort_order_file_size">Dateigröße</string> <string name="browse_sort_order_file_size">Dateigröße</string>
<string name="text_alignment_option">Textausrichtung</string> <string name="text_alignment_option">Textausrichtung</string>

View file

@ -218,7 +218,6 @@
<string name="help_desc_how_to_use_color_presets_1">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.</string> <string name="help_desc_how_to_use_color_presets_1">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.</string>
<string name="tryzub_badge">Tryzub</string> <string name="tryzub_badge">Tryzub</string>
<string name="sort_tab">Clasificar</string> <string name="sort_tab">Clasificar</string>
<string name="general_browse_settings">General</string>
<string name="browse_grid_size_option">Tamaño de la cuadrícula</string> <string name="browse_grid_size_option">Tamaño de la cuadrícula</string>
<string name="browse_layout_grid">Cuadrícula</string> <string name="browse_layout_grid">Cuadrícula</string>
<string name="browse_grid_size_per_row">por fila</string> <string name="browse_grid_size_per_row">por fila</string>

View file

@ -217,7 +217,6 @@
<string name="color_tab">Couleurs</string> <string name="color_tab">Couleurs</string>
<string name="general_settings">Paramètres généraux</string> <string name="general_settings">Paramètres généraux</string>
<string name="sort_browse_settings">Trier</string> <string name="sort_browse_settings">Trier</string>
<string name="general_browse_settings">Général</string>
<string name="language_option">Langue de l\'application</string> <string name="language_option">Langue de l\'application</string>
<string name="dark_theme_option">Thème sombre</string> <string name="dark_theme_option">Thème sombre</string>
<string name="pure_dark_option">Noir pur (OLED)</string> <string name="pure_dark_option">Noir pur (OLED)</string>

View file

@ -63,7 +63,6 @@
<string name="reading_speed_reader_settings">पढ़ने की गति</string> <string name="reading_speed_reader_settings">पढ़ने की गति</string>
<string name="theme_appearance_settings">थीम सेटिंग्स</string> <string name="theme_appearance_settings">थीम सेटिंग्स</string>
<string name="colors_appearance_settings">रंगों</string> <string name="colors_appearance_settings">रंगों</string>
<string name="general_browse_settings">सामान्य</string>
<string name="sort_browse_settings">क्रमबद्ध करना</string> <string name="sort_browse_settings">क्रमबद्ध करना</string>
<string name="language_option">ऐप भाषा</string> <string name="language_option">ऐप भाषा</string>
<string name="delete_books">किताबें हटाएँ?</string> <string name="delete_books">किताबें हटाएँ?</string>

View file

@ -146,7 +146,6 @@
<string name="today">Oggi</string> <string name="today">Oggi</string>
<string name="language_option">Lingua applicazione</string> <string name="language_option">Lingua applicazione</string>
<string name="dark_theme_option">Tema scuro</string> <string name="dark_theme_option">Tema scuro</string>
<string name="general_browse_settings">Generale</string>
<string name="filter_browse_settings">Filtro</string> <string name="filter_browse_settings">Filtro</string>
<string name="font_style_normal">Normale</string> <string name="font_style_normal">Normale</string>
<string name="delete_whole_history_content_desc">Elimina tutta la cronologia</string> <string name="delete_whole_history_content_desc">Elimina tutta la cronologia</string>

View file

@ -24,7 +24,6 @@
<string name="sort_tab">Sortuj</string> <string name="sort_tab">Sortuj</string>
<string name="font_reader_settings">Czcionka</string> <string name="font_reader_settings">Czcionka</string>
<string name="colors_appearance_settings">Kolory</string> <string name="colors_appearance_settings">Kolory</string>
<string name="general_browse_settings">Ogólne</string>
<string name="filter_browse_settings">Filtr</string> <string name="filter_browse_settings">Filtr</string>
<string name="green_color">Zielony</string> <string name="green_color">Zielony</string>
<string name="blue_color">Niebieski</string> <string name="blue_color">Niebieski</string>

View file

@ -20,7 +20,6 @@
<string name="font_style_italic">Itálico</string> <string name="font_style_italic">Itálico</string>
<string name="browse_layout_list">Lista</string> <string name="browse_layout_list">Lista</string>
<string name="no">Não</string> <string name="no">Não</string>
<string name="general_browse_settings">Geral</string>
<string name="history_screen">Histórico</string> <string name="history_screen">Histórico</string>
<string name="browse_screen">Explorar</string> <string name="browse_screen">Explorar</string>
<string name="fullscreen_option">Tela cheia</string> <string name="fullscreen_option">Tela cheia</string>

View file

@ -122,7 +122,6 @@
<string name="padding_reader_settings">திணிப்பு</string> <string name="padding_reader_settings">திணிப்பு</string>
<string name="misc_reader_settings">இதர</string> <string name="misc_reader_settings">இதர</string>
<string name="colors_appearance_settings">நிறங்கள்</string> <string name="colors_appearance_settings">நிறங்கள்</string>
<string name="general_browse_settings">பொது</string>
<string name="double_press_exit_option">வெளியேற டபுள் பேக் பிரச்</string> <string name="double_press_exit_option">வெளியேற டபுள் பேக் பிரச்</string>
<string name="double_press_exit_option_desc">பயன்பாட்டிலிருந்து வெளியேற இரண்டு முறை மீண்டும் அழுத்தவும்</string> <string name="double_press_exit_option_desc">பயன்பாட்டிலிருந்து வெளியேற இரண்டு முறை மீண்டும் அழுத்தவும்</string>
<string name="font_family_option">எழுத்துரு குடும்பம்</string> <string name="font_family_option">எழுத்துரு குடும்பம்</string>

View file

@ -153,7 +153,6 @@
<string name="progress_reader_settings">İlerleme</string> <string name="progress_reader_settings">İlerleme</string>
<string name="theme_appearance_settings">Tema tercihleri</string> <string name="theme_appearance_settings">Tema tercihleri</string>
<string name="colors_appearance_settings">Renkler</string> <string name="colors_appearance_settings">Renkler</string>
<string name="general_browse_settings">Genel</string>
<string name="filter_browse_settings">Filtre</string> <string name="filter_browse_settings">Filtre</string>
<string name="sort_browse_settings">Sırala</string> <string name="sort_browse_settings">Sırala</string>

View file

@ -96,9 +96,10 @@
<string name="planning_tab">Планую</string> <string name="planning_tab">Планую</string>
<string name="dropped_tab">Кинуто</string> <string name="dropped_tab">Кинуто</string>
<string name="general_tab">Головні</string> <string name="general_tab">Головні</string>
<string name="display_tab">Вигляд</string>
<string name="color_tab">Кольори</string> <string name="color_tab">Кольори</string>
<string name="filter_tab">Фільтр</string> <string name="filter_tab">Фільтр</string>
<string name="sort_tab">Сортування</string> <string name="sort_tab">Сортувати</string>
<string name="reader_tab">Читач</string> <string name="reader_tab">Читач</string>
<!-- Settings categories --> <!-- Settings categories -->
@ -126,9 +127,9 @@
<string name="theme_appearance_settings">Налаштування теми</string> <string name="theme_appearance_settings">Налаштування теми</string>
<string name="colors_appearance_settings">Кольори</string> <string name="colors_appearance_settings">Кольори</string>
<string name="scan_browse_settings">Сканування</string> <string name="scan_browse_settings">Сканування</string>
<string name="general_browse_settings">Головні</string> <string name="display_browse_settings">Вигляд</string>
<string name="filter_browse_settings">Фільтр</string> <string name="filter_browse_settings">Фільтр</string>
<string name="sort_browse_settings">Сотрування</string> <string name="sort_browse_settings">Сотрувати</string>
<!-- Settings notes --> <!-- Settings notes -->
<string name="browse_scan_option_note"> <string name="browse_scan_option_note">

View file

@ -134,7 +134,6 @@
<string name="perception_expander_option_desc">专注于中心以提升你的阅读速度</string> <string name="perception_expander_option_desc">专注于中心以提升你的阅读速度</string>
<string name="perception_expander_thickness_option">行高度</string> <string name="perception_expander_thickness_option">行高度</string>
<string name="green_color">绿色</string> <string name="green_color">绿色</string>
<string name="general_browse_settings">常规</string>
<string name="theme_contrast_medium">中等</string> <string name="theme_contrast_medium">中等</string>
<string name="theme_contrast_high"></string> <string name="theme_contrast_high"></string>
<string name="red_theme">火星</string> <string name="red_theme">火星</string>

View file

@ -125,6 +125,7 @@
<string name="planning_tab">Planning</string> <string name="planning_tab">Planning</string>
<string name="dropped_tab">Dropped</string> <string name="dropped_tab">Dropped</string>
<string name="general_tab">General</string> <string name="general_tab">General</string>
<string name="display_tab">Display</string>
<string name="color_tab">Colors</string> <string name="color_tab">Colors</string>
<string name="filter_tab">Filter</string> <string name="filter_tab">Filter</string>
<string name="sort_tab">Sort</string> <string name="sort_tab">Sort</string>
@ -155,7 +156,7 @@
<string name="theme_appearance_settings">Theme preferences</string> <string name="theme_appearance_settings">Theme preferences</string>
<string name="colors_appearance_settings">Colors</string> <string name="colors_appearance_settings">Colors</string>
<string name="scan_browse_settings">Scan</string> <string name="scan_browse_settings">Scan</string>
<string name="general_browse_settings">General</string> <string name="display_browse_settings">Display</string>
<string name="filter_browse_settings">Filter</string> <string name="filter_browse_settings">Filter</string>
<string name="sort_browse_settings">Sort</string> <string name="sort_browse_settings">Sort</string>