diff --git a/app/src/main/java/helium314/keyboard/latin/common/Constants.kt b/app/src/main/java/helium314/keyboard/latin/common/Constants.kt index 3ecf4e533..717105d36 100644 --- a/app/src/main/java/helium314/keyboard/latin/common/Constants.kt +++ b/app/src/main/java/helium314/keyboard/latin/common/Constants.kt @@ -20,6 +20,7 @@ object Links { const val FEATURES_URL = "$GITHUB/blob/main/docs/FEATURES.md" const val KEYCODES_URL = "$FEATURES_URL#30-comprehensive-keycodes--actions-reference" const val TEXT_EXPANDER_GUIDE_URL = "$FEATURES_URL#12-versatile-text-expander--modifiers" + const val CUSTOM_TEXT_STYLES_GUIDE_URL = "$FEATURES_URL#46-custom-text-styles" // Original HeliBoard wiki and community links const val ORIGINAL_GITHUB = "https://github.com/Helium314/HeliBoard" const val LAYOUT_WIKI_URL = "$ORIGINAL_GITHUB/wiki/2.-Layouts" diff --git a/app/src/main/java/helium314/keyboard/latin/common/StringUtils.kt b/app/src/main/java/helium314/keyboard/latin/common/StringUtils.kt index b5cd5d4c5..bdd8ea7ec 100644 --- a/app/src/main/java/helium314/keyboard/latin/common/StringUtils.kt +++ b/app/src/main/java/helium314/keyboard/latin/common/StringUtils.kt @@ -112,7 +112,22 @@ fun getFullEmojiAtEnd(text: CharSequence): String { } val result = s.substring(offset) if (isEmoji(result)) return result - return if (offset == 0) result else s.substring(s.length - Character.charCount(lastCodepoint)) + // Reaching the start of the text only means that everything before the cursor consists of codepoints that + // might be emoji. That is also true for circled letters, arrows or math symbols, and deleting all of those + // at once is wrong, so keep the whole text only if it has emoji sequence parts. + return if (offset == 0 && hasEmojiSequenceParts(result)) result else s.substring(s.length - Character.charCount(lastCodepoint)) +} + +/** Whether [s] contains something that joins or modifies emoji: ZWJ, variation selector, keycap, skin tone, flag letter, tag. */ +private fun hasEmojiSequenceParts(s: String): Boolean { + var i = 0 + while (i < s.length) { + val cp = s.codePointAt(i) + if (cp == 0x200D || cp == 0xFE0F || cp == 0xFE0E || cp == 0x20E3 + || cp in 0x1F3FB..0x1F3FF || cp in 0x1F1E6..0x1F1FF || cp in 0xE0020..0xE007F) return true + i += Character.charCount(cp) + } + return false } /** 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 f3fb7304d..d37591f81 100644 --- a/app/src/main/java/helium314/keyboard/latin/style/UnicodeStyleEngine.kt +++ b/app/src/main/java/helium314/keyboard/latin/style/UnicodeStyleEngine.kt @@ -683,20 +683,20 @@ object UnicodeStyleEngine { /** 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) + return raw.lineSequence().filter { it.isNotBlank() }.withIndex().all { (index, line) -> + val parsed = parseCustomStyleLine(line, index) 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, + * Each line is `Name: ` (the colon may be full-width, the name may be left out), 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 + return raw.lineSequence().filter { it.isNotBlank() }.withIndex().mapNotNull { (index, line) -> + val (name, cps) = parseCustomStyleLine(line, index) ?: 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')]) @@ -717,19 +717,27 @@ object UnicodeStyleEngine { }.toList() } - private fun parseCustomStyleLine(line: String): Pair? { + /** + * Characters that pasting often adds without being visible: variation selectors (e.g. after circled M, which is + * also an emoji) and format characters such as zero-width space, joiner and BOM. They would change the count. + */ + private fun isInvisibleFormatting(cp: Int): Boolean = + cp in 0xFE00..0xFE0F || cp in 0xE0100..0xE01EF || Character.getType(cp) == Character.FORMAT.toInt() + + /** [index] is the position among the non-blank lines, used to name a line that is only an alphabet. */ + private fun parseCustomStyleLine(line: String, index: Int): 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() + // a bare pasted alphabet without "Name:" still works and gets a generated name + val name = if (colon < 0) "Custom ${index + 1}" else line.substring(0, colon).trim() if (name.isEmpty()) return null // plain loop: String.codePoints() and IntStream need API 24, the app supports API 21/23 - val rest = line.substring(colon + 1) + val rest = if (colon < 0) line else line.substring(colon + 1) val cps = ArrayList(62) var i = 0 while (i < rest.length) { val cp = rest.codePointAt(i) - if (!Character.isWhitespace(cp)) cps.add(cp) + if (!Character.isWhitespace(cp) && !isInvisibleFormatting(cp)) cps.add(cp) i += Character.charCount(cp) } return if (cps.size == 52 || cps.size == 62) name to cps.toIntArray() else null diff --git a/app/src/main/java/helium314/keyboard/latin/suggestions/SuggestionStripView.kt b/app/src/main/java/helium314/keyboard/latin/suggestions/SuggestionStripView.kt index d3ebd2224..0f7b83102 100644 --- a/app/src/main/java/helium314/keyboard/latin/suggestions/SuggestionStripView.kt +++ b/app/src/main/java/helium314/keyboard/latin/suggestions/SuggestionStripView.kt @@ -408,10 +408,11 @@ class SuggestionStripView(context: Context, attrs: AttributeSet?, defStyle: Int) } else { val mode = Settings.getValues().mToolbarMode val isPassword = Settings.getValues().mInputAttributes.mIsPasswordField - val suppressToolbarForAutofill = isExternalSuggestionVisible && (isPassword || !isToolbarManuallyOpen) + // the voice status must stay visible even when the toolbar was opened manually (typing a recognized piece updates the strip) + val suppressToolbarForAutofill = isExternalSuggestionVisible && (isPassword || !isToolbarManuallyOpen || isVoiceActive) val forceToolbar = mode == ToolbarMode.TOOLBAR_KEYS && !suppressToolbarForAutofill val effectiveToolbarVisible = !suppressToolbarForAutofill && (forceToolbar || toolbarVisible) - val showPinned = !locked && !effectiveToolbarVisible && mode != ToolbarMode.SUGGESTION_STRIP + val showPinned = !locked && !effectiveToolbarVisible && mode != ToolbarMode.SUGGESTION_STRIP && !isVoiceActive val duration = Settings.getAnimationDuration(60) val prevToolbarVisible = toolbarContainer.isVisible val nextToolbarVisible = !locked && effectiveToolbarVisible 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 f23b59599..8cb28a806 100644 --- a/app/src/main/java/helium314/keyboard/settings/preferences/TextInputPreference.kt +++ b/app/src/main/java/helium314/keyboard/settings/preferences/TextInputPreference.kt @@ -23,6 +23,8 @@ fun TextInputPreference( checkTextValid: (String) -> Boolean = { true }, singleLine: Boolean = true, showValue: Boolean = true, + neutralButtonText: String? = null, + onNeutral: () -> Unit = { }, onConfirmed: (String) -> Unit = { } ) { var showDialog by rememberSaveable { mutableStateOf(false) } @@ -44,7 +46,9 @@ fun TextInputPreference( initialText = prefs.getString(setting.key, default) ?: "", title = { Text(setting.title) }, checkTextValid = checkTextValid, - singleLine = singleLine + singleLine = singleLine, + neutralButtonText = neutralButtonText, + onNeutral = onNeutral ) } } 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 f0c4b3044..381bf16d1 100644 --- a/app/src/main/java/helium314/keyboard/settings/screens/ToolbarScreen.kt +++ b/app/src/main/java/helium314/keyboard/settings/screens/ToolbarScreen.kt @@ -19,7 +19,10 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.asImageBitmap +import android.content.Intent +import android.net.Uri import androidx.compose.ui.platform.LocalContext +import helium314.keyboard.latin.common.Links import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalResources import androidx.compose.ui.res.painterResource @@ -179,10 +182,17 @@ fun createToolbarSettings(context: Context): List { 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 -> + val ctx = LocalContext.current TextInputPreference( setting, Defaults.PREF_CUSTOM_TEXT_STYLES, checkTextValid = { it.isBlank() || UnicodeStyleEngine.isValidCustomStylesText(it) }, - singleLine = false, showValue = false + singleLine = false, showValue = false, + neutralButtonText = stringResource(R.string.libraries_features_guide_title), + onNeutral = { + val intent = Intent(Intent.ACTION_VIEW, Uri.parse(Links.CUSTOM_TEXT_STYLES_GUIDE_URL)) + .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + runCatching { ctx.startActivity(intent) } + } ) }, Setting(context, Settings.PREF_TOOLBAR_KEYS_ALIGNMENT, R.string.toolbar_keys_alignment, R.string.toolbar_keys_alignment_summary) { setting -> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 4a4643abf..a79d327d6 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1769,9 +1769,9 @@ نماذج Whisper المضبوطة بدقة والمُحسّنة للإملاء على الهاتف المحمول تصفح نسخ أثناء التحدث - في كل توقف في الكلام، يتم بالفعل نسخ الجزء الذي تم التحدث به حتى الآن. بعد التوقف، بقي الجزء الأخير فقط: انتظار الإملاءات الطويلة أقصر بكثير. توقف الإملاء: تم تغيير حقل النص، ولم يتم إدراج الباقي تظهر في شاشته أنماط النص المخصصة نمط واحد لكل سطر. التنسيق: الاسم: بالنمط 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 34efb25ee..9b9d3c00c 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -1746,9 +1746,9 @@ Дакладна наладжаныя мадэлі Whisper, аптымізаваныя для мабільнай дыктоўкі Праглядзіце Расшыфроўка падчас размовы - Пры кожнай паўзе ў маўленні прамоўленая частка ўжо транскрыбуецца. Пасля прыпынку застаецца толькі апошняя частка: доўгія дыктоўкі чакаюць значна карацей. Дыктоўка спынена: тэкставае поле змянілася, астатняе не ўстаўлена Паказаць на сваім экране Карыстальніцкія стылі тэксту Адзін стыль на радок. Фармат: Імя: у стылі 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 faa8dda37..c81f8ccd8 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1746,9 +1746,9 @@ Фино настроени модели Whisper, оптимизирани за мобилно диктовка Прегледайте Транскрибирайте, докато говорите - При всяка пауза в речта изречената до момента част вече е транскрибирана. След спиране остава само последната част: много по-кратко изчакване за дълги диктовки. Диктовката е спряна: текстовото поле е променено, останалото не е вмъкнато Показване на екрана му Персонализирани текстови стилове Един стил на ред. Формат: Име: стилизирано 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 5837dd7f1..8fc7a18ac 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1711,9 +1711,9 @@ Umožňuje lokální inferenci GGUF / llama.cpp na zařízení pro korektury a p Vyladěné modely Whisper optimalizované pro mobilní diktování Prohlížet Přepisujte při mluvení - 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ů). + Kratší čekání na dlouhé diktáty diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1e3c705ad..e1a99b3f1 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1761,10 +1761,10 @@ Ermöglicht lokale GGUF / llama.cpp-Inferenz für Korrekturlesen und Umschreiben Fein abgestimmte Whisper-Modelle, optimiert für mobiles Diktieren Durchsuchen Schon beim Sprechen erkennen - Bei jeder Sprechpause wird das bisher Gesagte schon erkannt. Nach dem Stopp bleibt nur das letzte Stück: viel kürzeres Warten bei langen Diktaten. 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). + Kürzere Wartezeiten bei langen Diktaten diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index d4cb10db5..9b033b684 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1812,9 +1812,9 @@ Βελτιστοποιημένα μοντέλα Whisper βελτιστοποιημένα για υπαγόρευση μέσω κινητού Ξεφυλλίζω Μεταγραφή ενώ μιλάτε - Σε κάθε παύση στην ομιλία το μέρος που ειπώθηκε μέχρι τώρα έχει ήδη μεταγραφεί. Μετά τη διακοπή, απομένει μόνο το τελευταίο μέρος: πολύ μικρότερη αναμονή για μεγάλες υπαγορεύσεις. Η υπαγόρευση σταμάτησε: το πεδίο κειμένου άλλαξε, το υπόλοιπο δεν εισήχθη Εμφάνιση στην οθόνη του Προσαρμοσμένα στυλ κειμένου Ένα στυλ ανά γραμμή. Μορφή: Όνομα: στυλ 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 e4a40d5fc..5c1a9d694 100644 --- a/app/src/main/res/values-es-rUS/strings.xml +++ b/app/src/main/res/values-es-rUS/strings.xml @@ -1778,9 +1778,9 @@ Permite la inferencia GGUF / llama.cpp en el dispositivo para corrección y rees Modelos Whisper optimizados para dictado móvil Navegar Transcribe mientras hablas - 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). + Espera más corta para dictados largos diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f4aba3fa0..cc2256a4e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1708,9 +1708,9 @@ Permite la inferencia GGUF / llama.cpp en el dispositivo para corrección y rees Modelos Whisper optimizados para dictado móvil Navegar Transcribe mientras hablas - 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). + Espera más corta para dictados largos diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index a259c5221..46ec07d63 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -1746,9 +1746,9 @@ Võimaldab seadmesisese GGUF / llama.cpp järelduse korrektuuri ja ümbersõnast Peenhäälestatud Whisperi mudelid, mis on optimeeritud mobiilseks dikteerimiseks Sirvige Transkribeeri rääkimise ajal - 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). + Lühem ootamine pikkade diktaatide jaoks diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index aabbc0319..f36377f30 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1767,9 +1767,9 @@ Permet l\'inférence GGUF / llama.cpp sur l\'appareil pour la correction et la r Modèles Whisper affinés et optimisés pour la dictée mobile Parcourir Transcrire en parlant - 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). + Attente plus courte pour les longues dictées diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 0cc6c63ca..1a73a7b47 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -1738,9 +1738,9 @@ मोबाइल डिक्टेशन के लिए अनुकूलित फाइन-ट्यून व्हिस्पर मॉडल ब्राउज़ बोलते समय प्रतिलेखन करें - भाषण में प्रत्येक विराम पर अब तक बोला गया भाग पहले ही प्रतिलेखित हो चुका होता है। रुकने के बाद, केवल अंतिम भाग ही बचा है: लंबे श्रुतलेखों के लिए बहुत कम प्रतीक्षा। डिक्टेशन बंद हो गया: टेक्स्ट फ़ील्ड बदल गया, बाकी नहीं डाला गया इसकी स्क्रीन में दिखाएँ कस्टम पाठ शैलियाँ प्रति पंक्ति एक शैली. प्रारूप: नाम: शैली 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 4fc22edc4..f74351bcf 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -1709,9 +1709,9 @@ Omogućuje lokalno GGUF / llama.cpp zaključivanje na uređaju za lekturu i prep Fino podešeni Whisper modeli optimizirani za mobilno diktiranje Pregledaj Transkribirajte dok govorite - 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). + Kraće čekanje za duge diktate diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 23b446948..6632c2e05 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1709,9 +1709,9 @@ Lehetővé teszi az eszközön futó GGUF / llama.cpp következtetést a javít Finomhangolt Whisper modellek mobil diktálásra optimalizálva Tallózás Átírás beszéd közben - 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). + Rövidebb várakozás a hosszú diktálásokra diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 57b9c420c..0cfb65163 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1709,9 +1709,9 @@ Memungkinkan inferensi GGUF / llama.cpp di perangkat untuk koreksi teks dan penu Model Whisper yang disempurnakan dan dioptimalkan untuk dikte seluler Jelajahi Transkripsikan sambil berbicara - 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). + Penantian yang lebih singkat untuk dikte yang panjang diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index c0720cd35..89df4e084 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1778,9 +1778,9 @@ Abilita l\'inferenza GGUF / llama.cpp sul dispositivo per correzione e riscrittu Modelli Whisper ottimizzati per la dettatura mobile Sfoglia Trascrivi mentre parli - 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). + Attesa più breve per dettati lunghi diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 81f0a4ab3..ece415477 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -1717,9 +1717,9 @@ דגמי Whisper מכוונים עדינים המותאמים להכתבה ניידת לְדַפדֵף תמלל תוך כדי דיבור - בכל הפסקה בדיבור החלק שנאמר עד כה כבר מתומלל. לאחר העצירה נותר רק החלק האחרון: המתנה קצרה בהרבה לתכתיבים ארוכים. ההכתבה הופסקה: שדה הטקסט השתנה, השאר לא הוכנס הצג במסך שלו סגנונות טקסט מותאמים אישית סגנון אחד בכל שורה. פורמט: שם: בסגנון 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 37053093c..283ee7e6e 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -1747,9 +1747,9 @@ Ar norite atnaujinti? Tiksliai sureguliuoti Whisper modeliai, optimizuoti diktavimui mobiliajame telefone Naršyti Transkribuokite kalbėdami - 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). + Trumpesnis laukimas ilgiems diktantams diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 376a3b883..0b1565ed4 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -1812,9 +1812,9 @@ മൊബൈൽ ഡിക്റ്റേഷനായി ഒപ്റ്റിമൈസ് ചെയ്ത ഫൈൻ-ട്യൂൺ ചെയ്ത വിസ്പർ മോഡലുകൾ ബ്രൗസ് ചെയ്യുക സംസാരിക്കുമ്പോൾ പകർത്തുക - പ്രസംഗത്തിലെ ഓരോ ഇടവേളയിലും ഇതുവരെ സംസാരിച്ച ഭാഗം ഇതിനകം പകർത്തിയെഴുതിയിരിക്കുന്നു. നിർത്തിയ ശേഷം, അവസാന ഭാഗം മാത്രം അവശേഷിക്കുന്നു: ദീർഘമായ നിർദ്ദേശങ്ങൾക്കായി വളരെ ചെറിയ കാത്തിരിപ്പ്. ഡിക്റ്റേഷൻ നിർത്തി: ടെക്സ്റ്റ് ഫീൽഡ് മാറി, ബാക്കിയുള്ളത് ചേർത്തില്ല അതിൻ്റെ സ്ക്രീനിൽ കാണിക്കുക ഇഷ്ടാനുസൃത ടെക്സ്റ്റ് ശൈലികൾ ഓരോ വരിയിലും ഒരു ശൈലി. ഫോർമാറ്റ്: പേര്: ശൈലിയിലുള്ള 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 845675059..9d7269dde 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1753,9 +1753,9 @@ Maakt GGUF / llama.cpp-inferentie op het apparaat mogelijk voor proeflezen en he Verfijnde Whisper-modellen geoptimaliseerd voor mobiel dicteren Blader Transcribeer terwijl u spreekt - 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). + Kortere wachttijd voor lange dictaten diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 5af2f3208..139b61c45 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1753,9 +1753,9 @@ Umożliwia lokalne wnioskowanie GGUF / llama.cpp na urządzeniu w celu korekty i Dopracowane modele Whisper zoptymalizowane pod kątem mobilnego dyktowania Przeglądać Transkrypcja podczas mówienia - 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). + Krótsze oczekiwanie na długie dyktanda diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 13571385c..53293f031 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1716,9 +1716,9 @@ Habilita inferência GGUF / llama.cpp no dispositivo para revisão e reescrita.< Modelos Whisper ajustados e otimizados para ditado móvel Navegar Transcreva enquanto fala - 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). + Espera mais curta para ditados longos diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 3d0d64050..398f8dffd 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1708,9 +1708,9 @@ Habilita inferência GGUF / llama.cpp no dispositivo para revisão e reescrita.< Modelos Whisper ajustados e otimizados para ditado móvel Navegar Transcreva enquanto fala - 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). + Espera mais curta para ditados longos diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 187578f21..bef722f4c 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -1769,9 +1769,9 @@ Habilita inferência GGUF / llama.cpp no dispositivo para revisão e reescrita.< Modelos Whisper ajustados e otimizados para ditado móvel Navegar Transcreva enquanto fala - 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). + Espera mais curta para ditados longos diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index adae375bd..97b604a78 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1746,9 +1746,9 @@ Activează inferența GGUF / llama.cpp pe dispozitiv pentru corectură și refor Modele Whisper reglate fin, optimizate pentru dictarea pe mobil Răsfoiește Transcrieți în timp ce vorbiți - 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). + Așteptați mai scurt pentru dictate lungi diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 248671011..951c1839b 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1771,9 +1771,9 @@ Точные модели Whisper, оптимизированные для мобильной диктовки Просматривать Расшифруйте во время разговора - В каждой паузе речи уже записывается часть произнесенной речи. После остановки остается только последняя часть: гораздо короче ждать долгих диктовок. Диктовка остановлена: текстовое поле изменилось, остальное не вставилось Показать на своем экране Пользовательские стили текста Один стиль в строке. Формат: Имя: в стиле 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 2ee36a6dd..99bee0a36 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1738,9 +1738,9 @@ Metin düzeltme ve yeniden yazma için cihaz üzerinde GGUF / llama.cpp çıkar Mobil dikte için optimize edilmiş ince ayarlı Whisper modelleri Göz at Konuşurken yazıya dök - 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). + Uzun dikteler için daha kısa bekleme süresi diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 464e340b1..918bf2317 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1711,9 +1711,9 @@ Тонко налаштовані моделі Whisper, оптимізовані для мобільного диктування переглядати Транскрибуйте під час мовлення - На кожній паузі в мовленні частина, промовлена ​​до цього моменту, вже транскрибується. Після зупинки залишається лише остання частина: для довгих диктантів очікування набагато коротше. Диктування зупинено: текстове поле змінено, решту не вставлено Показати на екрані Власні стилі тексту Один стиль на рядок. Формат: ім’я: стилі 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 94ea417c9..e753315eb 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -1803,9 +1803,9 @@ موبائل ڈکٹیشن کے لیے موزوں وِسپر ماڈلز براؤز کریں۔ بولتے ہوئے نقل کریں۔ - تقریر کے ہر وقفے پر اب تک بولا گیا حصہ پہلے ہی نقل کیا جاتا ہے۔ رکنے کے بعد، صرف آخری حصہ رہ جاتا ہے: طویل ڈکٹیشن کے لیے بہت کم انتظار۔ ڈکٹیشن بند ہو گئی: ٹیکسٹ فیلڈ تبدیل ہو گئی، باقی داخل نہیں کیا گیا۔ اس کی سکرین میں دکھائیں۔ حسب ضرورت ٹیکسٹ اسٹائل فی لائن ایک انداز۔ فارمیٹ: نام: اسٹائل شدہ 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 8ab360096..bfda58c34 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1712,9 +1712,9 @@ 针对移动听写优化的微调 Whisper 模型 浏览 说话时转录 - 每次讲话停顿时,到目前为止所说的部分都已被转录。停止后,只剩下最后一部分:长听写的等待时间要短得多。 听写停止:文本字段发生变化,其余部分未插入 在其屏幕上显示 自定义文本样式 每行一种样式。格式:名称:样式为 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 c1ca318ab..a3793db30 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2462,7 +2462,7 @@ New dictionary: Active style: %s None (Plain text) Transcribe while speaking - At every pause in speech the part spoken so far is already transcribed. After stopping, only the last part is left: much shorter wait for long dictations. + Shorter wait for long dictations Dictation stopped: the text field changed, the rest was not inserted Show in its screen diff --git a/app/src/test/java/helium314/keyboard/latin/StringUtilsTest.kt b/app/src/test/java/helium314/keyboard/latin/StringUtilsTest.kt index 30aff05a0..028568247 100644 --- a/app/src/test/java/helium314/keyboard/latin/StringUtilsTest.kt +++ b/app/src/test/java/helium314/keyboard/latin/StringUtilsTest.kt @@ -133,6 +133,15 @@ class StringUtilsTest { assertEquals("\uD83D\uDD75\uD83C\uDFFC", getFullEmojiAtEnd("🕵🏼")) } + @Test fun emojiAtEndIsNotWholeTextForSymbolRuns() { + // everything before the cursor "might be emoji", but these are letters and symbols: delete only the last one + assertEquals("ⓩ", getFullEmojiAtEnd("ⒶⒷⒸⓩ")) + assertEquals("ⓩ", getFullEmojiAtEnd("name: ⒶⒷⒸⓩ")) + assertEquals("\uD83C\uDD29", getFullEmojiAtEnd("\uD83C\uDD10\uD83C\uDD11\uD83C\uDD29")) // parenthesized capital letters + assertEquals("→", getFullEmojiAtEnd("→→→")) + assertEquals("∑", getFullEmojiAtEnd("∑∑∑")) + } + @Test fun isEmojiDetectsAllAvailableEmojis() { val ctx = ApplicationProvider.getApplicationContext() val allEmojis = ctx.assets.list("emoji")!!.flatMap { diff --git a/app/src/test/java/helium314/keyboard/latin/style/CustomTextStylesTest.kt b/app/src/test/java/helium314/keyboard/latin/style/CustomTextStylesTest.kt index c3d9b1654..6b8a0db6e 100644 --- a/app/src/test/java/helium314/keyboard/latin/style/CustomTextStylesTest.kt +++ b/app/src/test/java/helium314/keyboard/latin/style/CustomTextStylesTest.kt @@ -44,6 +44,34 @@ class CustomTextStylesTest { assertEquals("ⓐ", UnicodeStyleEngine.transformText("a", "custom_Mine")) } + @Test fun acceptsThePastedExamples() { + val paren = (0 until 26).joinToString("") { String(Character.toChars(0x1F110 + it)) } + + (0 until 26).joinToString("") { String(Character.toChars(0x249C + it)) } + val bubble = fancyUpper + fancyLower + fancyDigits + assertTrue(UnicodeStyleEngine.isValidCustomStylesText("Paren: $paren\nBubble: $bubble")) + assertTrue(UnicodeStyleEngine.isValidCustomStylesText("Paren: $paren\r\nBubble: $bubble\r\n")) + } + + @Test fun ignoresInvisibleCharactersFromPasting() { + // circled M is also an emoji, so apps like to add a variation selector after it + val withSelector = fancyUpper.replace("Ⓜ", "Ⓜ\uFE0F") + fancyLower + assertTrue(UnicodeStyleEngine.isValidCustomStylesText("Mine: $withSelector")) + assertTrue(UnicodeStyleEngine.isValidCustomStylesText("Mine: \u200B$fancyUpper\u200D$fancyLower\uFEFF")) + UnicodeStyleEngine.setCustomStyles("Mine: $withSelector") + assertEquals("ⓐⓂ", UnicodeStyleEngine.transformText("aM", "custom_Mine")) + } + + @Test fun aBareAlphabetGetsAGeneratedName() { + assertTrue(UnicodeStyleEngine.isValidCustomStylesText(fancyUpper + fancyLower + fancyDigits)) + UnicodeStyleEngine.setCustomStyles("$fancyUpper$fancyLower$fancyDigits\nMine: $fancyUpper$fancyLower") + assertNotNull(UnicodeStyleEngine.getStyle("custom_Custom 1")) + assertNotNull(UnicodeStyleEngine.getStyle("custom_Mine")) + assertEquals("ⓐ", UnicodeStyleEngine.transformText("a", "custom_Custom 1")) + // a wrong length is still rejected, with or without a name + assertFalse(UnicodeStyleEngine.isValidCustomStylesText(fancyUpper)) + assertFalse(UnicodeStyleEngine.isValidCustomStylesText("Short: $fancyUpper")) + } + @Test fun lettersOnlyKeepsDigits() { UnicodeStyleEngine.setCustomStyles("Mine: $fancyUpper$fancyLower") assertEquals("ⓐ1", UnicodeStyleEngine.transformText("a1", "custom_Mine")) diff --git a/docs/FEATURES.md b/docs/FEATURES.md index dffe25f13..b39bd52dc 100644 --- a/docs/FEATURES.md +++ b/docs/FEATURES.md @@ -1149,7 +1149,7 @@ The **Font Style** toolbar key converts text to decorative Unicode fonts (bold, ### Adding a Custom Style 1. Open `Toolbar > Custom text styles`. -2. Write one style per line as `Name:` followed by the styled alphabet: +2. Write one style per line as `Name:` followed by the styled alphabet (the **Features Guide** button in the dialog opens this section): ``` Bubble: ⒶⒷⒸⒹⒺⒻⒼⒽⒾⒿⓀⓁⓂⓃⓄⓅⓆⓇⓈⓉⓊⓋⓌⓍⓎⓏⓐⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜⓝⓞⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ⓪①②③④⑤⑥⑦⑧⑨ @@ -1160,7 +1160,7 @@ Bubble: ⒶⒷⒸⒹⒺⒻⒼⒽⒾⒿⓀⓁⓂⓃⓄⓅⓆⓇⓈⓉⓊⓋⓌⓍ ### 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). +- Each name must be unique. The name is everything before the first `:` (a full-width `:` is accepted too). A line that is only the alphabet, with no `Name:`, is accepted and named `Custom 1`, `Custom 2` and so on by its line position. - **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.