From: Thad Hughes Date: Wed, 9 Jan 2013 05:57:56 +0000 (-0800) Subject: Fixed crashes, Slovenian fix, hide up/down buttons, proper keyboard X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=commitdiff_plain;h=0c24438a58327fedcb69eba60c2985decceccf72 Fixed crashes, Slovenian fix, hide up/down buttons, proper keyboard focus when returning to app, messed around with link colors. --- diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 99eea88..0c8e8ac 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="23" + android:versionName="4.0.1" > -Vielen Dank für die Aktualisierung auf QuickDic 4.0. +Vielen Dank für die Aktualisierung auf QuickDic 4.0.1.

Neue Funktionen:

Wenn QuickDic stürzt (vor allem Sony -Ericsson-Geräte), versuchen Sie es mit QuickDic-Einstellungen, -um zum "System default" Schriftart zu ändern.
(Beta) Einsprachige Wörterbücher für Deutsch, +
(Beta) Einsprachige Wörterbücher für Deutsch, Englisch, Italienisch.
Detailseiten zeigt Wiktionary Informationen für einige -Wörter, einschließlich: Etymologie, Aussprache und -Synonyme / Antonyme. (Und italienischen Konjugationen in der EN-IT +
Detailseiten zeigt Wiktionary Informationen für einige +Wörter, einschließlich: Etymologie, Aussprache und +Synonyme / Antonyme. (Und italienischen Konjugationen in der EN-IT Wörterbuch!)
Mit Wiktionary Daten aus de.wiktionary.org, fr.wiktionary.org +
Mit Wiktionary Daten aus de.wiktionary.org, fr.wiktionary.org und it.wiktionary.org.
Wörterbücher mit den neuesten Wiktionary Daten +
Wörterbücher mit den neuesten Wiktionary Daten aktualisiert.
Einfache Text-To-Speech für Haupt Zeilen.
Mehrere neue Wörterbücher, auf Anfrage.
Wenn QuickDic stürzt (vor allem Sony +Ericsson-Geräte), versuchen Sie es mit QuickDic-Einstellungen, +um zum "System default" Schriftart zu ändern.

diff --git a/res/raw-it/whats_new.html b/res/raw-it/whats_new.html index a877f2a..84a63b0 100644 --- a/res/raw-it/whats_new.html +++ b/res/raw-it/whats_new.html @@ -12,19 +12,19 @@ Thanks for updating to QuickDic 4.0.

Nuove caratteristiche:

Se QuickDic si bloccasse (in particolare con cellulari Sony -Ericsson), prova a cambiare le preferenze e impostare "default di -sistema" font.
(Beta) Dizionari monolingue in inglese, tedesco, italiano.
Aggiunte informazioni Wikizionario per alcune parole, tra cui: -etimologia, pronuncia, sinonimi e contrari (inclusa coniugazione +
Aggiunte informazioni Wikizionario per alcune parole, tra cui: +etimologia, pronuncia, sinonimi e contrari (inclusa coniugazione dei verbi italiani nel dizionario EN-IT!)
Utilizza i dati di Wikizionario de.wiktionary.org, +
Utilizza i dati di Wikizionario de.wiktionary.org, fr.wiktionary.org e it.wiktionary.org.
Dizionario aggiornato con gli ultimi dati Wikizionario.
Pronuncia per le parole principali utilizzando +
Pronuncia per le parole principali utilizzando text-to-speech.
Numerosi dizionari nuovi, su richiesta.
Se QuickDic si bloccasse (in particolare con cellulari Sony +Ericsson), prova a cambiare le preferenze e impostare "default di +sistema" font.

diff --git a/res/raw/whats_new.html b/res/raw/whats_new.html index e3615e0..eaafd4c 100644 --- a/res/raw/whats_new.html +++ b/res/raw/whats_new.html @@ -9,23 +9,25 @@ -Thanks for updating to QuickDic 4.0. +Thanks for updating to QuickDic 4.0.1.

New features:

If QuickDic crashes (especially Sony Ericsson devices), try -using QuickDic's preferences to change to the "System default" -font.
(Beta) Monolingual dictionaries for English, German, +
Fixed crashes.
Add option to hide previous and next word buttons.
(Beta) Monolingual dictionaries for English, German, Italian.
Detail pages showing Wiktionary information for some words, -including: etymology, pronunciation, and synonyms/antonyms. (And +
Detail pages showing Wiktionary information for some words, +including: etymology, pronunciation, and synonyms/antonyms. (And Italian verb conjugations in the EN-IT dictionary!)
Basic parsing of Wiktionary data from de.wiktionary.org, -fr.wiktionary.org, and it.wiktionary.org for better coverage of +
Basic parsing of Wiktionary data from de.wiktionary.org, +fr.wiktionary.org, and it.wiktionary.org for better coverage of those languages.
Dictionaries updated with latest Wiktionary data.
Simple text-to-speech pronunciations for main rows.
Several new dictionaries, by request.
If QuickDic crashes (especially Sony Ericsson devices), try +using QuickDic's preferences to change to the "System default" +font.

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index de771a6..98c48cc 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -3,7 +3,7 @@ QuickDic - QuickDic 4.0 + QuickDic 4.0.1 Ãber QuickDicâ¦ @@ -24,7 +24,7 @@ Filter Nur SD-Karte - 4.0_de_b + 4.0.1_de_b Suchtext diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 86707f6..72ee7d7 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -1,7 +1,7 @@ QuickDic -QuickDic 4.0 +QuickDic 4.0.1 About QuickDicâ¦ Preferenzeâ¦ @@ -20,7 +20,7 @@ Rilevato problema di font (comune su apparecchi Sony Ericsson), ritorno a font d %1$s: %2$,d parole Filtra lista Solo locali -4.0_it_a +4.0.1_it_a Cerca testo Seleziona dizionarioâ¦ diff --git a/res/values-v11/themes.xml b/res/values-v11/themes.xml index b2f04ea..90e8b5b 100644 --- a/res/values-v11/themes.xml +++ b/res/values-v11/themes.xml @@ -4,14 +4,12 @@ diff --git a/res/values/strings.xml b/res/values/strings.xml index 9e589a6..b9f3f17 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3,7 +3,7 @@ QuickDic - QuickDic 4.0 + QuickDic 4.0.1 About QuickDicâ¦ @@ -25,7 +25,7 @@ Local only - 4.0_en_b + 4.0.1_en_a Search Text @@ -109,6 +109,10 @@ Show \'clear search text\' button Show the button to clear the search text. You can also just move focus away from search text and start typing. + showPrevNextButtons + Show up/down buttons + Show or hide the previous and next word buttons in the dictionary view. + theme UI theme User-interface color theme. diff --git a/res/values/themes.xml b/res/values/themes.xml index a39b036..4555077 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -4,12 +4,12 @@ + #FFFFFF + #00AAFF + #FFFFFF #111111 @@ -20,11 +20,11 @@ #000000 @@ -32,5 +32,4 @@ #EEEEEE #FFFFFF - \ No newline at end of file diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 4a6f57e..f331dfb 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -59,6 +59,14 @@ android:persistent="true" /> + + %s", html), diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java index aee8803..72892da 100644 --- a/src/com/hughes/android/dictionary/DictionaryApplication.java +++ b/src/com/hughes/android/dictionary/DictionaryApplication.java @@ -189,8 +189,7 @@ public class DictionaryApplication extends Application { return new File(getDictDir(), uncompressedFilename); } - - + String defaultLangISO2 = Locale.getDefault().getLanguage().toLowerCase(); String defaultLangName = null; final Map fileToNameCache = new LinkedHashMap(); diff --git a/src/com/hughes/android/dictionary/engine/Index.java b/src/com/hughes/android/dictionary/engine/Index.java index ad95334..cea2cac 100644 --- a/src/com/hughes/android/dictionary/engine/Index.java +++ b/src/com/hughes/android/dictionary/engine/Index.java @@ -372,7 +372,7 @@ public final class Index implements RAFSerializable { final int exactMatchIndex = findInsertionPointIndex(searchText, interrupted); if (exactMatchIndex != -1) { final IndexEntry exactMatch = sortedIndexEntries.get(exactMatchIndex); - if (pattern.matcher(exactMatch.token).matches()) { + if (pattern.matcher(exactMatch.token).find()) { matches.get(RowMatchType.TITLE_MATCH).add(rows.get(exactMatch.startRow)); } } diff --git a/src/com/hughes/android/dictionary/engine/Language.java b/src/com/hughes/android/dictionary/engine/Language.java index 27e6ad3..1955ad7 100644 --- a/src/com/hughes/android/dictionary/engine/Language.java +++ b/src/com/hughes/android/dictionary/engine/Language.java @@ -97,7 +97,7 @@ public class Language { isoCodeToResources.put("SA", new LanguageResources("Sanskrit", R.string.SA)); isoCodeToResources.put("SR", new LanguageResources("Serbian", R.string.SR)); isoCodeToResources.put("SK", new LanguageResources("Slovak", R.string.SK)); - isoCodeToResources.put("SK", new LanguageResources("Slovenian", R.string.SL)); + isoCodeToResources.put("SL", new LanguageResources("Slovenian", R.string.SL)); isoCodeToResources.put("SO", new LanguageResources("Somali", R.string.SO)); isoCodeToResources.put("ES", new LanguageResources("Spanish", R.string.ES)); isoCodeToResources.put("SW", new LanguageResources("Swahili", R.string.SW));