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/components/CustomSelectionContainer.kt index 8e96079c..0f4fba42 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomSelectionContainer.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/components/CustomSelectionContainer.kt @@ -207,7 +207,7 @@ fun CustomSelectionContainer( onCopyRequested: (() -> Unit), onTranslateRequested: ((String) -> Unit), onDictionaryRequested: ((String) -> Unit), - content: @Composable (Boolean) -> Unit + content: @Composable (toolbarHidden: Boolean) -> Unit ) { val view = LocalView.current val context = LocalContext.current 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 6596814c..22d88a63 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 @@ -348,14 +348,14 @@ private fun ReaderScreen( ) ) } - ) { toolbarShowed -> + ) { toolbarHidden -> LazyColumn( state = state.value.listState, modifier = Modifier .fillMaxSize() .background(backgroundColor) .then( - if (!loading.value && toolbarShowed) { + if (!loading.value && toolbarHidden) { Modifier .clickable( interactionSource = null, @@ -398,6 +398,7 @@ private fun ReaderScreen( fontSize = mainState.value.fontSize!!.sp, sidePadding = sidePadding, paragraphIndentation = mainState.value.paragraphIndentation!!, + toolbarHidden = toolbarHidden, onEvent = onEvent ) } diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/text/ReaderTextParagraph.kt b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/text/ReaderTextParagraph.kt index c17168ef..496f3e47 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/text/ReaderTextParagraph.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/screens/reader/components/text/ReaderTextParagraph.kt @@ -60,6 +60,7 @@ import java.util.Locale * @param fontSize Line's font size. * @param sidePadding Line's side padding. * @param paragraphIndentation Whether Paragraph Indentation is enabled for this line. + * @param toolbarHidden Whether selection toolbar is hidden. * @param onEvent [ReaderEvent] callback. */ @OptIn(ExperimentalFoundationApi::class) @@ -77,6 +78,7 @@ fun LazyItemScope.ReaderTextParagraph( fontSize: TextUnit, sidePadding: Dp, paragraphIndentation: Boolean, + toolbarHidden: Boolean, onEvent: (ReaderEvent) -> Unit ) { val text = remember( @@ -167,7 +169,8 @@ fun LazyItemScope.ReaderTextParagraph( .then( if ( state.value.book.enableTranslator && - state.value.book.doubleClickTranslation + state.value.book.doubleClickTranslation && + toolbarHidden ) { Modifier.combinedClickable( interactionSource = null,