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)
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:
parent
3a31e4fc7b
commit
b9f8825ad7
5 changed files with 298 additions and 50 deletions
|
|
@ -766,8 +766,8 @@ fun AutoScrollControls(
|
||||||
onClose: () -> Unit,
|
onClose: () -> Unit,
|
||||||
isCollapsed: Boolean,
|
isCollapsed: Boolean,
|
||||||
onCollapseChange: (Boolean) -> Unit,
|
onCollapseChange: (Boolean) -> Unit,
|
||||||
isLocked: Boolean,
|
isMusicianMode: Boolean,
|
||||||
onLockToggle: () -> Unit,
|
onMusicianModeToggle: () -> Unit,
|
||||||
useSlider: Boolean,
|
useSlider: Boolean,
|
||||||
onInputModeToggle: () -> Unit,
|
onInputModeToggle: () -> Unit,
|
||||||
isLocalMode: Boolean,
|
isLocalMode: Boolean,
|
||||||
|
|
@ -908,14 +908,14 @@ fun AutoScrollControls(
|
||||||
|
|
||||||
Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) {
|
Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) {
|
||||||
IconButton(
|
IconButton(
|
||||||
onClick = onLockToggle,
|
onClick = onMusicianModeToggle,
|
||||||
modifier = Modifier.size(32.dp)
|
modifier = Modifier.size(32.dp)
|
||||||
) {
|
) {
|
||||||
Icon(
|
Icon(
|
||||||
imageVector = if (isLocked) Icons.Default.LockOpen else Icons.Default.Lock,
|
painter = painterResource(id = R.drawable.music_note),
|
||||||
contentDescription = if (isLocked) "Unlock" else "Lock",
|
contentDescription = if (isMusicianMode) "Disable Musician Mode" else "Enable Musician Mode",
|
||||||
modifier = Modifier.size(18.dp),
|
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(
|
IconButton(
|
||||||
|
|
|
||||||
|
|
@ -46,8 +46,10 @@ import androidx.compose.animation.slideInVertically
|
||||||
import androidx.compose.animation.slideOutVertically
|
import androidx.compose.animation.slideOutVertically
|
||||||
import androidx.compose.animation.togetherWith
|
import androidx.compose.animation.togetherWith
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
|
import androidx.compose.foundation.border
|
||||||
import androidx.compose.foundation.clickable
|
import androidx.compose.foundation.clickable
|
||||||
import androidx.compose.foundation.focusable
|
import androidx.compose.foundation.focusable
|
||||||
|
import androidx.compose.foundation.interaction.MutableInteractionSource
|
||||||
import androidx.compose.foundation.isSystemInDarkTheme
|
import androidx.compose.foundation.isSystemInDarkTheme
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.BoxWithConstraints
|
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.fillMaxWidth
|
||||||
import androidx.compose.foundation.layout.height
|
import androidx.compose.foundation.layout.height
|
||||||
import androidx.compose.foundation.layout.navigationBars
|
import androidx.compose.foundation.layout.navigationBars
|
||||||
|
import androidx.compose.foundation.layout.offset
|
||||||
import androidx.compose.foundation.layout.padding
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.layout.statusBars
|
import androidx.compose.foundation.layout.statusBars
|
||||||
import androidx.compose.foundation.layout.windowInsetsBottomHeight
|
import androidx.compose.foundation.layout.windowInsetsBottomHeight
|
||||||
import androidx.compose.foundation.layout.windowInsetsEndWidth
|
import androidx.compose.foundation.layout.windowInsetsEndWidth
|
||||||
import androidx.compose.foundation.layout.windowInsetsStartWidth
|
import androidx.compose.foundation.layout.windowInsetsStartWidth
|
||||||
import androidx.compose.foundation.pager.rememberPagerState
|
import androidx.compose.foundation.pager.rememberPagerState
|
||||||
|
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.filled.Info
|
import androidx.compose.material.icons.filled.Info
|
||||||
import androidx.compose.material3.AlertDialog
|
import androidx.compose.material3.AlertDialog
|
||||||
|
|
@ -106,6 +110,7 @@ import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.draw.alpha
|
import androidx.compose.ui.draw.alpha
|
||||||
import androidx.compose.ui.focus.FocusRequester
|
import androidx.compose.ui.focus.FocusRequester
|
||||||
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.LocalContext
|
||||||
import androidx.compose.ui.platform.LocalDensity
|
import androidx.compose.ui.platform.LocalDensity
|
||||||
import androidx.compose.ui.platform.LocalFocusManager
|
import androidx.compose.ui.platform.LocalFocusManager
|
||||||
|
|
@ -175,7 +180,6 @@ import kotlin.math.max
|
||||||
import kotlin.math.min
|
import kotlin.math.min
|
||||||
import kotlin.math.roundToInt
|
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_USE_SLIDER_KEY = "auto_scroll_use_slider"
|
||||||
private const val AUTO_SCROLL_MIN_SPEED_KEY = "auto_scroll_min_speed"
|
private const val AUTO_SCROLL_MIN_SPEED_KEY = "auto_scroll_min_speed"
|
||||||
private const val AUTO_SCROLL_MAX_SPEED_KEY = "auto_scroll_max_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_SPEED_PREFIX = "auto_scroll_local_speed_"
|
||||||
private const val AUTO_SCROLL_LOCAL_MIN_PREFIX = "auto_scroll_local_min_"
|
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 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 {
|
private fun getBookIdForPrefs(title: String): String {
|
||||||
return title.hashCode().toString()
|
return title.hashCode().toString()
|
||||||
|
|
@ -250,17 +265,6 @@ private fun loadAutoScrollMaxSpeed(context: Context): Float {
|
||||||
return prefs.getFloat(AUTO_SCROLL_MAX_SPEED_KEY, 10.0f)
|
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) {
|
private fun saveAutoScrollUseSlider(context: Context, useSlider: Boolean) {
|
||||||
val prefs = context.getSharedPreferences("reader_prefs", Context.MODE_PRIVATE)
|
val prefs = context.getSharedPreferences("reader_prefs", Context.MODE_PRIVATE)
|
||||||
prefs.edit { putBoolean(AUTO_SCROLL_USE_SLIDER_KEY, useSlider) }
|
prefs.edit { putBoolean(AUTO_SCROLL_USE_SLIDER_KEY, useSlider) }
|
||||||
|
|
@ -766,7 +770,7 @@ fun EpubReaderHost(
|
||||||
var isAutoScrollTempPaused by remember { mutableStateOf(false) }
|
var isAutoScrollTempPaused by remember { mutableStateOf(false) }
|
||||||
val autoScrollResumeJob = remember { mutableStateOf<Job?>(null) }
|
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)) }
|
var autoScrollUseSlider by remember { mutableStateOf(loadAutoScrollUseSlider(context)) }
|
||||||
|
|
||||||
DisposableEffect(Unit) {
|
DisposableEffect(Unit) {
|
||||||
|
|
@ -1298,6 +1302,10 @@ fun EpubReaderHost(
|
||||||
Timber.d("Back pressed: Closing drawer")
|
Timber.d("Back pressed: Closing drawer")
|
||||||
drawerState.close()
|
drawerState.close()
|
||||||
}
|
}
|
||||||
|
} else if (isAutoScrollModeActive) {
|
||||||
|
isAutoScrollModeActive = false
|
||||||
|
isAutoScrollPlaying = false
|
||||||
|
showBars = true
|
||||||
} else if (searchState.isSearchActive) {
|
} else if (searchState.isSearchActive) {
|
||||||
searchState.isSearchActive = false
|
searchState.isSearchActive = false
|
||||||
searchState.onQueryChange("")
|
searchState.onQueryChange("")
|
||||||
|
|
@ -1888,7 +1896,7 @@ fun EpubReaderHost(
|
||||||
Timber.d("Auto-scroll toggled via tap: $isAutoScrollPlaying")
|
Timber.d("Auto-scroll toggled via tap: $isAutoScrollPlaying")
|
||||||
}
|
}
|
||||||
|
|
||||||
if (System.currentTimeMillis() - lastHighlightClickTime > 500) {
|
if (!isMusicianMode && System.currentTimeMillis() - lastHighlightClickTime > 500) {
|
||||||
focusManager.clearFocus()
|
focusManager.clearFocus()
|
||||||
if (volumeScrollEnabled && !searchState.isSearchActive) {
|
if (volumeScrollEnabled && !searchState.isSearchActive) {
|
||||||
containerFocusRequester.requestFocus()
|
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()) {
|
Box(modifier = Modifier.fillMaxSize()) {
|
||||||
EpubReaderSearchOverlay(
|
EpubReaderSearchOverlay(
|
||||||
searchState = searchState,
|
searchState = searchState,
|
||||||
|
|
@ -2898,8 +2980,11 @@ fun EpubReaderHost(
|
||||||
onStartAutoScroll = {
|
onStartAutoScroll = {
|
||||||
isAutoScrollModeActive = true
|
isAutoScrollModeActive = true
|
||||||
isAutoScrollPlaying = true
|
isAutoScrollPlaying = true
|
||||||
showBars = false
|
showBars = if (isMusicianMode) {
|
||||||
showBars = true
|
false
|
||||||
|
} else {
|
||||||
|
true
|
||||||
|
}
|
||||||
},
|
},
|
||||||
searchFocusRequester = searchFocusRequester,
|
searchFocusRequester = searchFocusRequester,
|
||||||
modifier = Modifier.align(Alignment.TopCenter),
|
modifier = Modifier.align(Alignment.TopCenter),
|
||||||
|
|
@ -2918,7 +3003,7 @@ fun EpubReaderHost(
|
||||||
label = "AutoScrollAlignAnimation"
|
label = "AutoScrollAlignAnimation"
|
||||||
)
|
)
|
||||||
|
|
||||||
val isAutoScrollControlsVisible = isAutoScrollModeActive && (!isAutoScrollLocked || showBars)
|
val isAutoScrollControlsVisible = isAutoScrollModeActive
|
||||||
|
|
||||||
AnimatedVisibility(
|
AnimatedVisibility(
|
||||||
visible = isAutoScrollControlsVisible,
|
visible = isAutoScrollControlsVisible,
|
||||||
|
|
@ -2985,10 +3070,16 @@ fun EpubReaderHost(
|
||||||
},
|
},
|
||||||
isCollapsed = isAutoScrollCollapsed,
|
isCollapsed = isAutoScrollCollapsed,
|
||||||
onCollapseChange = { isAutoScrollCollapsed = it },
|
onCollapseChange = { isAutoScrollCollapsed = it },
|
||||||
isLocked = isAutoScrollLocked,
|
isMusicianMode = isMusicianMode,
|
||||||
onLockToggle = {
|
onMusicianModeToggle = {
|
||||||
isAutoScrollLocked = !isAutoScrollLocked
|
val newMode = !isMusicianMode
|
||||||
saveAutoScrollLocked(context, isAutoScrollLocked)
|
isMusicianMode = newMode
|
||||||
|
saveMusicianMode(context, newMode)
|
||||||
|
if (newMode) {
|
||||||
|
showBars = false
|
||||||
|
showFormatAdjustmentBars = false
|
||||||
|
}
|
||||||
|
Timber.d("Musician mode toggled: $newMode")
|
||||||
},
|
},
|
||||||
useSlider = autoScrollUseSlider,
|
useSlider = autoScrollUseSlider,
|
||||||
onInputModeToggle = {
|
onInputModeToggle = {
|
||||||
|
|
|
||||||
|
|
@ -137,8 +137,8 @@ class VerticalPdfReaderState {
|
||||||
internal set
|
internal set
|
||||||
|
|
||||||
internal var scrollToPageHandler: (suspend (Int) -> Unit)? = null
|
internal var scrollToPageHandler: (suspend (Int) -> Unit)? = null
|
||||||
|
|
||||||
internal var snapToPageHandler: (suspend (Int) -> Unit)? = null
|
internal var snapToPageHandler: (suspend (Int) -> Unit)? = null
|
||||||
|
internal var scrollByHandler: (suspend (Float) -> Unit)? = null
|
||||||
|
|
||||||
suspend fun scrollToPage(pageIndex: Int) {
|
suspend fun scrollToPage(pageIndex: Int) {
|
||||||
scrollToPageHandler?.invoke(pageIndex)
|
scrollToPageHandler?.invoke(pageIndex)
|
||||||
|
|
@ -147,6 +147,10 @@ class VerticalPdfReaderState {
|
||||||
suspend fun snapToPage(pageIndex: Int) {
|
suspend fun snapToPage(pageIndex: Int) {
|
||||||
snapToPageHandler?.invoke(pageIndex)
|
snapToPageHandler?.invoke(pageIndex)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
suspend fun scrollBy(delta: Float) {
|
||||||
|
scrollByHandler?.invoke(delta)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
|
|
@ -414,6 +418,22 @@ internal fun PdfVerticalReader(
|
||||||
panYAnimatable.snapTo(clampedPanY)
|
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) }
|
var selectionClearTrigger by remember { mutableLongStateOf(0L) }
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,7 @@ import android.net.Uri
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.os.ParcelFileDescriptor
|
import android.os.ParcelFileDescriptor
|
||||||
import android.provider.OpenableColumns
|
import android.provider.OpenableColumns
|
||||||
|
import androidx.compose.foundation.border
|
||||||
import android.util.Base64
|
import android.util.Base64
|
||||||
import androidx.activity.compose.BackHandler
|
import androidx.activity.compose.BackHandler
|
||||||
import androidx.activity.compose.rememberLauncherForActivityResult
|
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_X_KEY = "dock_offset_x"
|
||||||
private const val DOCK_OFFSET_Y_KEY = "dock_offset_y"
|
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_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_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_MIN_SPEED_KEY = "pdf_auto_scroll_min_speed"
|
||||||
private const val PDF_AUTO_SCROLL_MAX_SPEED_KEY = "pdf_auto_scroll_max_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_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_MIN_PREFIX = "pdf_as_local_min_"
|
||||||
private const val PDF_AUTO_SCROLL_LOCAL_MAX_PREFIX = "pdf_as_local_max_"
|
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) {
|
private fun savePdfAutoScrollLocalMode(context: Context, bookId: String, isLocal: Boolean) {
|
||||||
val prefs = context.getSharedPreferences(SETTINGS_PREFS_NAME, Context.MODE_PRIVATE)
|
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)
|
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) {
|
private fun savePdfAutoScrollUseSlider(context: Context, useSlider: Boolean) {
|
||||||
val prefs = context.getSharedPreferences(SETTINGS_PREFS_NAME, Context.MODE_PRIVATE)
|
val prefs = context.getSharedPreferences(SETTINGS_PREFS_NAME, Context.MODE_PRIVATE)
|
||||||
prefs.edit { putBoolean(PDF_AUTO_SCROLL_USE_SLIDER_KEY, useSlider) }
|
prefs.edit { putBoolean(PDF_AUTO_SCROLL_USE_SLIDER_KEY, useSlider) }
|
||||||
|
|
@ -680,6 +703,11 @@ fun PdfViewerScreen(
|
||||||
var currentBookId by remember { mutableStateOf<String?>(null) }
|
var currentBookId by remember { mutableStateOf<String?>(null) }
|
||||||
val bookId = currentBookId ?: pdfUri.toString().hashCode().toString()
|
val bookId = currentBookId ?: pdfUri.toString().hashCode().toString()
|
||||||
|
|
||||||
|
LaunchedEffect(bookId) {
|
||||||
|
isScrollLocked = loadPdfScrollLocked(context, bookId)
|
||||||
|
isFullScreen = loadPdfFullScreen(context, bookId)
|
||||||
|
}
|
||||||
|
|
||||||
val uiState by viewModel.uiState.collectAsState()
|
val uiState by viewModel.uiState.collectAsState()
|
||||||
val reflowBookId = remember(bookId) { "${bookId}_reflow" }
|
val reflowBookId = remember(bookId) { "${bookId}_reflow" }
|
||||||
val hasReflowFile by remember(uiState.recentFiles, reflowBookId) {
|
val hasReflowFile by remember(uiState.recentFiles, reflowBookId) {
|
||||||
|
|
@ -702,7 +730,7 @@ fun PdfViewerScreen(
|
||||||
val autoScrollResumeJob = remember { mutableStateOf<Job?>(null) }
|
val autoScrollResumeJob = remember { mutableStateOf<Job?>(null) }
|
||||||
var isAutoScrollCollapsed by remember { mutableStateOf(false) }
|
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 autoScrollUseSlider by remember { mutableStateOf(loadPdfAutoScrollUseSlider(context)) }
|
||||||
var isStylusOnlyMode by remember { mutableStateOf(loadStylusOnlyMode(context)) }
|
var isStylusOnlyMode by remember { mutableStateOf(loadStylusOnlyMode(context)) }
|
||||||
var currentTtsMode by remember { mutableStateOf(loadTtsMode(context)) }
|
var currentTtsMode by remember { mutableStateOf(loadTtsMode(context)) }
|
||||||
|
|
@ -1317,7 +1345,7 @@ fun PdfViewerScreen(
|
||||||
}
|
}
|
||||||
selectedTextBoxId = null
|
selectedTextBoxId = null
|
||||||
} else {
|
} else {
|
||||||
if (!isFullScreen) {
|
if (!isFullScreen && !isMusicianMode) {
|
||||||
showBars = !showBars
|
showBars = !showBars
|
||||||
Timber.d("Vertical Reader Clicked. showBars now: $showBars")
|
Timber.d("Vertical Reader Clicked. showBars now: $showBars")
|
||||||
}
|
}
|
||||||
|
|
@ -2847,9 +2875,17 @@ fun PdfViewerScreen(
|
||||||
|
|
||||||
isFullScreen -> {
|
isFullScreen -> {
|
||||||
isFullScreen = false
|
isFullScreen = false
|
||||||
|
savePdfFullScreen(context, bookId, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
showReindexDialog != null -> showReindexDialog = null
|
showReindexDialog != null -> showReindexDialog = null
|
||||||
|
|
||||||
|
isAutoScrollModeActive -> {
|
||||||
|
isAutoScrollModeActive = false
|
||||||
|
isAutoScrollPlaying = false
|
||||||
|
showBars = true
|
||||||
|
}
|
||||||
|
|
||||||
drawerState.isOpen -> {
|
drawerState.isOpen -> {
|
||||||
coroutineScope.launch { drawerState.close() }
|
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
|
// OCR language download indicator
|
||||||
AnimatedVisibility(
|
AnimatedVisibility(
|
||||||
visible = isOcrModelDownloading,
|
visible = isOcrModelDownloading,
|
||||||
|
|
@ -4213,7 +4322,10 @@ fun PdfViewerScreen(
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
IconButton(onClick = { isScrollLocked = !isScrollLocked }) {
|
IconButton(onClick = {
|
||||||
|
isScrollLocked = !isScrollLocked
|
||||||
|
savePdfScrollLocked(context, bookId, isScrollLocked)
|
||||||
|
}) {
|
||||||
Icon(
|
Icon(
|
||||||
imageVector = if (isScrollLocked) Icons.Default.Lock else Icons.Default.LockOpen,
|
imageVector = if (isScrollLocked) Icons.Default.Lock else Icons.Default.LockOpen,
|
||||||
contentDescription = if (isScrollLocked) "Unlock Panning" else "Lock Panning",
|
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(
|
Icon(
|
||||||
imageVector = Icons.Default.Fullscreen,
|
imageVector = Icons.Default.Fullscreen,
|
||||||
contentDescription = "Enter Full Screen",
|
contentDescription = "Enter Full Screen",
|
||||||
|
|
@ -4337,7 +4452,11 @@ fun PdfViewerScreen(
|
||||||
showMoreMenu = false
|
showMoreMenu = false
|
||||||
isAutoScrollModeActive = true
|
isAutoScrollModeActive = true
|
||||||
isAutoScrollPlaying = 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
|
val fabContentColor = if (isBackgroundDark) Color.White else Color.Black
|
||||||
|
|
||||||
Surface(
|
Surface(
|
||||||
onClick = { isFullScreen = false },
|
onClick = {
|
||||||
|
isFullScreen = false
|
||||||
|
savePdfFullScreen(context, bookId, false)
|
||||||
|
},
|
||||||
color = fabContainerColor,
|
color = fabContainerColor,
|
||||||
contentColor = fabContentColor,
|
contentColor = fabContentColor,
|
||||||
shape = CircleShape,
|
shape = CircleShape,
|
||||||
|
|
@ -5920,7 +6042,7 @@ fun PdfViewerScreen(
|
||||||
label = "AutoScrollPadding"
|
label = "AutoScrollPadding"
|
||||||
)
|
)
|
||||||
|
|
||||||
val isAutoScrollControlsVisible = isAutoScrollModeActive && (!isAutoScrollLocked || showBars)
|
val isAutoScrollControlsVisible = isAutoScrollModeActive
|
||||||
|
|
||||||
val alignmentBias by animateFloatAsState(
|
val alignmentBias by animateFloatAsState(
|
||||||
targetValue = if (isAutoScrollCollapsed) 1f else 0f,
|
targetValue = if (isAutoScrollCollapsed) 1f else 0f,
|
||||||
|
|
@ -5992,10 +6114,15 @@ fun PdfViewerScreen(
|
||||||
},
|
},
|
||||||
isCollapsed = isAutoScrollCollapsed,
|
isCollapsed = isAutoScrollCollapsed,
|
||||||
onCollapseChange = { isAutoScrollCollapsed = it },
|
onCollapseChange = { isAutoScrollCollapsed = it },
|
||||||
isLocked = isAutoScrollLocked,
|
isMusicianMode = isMusicianMode,
|
||||||
onLockToggle = {
|
onMusicianModeToggle = {
|
||||||
isAutoScrollLocked = !isAutoScrollLocked
|
val newMode = !isMusicianMode
|
||||||
savePdfAutoScrollLocked(context, isAutoScrollLocked)
|
isMusicianMode = newMode
|
||||||
|
savePdfMusicianMode(context, newMode)
|
||||||
|
if (newMode) {
|
||||||
|
showBars = false
|
||||||
|
}
|
||||||
|
Timber.d("Musician mode toggled: $newMode")
|
||||||
},
|
},
|
||||||
useSlider = autoScrollUseSlider,
|
useSlider = autoScrollUseSlider,
|
||||||
onInputModeToggle = {
|
onInputModeToggle = {
|
||||||
|
|
|
||||||
10
app/src/main/res/drawable-nodpi/music_note.xml
Normal file
10
app/src/main/res/drawable-nodpi/music_note.xml
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="960"
|
||||||
|
android:viewportHeight="960"
|
||||||
|
android:tint="?attr/colorControlNormal">
|
||||||
|
<path
|
||||||
|
android:fillColor="@android:color/white"
|
||||||
|
android:pathData="M287,793Q240,746 240,680Q240,614 287,567Q334,520 400,520Q423,520 442.5,525.5Q462,531 480,542L480,120L720,120L720,280L560,280L560,680Q560,746 513,793Q466,840 400,840Q334,840 287,793Z"/>
|
||||||
|
</vector>
|
||||||
Loading…
Add table
Add a link
Reference in a new issue