Update v1.0.49 (#330)
* Added PDF top tab strip visibility toggle and fixed WebView hit test NPE * Refactored desktop reader screens and state management into specialized components * Added image gallery to reader sidebar and refactored desktop PDF UI components * Implemented EPUB image gallery * Refactored reader and library models to use shared common types, centralizing file type resolution and texture management while removing redundant mapping logic * Standardized UI styling and refactored app navigation layout * Implemented auto-hiding reader chrome and activity tracking in desktop * Refactored reader panels into distinct left and right modal layers with platform-specific sizing and keyboard navigation support. * Added PPTX support for desktop and refactored parsing into a shared module * Implement paid AI features and account management for the desktop application. * Implement AI Hub and enhanced Cloud TTS integration for Desktop * Implement streaming support for AI definition and summarization features * Implement support for password-protected PDFs and file actions in the desktop reader. * Implement cloud synchronization for desktop using Firestore and Google Drive * Implement PDF reflow and "Text View" for the desktop reader * Refactor OPDS logic to use SharedOpdsController * Optimize PDF tile rendering performance * Implement two-page spread support for PDF pagination * Implement two-page spread support for the PDF viewer * Improved shared spread zoom in PDF viewer * Improve PDF spread navigation with fling support and configurable page gaps * Add brightness control to PDF and EPUB readers * Refactor folder synchronization to use shared logic engine * Implement safe string formatting and validation for localized resources * Implement TTS chunk skip navigation * Implement deep-linking and playback controls for TTS media sessions * Implement start index for TTS playback * Improve TTS navigation, prefetching, and notification duration reporting * Implement TTS mini playback bar for background reading * Implement multi-window reader support for the desktop application * Improve desktop modal window management and visibility syncing * Implement localized string support for Desktop and shared UI * Implement language selection and persistence for Desktop * Implement plural string support for Desktop and migrate hardcoded counts to plurals.xml * Implement localized banner messages and UI strings using resource-backed SharedText * Implement compact badge styling for small book covers * Refactor PDF native interaction and improve HTML import memory safety * fix language persistence * Refactor reader overflow menus to use section-based logic * Refactor PDF layout remapping and improve text box interaction * Improve CFI resolution and TTS resume accuracy using dynamic chunk offsets * Centralize PDF annotation export mapping and improve metadata handling * Add support for threaded comments in PDF highlight annotations * Flatten highlight comments into a single thread for PDF export and allow author editing * Integrate page slider into reader chrome and persist toggle state * Handle fragments and queries in EPUB chapter paths * Implement dynamic, theme-aware coloring for the reader slider * Implement customizable app-wide font preference * Implement one-hand zoom gestures in the PDF viewer * Implement File Information dialog for PDF and EPUB readers * Bump version to 1.0.49 (53) * Refactor PDF reader logic into modular components * Add ProGuard rules to prevent R8 optimization issues in EPUB reader screens * Add option to use PDF filenames as display names * Fix preservation of PDF filename display preference in library projection
This commit is contained in:
parent
dc5196526f
commit
9510293ac3
245 changed files with 37538 additions and 12460 deletions
|
|
@ -0,0 +1,143 @@
|
|||
package com.aryan.reader
|
||||
|
||||
import java.io.File
|
||||
import java.util.Date
|
||||
import java.util.IllegalFormatException
|
||||
import java.util.Locale
|
||||
import javax.xml.parsers.DocumentBuilderFactory
|
||||
import org.junit.Assert.assertTrue
|
||||
import org.junit.Test
|
||||
|
||||
class AndroidStringFormatResourcesTest {
|
||||
|
||||
@Test
|
||||
fun `localized formatted strings use valid formatter syntax`() {
|
||||
val resDirectory = findResDirectory()
|
||||
val baseStrings = readStringResources(File(resDirectory, "values/strings.xml"))
|
||||
val formattedBaseStrings = baseStrings
|
||||
.mapValues { (_, value) -> value.formatArguments() }
|
||||
.filterValues { it.isNotEmpty() }
|
||||
|
||||
val failures = resDirectory
|
||||
.listFiles()
|
||||
.orEmpty()
|
||||
.filter { it.isDirectory && it.name.startsWith("values") }
|
||||
.map { File(it, "strings.xml") }
|
||||
.filter { it.isFile }
|
||||
.flatMap { stringsFile ->
|
||||
val strings = readStringResources(stringsFile)
|
||||
formattedBaseStrings.mapNotNull { (name, arguments) ->
|
||||
val value = strings[name] ?: return@mapNotNull null
|
||||
val sampleArguments = arguments.toSampleArguments()
|
||||
try {
|
||||
String.format(Locale.ROOT, value, *sampleArguments)
|
||||
null
|
||||
} catch (exception: IllegalFormatException) {
|
||||
"${stringsFile.invariantSeparatorsPath}:$name -> ${exception.javaClass.simpleName}: ${exception.message}"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
assertTrue(failures.joinToString(separator = "\n"), failures.isEmpty())
|
||||
}
|
||||
|
||||
private fun findResDirectory(): File {
|
||||
return listOf(
|
||||
File("src/main/res"),
|
||||
File("app/src/main/res")
|
||||
).first { it.isDirectory }
|
||||
}
|
||||
|
||||
private fun readStringResources(stringsFile: File): Map<String, String> {
|
||||
val document = DocumentBuilderFactory.newInstance()
|
||||
.newDocumentBuilder()
|
||||
.parse(stringsFile)
|
||||
val nodes = document.getElementsByTagName("string")
|
||||
|
||||
return buildMap {
|
||||
for (index in 0 until nodes.length) {
|
||||
val node = nodes.item(index)
|
||||
val name = node.attributes
|
||||
?.getNamedItem("name")
|
||||
?.nodeValue
|
||||
?: continue
|
||||
put(name, node.textContent)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun String.formatArguments(): List<FormatArgument> {
|
||||
val arguments = mutableListOf<FormatArgument>()
|
||||
var nextImplicitIndex = 0
|
||||
var previousIndex = -1
|
||||
|
||||
for (match in formatterPattern.findAll(this)) {
|
||||
val conversion = (match.groups[4] ?: match.groups[5])?.value?.singleOrNull() ?: continue
|
||||
val dateTimePrefix = match.groups[3]?.value
|
||||
if (conversion == '%' || conversion == 'n') continue
|
||||
|
||||
val index = when {
|
||||
match.groups[2] != null -> previousIndex
|
||||
match.groups[1] != null -> match.groups[1]!!.value.toInt() - 1
|
||||
else -> nextImplicitIndex++
|
||||
}
|
||||
if (index < 0) continue
|
||||
|
||||
previousIndex = index
|
||||
val argument = FormatArgument(index, conversion.sampleKind(dateTimePrefix != null))
|
||||
val existingIndex = arguments.indexOfFirst { it.index == index }
|
||||
if (existingIndex >= 0) {
|
||||
arguments[existingIndex] = arguments[existingIndex].merge(argument)
|
||||
} else {
|
||||
arguments += argument
|
||||
}
|
||||
}
|
||||
|
||||
return arguments
|
||||
}
|
||||
|
||||
private fun Char.sampleKind(isDateTime: Boolean): SampleKind {
|
||||
if (isDateTime) return SampleKind.DateTime
|
||||
return when (lowercaseChar()) {
|
||||
'd', 'o', 'x' -> SampleKind.Integer
|
||||
'e', 'f', 'g', 'a' -> SampleKind.Decimal
|
||||
'c' -> SampleKind.Character
|
||||
'b' -> SampleKind.Boolean
|
||||
'h', 's' -> SampleKind.Text
|
||||
else -> SampleKind.Text
|
||||
}
|
||||
}
|
||||
|
||||
private fun List<FormatArgument>.toSampleArguments(): Array<Any> {
|
||||
val maxIndex = maxOf { it.index }
|
||||
val samples = Array<Any>(maxIndex + 1) { "sample" }
|
||||
forEach { argument ->
|
||||
samples[argument.index] = argument.kind.sample
|
||||
}
|
||||
return samples
|
||||
}
|
||||
|
||||
private data class FormatArgument(
|
||||
val index: Int,
|
||||
val kind: SampleKind
|
||||
) {
|
||||
fun merge(other: FormatArgument): FormatArgument {
|
||||
return if (kind == other.kind) this else copy(kind = SampleKind.Text)
|
||||
}
|
||||
}
|
||||
|
||||
private enum class SampleKind(val sample: Any) {
|
||||
Text("sample"),
|
||||
Integer(7),
|
||||
Decimal(1.5),
|
||||
Character('x'),
|
||||
Boolean(true),
|
||||
DateTime(Date(0L))
|
||||
}
|
||||
|
||||
private companion object {
|
||||
private val formatterPattern = Regex(
|
||||
"%(?:([1-9]\\d*)\\$|(<))?[-#+ 0,(]*\\d*(?:\\.\\d+)?(?:(?:([tT])([a-zA-Z]))|([bBhHsScCdoxXeEfgGaA%n]))"
|
||||
)
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue