diff --git a/app/src/main/java/helium314/keyboard/latin/settings/Defaults.kt b/app/src/main/java/helium314/keyboard/latin/settings/Defaults.kt index 220423714..eec3e5bde 100644 --- a/app/src/main/java/helium314/keyboard/latin/settings/Defaults.kt +++ b/app/src/main/java/helium314/keyboard/latin/settings/Defaults.kt @@ -290,6 +290,7 @@ object Defaults { const val PREF_REMOVE_REDUNDANT_POPUPS = true const val PREF_SPACE_BAR_TEXT = "" const val PREF_TIMESTAMP_FORMAT = "yyyy-MM-dd HH:mm:ss" + const val PREF_CUSTOM_TEXT_STYLES = "" const val PREF_EMOJI_RECENT_KEYS = "" const val PREF_LAST_SHOWN_EMOJI_CATEGORY_PAGE_ID = 0 const val PREF_SHOW_DEBUG_SETTINGS = false diff --git a/app/src/main/java/helium314/keyboard/latin/settings/Settings.kt b/app/src/main/java/helium314/keyboard/latin/settings/Settings.kt index 0fe8464c8..4cff8d47c 100644 --- a/app/src/main/java/helium314/keyboard/latin/settings/Settings.kt +++ b/app/src/main/java/helium314/keyboard/latin/settings/Settings.kt @@ -112,6 +112,7 @@ class Settings private constructor() : SharedPreferences.OnSharedPreferenceChang try { val prefs = mPrefs ?: appContext.prefs().also { mPrefs = it } Log.i(TAG, "loadSettings") + helium314.keyboard.latin.style.UnicodeStyleEngine.setCustomStyles(prefs.getString(PREF_CUSTOM_TEXT_STYLES, Defaults.PREF_CUSTOM_TEXT_STYLES) ?: "") val actualLocale = locale ?: context.resources.configuration.locale() mSettingsValues = runInLocale(appContext, actualLocale) { ctx -> SettingsValues(ctx, prefs, ctx.resources, inputAttributes, currentKeyboardScript) @@ -575,6 +576,7 @@ class Settings private constructor() : SharedPreferences.OnSharedPreferenceChang const val PREF_REMOVE_REDUNDANT_POPUPS = "remove_redundant_popups" const val PREF_SPACE_BAR_TEXT = "space_bar_text" const val PREF_TIMESTAMP_FORMAT = "timestamp_format" + const val PREF_CUSTOM_TEXT_STYLES = "custom_text_styles" const val PREF_TOOLBAR_MODE = "toolbar_mode" const val PREF_TOOLBAR_HIDING_GLOBAL = "toolbar_hiding_global" const val PREF_SPLIT_TOOLBAR = "split_toolbar" diff --git a/app/src/main/java/helium314/keyboard/latin/style/UnicodeStyleEngine.kt b/app/src/main/java/helium314/keyboard/latin/style/UnicodeStyleEngine.kt index dac80ec30..99e7bda82 100644 --- a/app/src/main/java/helium314/keyboard/latin/style/UnicodeStyleEngine.kt +++ b/app/src/main/java/helium314/keyboard/latin/style/UnicodeStyleEngine.kt @@ -12,9 +12,20 @@ import helium314.keyboard.latin.utils.InputTypeUtils */ object UnicodeStyleEngine { - val STYLES: List by lazy { initializeStyles() } - private val STYLES_BY_ID: Map by lazy { STYLES.associateBy { it.id } } - private val REVERSE_MAP: Map by lazy { initializeReverseMap() } + /** Built-in styles plus user-defined ones, with lookups derived from them. Replaced as a whole, never mutated. */ + private class StyleSet(val styles: List) { + val byId: Map = styles.associateBy { it.id } + val reverse: Map = buildReverseMap(styles) + } + + private val builtinStyles: List by lazy { initializeStyles() } + @Volatile private var styleSet: StyleSet? = null + private var customStylesRaw = "" + + private fun currentSet(): StyleSet = + styleSet ?: synchronized(this) { styleSet ?: StyleSet(builtinStyles + parseCustomStyles(customStylesRaw)).also { styleSet = it } } + + val STYLES: List get() = currentSet().styles var activeLiveStyleId: String? = null @@ -49,12 +60,12 @@ object UnicodeStyleEngine { * Checks whether a codepoint is a styled Unicode character or combining mark. */ fun isStyledCharacter(codePoint: Int): Boolean { - return REVERSE_MAP.containsKey(codePoint) || isCombiningMark(codePoint) + return currentSet().reverse.containsKey(codePoint) || isCombiningMark(codePoint) } - fun getStyle(styleId: String): StyleDefinition? = STYLES_BY_ID[styleId] + fun getStyle(styleId: String): StyleDefinition? = currentSet().byId[styleId] - fun getAllStyles(): List = STYLES + fun getAllStyles(): List = currentSet().styles /** * Transforms an entire text string to the target style safely. @@ -101,6 +112,7 @@ object UnicodeStyleEngine { * Strips styling and combining marks, reverting styled Unicode back to plain text. */ fun toPlainText(styledText: String): String { + val reverse = currentSet().reverse val sb = StringBuilder(styledText.length) var i = 0 val len = styledText.length @@ -110,7 +122,7 @@ object UnicodeStyleEngine { i += Character.charCount(cp) continue } - val plain = REVERSE_MAP[cp] ?: cp + val plain = reverse[cp] ?: cp sb.appendCodePoint(plain) i += Character.charCount(cp) } @@ -656,7 +668,66 @@ object UnicodeStyleEngine { ) } - private fun initializeReverseMap(): Map { + /** + * Replaces the user-defined styles. Called whenever settings are (re)loaded, so it must be cheap + * when nothing changed. See [parseCustomStyles] for the accepted format. + */ + fun setCustomStyles(raw: String) { + synchronized(this) { + if (raw == customStylesRaw && styleSet != null) return + customStylesRaw = raw + styleSet = null + } + } + + /** True if [raw] is empty or every non-blank line is a valid style definition with a unique name. */ + fun isValidCustomStylesText(raw: String): Boolean { + val names = HashSet() + return raw.lineSequence().filter { it.isNotBlank() }.all { line -> + val parsed = parseCustomStyleLine(line) + parsed != null && names.add(parsed.first) + } + } + + /** + * Each line is `Name: ` (the colon may be full-width), where the letters (whitespace ignored) are the styled A-Z, then a-z, + * optionally followed by 0-9, i.e. 52 or 62 characters. Invalid or duplicate lines are skipped. + */ + private fun parseCustomStyles(raw: String): List { + val seen = HashSet() + return raw.lineSequence().filter { it.isNotBlank() }.mapNotNull { line -> + val (name, cps) = parseCustomStyleLine(line) ?: return@mapNotNull null + if (!seen.add(name)) return@mapNotNull null + val sample = StringBuilder() + for (c in "Abc") sample.appendCodePoint(cps[if (c.isUpperCase()) c - 'A' else 26 + (c - 'a')]) + StyleDefinition( + id = "custom_$name", + name = name, + category = StyleCategory.DECORATIVE, + samplePreview = sample.toString(), + mapCodePoint = { cp -> + when (cp) { + in 'A'.code..'Z'.code -> cps[cp - 'A'.code] + in 'a'.code..'z'.code -> cps[26 + cp - 'a'.code] + in '0'.code..'9'.code -> if (cps.size == 62) cps[52 + cp - '0'.code] else cp + else -> cp + } + } + ) + }.toList() + } + + private fun parseCustomStyleLine(line: String): Pair? { + // also accept the full-width colon that CJK keyboards type + val colon = line.indexOfFirst { it == ':' || it == '\uFF1A' } + if (colon < 0) return null + val name = line.substring(0, colon).trim() + if (name.isEmpty()) return null + val cps = line.substring(colon + 1).codePoints().filter { !Character.isWhitespace(it) }.toArray() + return if (cps.size == 52 || cps.size == 62) name to cps else null + } + + private fun buildReverseMap(styles: List): Map { val reverse = HashMap(2048) val testChars = StringBuilder() for (c in 'a'..'z') testChars.append(c) @@ -664,7 +735,7 @@ object UnicodeStyleEngine { for (c in '0'..'9') testChars.append(c) testChars.append("+-=() .,?!'\"<>_") - for (style in STYLES) { + for (style in styles) { if (style.combiningMark != 0) continue var i = 0 val len = testChars.length diff --git a/app/src/main/java/helium314/keyboard/settings/preferences/TextInputPreference.kt b/app/src/main/java/helium314/keyboard/settings/preferences/TextInputPreference.kt index 5af57cdb4..f23b59599 100644 --- a/app/src/main/java/helium314/keyboard/settings/preferences/TextInputPreference.kt +++ b/app/src/main/java/helium314/keyboard/settings/preferences/TextInputPreference.kt @@ -21,6 +21,8 @@ fun TextInputPreference( default: String, @DrawableRes icon: Int = 0, checkTextValid: (String) -> Boolean = { true }, + singleLine: Boolean = true, + showValue: Boolean = true, onConfirmed: (String) -> Unit = { } ) { var showDialog by rememberSaveable { mutableStateOf(false) } @@ -29,7 +31,7 @@ fun TextInputPreference( name = setting.title, icon = icon.takeIf { it != 0 }, onClick = { showDialog = true }, - description = prefs.getString(setting.key, default)?.takeIf { it.isNotEmpty() } + description = if (showValue) prefs.getString(setting.key, default)?.takeIf { it.isNotEmpty() } else null ) if (showDialog) { TextInputDialog( @@ -41,7 +43,8 @@ fun TextInputPreference( }, initialText = prefs.getString(setting.key, default) ?: "", title = { Text(setting.title) }, - checkTextValid = checkTextValid + checkTextValid = checkTextValid, + singleLine = singleLine ) } } diff --git a/app/src/main/java/helium314/keyboard/settings/screens/ToolbarScreen.kt b/app/src/main/java/helium314/keyboard/settings/screens/ToolbarScreen.kt index 0aee151b5..f0c4b3044 100644 --- a/app/src/main/java/helium314/keyboard/settings/screens/ToolbarScreen.kt +++ b/app/src/main/java/helium314/keyboard/settings/screens/ToolbarScreen.kt @@ -34,6 +34,8 @@ import helium314.keyboard.latin.BuildConfig import helium314.keyboard.latin.R import helium314.keyboard.latin.settings.Defaults import helium314.keyboard.latin.settings.Settings +import helium314.keyboard.latin.style.UnicodeStyleEngine +import helium314.keyboard.settings.preferences.TextInputPreference import helium314.keyboard.latin.utils.Log import helium314.keyboard.latin.utils.ToolbarMode import helium314.keyboard.latin.utils.dpToPx @@ -82,6 +84,7 @@ fun ToolbarScreen( Settings.PREF_TOOLBAR_KEYS, Settings.PREF_PINNED_TOOLBAR_KEYS, Settings.PREF_CLIPBOARD_TOOLBAR_KEYS, + Settings.PREF_CUSTOM_TEXT_STYLES, if (BuildConfig.FLAVOR == "standard" || BuildConfig.FLAVOR == "standardfull") Settings.PREF_SHOW_DOWNLOAD_BUTTON_IN_TOOLBAR else null, Settings.PREF_EXPAND_FINE_TUNE_TOOLBAR, @@ -175,6 +178,13 @@ fun createToolbarSettings(context: Context): List { Setting(context, Settings.PREF_CLIPBOARD_TOOLBAR_KEYS, R.string.clipboard_toolbar_keys) { ReorderSwitchPreference(it, Defaults.PREF_CLIPBOARD_TOOLBAR_KEYS, filter) }, + Setting(context, Settings.PREF_CUSTOM_TEXT_STYLES, R.string.custom_text_styles_title, R.string.custom_text_styles_summary) { setting -> + TextInputPreference( + setting, Defaults.PREF_CUSTOM_TEXT_STYLES, + checkTextValid = { it.isBlank() || UnicodeStyleEngine.isValidCustomStylesText(it) }, + singleLine = false, showValue = false + ) + }, Setting(context, Settings.PREF_TOOLBAR_KEYS_ALIGNMENT, R.string.toolbar_keys_alignment, R.string.toolbar_keys_alignment_summary) { setting -> val items = listOf( stringResource(R.string.toolbar_keys_alignment_left) to "left", diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 499b964e8..4a4643abf 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1772,4 +1772,6 @@ في كل توقف في الكلام، يتم بالفعل نسخ الجزء الذي تم التحدث به حتى الآن. بعد التوقف، بقي الجزء الأخير فقط: انتظار الإملاءات الطويلة أقصر بكثير. توقف الإملاء: تم تغيير حقل النص، ولم يتم إدراج الباقي تظهر في شاشته + أنماط النص المخصصة + نمط واحد لكل سطر. التنسيق: الاسم: بالنمط A-Z a-z 0-9 (52 أو 62 حرفًا). diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index cad2daf3b..34efb25ee 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -1749,4 +1749,6 @@ Пры кожнай паўзе ў маўленні прамоўленая частка ўжо транскрыбуецца. Пасля прыпынку застаецца толькі апошняя частка: доўгія дыктоўкі чакаюць значна карацей. Дыктоўка спынена: тэкставае поле змянілася, астатняе не ўстаўлена Паказаць на сваім экране + Карыстальніцкія стылі тэксту + Адзін стыль на радок. Фармат: Імя: у стылі A-Z a-z 0-9 (52 або 62 сімвалы). diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index ae0865696..faa8dda37 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1749,4 +1749,6 @@ При всяка пауза в речта изречената до момента част вече е транскрибирана. След спиране остава само последната част: много по-кратко изчакване за дълги диктовки. Диктовката е спряна: текстовото поле е променено, останалото не е вмъкнато Показване на екрана му + Персонализирани текстови стилове + Един стил на ред. Формат: Име: стилизирано A-Z a-z 0-9 (52 или 62 знака). diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index daca09dfb..5837dd7f1 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1714,4 +1714,6 @@ Umožňuje lokální inferenci GGUF / llama.cpp na zařízení pro korektury a p Při každé pauze v řeči je dosud mluvená část již přepsána. Po zastavení zbývá už jen poslední část: mnohem kratší čekání na dlouhé diktáty. Diktování zastaveno: textové pole se změnilo, zbytek nebyl vložen Zobrazit na jeho obrazovce + Vlastní styly textu + Jeden styl na řádek. Formát: Název: stylizovaný A-Z a-z 0-9 (52 nebo 62 znaků). diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 609442623..1e3c705ad 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1765,4 +1765,6 @@ Ermöglicht lokale GGUF / llama.cpp-Inferenz für Korrekturlesen und Umschreiben Diktat beendet: Das Textfeld hat gewechselt, der Rest wurde nicht eingefügt Auf seiner Seite zeigen + Benutzerdefinierte Textstile + Ein Stil pro Zeile. Format: Name: Stil A-Z a-z 0-9 (52 oder 62 Zeichen). diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index d3f211325..d4cb10db5 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1815,4 +1815,6 @@ Σε κάθε παύση στην ομιλία το μέρος που ειπώθηκε μέχρι τώρα έχει ήδη μεταγραφεί. Μετά τη διακοπή, απομένει μόνο το τελευταίο μέρος: πολύ μικρότερη αναμονή για μεγάλες υπαγορεύσεις. Η υπαγόρευση σταμάτησε: το πεδίο κειμένου άλλαξε, το υπόλοιπο δεν εισήχθη Εμφάνιση στην οθόνη του + Προσαρμοσμένα στυλ κειμένου + Ένα στυλ ανά γραμμή. Μορφή: Όνομα: στυλ A-Z a-z 0-9 (52 ή 62 χαρακτήρες). diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml index 40b070e46..e4a40d5fc 100644 --- a/app/src/main/res/values-es-rUS/strings.xml +++ b/app/src/main/res/values-es-rUS/strings.xml @@ -1781,4 +1781,6 @@ Permite la inferencia GGUF / llama.cpp en el dispositivo para corrección y rees En cada pausa del discurso ya se transcribe la parte hablada hasta el momento. Después de parar, sólo queda la última parte: una espera mucho más corta para dictados largos. Dictado detenido: el campo de texto cambió, el resto no fue insertado Mostrar en su pantalla + Estilos de texto personalizados + Un estilo por línea. Formato: Nombre: estilo A-Z a-z 0-9 (52 o 62 caracteres). diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 9c95215d7..f4aba3fa0 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1711,4 +1711,6 @@ Permite la inferencia GGUF / llama.cpp en el dispositivo para corrección y rees En cada pausa del discurso ya se transcribe la parte hablada hasta el momento. Después de parar, sólo queda la última parte: una espera mucho más corta para dictados largos. Dictado detenido: el campo de texto cambió, el resto no fue insertado Mostrar en su pantalla + Estilos de texto personalizados + Un estilo por línea. Formato: Nombre: estilo A-Z a-z 0-9 (52 o 62 caracteres). diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 2241d84a1..a259c5221 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -1749,4 +1749,6 @@ Võimaldab seadmesisese GGUF / llama.cpp järelduse korrektuuri ja ümbersõnast Igal kõnepausil on seni räägitud osa juba transkribeeritud. Pärast peatumist on jäänud vaid viimane osa: pikkade dikteerimiste jaoks palju lühem ootamine. Dikteerimine peatus: tekstiväli muutus, ülejäänud jäi sisestamata Kuva selle ekraanil + Kohandatud tekstistiilid + Üks stiil rea kohta. Vorming: Nimi: stiilis A-Z a-z 0-9 (52 või 62 tähemärki). diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 6d70a4499..aabbc0319 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1770,4 +1770,6 @@ Permet l\'inférence GGUF / llama.cpp sur l\'appareil pour la correction et la r A chaque pause dans le discours, la partie prononcée jusqu\'à présent est déjà transcrite. Après l\'arrêt, il ne reste que la dernière partie : attente beaucoup plus courte pour les longues dictées. Dictée arrêtée : le champ de texte a changé, le reste n\'a pas été inséré Afficher sur son écran + Styles de texte personnalisés + Un style par ligne. Format : Nom : stylisé A-Z a-z 0-9 (52 ou 62 caractères). diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index c80de8608..0cc6c63ca 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1741,4 +1741,6 @@ भाषण में प्रत्येक विराम पर अब तक बोला गया भाग पहले ही प्रतिलेखित हो चुका होता है। रुकने के बाद, केवल अंतिम भाग ही बचा है: लंबे श्रुतलेखों के लिए बहुत कम प्रतीक्षा। डिक्टेशन बंद हो गया: टेक्स्ट फ़ील्ड बदल गया, बाकी नहीं डाला गया इसकी स्क्रीन में दिखाएँ + कस्टम पाठ शैलियाँ + प्रति पंक्ति एक शैली. प्रारूप: नाम: शैली A-Z a-z 0-9 (52 या 62 अक्षर)। diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 911289c04..4fc22edc4 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -1712,4 +1712,6 @@ Omogućuje lokalno GGUF / llama.cpp zaključivanje na uređaju za lekturu i prep U svakoj pauzi u govoru do sada izgovoreni dio je već transkribiran. Nakon zaustavljanja ostaje samo posljednji dio: puno kraće čekanje za duge diktate. Diktiranje zaustavljeno: tekstualno polje je promijenjeno, ostatak nije umetnut Prikaži na njegovom ekranu + Prilagođeni stilovi teksta + Jedan stil po retku. Format: Ime: stilizirano A-Z a-z 0-9 (52 ili 62 znaka). diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 7a055b07c..23b446948 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1712,4 +1712,6 @@ Lehetővé teszi az eszközön futó GGUF / llama.cpp következtetést a javít A beszéd minden szünetében az eddig elhangzott rész már átírásra kerül. Megállás után már csak az utolsó rész van hátra: sokkal rövidebb várakozás a hosszú diktálásokra. A diktálás leállt: a szövegmező megváltozott, a többi nem került be Megjelenítés a képernyőjén + Egyedi szövegstílusok + Soronként egy stílus. Formátum: Név: A-Z a-z 0-9 stílusban (52 vagy 62 karakter). diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 14e31b34c..57b9c420c 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1712,4 +1712,6 @@ Memungkinkan inferensi GGUF / llama.cpp di perangkat untuk koreksi teks dan penu Pada setiap jeda dalam pidato, bagian yang diucapkan sejauh ini telah ditranskrip. Setelah berhenti, hanya bagian terakhir yang tersisa: menunggu lebih singkat untuk dikte yang panjang. Dikte berhenti: kolom teks berubah, sisanya tidak disisipkan Tampilkan di layarnya + Gaya teks khusus + Satu gaya per baris. Format: Nama: diberi gaya A-Z a-z 0-9 (52 atau 62 karakter). diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 469603734..c0720cd35 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1781,4 +1781,6 @@ Abilita l\'inferenza GGUF / llama.cpp sul dispositivo per correzione e riscrittu Ad ogni pausa del discorso è già trascritta la parte fin qui parlata. Dopo l\'interruzione rimane solo l\'ultima parte: un\'attesa molto più breve per dettati lunghi. Dettatura interrotta: il campo testo è cambiato, il resto non è stato inserito Mostra sul suo schermo + Stili di testo personalizzati + Uno stile per riga. Formato: Nome: in stile A-Z a-z 0-9 (52 o 62 caratteri). diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 42a0b4ddd..81f0a4ab3 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -1720,4 +1720,6 @@ בכל הפסקה בדיבור החלק שנאמר עד כה כבר מתומלל. לאחר העצירה נותר רק החלק האחרון: המתנה קצרה בהרבה לתכתיבים ארוכים. ההכתבה הופסקה: שדה הטקסט השתנה, השאר לא הוכנס הצג במסך שלו + סגנונות טקסט מותאמים אישית + סגנון אחד בכל שורה. פורמט: שם: בסגנון A-Z a-z 0-9 (52 או 62 תווים). diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 039d70667..37053093c 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -1750,4 +1750,6 @@ Ar norite atnaujinti? Kiekvienos kalbos pauzės metu iki šiol pasakyta dalis jau yra perrašyta. Sustojus belieka tik paskutinė dalis: daug trumpiau laukti ilgų diktantų. Diktavimas sustabdytas: pasikeitė teksto laukas, likusi dalis neįterpta Rodyti jo ekrane + Pasirinktiniai teksto stiliai + Vienas stilius eilutėje. Formatas: pavadinimas: stilius A-Z a-z 0-9 (52 arba 62 simboliai). diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 085f6813e..376a3b883 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -1815,4 +1815,6 @@ പ്രസംഗത്തിലെ ഓരോ ഇടവേളയിലും ഇതുവരെ സംസാരിച്ച ഭാഗം ഇതിനകം പകർത്തിയെഴുതിയിരിക്കുന്നു. നിർത്തിയ ശേഷം, അവസാന ഭാഗം മാത്രം അവശേഷിക്കുന്നു: ദീർഘമായ നിർദ്ദേശങ്ങൾക്കായി വളരെ ചെറിയ കാത്തിരിപ്പ്. ഡിക്റ്റേഷൻ നിർത്തി: ടെക്സ്റ്റ് ഫീൽഡ് മാറി, ബാക്കിയുള്ളത് ചേർത്തില്ല അതിൻ്റെ സ്ക്രീനിൽ കാണിക്കുക + ഇഷ്ടാനുസൃത ടെക്സ്റ്റ് ശൈലികൾ + ഓരോ വരിയിലും ഒരു ശൈലി. ഫോർമാറ്റ്: പേര്: ശൈലിയിലുള്ള A-Z a-z 0-9 (52 അല്ലെങ്കിൽ 62 പ്രതീകങ്ങൾ). diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 579340ad2..845675059 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1756,4 +1756,6 @@ Maakt GGUF / llama.cpp-inferentie op het apparaat mogelijk voor proeflezen en he Bij elke pauze in de toespraak wordt het tot dan toe gesproken deel al getranscribeerd. Na het stoppen blijft alleen het laatste deel over: veel korter wachten op lange dictaten. Dicteren gestopt: het tekstveld is gewijzigd, de rest is niet ingevoegd Toon in het scherm + Aangepaste tekststijlen + Eén stijl per regel. Formaat: Naam: opgemaakt A-Z a-z 0-9 (52 of 62 tekens). diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 6195e2af1..5af2f3208 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1756,4 +1756,6 @@ Umożliwia lokalne wnioskowanie GGUF / llama.cpp na urządzeniu w celu korekty i Przy każdej przerwie w mowie część wypowiedziana dotychczas jest już transkrybowana. Po zatrzymaniu pozostaje tylko ostatnia część: znacznie krótsze oczekiwanie na długie dyktanda. Dyktowanie zatrzymane: pole tekstowe uległo zmianie, reszta nie została wstawiona Pokaż na jego ekranie + Niestandardowe style tekstu + Jeden styl na linię. Format: Nazwa: stylizowana na A-Z a-z 0-9 (52 lub 62 znaki). diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index ac2d6b828..13571385c 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1719,4 +1719,6 @@ Habilita inferência GGUF / llama.cpp no dispositivo para revisão e reescrita.< A cada pausa na fala a parte falada até então já está transcrita. Depois de parar, resta apenas a última parte: espera muito mais curta por longos ditados. O ditado parou: o campo de texto mudou, o restante não foi inserido Mostrar em sua tela + Estilos de texto personalizados + Um estilo por linha. Formato: Nome: estilo A-Z a-z 0-9 (52 ou 62 caracteres). diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index b12ea238e..3d0d64050 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1711,4 +1711,6 @@ Habilita inferência GGUF / llama.cpp no dispositivo para revisão e reescrita.< A cada pausa na fala a parte falada até então já está transcrita. Depois de parar, resta apenas a última parte: espera muito mais curta por longos ditados. O ditado parou: o campo de texto mudou, o restante não foi inserido Mostrar em sua tela + Estilos de texto personalizados + Um estilo por linha. Formato: Nome: estilo A-Z a-z 0-9 (52 ou 62 caracteres). diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 9950ddc5e..187578f21 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1772,4 +1772,6 @@ Habilita inferência GGUF / llama.cpp no dispositivo para revisão e reescrita.< A cada pausa na fala a parte falada até então já está transcrita. Depois de parar, resta apenas a última parte: espera muito mais curta por longos ditados. O ditado parou: o campo de texto mudou, o restante não foi inserido Mostrar em sua tela + Estilos de texto personalizados + Um estilo por linha. Formato: Nome: estilo A-Z a-z 0-9 (52 ou 62 caracteres). diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 409908e6e..adae375bd 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1749,4 +1749,6 @@ Activează inferența GGUF / llama.cpp pe dispozitiv pentru corectură și refor La fiecare pauză în vorbire partea vorbită până acum este deja transcrisă. După oprire, rămâne doar ultima parte: așteptare mult mai scurtă pentru dictate lungi. Dictarea s-a oprit: câmpul de text s-a schimbat, restul nu a fost introdus Arată pe ecranul său + Stiluri de text personalizate + Un stil pe linie. Format: Nume: stil A-Z a-z 0-9 (52 sau 62 de caractere). diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index fdcc77173..248671011 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1774,4 +1774,6 @@ В каждой паузе речи уже записывается часть произнесенной речи. После остановки остается только последняя часть: гораздо короче ждать долгих диктовок. Диктовка остановлена: текстовое поле изменилось, остальное не вставилось Показать на своем экране + Пользовательские стили текста + Один стиль в строке. Формат: Имя: в стиле A–Z a–z 0–9 (52 или 62 символа). diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index edd2bf90f..2ee36a6dd 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1741,4 +1741,6 @@ Metin düzeltme ve yeniden yazma için cihaz üzerinde GGUF / llama.cpp çıkar Konuşmadaki her duraklamada, o ana kadar konuşulan kısım zaten yazıya geçirilir. Durdurduktan sonra geriye yalnızca son kısım kalıyor: uzun dikteler için çok daha kısa bekleme süresi. Dikte durduruldu: metin alanı değişti, geri kalanı eklenmedi Ekranında göster + Özel metin stilleri + Her satıra bir stil. Biçim: Ad: A-Z a-z 0-9 stilinde (52 veya 62 karakter). diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 7982b8a5c..464e340b1 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1714,4 +1714,6 @@ На кожній паузі в мовленні частина, промовлена ​​до цього моменту, вже транскрибується. Після зупинки залишається лише остання частина: для довгих диктантів очікування набагато коротше. Диктування зупинено: текстове поле змінено, решту не вставлено Показати на екрані + Власні стилі тексту + Один стиль на рядок. Формат: ім’я: стилі A-Z a-z 0-9 (52 або 62 символи). diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index 855468078..94ea417c9 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -1806,4 +1806,6 @@ تقریر کے ہر وقفے پر اب تک بولا گیا حصہ پہلے ہی نقل کیا جاتا ہے۔ رکنے کے بعد، صرف آخری حصہ رہ جاتا ہے: طویل ڈکٹیشن کے لیے بہت کم انتظار۔ ڈکٹیشن بند ہو گئی: ٹیکسٹ فیلڈ تبدیل ہو گئی، باقی داخل نہیں کیا گیا۔ اس کی سکرین میں دکھائیں۔ + حسب ضرورت ٹیکسٹ اسٹائل + فی لائن ایک انداز۔ فارمیٹ: نام: اسٹائل شدہ A-Z a-z 0-9 (52 یا 62 حروف)۔ diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 14a65b145..8ab360096 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1715,4 +1715,6 @@ 每次讲话停顿时,到目前为止所说的部分都已被转录。停止后,只剩下最后一部分:长听写的等待时间要短得多。 听写停止:文本字段发生变化,其余部分未插入 在其屏幕上显示 + 自定义文本样式 + 每行一种样式。格式:名称:样式为 A-Z a-z 0-9(52 或 62 个字符)。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 24229424e..c1ca318ab 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -385,6 +385,8 @@ Backup restored Format for timestamp key + Custom text styles + One style per line. Format: Name: styled A-Z a-z 0-9 (52 or 62 characters). Multilingual typing diff --git a/app/src/test/java/helium314/keyboard/latin/style/CustomTextStylesTest.kt b/app/src/test/java/helium314/keyboard/latin/style/CustomTextStylesTest.kt new file mode 100644 index 000000000..c3d9b1654 --- /dev/null +++ b/app/src/test/java/helium314/keyboard/latin/style/CustomTextStylesTest.kt @@ -0,0 +1,66 @@ +// SPDX-License-Identifier: GPL-3.0-only +package helium314.keyboard.latin.style + +import kotlin.test.AfterTest +import kotlin.test.Test +import kotlin.test.assertEquals +import kotlin.test.assertFalse +import kotlin.test.assertNotNull +import kotlin.test.assertNull +import kotlin.test.assertTrue + +class CustomTextStylesTest { + private val upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" + private val lower = "abcdefghijklmnopqrstuvwxyz" + // shifted copies of the alphabet are enough to verify the mapping + private val fancyUpper = "ⒶⒷⒸⒹⒺⒻⒼⒽⒾⒿⓀⓁⓂⓃⓄⓅⓆⓇⓈⓉⓊⓋⓌⓍⓎⓏ" + private val fancyLower = "ⓐⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜⓝⓞⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ" + private val fancyDigits = "⓪①②③④⑤⑥⑦⑧⑨" + + @AfterTest fun reset() = UnicodeStyleEngine.setCustomStyles("") + + @Test fun validatesLines() { + assertTrue(UnicodeStyleEngine.isValidCustomStylesText("")) + assertTrue(UnicodeStyleEngine.isValidCustomStylesText("Mine: $fancyUpper$fancyLower")) + assertTrue(UnicodeStyleEngine.isValidCustomStylesText("Mine: $fancyUpper $fancyLower $fancyDigits\n\nTwo: $fancyUpper$fancyLower")) + assertFalse(UnicodeStyleEngine.isValidCustomStylesText("no colon $fancyUpper$fancyLower")) + assertFalse(UnicodeStyleEngine.isValidCustomStylesText(": $fancyUpper$fancyLower")) + assertFalse(UnicodeStyleEngine.isValidCustomStylesText("Short: $fancyUpper")) + assertFalse(UnicodeStyleEngine.isValidCustomStylesText("Mine: $fancyUpper$fancyLower\nMine: $fancyUpper$fancyLower")) + } + + @Test fun transformsAndUndoes() { + UnicodeStyleEngine.setCustomStyles("Mine: $fancyUpper$fancyLower$fancyDigits") + val style = assertNotNull(UnicodeStyleEngine.getAllStyles().firstOrNull { it.name == "Mine" }) + val styled = UnicodeStyleEngine.transformText("Hi 42!", style.id) + assertEquals("Ⓗⓘ ④②!", styled) + assertEquals("Hi 42!", UnicodeStyleEngine.toPlainText(styled)) + assertTrue(UnicodeStyleEngine.isStyledCharacter('Ⓗ'.code)) + } + + @Test fun acceptsFullWidthColon() { + assertTrue(UnicodeStyleEngine.isValidCustomStylesText("Mine\uFF1A $fancyUpper$fancyLower")) + UnicodeStyleEngine.setCustomStyles("Mine\uFF1A$fancyUpper$fancyLower") + assertEquals("ⓐ", UnicodeStyleEngine.transformText("a", "custom_Mine")) + } + + @Test fun lettersOnlyKeepsDigits() { + UnicodeStyleEngine.setCustomStyles("Mine: $fancyUpper$fancyLower") + assertEquals("ⓐ1", UnicodeStyleEngine.transformText("a1", "custom_Mine")) + } + + @Test fun surrogatePairsStayIntact() { + val bold = String(Character.toChars(0x1D400)) // MATHEMATICAL BOLD CAPITAL A + val letters = (0 until 52).joinToString("") { String(Character.toChars(0x1D400 + it)) } + UnicodeStyleEngine.setCustomStyles("Wide: $letters") + assertEquals(bold + String(Character.toChars(0x1D400 + 26)), UnicodeStyleEngine.transformText("Aa", "custom_Wide")) + } + + @Test fun removingStylesDropsThem() { + UnicodeStyleEngine.setCustomStyles("Mine: $fancyUpper$fancyLower") + assertNotNull(UnicodeStyleEngine.getStyle("custom_Mine")) + UnicodeStyleEngine.setCustomStyles("") + assertNull(UnicodeStyleEngine.getStyle("custom_Mine")) + assertNotNull(UnicodeStyleEngine.getStyle("math_bold")) + } +} diff --git a/docs/FEATURES.md b/docs/FEATURES.md index 5758466bf..8adacc9b6 100644 --- a/docs/FEATURES.md +++ b/docs/FEATURES.md @@ -54,6 +54,7 @@ LeanType combines a lightweight, privacy-focused keyboard foundation with cuttin | 🈲 **[Chinese Punctuation & CJK Symbols](#43-chinese-punctuation--cjk-symbols)** | Full-width punctuation, dedicated CJK symbols, and preedit sync | | 🚫 **[Blocked Words Standalone Import & Export](#44-blocked-words-standalone-import--export)** | Standalone word list import/export with duplicate filtering | | 🇮🇳 **[Tamil V4 Layout Option](#45-tamil-v4-layout-option)** | Modern Tamil V4 layout option dynamically available across Tamil locales | +| 🔤 **[Custom Text Styles](#46-custom-text-styles)** | Add your own Unicode font styles to the Font Style strip by pasting a styled alphabet | --- @@ -105,6 +106,7 @@ LeanType combines a lightweight, privacy-focused keyboard foundation with cuttin | **Chinese Punctuation & Symbols** | Full-width punctuation marks, dedicated CJK symbols, and live preedit sync. | CJK layouts / `Plugins > CJK Settings` | | **Blocked Words Import & Export** | Standalone word list import and export with duplicate filtering. | `Text correction > Blocked words blacklist` | | **Tamil V4 Layout** | Selectable Tamil V4 layout dynamically available across Tamil locales. | `Languages > Tamil > Layouts` | +| **Custom Text Styles** | Define your own Unicode font styles (one line each) and use them from the Font Style strip with live typing and undo. | `Toolbar > Custom text styles` | --- @@ -1139,6 +1141,32 @@ LeanType includes the standardized modern Tamil V4 layout: - Selectable as an additional keyboard layout option across Tamil locales (India, Sri Lanka, Singapore, Malaysia). - Dynamically available in subtype settings without cluttering system input methods. +--- + +## 46. Custom Text Styles + +The **Font Style** toolbar key converts text to decorative Unicode fonts (bold, script, circled, small caps and more). Besides the built-in styles, you can add your own. +### Adding a Custom Style +1. Open `Toolbar > Custom text styles`. +2. Write one style per line as `Name:` followed by the styled alphabet: +``` +Bubble: ⒶⒷⒸⒹⒺⒻⒼⒽⒾⒿⓀⓁⓂⓃⓄⓅⓆⓇⓈⓉⓊⓋⓌⓍⓎⓏⓐⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜⓝⓞⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ⓪①②③④⑤⑥⑦⑧⑨ +``` +3. Tap **OK**. The new style appears in the Font Style strip next to the built-in ones, shown in its own font. + +### Format Rules +- The characters after `Name:` must be the styled **A-Z**, then **a-z**, and optionally **0-9**, in that order. That is exactly **52** characters (letters only) or **62** characters (letters and digits). +- Spaces and line breaks between the characters are ignored, so you can paste an alphabet exactly as a text generator website produces it. +- Each name must be unique. The name is everything before the first `:` (a full-width `:` is accepted too). +- **OK** stays disabled while any line is invalid. An empty field removes all custom styles. +- Letters or digits outside the mapping (spaces, punctuation, and digits in a 52-character style) are left unchanged. +- Fonts that use characters outside the Basic Multilingual Plane (such as the Mathematical Alphanumeric block) work too. + +### Using and Undoing +- Custom styles behave like built-in ones: apply a style to selected text or the current word, or turn on live typing. +- Styled text can be converted back to plain text, including text styled with a custom font. +- Live styling is never applied in password, email, URL, or non-text fields. +- The styled characters are plain Unicode text, so they display correctly only where the receiving app has a font that includes them.