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

🚀 Hide Bars On Fast Scroll option

Browse source 
* Added "Hide bars on fast scroll" option in Reader
* If true, hides bars during fast scroll
This commit is contained in:
Acclorite 2024-09-08 20:24:58 +03:00
parent 11e21bf60b
commit 0496004cc4
10 changed files with 61 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/ua/acclorite/book_story/presentation/core/constants/DataStoreConstants.kt
View file

@ -33,6 +33,7 @@ object DataStoreConstants {
val CUTOUT_PADDING = booleanPreferencesKey("cutout_padding")
val FULLSCREEN = booleanPreferencesKey("fullscreen")
val KEEP_SCREEN_ON = booleanPreferencesKey("keep_screen_on")
val HIDE_BARS_ON_FAST_SCROLL = booleanPreferencesKey("hide_bars_on_fast_scroll")
// Browse settings
val BROWSE_FILES_STRUCTURE = stringPreferencesKey("browse_files_structure")

1
app/src/main/java/ua/acclorite/book_story/presentation/data/MainEvent.kt
View file

@ -36,4 +36,5 @@ sealed class MainEvent {
data class OnChangeFullscreen(val bool: Boolean) : MainEvent()
data class OnChangeKeepScreenOn(val bool: Boolean) : MainEvent()
data class OnChangeVerticalPadding(val padding: Int) : MainEvent()
data class OnChangeHideBarsOnFastScroll(val bool: Boolean) : MainEvent()
}

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

@ -73,6 +73,7 @@ data class MainState(
val cutoutPadding: Boolean = provideDefaultValue { false },
val fullscreen: Boolean = provideDefaultValue { true },
val keepScreenOn: Boolean = provideDefaultValue { true },
val hideBarsOnFastScroll: Boolean = provideDefaultValue { true },
// Browse Settings
val browseFilesStructure: BrowseFilesStructure = provideDefaultValue {
@ -234,6 +235,10 @@ data class MainState(
verticalPadding = provideValue(
VERTICAL_PADDING
) { verticalPadding },
hideBarsOnFastScroll = provideValue(
HIDE_BARS_ON_FAST_SCROLL
) { hideBarsOnFastScroll },
)
}
}

14
app/src/main/java/ua/acclorite/book_story/presentation/data/MainViewModel.kt
View file

@ -443,6 +443,20 @@ class MainViewModel @Inject constructor(
}
}
}
is MainEvent.OnChangeHideBarsOnFastScroll -> {
viewModelScope.launch(Dispatchers.IO) {
setDatastore.execute(
DataStoreConstants.HIDE_BARS_ON_FAST_SCROLL,
event.bool
)
updateStateWithSavedHandle {
it.copy(
hideBarsOnFastScroll = event.bool
)
}
}
}
}
}

9
app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/ReaderScreen.kt
View file

@ -191,17 +191,20 @@ private fun ReaderScreen(lazyListState: LazyListState) {
available: Offset,
source: NestedScrollSource
): Offset {
val velocity = consumed.y
consumed.y.let { velocity ->
if(velocity in -70f..70f) return@let
if(!state.value.showMenu) return@let
if(state.value.lockMenu) return@let
if(!mainState.value.hideBarsOnFastScroll) return@let
if ((velocity > 70 || velocity < -70) && state.value.showMenu && !state.value.lockMenu) {
onEvent(
ReaderEvent.OnShowHideMenu(
show = false,
fullscreenMode = mainState.value.fullscreen,
activity = context
)
)
}
return super.onPostScroll(consumed, available, source)
}
}

27
app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/HideBarsOnFastScrollSetting.kt Normal file
View file

@ -0,0 +1,27 @@
package ua.acclorite.book_story.presentation.screens.settings.nested.reader.components.settings
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
import ua.acclorite.book_story.R
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
/**
* Hide Bars On Fast Scroll setting.
* If true, hides bars during fast scroll.
*/
@Composable
fun HideBarsOnFastScrollSetting() {
val state = LocalMainViewModel.current.state
val onMainEvent = LocalMainViewModel.current.onEvent
SwitchWithTitle(
selected = state.value.hideBarsOnFastScroll,
title = stringResource(id = R.string.hide_bars_on_fast_scroll_option)
) {
onMainEvent(
MainEvent.OnChangeHideBarsOnFastScroll(!state.value.hideBarsOnFastScroll)
)
}
}

1
app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/settings/KeepScreenOnSetting.kt
View file

@ -19,7 +19,6 @@ fun KeepScreenOnSetting() {
SwitchWithTitle(
selected = state.value.keepScreenOn,
title = stringResource(id = R.string.keep_screen_on_option),
description = stringResource(id = R.string.keep_screen_on_option_desc),
onClick = {
onMainEvent(
MainEvent.OnChangeKeepScreenOn(

5
app/src/main/java/ua/acclorite/book_story/presentation/screens/settings/nested/reader/components/subcategories/MiscSubcategory.kt
View file

@ -11,6 +11,7 @@ import androidx.compose.ui.unit.Dp
import ua.acclorite.book_story.R
import ua.acclorite.book_story.presentation.screens.settings.components.SettingsSubcategory
import ua.acclorite.book_story.presentation.screens.settings.nested.reader.components.settings.FullscreenSetting
import ua.acclorite.book_story.presentation.screens.settings.nested.reader.components.settings.HideBarsOnFastScrollSetting
import ua.acclorite.book_story.presentation.screens.settings.nested.reader.components.settings.KeepScreenOnSetting
/**
@ -40,5 +41,9 @@ fun LazyListScope.MiscSubcategory(
item {
KeepScreenOnSetting()
}
item {
HideBarsOnFastScrollSetting()
}
}
}

2
app/src/main/res/values-uk/strings.xml
View file

@ -242,7 +242,7 @@
<string name="fullscreen_option">Повний екран</string>
<string name="fullscreen_option_desc">Сховати системні панелі та прибрати відступи</string>
<string name="keep_screen_on_option">Тримати екран увімкненим</string>
<string name="keep_screen_on_option_desc">Тримати екран увімкненим нескінченно</string>
<string name="hide_bars_on_fast_scroll_option">Ховати панелі при швидкому прокручуванні</string>
<!-- Browse -->
<string name="browse_files_structure_option">Структура файлів</string>

2
app/src/main/res/values/strings.xml
View file

@ -259,7 +259,7 @@
<string name="fullscreen_option">Fullscreen</string>
<string name="fullscreen_option_desc">Hide system bars and remove padding</string>
<string name="keep_screen_on_option">Keep screen on</string>
<string name="keep_screen_on_option_desc">Keep screen awake infinitely</string>
<string name="hide_bars_on_fast_scroll_option">Hide bars on fast scroll</string>
<!-- Browse -->
<string name="browse_files_structure_option">Files structure</string>