Windows ga (#358)
* Enhance Cloud TTS with navigation controls and shared UI overlay in desktop app * Refactor Cloud TTS voice settings and remove standalone settings overlay on desktop app * Persist reader window state and improve slider interaction in desktop app * Improve PDF page transitions and refine focus management in desktop app * Refactor scrollbar interaction and adjust desktop modal focus handling * Improve PDF sidecar synchronization and cross-platform metadata compatibility * Refactor PDF annotation comment logic to shared module and implement Desktop UI * Refactor reader screen to use tap-to-toggle and full-width styling in desktop app * Refactor reader workspace layout and chrome-panel interactions * Implement global search keyboard shortcuts and focusable chrome layers * Implement flavor-specific legal links and update the About UI * Refactor reader UI controls on desktop app * Enhance desktop folder sync with background metadata extraction and improved error handling * Refactor Library UI and remove redundant Home tab in desktop app * Add custom tooltips to reader icon buttons in desktop app * Integrate app theme controls into reader interfaces on desktop * Add right-to-left pagination support and improve focus restoration on desktop app * Improve EPUB pagination geometry and diagnostic logging for layout cutoffs on desktop app * Update desktop reader defaults and implement settings migration * Implement block-based position tracking in ReaderLocator * Enhance EPUB highlighting reliability in desktop app * Add support for custom reader themes and update highlight palette logic in desktop app * Replace the Tools panel with a "More" dropdown menu and refactor account UI * Implement account profile header in desktop sidebar * Implement cloud sync reliability improvements and sidebar toggle on desktop app * Improve EPUB annotation synchronization and highlight mapping accuracy in desktop app * Integrate WebView2 for EPUB vertical rendering on Windows * Refactor reader layout logic and enhance WebView2 diagnostics * Improve vertical reading layout and WebView2 resizing on Desktop * Refine vertical reading mode layout and margin handling * Enhance reader locator precision and Desktop mode-switching reliability * Implement chapter-level caching and warm-start pagination in desktop app * Replace bundled KCEF with native system webviews via SWT * Refactor EPUB page info bar visibility and layout logic * Improve PDF toolbar persistence and fix tab reactivation logic * Enable multi-selection and bulk operations for custom fonts * Refactor instrumentation tests * Add EPUB UI test fixture and initial instrumentation tests * Expand EpubReader UI tests and improve accessibility * Add instrumentation tests and test tags for library and reader screens * Enhance OPDS parser logic and catalog integration * Add support for toggling local synchronization on a per-folder basis. * Implement tri-state sizing for the TTS overlay * Persist TTS overlay size across sessions * Refactor reader brightness control and add incremental step buttons * Improve CSS support, pagination control, and style-aware semantic caching * Improve link handling, interaction, and diagnostics in the paginated reader * crash fixes * Implement persistent pending removal for external files * Implement book-specific word replacements * Add native vertical reading mode with custom renderer * Implement text selection and navigation improvements for the native vertical reader * Implement locator-based navigation and improved vertical scrolling in native vertical mode in epub * Implement lazy loading and chapter prefetching for native vertical reader * Improve window lifecycle and disposal handling on Desktop * Optimize vertical reading performance in desktop app * Enhance TTS start accuracy and diagnostic logging on desktop * Refactor AI settings visibility on desktop * Improve pagination height measurement and enhance cutoff diagnostics * Implement lifecycle management and improve justified text splitting for pagination * Refine AI usage tracking and force AI feature visibility on Desktop * Add descriptive context comments and usage examples to string and plural resources. * Optimize performance and memory usage in search and state mapping * Replace reader page sliders with minimal slider and navigation controls * Add support for CBT comic archives * Harden file path validation and XML parsing to prevent security vulnerabilities * Implement local account profile caching and optimize desktop performance * Improve desktop persistence reliability and add Linux secure storage support * Improved PDF zoom stability and layout prediction during zoom commits * Improved PDF spread layout prediction, reader focus restoration, and account profile caching * Enhance highlight precision and scoping using block-local offsets and CFIs * Enhance cloud book content synchronization and background downloads * Implement granular timestamp tracking for reading positions and PDF annotations * Restrict diagnostic logging and stack traces to debug builds * Refine PDF page gaps and reader chrome interaction logic * Refactor PDF highlight rendering and overhaul Desktop sidebar UI * Implement a new interaction dock and undo/redo history for PDF annotations in desktop * Enhance PDF color picker and improve navigation scroll restoration * Add highlight palette customization and improve selection menu UI in desktop app epub reader * Enhance desktop shelf management and library organization
This commit is contained in:
parent
5971eaa571
commit
83dcafa4b6
444 changed files with 47279 additions and 8096 deletions
|
|
@ -10,11 +10,16 @@ import androidx.compose.foundation.layout.Spacer
|
|||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Add
|
||||
import androidx.compose.material.icons.filled.Remove
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.HorizontalDivider
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.ModalBottomSheet
|
||||
import androidx.compose.material3.Slider
|
||||
import androidx.compose.material3.Switch
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextButton
|
||||
|
|
@ -28,20 +33,37 @@ import androidx.compose.ui.res.stringResource
|
|||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.core.content.edit
|
||||
import com.aryan.reader.shared.ui.ReaderMinimalSlider
|
||||
import kotlin.math.roundToInt
|
||||
|
||||
private const val READER_PREFS_NAME = "reader_prefs"
|
||||
private const val PREF_READER_BRIGHTNESS_USE_SYSTEM = "reader_brightness_use_system"
|
||||
private const val PREF_READER_BRIGHTNESS_VALUE = "reader_brightness_value"
|
||||
private const val DEFAULT_CUSTOM_BRIGHTNESS = 0.75f
|
||||
private const val MIN_CUSTOM_BRIGHTNESS = 0.05f
|
||||
private const val MIN_CUSTOM_BRIGHTNESS_PERCENT = 1
|
||||
private const val MAX_CUSTOM_BRIGHTNESS_PERCENT = 100
|
||||
private const val CUSTOM_BRIGHTNESS_STEP_PERCENT = 1
|
||||
private const val MIN_CUSTOM_BRIGHTNESS = 0.01f
|
||||
|
||||
data class ReaderBrightnessSettings(
|
||||
val useSystemBrightness: Boolean = true,
|
||||
val customBrightness: Float = DEFAULT_CUSTOM_BRIGHTNESS
|
||||
) {
|
||||
val safeCustomBrightness: Float
|
||||
get() = customBrightness.coerceIn(MIN_CUSTOM_BRIGHTNESS, 1f)
|
||||
get() = normalizeReaderBrightness(customBrightness)
|
||||
}
|
||||
|
||||
internal fun normalizeReaderBrightness(brightness: Float): Float {
|
||||
val percent = (brightness * 100f).roundToInt()
|
||||
.coerceIn(MIN_CUSTOM_BRIGHTNESS_PERCENT, MAX_CUSTOM_BRIGHTNESS_PERCENT)
|
||||
return percent / 100f
|
||||
}
|
||||
|
||||
internal fun stepReaderBrightness(brightness: Float, percentDelta: Int): Float {
|
||||
val currentPercent = (normalizeReaderBrightness(brightness) * 100f).roundToInt()
|
||||
val nextPercent = (currentPercent + percentDelta)
|
||||
.coerceIn(MIN_CUSTOM_BRIGHTNESS_PERCENT, MAX_CUSTOM_BRIGHTNESS_PERCENT)
|
||||
return nextPercent / 100f
|
||||
}
|
||||
|
||||
fun loadReaderBrightnessSettings(context: Context): ReaderBrightnessSettings {
|
||||
|
|
@ -49,7 +71,7 @@ fun loadReaderBrightnessSettings(context: Context): ReaderBrightnessSettings {
|
|||
return ReaderBrightnessSettings(
|
||||
useSystemBrightness = prefs.getBoolean(PREF_READER_BRIGHTNESS_USE_SYSTEM, true),
|
||||
customBrightness = prefs.getFloat(PREF_READER_BRIGHTNESS_VALUE, DEFAULT_CUSTOM_BRIGHTNESS)
|
||||
.coerceIn(MIN_CUSTOM_BRIGHTNESS, 1f)
|
||||
.let(::normalizeReaderBrightness)
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -162,17 +184,9 @@ fun ReaderBrightnessSheet(
|
|||
color = MaterialTheme.colorScheme.primary
|
||||
)
|
||||
}
|
||||
Slider(
|
||||
value = settings.safeCustomBrightness,
|
||||
onValueChange = { brightness ->
|
||||
onSettingsChange(
|
||||
settings.copy(
|
||||
useSystemBrightness = false,
|
||||
customBrightness = brightness.coerceIn(MIN_CUSTOM_BRIGHTNESS, 1f)
|
||||
)
|
||||
)
|
||||
},
|
||||
valueRange = MIN_CUSTOM_BRIGHTNESS..1f
|
||||
ReaderBrightnessControl(
|
||||
settings = settings,
|
||||
onSettingsChange = onSettingsChange
|
||||
)
|
||||
Text(
|
||||
text = stringResource(R.string.reader_brightness_custom_desc),
|
||||
|
|
@ -186,6 +200,67 @@ fun ReaderBrightnessSheet(
|
|||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun ReaderBrightnessControl(
|
||||
settings: ReaderBrightnessSettings,
|
||||
onSettingsChange: (ReaderBrightnessSettings) -> Unit
|
||||
) {
|
||||
val brightness = settings.safeCustomBrightness
|
||||
val canDecrease = brightness > MIN_CUSTOM_BRIGHTNESS
|
||||
val canIncrease = brightness < 1f
|
||||
|
||||
fun updateBrightness(value: Float) {
|
||||
onSettingsChange(
|
||||
settings.copy(
|
||||
useSystemBrightness = false,
|
||||
customBrightness = normalizeReaderBrightness(value)
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(12.dp)
|
||||
) {
|
||||
IconButton(
|
||||
onClick = {
|
||||
updateBrightness(stepReaderBrightness(brightness, -CUSTOM_BRIGHTNESS_STEP_PERCENT))
|
||||
},
|
||||
enabled = canDecrease,
|
||||
modifier = Modifier.size(36.dp)
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Remove,
|
||||
contentDescription = stringResource(R.string.content_desc_decrease),
|
||||
modifier = Modifier.size(18.dp)
|
||||
)
|
||||
}
|
||||
ReaderMinimalSlider(
|
||||
value = brightness,
|
||||
onValueChange = ::updateBrightness,
|
||||
valueRange = MIN_CUSTOM_BRIGHTNESS..1f,
|
||||
activeColor = MaterialTheme.colorScheme.primary,
|
||||
inactiveColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.12f),
|
||||
thumbColor = MaterialTheme.colorScheme.primary,
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
IconButton(
|
||||
onClick = {
|
||||
updateBrightness(stepReaderBrightness(brightness, CUSTOM_BRIGHTNESS_STEP_PERCENT))
|
||||
},
|
||||
enabled = canIncrease,
|
||||
modifier = Modifier.size(36.dp)
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Add,
|
||||
contentDescription = stringResource(R.string.content_desc_increase),
|
||||
modifier = Modifier.size(18.dp)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun Window.setReaderBrightness(brightness: Float) {
|
||||
attributes = attributes.apply {
|
||||
screenBrightness = brightness
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue