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

Added musician mode to EPUB and PDF readers, featuring tap-to-scroll regions and persistent state. Refactored auto-scroll lock functionality to support the new musician-oriented interface. (#39)

Browse source 
Added musician mode to EPUB and PDF readers, featuring tap-to-scroll regions and persistent state. Refactored auto-scroll lock functionality to support the new musician-oriented interface.
This commit is contained in:
Aryan 2026-03-07 21:28:15 +05:30 • committed by GitHub
parent 3a31e4fc7b
commit b9f8825ad7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 298 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/com/aryan/reader/epubreader/EpubReaderControls.kt
View file

@ -766,8 +766,8 @@ fun AutoScrollControls(
onClose: () -> Unit,
isCollapsed: Boolean,
onCollapseChange: (Boolean) -> Unit,
isLocked: Boolean,
onLockToggle: () -> Unit,
isMusicianMode: Boolean,
onMusicianModeToggle: () -> Unit,
useSlider: Boolean,
onInputModeToggle: () -> Unit,
isLocalMode: Boolean,
@ -908,14 +908,14 @@ fun AutoScrollControls(
Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) {
IconButton(
onClick = onLockToggle,
onClick = onMusicianModeToggle,
modifier = Modifier.size(32.dp)
) {
Icon(
imageVector = if (isLocked) Icons.Default.LockOpen else Icons.Default.Lock,
contentDescription = if (isLocked) "Unlock" else "Lock",
painter = painterResource(id = R.drawable.music_note),
contentDescription = if (isMusicianMode) "Disable Musician Mode" else "Enable Musician Mode",
modifier = Modifier.size(18.dp),
tint = if (isLocked) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurfaceVariant
tint = if (isMusicianMode) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurfaceVariant
)
}
IconButton(

133
app/src/main/java/com/aryan/reader/epubreader/EpubReaderScreen.kt
View file

@ -46,8 +46,10 @@ import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutVertically
import androidx.compose.animation.togetherWith
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.focusable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxWithConstraints
@ -60,12 +62,14 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.navigationBars
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.statusBars
import androidx.compose.foundation.layout.windowInsetsBottomHeight
import androidx.compose.foundation.layout.windowInsetsEndWidth
import androidx.compose.foundation.layout.windowInsetsStartWidth
import androidx.compose.foundation.pager.rememberPagerState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Info
import androidx.compose.material3.AlertDialog
@ -106,6 +110,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalFocusManager
@ -175,7 +180,6 @@ import kotlin.math.max
import kotlin.math.min
import kotlin.math.roundToInt
private const val AUTO_SCROLL_LOCKED_KEY = "auto_scroll_locked"
private const val AUTO_SCROLL_USE_SLIDER_KEY = "auto_scroll_use_slider"
private const val AUTO_SCROLL_MIN_SPEED_KEY = "auto_scroll_min_speed"
private const val AUTO_SCROLL_MAX_SPEED_KEY = "auto_scroll_max_speed"
@ -186,6 +190,17 @@ private const val AUTO_SCROLL_IS_LOCAL_PREFIX = "auto_scroll_is_local_"
private const val AUTO_SCROLL_LOCAL_SPEED_PREFIX = "auto_scroll_local_speed_"
private const val AUTO_SCROLL_LOCAL_MIN_PREFIX = "auto_scroll_local_min_"
private const val AUTO_SCROLL_LOCAL_MAX_PREFIX = "auto_scroll_local_max_"
private const val MUSICIAN_MODE_KEY = "musician_mode_enabled"
private fun saveMusicianMode(context: Context, isEnabled: Boolean) {
val prefs = context.getSharedPreferences("reader_prefs", Context.MODE_PRIVATE)
prefs.edit { putBoolean(MUSICIAN_MODE_KEY, isEnabled) }
}
private fun loadMusicianMode(context: Context): Boolean {
val prefs = context.getSharedPreferences("reader_prefs", Context.MODE_PRIVATE)
return prefs.getBoolean(MUSICIAN_MODE_KEY, false)
}
private fun getBookIdForPrefs(title: String): String {
return title.hashCode().toString()
@ -250,17 +265,6 @@ private fun loadAutoScrollMaxSpeed(context: Context): Float {
return prefs.getFloat(AUTO_SCROLL_MAX_SPEED_KEY, 10.0f)
}
private fun saveAutoScrollLocked(context: Context, isLocked: Boolean) {
val prefs = context.getSharedPreferences("reader_prefs", Context.MODE_PRIVATE)
prefs.edit { putBoolean(AUTO_SCROLL_LOCKED_KEY, isLocked)}
}
private fun loadAutoScrollLocked(context: Context): Boolean {
val prefs = context.getSharedPreferences("reader_prefs", Context.MODE_PRIVATE)
return prefs.getBoolean(AUTO_SCROLL_LOCKED_KEY, false)
}
private fun saveAutoScrollUseSlider(context: Context, useSlider: Boolean) {
val prefs = context.getSharedPreferences("reader_prefs", Context.MODE_PRIVATE)
prefs.edit { putBoolean(AUTO_SCROLL_USE_SLIDER_KEY, useSlider) }
@ -766,7 +770,7 @@ fun EpubReaderHost(
var isAutoScrollTempPaused by remember { mutableStateOf(false) }
val autoScrollResumeJob = remember { mutableStateOf<Job?>(null) }
var isAutoScrollLocked by remember { mutableStateOf(loadAutoScrollLocked(context)) }
var isMusicianMode by remember { mutableStateOf(loadMusicianMode(context)) }
var autoScrollUseSlider by remember { mutableStateOf(loadAutoScrollUseSlider(context)) }
DisposableEffect(Unit) {
@ -1298,6 +1302,10 @@ fun EpubReaderHost(
Timber.d("Back pressed: Closing drawer")
drawerState.close()
}
} else if (isAutoScrollModeActive) {
isAutoScrollModeActive = false
isAutoScrollPlaying = false
showBars = true
} else if (searchState.isSearchActive) {
searchState.isSearchActive = false
searchState.onQueryChange("")
@ -1888,7 +1896,7 @@ fun EpubReaderHost(
Timber.d("Auto-scroll toggled via tap: $isAutoScrollPlaying")
}
if (System.currentTimeMillis() - lastHighlightClickTime > 500) {
if (!isMusicianMode && System.currentTimeMillis() - lastHighlightClickTime > 500) {
focusManager.clearFocus()
if (volumeScrollEnabled && !searchState.isSearchActive) {
containerFocusRequester.requestFocus()
@ -2805,6 +2813,80 @@ fun EpubReaderHost(
}
}
if (isMusicianMode && isAutoScrollModeActive) {
val density = LocalDensity.current
// States for visual feedback
var leftPulseTrigger by remember { mutableLongStateOf(0L) }
var rightPulseTrigger by remember { mutableLongStateOf(0L) }
val leftPulseAlpha by animateFloatAsState(
targetValue = if (System.currentTimeMillis() - leftPulseTrigger < 150) 0.3f else 0f,
animationSpec = tween(150), label = "leftPulse"
)
val rightPulseAlpha by animateFloatAsState(
targetValue = if (System.currentTimeMillis() - rightPulseTrigger < 150) 0.3f else 0f,
animationSpec = tween(150), label = "rightPulse"
)
Box(modifier = Modifier.fillMaxSize()) {
val regionHeight = Modifier.fillMaxHeight(0.4f)
val regionWidth = Modifier.fillMaxWidth(0.25f)
val topOffset = 100.dp
// Left Region
Box(
modifier = regionWidth
.then(regionHeight)
.align(Alignment.TopStart)
.offset(y = topOffset)
.padding(start = 8.dp)
.background(MaterialTheme.colorScheme.primary.copy(alpha = leftPulseAlpha), RoundedCornerShape(12.dp)) // Pulse
.border(2.dp, Color.Gray.copy(alpha = 0.3f), RoundedCornerShape(12.dp))
.clickable(
interactionSource = remember { MutableInteractionSource() },
indication = null,
onClick = {
leftPulseTrigger = System.currentTimeMillis()
// Pause loop to allow smooth scroll
triggerAutoScrollTempPause(600L)
val amount = (currentClientHeightValue * 0.75f).toInt()
webViewRefForTts?.evaluateJavascript(
"window.scrollBy({ top: -${amount}, behavior: 'smooth' });", null
)
}
)
)
// Right Region
Box(
modifier = regionWidth
.then(regionHeight)
.align(Alignment.TopEnd)
.offset(y = topOffset)
.padding(end = 8.dp)
.background(MaterialTheme.colorScheme.primary.copy(alpha = rightPulseAlpha), RoundedCornerShape(12.dp)) // Pulse
.border(2.dp, Color.Gray.copy(alpha = 0.3f), RoundedCornerShape(12.dp))
.clickable(
interactionSource = remember { MutableInteractionSource() },
indication = null,
onClick = {
rightPulseTrigger = System.currentTimeMillis()
triggerAutoScrollTempPause(600L)
val amount = (currentClientHeightValue * 0.75f).toInt()
webViewRefForTts?.evaluateJavascript(
"window.scrollBy({ top: ${amount}, behavior: 'smooth' });", null
)
}
)
)
}
}
Box(modifier = Modifier.fillMaxSize()) {
EpubReaderSearchOverlay(
searchState = searchState,
@ -2898,8 +2980,11 @@ fun EpubReaderHost(
onStartAutoScroll = {
isAutoScrollModeActive = true
isAutoScrollPlaying = true
showBars = false
showBars = true
showBars = if (isMusicianMode) {
false
} else {
true
}
},
searchFocusRequester = searchFocusRequester,
modifier = Modifier.align(Alignment.TopCenter),
@ -2918,7 +3003,7 @@ fun EpubReaderHost(
label = "AutoScrollAlignAnimation"
)
val isAutoScrollControlsVisible = isAutoScrollModeActive && (!isAutoScrollLocked || showBars)
val isAutoScrollControlsVisible = isAutoScrollModeActive
AnimatedVisibility(
visible = isAutoScrollControlsVisible,
@ -2985,10 +3070,16 @@ fun EpubReaderHost(
},
isCollapsed = isAutoScrollCollapsed,
onCollapseChange = { isAutoScrollCollapsed = it },
isLocked = isAutoScrollLocked,
onLockToggle = {
isAutoScrollLocked = !isAutoScrollLocked
saveAutoScrollLocked(context, isAutoScrollLocked)
isMusicianMode = isMusicianMode,
onMusicianModeToggle = {
val newMode = !isMusicianMode
isMusicianMode = newMode
saveMusicianMode(context, newMode)
if (newMode) {
showBars = false
showFormatAdjustmentBars = false
}
Timber.d("Musician mode toggled: $newMode")
},
useSlider = autoScrollUseSlider,
onInputModeToggle = {

22
app/src/main/java/com/aryan/reader/pdf/PdfVerticalReader.kt
View file

@ -137,8 +137,8 @@ class VerticalPdfReaderState {
internal set
internal var scrollToPageHandler: (suspend (Int) -> Unit)? = null
internal var snapToPageHandler: (suspend (Int) -> Unit)? = null
internal var scrollByHandler: (suspend (Float) -> Unit)? = null
suspend fun scrollToPage(pageIndex: Int) {
scrollToPageHandler?.invoke(pageIndex)
@ -147,6 +147,10 @@ class VerticalPdfReaderState {
suspend fun snapToPage(pageIndex: Int) {
snapToPageHandler?.invoke(pageIndex)
}
suspend fun scrollBy(delta: Float) {
scrollByHandler?.invoke(delta)
}
}
@Composable
@ -414,6 +418,22 @@ internal fun PdfVerticalReader(
panYAnimatable.snapTo(clampedPanY)
}
}
state.scrollByHandler = { delta ->
val currentZoom = zoomAnimatable.value
val zoomedDocHeight = totalDocHeight * currentZoom
val minPanY = (screenHeight - footerHeightPx - zoomedDocHeight).coerceAtMost(headerHeightPx)
val targetPanY = (panYAnimatable.value - delta).coerceIn(minPanY, headerHeightPx)
if (abs(targetPanY - panYAnimatable.value) > 0.5f) {
panYAnimatable.animateTo(
targetValue = targetPanY,
animationSpec = tween(durationMillis = 500, easing = FastOutSlowInEasing)
)
}
}
}
var selectionClearTrigger by remember { mutableLongStateOf(0L) }

171
app/src/main/java/com/aryan/reader/pdf/PdfViewerScreen.kt
View file

@ -35,6 +35,7 @@ import android.net.Uri
import android.os.Build
import android.os.ParcelFileDescriptor
import android.provider.OpenableColumns
import androidx.compose.foundation.border
import android.util.Base64
import androidx.activity.compose.BackHandler
import androidx.activity.compose.rememberLauncherForActivityResult
@ -291,7 +292,6 @@ private const val DOCK_LOCATION_KEY = "dock_location"
private const val DOCK_OFFSET_X_KEY = "dock_offset_x"
private const val DOCK_OFFSET_Y_KEY = "dock_offset_y"
private const val PDF_AUTO_SCROLL_SPEED_KEY = "pdf_auto_scroll_speed"
private const val PDF_AUTO_SCROLL_LOCKED_KEY = "pdf_auto_scroll_locked"
private const val PDF_AUTO_SCROLL_USE_SLIDER_KEY = "pdf_auto_scroll_use_slider"
private const val PDF_AUTO_SCROLL_MIN_SPEED_KEY = "pdf_auto_scroll_min_speed"
private const val PDF_AUTO_SCROLL_MAX_SPEED_KEY = "pdf_auto_scroll_max_speed"
@ -301,6 +301,39 @@ private const val PDF_AUTO_SCROLL_IS_LOCAL_PREFIX = "pdf_as_local_"
private const val PDF_AUTO_SCROLL_LOCAL_SPEED_PREFIX = "pdf_as_local_speed_"
private const val PDF_AUTO_SCROLL_LOCAL_MIN_PREFIX = "pdf_as_local_min_"
private const val PDF_AUTO_SCROLL_LOCAL_MAX_PREFIX = "pdf_as_local_max_"
private const val PDF_SCROLL_LOCKED_PREFIX = "pdf_sl_local_"
private const val PDF_FULL_SCREEN_PREFIX = "pdf_fs_local_"
private const val PDF_MUSICIAN_MODE_KEY = "pdf_musician_mode_enabled"
private fun savePdfMusicianMode(context: Context, isEnabled: Boolean) {
val prefs = context.getSharedPreferences(SETTINGS_PREFS_NAME, Context.MODE_PRIVATE)
prefs.edit { putBoolean(PDF_MUSICIAN_MODE_KEY, isEnabled) }
}
private fun loadPdfMusicianMode(context: Context): Boolean {
val prefs = context.getSharedPreferences(SETTINGS_PREFS_NAME, Context.MODE_PRIVATE)
return prefs.getBoolean(PDF_MUSICIAN_MODE_KEY, false)
}
private fun savePdfScrollLocked(context: Context, bookId: String, isLocked: Boolean) {
val prefs = context.getSharedPreferences(SETTINGS_PREFS_NAME, Context.MODE_PRIVATE)
prefs.edit { putBoolean(PDF_SCROLL_LOCKED_PREFIX + bookId, isLocked) }
}
private fun loadPdfScrollLocked(context: Context, bookId: String): Boolean {
val prefs = context.getSharedPreferences(SETTINGS_PREFS_NAME, Context.MODE_PRIVATE)
return prefs.getBoolean(PDF_SCROLL_LOCKED_PREFIX + bookId, false)
}
private fun savePdfFullScreen(context: Context, bookId: String, isFull: Boolean) {
val prefs = context.getSharedPreferences(SETTINGS_PREFS_NAME, Context.MODE_PRIVATE)
prefs.edit { putBoolean(PDF_FULL_SCREEN_PREFIX + bookId, isFull) }
}
private fun loadPdfFullScreen(context: Context, bookId: String): Boolean {
val prefs = context.getSharedPreferences(SETTINGS_PREFS_NAME, Context.MODE_PRIVATE)
return prefs.getBoolean(PDF_FULL_SCREEN_PREFIX + bookId, false)
}
private fun savePdfAutoScrollLocalMode(context: Context, bookId: String, isLocal: Boolean) {
val prefs = context.getSharedPreferences(SETTINGS_PREFS_NAME, Context.MODE_PRIVATE)
@ -361,16 +394,6 @@ private fun loadPdfAutoScrollMaxSpeed(context: Context): Float {
return prefs.getFloat(PDF_AUTO_SCROLL_MAX_SPEED_KEY, 10.0f)
}
private fun savePdfAutoScrollLocked(context: Context, isLocked: Boolean) {
val prefs = context.getSharedPreferences(SETTINGS_PREFS_NAME, Context.MODE_PRIVATE)
prefs.edit { putBoolean(PDF_AUTO_SCROLL_LOCKED_KEY, isLocked) }
}
private fun loadPdfAutoScrollLocked(context: Context): Boolean {
val prefs = context.getSharedPreferences(SETTINGS_PREFS_NAME, Context.MODE_PRIVATE)
return prefs.getBoolean(PDF_AUTO_SCROLL_LOCKED_KEY, false)
}
private fun savePdfAutoScrollUseSlider(context: Context, useSlider: Boolean) {
val prefs = context.getSharedPreferences(SETTINGS_PREFS_NAME, Context.MODE_PRIVATE)
prefs.edit { putBoolean(PDF_AUTO_SCROLL_USE_SLIDER_KEY, useSlider) }
@ -680,6 +703,11 @@ fun PdfViewerScreen(
var currentBookId by remember { mutableStateOf<String?>(null) }
val bookId = currentBookId ?: pdfUri.toString().hashCode().toString()
LaunchedEffect(bookId) {
isScrollLocked = loadPdfScrollLocked(context, bookId)
isFullScreen = loadPdfFullScreen(context, bookId)
}
val uiState by viewModel.uiState.collectAsState()
val reflowBookId = remember(bookId) { "${bookId}_reflow" }
val hasReflowFile by remember(uiState.recentFiles, reflowBookId) {
@ -702,7 +730,7 @@ fun PdfViewerScreen(
val autoScrollResumeJob = remember { mutableStateOf<Job?>(null) }
var isAutoScrollCollapsed by remember { mutableStateOf(false) }
var isAutoScrollLocked by remember { mutableStateOf(loadPdfAutoScrollLocked(context)) }
var isMusicianMode by remember { mutableStateOf(loadPdfMusicianMode(context)) }
var autoScrollUseSlider by remember { mutableStateOf(loadPdfAutoScrollUseSlider(context)) }
var isStylusOnlyMode by remember { mutableStateOf(loadStylusOnlyMode(context)) }
var currentTtsMode by remember { mutableStateOf(loadTtsMode(context)) }
@ -1317,7 +1345,7 @@ fun PdfViewerScreen(
}
selectedTextBoxId = null
} else {
if (!isFullScreen) {
if (!isFullScreen && !isMusicianMode) {
showBars = !showBars
Timber.d("Vertical Reader Clicked. showBars now: $showBars")
}
@ -2847,9 +2875,17 @@ fun PdfViewerScreen(
isFullScreen -> {
isFullScreen = false
savePdfFullScreen(context, bookId, false)
}
showReindexDialog != null -> showReindexDialog = null
isAutoScrollModeActive -> {
isAutoScrollModeActive = false
isAutoScrollPlaying = false
showBars = true
}
drawerState.isOpen -> {
coroutineScope.launch { drawerState.close() }
}
@ -3902,6 +3938,79 @@ fun PdfViewerScreen(
}
}
if (isMusicianMode && isAutoScrollModeActive) {
val density = LocalDensity.current
var leftPulseTrigger by remember { mutableLongStateOf(0L) }
var rightPulseTrigger by remember { mutableLongStateOf(0L) }
val leftPulseAlpha by animateFloatAsState(
targetValue = if (System.currentTimeMillis() - leftPulseTrigger < 150) 0.3f else 0f,
animationSpec = tween(150), label = "leftPulse"
)
val rightPulseAlpha by animateFloatAsState(
targetValue = if (System.currentTimeMillis() - rightPulseTrigger < 150) 0.3f else 0f,
animationSpec = tween(150), label = "rightPulse"
)
Box(modifier = Modifier.fillMaxSize()) {
val regionHeight = Modifier.fillMaxHeight(0.4f)
val regionWidth = Modifier.fillMaxWidth(0.25f)
val topOffset = 100.dp
val scrollAmount = boxMaxHeightFloat * 0.75f
Box(
modifier = regionWidth
.then(regionHeight)
.align(Alignment.TopStart)
.offset(y = topOffset)
.padding(start = 8.dp)
.background(Color.White.copy(alpha = leftPulseAlpha), RoundedCornerShape(12.dp))
.border(2.dp, Color.Gray.copy(alpha = 0.3f), RoundedCornerShape(12.dp))
.clickable(
interactionSource = remember { MutableInteractionSource() },
indication = null,
onClick = {
Timber.tag("MusicianMode").d("Left region tapped")
leftPulseTrigger = System.currentTimeMillis()
triggerAutoScrollTempPause(600L)
coroutineScope.launch {
verticalReaderState.scrollBy(-scrollAmount)
}
}
)
)
Box(
modifier = regionWidth
.then(regionHeight)
.align(Alignment.TopEnd)
.offset(y = topOffset)
.padding(end = 8.dp)
.background(Color.White.copy(alpha = rightPulseAlpha), RoundedCornerShape(12.dp))
.border(2.dp, Color.Gray.copy(alpha = 0.3f), RoundedCornerShape(12.dp))
.clickable(
interactionSource = remember { MutableInteractionSource() },
indication = null,
onClick = {
Timber.tag("MusicianMode").d("Right region tapped")
rightPulseTrigger = System.currentTimeMillis() // Trigger flash
// Pause loop to allow smooth scroll
triggerAutoScrollTempPause(600L)
coroutineScope.launch {
verticalReaderState.scrollBy(scrollAmount)
}
}
)
)
}
}
// OCR language download indicator
AnimatedVisibility(
visible = isOcrModelDownloading,
@ -4213,7 +4322,10 @@ fun PdfViewerScreen(
)
}
IconButton(onClick = { isScrollLocked = !isScrollLocked }) {
IconButton(onClick = {
isScrollLocked = !isScrollLocked
savePdfScrollLocked(context, bookId, isScrollLocked)
}) {
Icon(
imageVector = if (isScrollLocked) Icons.Default.Lock else Icons.Default.LockOpen,
contentDescription = if (isScrollLocked) "Unlock Panning" else "Lock Panning",
@ -4221,7 +4333,10 @@ fun PdfViewerScreen(
)
}
IconButton(onClick = { isFullScreen = true }) {
IconButton(onClick = {
isFullScreen = true
savePdfFullScreen(context, bookId, true)
}) {
Icon(
imageVector = Icons.Default.Fullscreen,
contentDescription = "Enter Full Screen",
@ -4337,7 +4452,11 @@ fun PdfViewerScreen(
showMoreMenu = false
isAutoScrollModeActive = true
isAutoScrollPlaying = true
showBars = true
showBars = if (isMusicianMode) {
false
} else {
true
}
}
)
@ -4943,7 +5062,10 @@ fun PdfViewerScreen(
val fabContentColor = if (isBackgroundDark) Color.White else Color.Black
Surface(
onClick = { isFullScreen = false },
onClick = {
isFullScreen = false
savePdfFullScreen(context, bookId, false)
},
color = fabContainerColor,
contentColor = fabContentColor,
shape = CircleShape,
@ -5920,7 +6042,7 @@ fun PdfViewerScreen(
label = "AutoScrollPadding"
)
val isAutoScrollControlsVisible = isAutoScrollModeActive && (!isAutoScrollLocked || showBars)
val isAutoScrollControlsVisible = isAutoScrollModeActive
val alignmentBias by animateFloatAsState(
targetValue = if (isAutoScrollCollapsed) 1f else 0f,
@ -5992,10 +6114,15 @@ fun PdfViewerScreen(
},
isCollapsed = isAutoScrollCollapsed,
onCollapseChange = { isAutoScrollCollapsed = it },
isLocked = isAutoScrollLocked,
onLockToggle = {
isAutoScrollLocked = !isAutoScrollLocked
savePdfAutoScrollLocked(context, isAutoScrollLocked)
isMusicianMode = isMusicianMode,
onMusicianModeToggle = {
val newMode = !isMusicianMode
isMusicianMode = newMode
savePdfMusicianMode(context, newMode)
if (newMode) {
showBars = false
}
Timber.d("Musician mode toggled: $newMode")
},
useSlider = autoScrollUseSlider,
onInputModeToggle = {