From 16e91144f6047f8dd158f50ea9739c9bba8e1c97 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Reimar=20D=C3=B6ffinger?= Date: Fri, 21 Aug 2015 00:58:04 +0200 Subject: [PATCH] Many fixes/hack to get a compilable version. --- AndroidManifest.xml | 4 +- build.gradle | 46 +++++ project.properties | 16 -- res/values-de/strings.xml | 3 +- res/values-fr/p.xml | 24 --- res/values-fr/strings.xml | 3 +- res/values-v11/styles.xml | 8 +- res/values/styles.xml | 14 +- .../dictionary/DictionaryActivity.java | 53 ++++-- .../dictionary/DictionaryApplication.java | 175 +++++++++++++++++- .../dictionary/DictionaryManagerActivity.java | 28 ++- .../dictionary/HtmlDisplayActivity.java | 6 +- .../hughes/android/dictionary/MyWebView.java | 2 + .../android/dictionary/engine/Language.java | 169 +---------------- 14 files changed, 288 insertions(+), 263 deletions(-) create mode 100644 build.gradle delete mode 100644 project.properties delete mode 100644 res/values-fr/p.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a303ab1..0bbd5de 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -22,7 +22,7 @@ android:allowBackup="true" android:icon="@drawable/icon" android:label="@string/app_name" - android:theme="@style/AppTheme" > + android:theme="@style/AppBaseThemeDark" > @@ -102,4 +102,4 @@ - \ No newline at end of file + diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..56b374b --- /dev/null +++ b/build.gradle @@ -0,0 +1,46 @@ +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:1.2.3' + } +} + +apply plugin: 'com.android.application' + +repositories { + jcenter() +} +dependencies { + compile 'com.android.support:appcompat-v7:21.0.3' + compile 'com.ibm.icu:icu4j:55.1' +} + +android { + compileSdkVersion 21 + buildToolsVersion "22.0.1" + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src', '../Util/src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + } + + // Move the tests to tests/java, tests/res, etc... + instrumentTest.setRoot('tests') + + // Move the build types to build-types/ + // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... + // This moves them out of them default location under src//... which would + // conflict with src/ being used by the main source set. + // Adding new build types or product flavors should be accompanied + // by a similar customization. + debug.setRoot('build-types/debug') + release.setRoot('build-types/release') + } + defaultConfig { + targetSdkVersion 22 + } +} diff --git a/project.properties b/project.properties deleted file mode 100644 index 9fd6c00..0000000 --- a/project.properties +++ /dev/null @@ -1,16 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Indicates whether an apk should be generated for each density. -split.density=false -# Project target. -target=android-19 -android.library.reference.1=../Util -android.library.reference.1=../Util -android.library.reference.2=../JakeWharton-ActionBarSherlock/actionbarsherlock diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 2c4a2ba..310d7c0 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -3,8 +3,7 @@ QuickDic QuickDic 5.0.1 - 5.0.1 - + Über QuickDic… Einstellungen… diff --git a/res/values-fr/p.xml b/res/values-fr/p.xml deleted file mode 100644 index 9302922..0000000 --- a/res/values-fr/p.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - FreeSerif.ttf.jpg - SYSTEM - - - - FreeSerif - System standard - - - - themeLight - themeDefault - - - - theme clair - theme standard - - - \ No newline at end of file diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 107fd90..d043f18 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -3,8 +3,7 @@ QuickDic QuickDic 5.0.1 - 5.0.1 - + À propos de QuickDic Configuration diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml index 5b00ba2..dae0c37 100644 --- a/res/values-v11/styles.xml +++ b/res/values-v11/styles.xml @@ -1,23 +1,19 @@ - - - - - diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java index 11606bc..f932fbc 100644 --- a/src/com/hughes/android/dictionary/DictionaryActivity.java +++ b/src/com/hughes/android/dictionary/DictionaryActivity.java @@ -47,7 +47,9 @@ import android.view.ViewGroup; import android.view.WindowManager; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; +import android.widget.AdapterView; import android.widget.AdapterView.AdapterContextMenuInfo; +import android.widget.AdapterView.OnItemClickListener; import android.widget.BaseAdapter; import android.widget.Button; import android.widget.FrameLayout; @@ -63,13 +65,13 @@ import android.widget.TextView; import android.widget.TextView.BufferType; import android.widget.Toast; -import com.actionbarsherlock.app.ActionBar; -import com.actionbarsherlock.app.SherlockListActivity; -import com.actionbarsherlock.view.Menu; -import com.actionbarsherlock.view.MenuItem; -import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener; -import com.actionbarsherlock.widget.SearchView; -import com.actionbarsherlock.widget.SearchView.OnQueryTextListener; +import android.support.v7.app.ActionBar; +import android.support.v7.app.ActionBarActivity; +import android.support.v7.widget.SearchView; +import android.support.v7.widget.SearchView.OnQueryTextListener; +import android.view.Menu; +import android.view.MenuItem; +import android.view.MenuItem.OnMenuItemClickListener; import com.hughes.android.dictionary.DictionaryInfo.IndexInfo; import com.hughes.android.dictionary.engine.Dictionary; import com.hughes.android.dictionary.engine.EntrySource; @@ -109,7 +111,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class DictionaryActivity extends SherlockListActivity { +public class DictionaryActivity extends ActionBarActivity { static final String LOG = "QuickDic"; @@ -145,6 +147,22 @@ public class DictionaryActivity extends SherlockListActivity { int textColorFg = Color.BLACK; int fontSizeSp; + private ListView listView; + private ListView getListView() { + if (listView == null) { + listView = (ListView)findViewById(android.R.id.list); + } + return listView; + } + + private void setListAdapter(ListAdapter adapter) { + getListView().setAdapter(adapter); + } + + private ListAdapter getListAdapter() { + return getListView().getAdapter(); + } + SearchView searchView; ImageButton languageButton; SearchView.OnQueryTextListener onQueryTextListener; @@ -460,6 +478,13 @@ public class DictionaryActivity extends SherlockListActivity { width, ViewGroup.LayoutParams.WRAP_CONTENT); customSearchView.setLayoutParams(layoutParams); + listView.setOnItemClickListener(new OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int row, long id) { + onListItemClick(getListView(), view, row, id); + } + }); + languageButton = new ImageButton(customSearchView.getContext()); languageButton.setMinimumWidth(application.languageButtonPixels); languageButton.setMinimumHeight(application.languageButtonPixels * 2 / 3); @@ -515,13 +540,6 @@ public class DictionaryActivity extends SherlockListActivity { searchView.setFocusable(true); customSearchView.addView(searchView); - // Clear the searchHint icon so that it takes as little space as possible. - ImageView searchHintIcon = (ImageView) searchView.findViewById(R.id.abs__search_mag_icon); - searchHintIcon.setBackgroundResource(android.R.color.transparent); - searchHintIcon.setLayoutParams(new LinearLayout.LayoutParams(1, 1)); - searchHintIcon.setAdjustViewBounds(true); - searchHintIcon.setPadding(0, 0, 0, 0); - actionBar.setCustomView(customSearchView); actionBar.setDisplayShowCustomEnabled(true); } @@ -619,7 +637,7 @@ public class DictionaryActivity extends SherlockListActivity { void updateLangButton() { final LanguageResources languageResources = - Language.isoCodeToResources.get(index.shortName); + DictionaryApplication.isoCodeToResources.get(index.shortName); if (languageResources != null && languageResources.flagId != 0) { languageButton.setImageResource(languageResources.flagId); } else { @@ -924,7 +942,7 @@ public class DictionaryActivity extends SherlockListActivity { } }); // Rats, this won't be shown: - searchForSelection.setIcon(R.drawable.abs__ic_search); + //searchForSelection.setIcon(R.drawable.abs__ic_search); } if (row instanceof TokenRow && ttsReady) { @@ -989,7 +1007,6 @@ public class DictionaryActivity extends SherlockListActivity { // searchView.selectAll(); } - @Override protected void onListItemClick(ListView l, View v, int row, long id) { defocusSearchText(); if (clickOpensContextMenu && dictRaf != null) { diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java index a4e0afe..90027a0 100644 --- a/src/com/hughes/android/dictionary/DictionaryApplication.java +++ b/src/com/hughes/android/dictionary/DictionaryApplication.java @@ -29,9 +29,9 @@ import android.widget.Button; import android.widget.ImageButton; import android.widget.ImageView.ScaleType; -import com.actionbarsherlock.view.Menu; -import com.actionbarsherlock.view.MenuItem; -import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener; +import android.view.Menu; +import android.view.MenuItem; +import android.view.MenuItem.OnMenuItemClickListener; import com.hughes.android.dictionary.DictionaryInfo.IndexInfo; import com.hughes.android.dictionary.engine.Dictionary; import com.hughes.android.dictionary.engine.Language; @@ -62,6 +62,171 @@ public class DictionaryApplication extends Application { // Unordered. static Map DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO = null; + // Useful: + // http://www.loc.gov/standards/iso639-2/php/code_list.php + public static final Map isoCodeToResources = new LinkedHashMap(); + static { + isoCodeToResources.put("AF", new LanguageResources("Afrikaans", R.string.AF, + R.drawable.flag_of_south_africa)); + isoCodeToResources.put("SQ", new LanguageResources("Albanian", R.string.SQ, + R.drawable.flag_of_albania)); + isoCodeToResources.put("AR", + new LanguageResources("Arabic", R.string.AR, R.drawable.arabic)); + isoCodeToResources.put("HY", new LanguageResources("Armenian", R.string.HY, + R.drawable.flag_of_armenia)); + isoCodeToResources.put("BE", new LanguageResources("Belarusian", R.string.BE, + R.drawable.flag_of_belarus)); + isoCodeToResources.put("BN", new LanguageResources("Bengali", R.string.BN)); + isoCodeToResources.put("BS", new LanguageResources("Bosnian", R.string.BS, + R.drawable.flag_of_bosnia_and_herzegovina)); + isoCodeToResources.put("BG", new LanguageResources("Bulgarian", R.string.BG, + R.drawable.flag_of_bulgaria)); + isoCodeToResources.put("MY", new LanguageResources("Burmese", R.string.MY, + R.drawable.flag_of_myanmar)); + isoCodeToResources.put("ZH", new LanguageResources("Chinese", R.string.ZH, + R.drawable.flag_of_the_peoples_republic_of_china)); + isoCodeToResources.put("cmn", new LanguageResources("Mandarin", R.string.cmn, + R.drawable.flag_of_the_peoples_republic_of_china)); + isoCodeToResources.put("yue", new LanguageResources("Cantonese", R.string.yue, + R.drawable.flag_of_hong_kong)); + isoCodeToResources.put("CA", new LanguageResources("Catalan", R.string.CA)); + isoCodeToResources.put("HR", new LanguageResources("Croatian", R.string.HR, + R.drawable.flag_of_croatia)); + isoCodeToResources.put("CS", new LanguageResources("Czech", R.string.CS, + R.drawable.flag_of_the_czech_republic)); + isoCodeToResources.put("DA", new LanguageResources("Danish", R.string.DA, + R.drawable.flag_of_denmark)); + isoCodeToResources.put("NL", new LanguageResources("Dutch", R.string.NL, + R.drawable.flag_of_the_netherlands)); + isoCodeToResources.put("EN", new LanguageResources("English", R.string.EN, + R.drawable.flag_of_the_united_kingdom)); + isoCodeToResources.put("EO", new LanguageResources("Esperanto", R.string.EO, + R.drawable.flag_of_esperanto)); + isoCodeToResources.put("ET", new LanguageResources("Estonian", R.string.ET, + R.drawable.flag_of_estonia)); + isoCodeToResources.put("FI", new LanguageResources("Finnish", R.string.FI, + R.drawable.flag_of_finland)); + isoCodeToResources.put("FR", new LanguageResources("French", R.string.FR, + R.drawable.flag_of_france)); + isoCodeToResources.put("DE", new LanguageResources("German", R.string.DE, + R.drawable.flag_of_germany)); + isoCodeToResources.put("EL", new LanguageResources("Greek", R.string.EL, + R.drawable.flag_of_greece)); + isoCodeToResources.put("grc", new LanguageResources("Ancient Greek", R.string.grc)); + isoCodeToResources.put("haw", new LanguageResources("Hawaiian", R.string.haw, + R.drawable.flag_of_hawaii)); + isoCodeToResources.put("HE", new LanguageResources("Hebrew", R.string.HE, + R.drawable.flag_of_israel)); + isoCodeToResources.put("HI", new LanguageResources("Hindi", R.string.HI, R.drawable.hindi)); + isoCodeToResources.put("HU", new LanguageResources("Hungarian", R.string.HU, + R.drawable.flag_of_hungary)); + isoCodeToResources.put("IS", new LanguageResources("Icelandic", R.string.IS, + R.drawable.flag_of_iceland)); + isoCodeToResources.put("ID", new LanguageResources("Indonesian", R.string.ID, + R.drawable.flag_of_indonesia)); + isoCodeToResources.put("GA", new LanguageResources("Irish", R.string.GA, + R.drawable.flag_of_ireland)); + isoCodeToResources.put("GD", new LanguageResources("Scottish Gaelic", R.string.GD, + R.drawable.flag_of_scotland)); + isoCodeToResources.put("GV", new LanguageResources("Manx", R.string.GV, + R.drawable.flag_of_the_isle_of_man)); + isoCodeToResources.put("IT", new LanguageResources("Italian", R.string.IT, + R.drawable.flag_of_italy)); + isoCodeToResources.put("LA", new LanguageResources("Latin", R.string.LA)); + isoCodeToResources.put("LV", new LanguageResources("Latvian", R.string.LV, + R.drawable.flag_of_latvia)); + isoCodeToResources.put("LT", new LanguageResources("Lithuanian", R.string.LT, + R.drawable.flag_of_lithuania)); + isoCodeToResources.put("JA", new LanguageResources("Japanese", R.string.JA, + R.drawable.flag_of_japan)); + isoCodeToResources.put("KO", new LanguageResources("Korean", R.string.KO, + R.drawable.flag_of_south_korea)); + isoCodeToResources.put("KU", new LanguageResources("Kurdish", R.string.KU)); + isoCodeToResources.put("MS", new LanguageResources("Malay", R.string.MS, + R.drawable.flag_of_malaysia)); + isoCodeToResources.put("MI", new LanguageResources("Maori", R.string.MI, + R.drawable.flag_of_new_zealand)); + isoCodeToResources.put("MN", new LanguageResources("Mongolian", R.string.MN, + R.drawable.flag_of_mongolia)); + isoCodeToResources.put("NE", new LanguageResources("Nepali", R.string.NE, + R.drawable.flag_of_nepal)); + isoCodeToResources.put("NO", new LanguageResources("Norwegian", R.string.NO, + R.drawable.flag_of_norway)); + isoCodeToResources.put("FA", new LanguageResources("Persian", R.string.FA, + R.drawable.flag_of_iran)); + isoCodeToResources.put("PL", new LanguageResources("Polish", R.string.PL, + R.drawable.flag_of_poland)); + isoCodeToResources.put("PT", new LanguageResources("Portuguese", R.string.PT, + R.drawable.flag_of_portugal)); + isoCodeToResources.put("PA", new LanguageResources("Punjabi", R.string.PA)); + isoCodeToResources.put("RO", new LanguageResources("Romanian", R.string.RO, + R.drawable.flag_of_romania)); + isoCodeToResources.put("RU", new LanguageResources("Russian", R.string.RU, + R.drawable.flag_of_russia)); + isoCodeToResources.put("SA", new LanguageResources("Sanskrit", R.string.SA)); + isoCodeToResources.put("SR", new LanguageResources("Serbian", R.string.SR, + R.drawable.flag_of_serbia)); + isoCodeToResources.put("SK", new LanguageResources("Slovak", R.string.SK, + R.drawable.flag_of_slovakia)); + isoCodeToResources.put("SL", new LanguageResources("Slovenian", R.string.SL, + R.drawable.flag_of_slovenia)); + isoCodeToResources.put("SO", new LanguageResources("Somali", R.string.SO, + R.drawable.flag_of_somalia)); + isoCodeToResources.put("ES", new LanguageResources("Spanish", R.string.ES, + R.drawable.flag_of_spain)); + isoCodeToResources.put("SW", new LanguageResources("Swahili", R.string.SW)); + isoCodeToResources.put("SV", new LanguageResources("Swedish", R.string.SV, + R.drawable.flag_of_sweden)); + isoCodeToResources.put("TL", new LanguageResources("Tagalog", R.string.TL)); + isoCodeToResources.put("TG", new LanguageResources("Tajik", R.string.TG, + R.drawable.flag_of_tajikistan)); + isoCodeToResources.put("TH", new LanguageResources("Thai", R.string.TH, + R.drawable.flag_of_thailand)); + isoCodeToResources.put("BO", new LanguageResources("Tibetan", R.string.BO)); + isoCodeToResources.put("TR", new LanguageResources("Turkish", R.string.TR, + R.drawable.flag_of_turkey)); + isoCodeToResources.put("UK", new LanguageResources("Ukrainian", R.string.UK, + R.drawable.flag_of_ukraine)); + isoCodeToResources.put("UR", new LanguageResources("Urdu", R.string.UR)); + isoCodeToResources.put("VI", new LanguageResources("Vietnamese", R.string.VI, + R.drawable.flag_of_vietnam)); + isoCodeToResources.put("CI", new LanguageResources("Welsh", R.string.CI, + R.drawable.flag_of_wales_2)); + isoCodeToResources.put("YI", new LanguageResources("Yiddish", R.string.YI)); + isoCodeToResources.put("ZU", new LanguageResources("Zulu", R.string.ZU)); + isoCodeToResources.put("AZ", new LanguageResources("Azeri", R.string.AZ, + R.drawable.flag_of_azerbaijan)); + isoCodeToResources.put("EU", new LanguageResources("Basque", R.string.EU, + R.drawable.flag_of_the_basque_country)); + isoCodeToResources.put("BR", new LanguageResources("Breton", R.string.BR)); + isoCodeToResources.put("MR", new LanguageResources("Marathi", R.string.MR)); + isoCodeToResources.put("FO", new LanguageResources("Faroese", R.string.FO)); + isoCodeToResources.put("GL", new LanguageResources("Galician", R.string.GL, + R.drawable.flag_of_galicia)); + isoCodeToResources.put("KA", new LanguageResources("Georgian", R.string.KA, + R.drawable.flag_of_georgia)); + isoCodeToResources.put("HT", new LanguageResources("Haitian Creole", R.string.HT, + R.drawable.flag_of_haiti)); + isoCodeToResources.put("LB", new LanguageResources("Luxembourgish", R.string.LB, + R.drawable.flag_of_luxembourg)); + isoCodeToResources.put("MK", new LanguageResources("Macedonian", R.string.MK, + R.drawable.flag_of_macedonia)); + isoCodeToResources.put("LO", new LanguageResources("Lao", R.string.LO, + R.drawable.flag_of_laos)); + isoCodeToResources.put("ML", new LanguageResources("Malayalam", R.string.ML)); + isoCodeToResources.put("SL", new LanguageResources("Slovenian", R.string.SL, + R.drawable.flag_of_slovenia)); + isoCodeToResources.put("TA", new LanguageResources("Tamil", R.string.TA)); + isoCodeToResources.put("SH", new LanguageResources("Serbo-Croatian", R.string.SH)); + isoCodeToResources.put("SD", new LanguageResources("Sindhi", R.string.SD)); + + // Hack to allow lower-case ISO codes to work: + for (final String isoCode : new ArrayList(isoCodeToResources.keySet())) { + isoCodeToResources.put(isoCode.toLowerCase(), isoCodeToResources.get(isoCode)); + } + + } + static final class DictionaryConfig implements Serializable { private static final long serialVersionUID = -1444177164708201263L; // User-ordered list, persisted, just the ones that are/have been @@ -232,7 +397,7 @@ public class DictionaryApplication extends Application { final Map fileToNameCache = new LinkedHashMap(); public String isoCodeToLocalizedLanguageName(final String isoCode) { - final Language.LanguageResources languageResources = Language.isoCodeToResources + final Language.LanguageResources languageResources = isoCodeToResources .get(isoCode); final String lang = languageResources != null ? getApplicationContext().getString( languageResources.nameId) : isoCode; @@ -289,7 +454,7 @@ public class DictionaryApplication extends Application { public View createButton(final Context context, final DictionaryInfo dictionaryInfo, final IndexInfo indexInfo) { - LanguageResources languageResources = Language.isoCodeToResources.get(indexInfo.shortName); + LanguageResources languageResources = isoCodeToResources.get(indexInfo.shortName); View result; if (languageResources == null || languageResources.flagId <= 0) { diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java index 1649144..3070af1 100644 --- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java +++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java @@ -45,15 +45,17 @@ import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.FrameLayout; import android.widget.LinearLayout; +import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; import android.widget.ToggleButton; -import com.actionbarsherlock.app.ActionBar; -import com.actionbarsherlock.app.SherlockListActivity; -import com.actionbarsherlock.view.Menu; -import com.actionbarsherlock.widget.SearchView; -import com.actionbarsherlock.widget.SearchView.OnQueryTextListener; +import android.support.v7.app.ActionBar; +import android.support.v7.app.ActionBarActivity; +import android.support.v7.widget.SearchView; +import android.support.v7.widget.SearchView.OnQueryTextListener; +import android.view.Menu; +import android.widget.ListAdapter; import com.hughes.android.dictionary.DictionaryInfo.IndexInfo; import com.hughes.android.util.IntentLauncher; @@ -72,11 +74,25 @@ import java.util.zip.ZipFile; // Right-click: // Delete, move to top. -public class DictionaryManagerActivity extends SherlockListActivity { +public class DictionaryManagerActivity extends ActionBarActivity { static final String LOG = "QuickDic"; static boolean blockAutoLaunch = false; + private ListView listView; + private ListView getListView() { + if (listView == null) { + listView = (ListView)findViewById(android.R.id.list); + } + return listView; + } + private void setListAdapter(ListAdapter adapter) { + getListView().setAdapter(adapter); + } + private ListAdapter getListAdapter() { + return getListView().getAdapter(); + } + DictionaryApplication application; SearchView filterSearchView; diff --git a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java index 6abb525..1a30487 100644 --- a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java +++ b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java @@ -21,11 +21,11 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; -import com.actionbarsherlock.app.ActionBar; -import com.actionbarsherlock.app.SherlockActivity; +import android.support.v7.app.ActionBar; +import android.support.v7.app.ActionBarActivity; import com.hughes.util.StringUtil; -public final class HtmlDisplayActivity extends SherlockActivity { +public final class HtmlDisplayActivity extends ActionBarActivity { static final String LOG = "QuickDic"; diff --git a/src/com/hughes/android/dictionary/MyWebView.java b/src/com/hughes/android/dictionary/MyWebView.java index d0fdd5b..abb7fdc 100644 --- a/src/com/hughes/android/dictionary/MyWebView.java +++ b/src/com/hughes/android/dictionary/MyWebView.java @@ -1,6 +1,8 @@ package com.hughes.android.dictionary; +import com.hughes.util.StringUtil; + import android.app.Activity; import android.content.Context; import android.content.Intent; diff --git a/src/com/hughes/android/dictionary/engine/Language.java b/src/com/hughes/android/dictionary/engine/Language.java index dc5a845..9e729a8 100644 --- a/src/com/hughes/android/dictionary/engine/Language.java +++ b/src/com/hughes/android/dictionary/engine/Language.java @@ -30,182 +30,17 @@ public class Language { public final int nameId; public final int flagId; - private LanguageResources(final String englishName, int nameId, int flagId) { + public LanguageResources(final String englishName, int nameId, int flagId) { this.englishName = englishName; this.nameId = nameId; this.flagId = flagId; } - private LanguageResources(final String englishName, int nameId) { + public LanguageResources(final String englishName, int nameId) { this(englishName, nameId, 0); } } - // Useful: - // http://www.loc.gov/standards/iso639-2/php/code_list.php - public static final Map isoCodeToResources = new LinkedHashMap(); - static { - isoCodeToResources.put("AF", new LanguageResources("Afrikaans", R.string.AF, - R.drawable.flag_of_south_africa)); - isoCodeToResources.put("SQ", new LanguageResources("Albanian", R.string.SQ, - R.drawable.flag_of_albania)); - isoCodeToResources.put("AR", - new LanguageResources("Arabic", R.string.AR, R.drawable.arabic)); - isoCodeToResources.put("HY", new LanguageResources("Armenian", R.string.HY, - R.drawable.flag_of_armenia)); - isoCodeToResources.put("BE", new LanguageResources("Belarusian", R.string.BE, - R.drawable.flag_of_belarus)); - isoCodeToResources.put("BN", new LanguageResources("Bengali", R.string.BN)); - isoCodeToResources.put("BS", new LanguageResources("Bosnian", R.string.BS, - R.drawable.flag_of_bosnia_and_herzegovina)); - isoCodeToResources.put("BG", new LanguageResources("Bulgarian", R.string.BG, - R.drawable.flag_of_bulgaria)); - isoCodeToResources.put("MY", new LanguageResources("Burmese", R.string.MY, - R.drawable.flag_of_myanmar)); - isoCodeToResources.put("ZH", new LanguageResources("Chinese", R.string.ZH, - R.drawable.flag_of_the_peoples_republic_of_china)); - isoCodeToResources.put("cmn", new LanguageResources("Mandarin", R.string.cmn, - R.drawable.flag_of_the_peoples_republic_of_china)); - isoCodeToResources.put("yue", new LanguageResources("Cantonese", R.string.yue, - R.drawable.flag_of_hong_kong)); - isoCodeToResources.put("CA", new LanguageResources("Catalan", R.string.CA)); - isoCodeToResources.put("HR", new LanguageResources("Croatian", R.string.HR, - R.drawable.flag_of_croatia)); - isoCodeToResources.put("CS", new LanguageResources("Czech", R.string.CS, - R.drawable.flag_of_the_czech_republic)); - isoCodeToResources.put("DA", new LanguageResources("Danish", R.string.DA, - R.drawable.flag_of_denmark)); - isoCodeToResources.put("NL", new LanguageResources("Dutch", R.string.NL, - R.drawable.flag_of_the_netherlands)); - isoCodeToResources.put("EN", new LanguageResources("English", R.string.EN, - R.drawable.flag_of_the_united_kingdom)); - isoCodeToResources.put("EO", new LanguageResources("Esperanto", R.string.EO, - R.drawable.flag_of_esperanto)); - isoCodeToResources.put("ET", new LanguageResources("Estonian", R.string.ET, - R.drawable.flag_of_estonia)); - isoCodeToResources.put("FI", new LanguageResources("Finnish", R.string.FI, - R.drawable.flag_of_finland)); - isoCodeToResources.put("FR", new LanguageResources("French", R.string.FR, - R.drawable.flag_of_france)); - isoCodeToResources.put("DE", new LanguageResources("German", R.string.DE, - R.drawable.flag_of_germany)); - isoCodeToResources.put("EL", new LanguageResources("Greek", R.string.EL, - R.drawable.flag_of_greece)); - isoCodeToResources.put("grc", new LanguageResources("Ancient Greek", R.string.grc)); - isoCodeToResources.put("haw", new LanguageResources("Hawaiian", R.string.haw, - R.drawable.flag_of_hawaii)); - isoCodeToResources.put("HE", new LanguageResources("Hebrew", R.string.HE, - R.drawable.flag_of_israel)); - isoCodeToResources.put("HI", new LanguageResources("Hindi", R.string.HI, R.drawable.hindi)); - isoCodeToResources.put("HU", new LanguageResources("Hungarian", R.string.HU, - R.drawable.flag_of_hungary)); - isoCodeToResources.put("IS", new LanguageResources("Icelandic", R.string.IS, - R.drawable.flag_of_iceland)); - isoCodeToResources.put("ID", new LanguageResources("Indonesian", R.string.ID, - R.drawable.flag_of_indonesia)); - isoCodeToResources.put("GA", new LanguageResources("Irish", R.string.GA, - R.drawable.flag_of_ireland)); - isoCodeToResources.put("GD", new LanguageResources("Scottish Gaelic", R.string.GD, - R.drawable.flag_of_scotland)); - isoCodeToResources.put("GV", new LanguageResources("Manx", R.string.GV, - R.drawable.flag_of_the_isle_of_man)); - isoCodeToResources.put("IT", new LanguageResources("Italian", R.string.IT, - R.drawable.flag_of_italy)); - isoCodeToResources.put("LA", new LanguageResources("Latin", R.string.LA)); - isoCodeToResources.put("LV", new LanguageResources("Latvian", R.string.LV, - R.drawable.flag_of_latvia)); - isoCodeToResources.put("LT", new LanguageResources("Lithuanian", R.string.LT, - R.drawable.flag_of_lithuania)); - isoCodeToResources.put("JA", new LanguageResources("Japanese", R.string.JA, - R.drawable.flag_of_japan)); - isoCodeToResources.put("KO", new LanguageResources("Korean", R.string.KO, - R.drawable.flag_of_south_korea)); - isoCodeToResources.put("KU", new LanguageResources("Kurdish", R.string.KU)); - isoCodeToResources.put("MS", new LanguageResources("Malay", R.string.MS, - R.drawable.flag_of_malaysia)); - isoCodeToResources.put("MI", new LanguageResources("Maori", R.string.MI, - R.drawable.flag_of_new_zealand)); - isoCodeToResources.put("MN", new LanguageResources("Mongolian", R.string.MN, - R.drawable.flag_of_mongolia)); - isoCodeToResources.put("NE", new LanguageResources("Nepali", R.string.NE, - R.drawable.flag_of_nepal)); - isoCodeToResources.put("NO", new LanguageResources("Norwegian", R.string.NO, - R.drawable.flag_of_norway)); - isoCodeToResources.put("FA", new LanguageResources("Persian", R.string.FA, - R.drawable.flag_of_iran)); - isoCodeToResources.put("PL", new LanguageResources("Polish", R.string.PL, - R.drawable.flag_of_poland)); - isoCodeToResources.put("PT", new LanguageResources("Portuguese", R.string.PT, - R.drawable.flag_of_portugal)); - isoCodeToResources.put("PA", new LanguageResources("Punjabi", R.string.PA)); - isoCodeToResources.put("RO", new LanguageResources("Romanian", R.string.RO, - R.drawable.flag_of_romania)); - isoCodeToResources.put("RU", new LanguageResources("Russian", R.string.RU, - R.drawable.flag_of_russia)); - isoCodeToResources.put("SA", new LanguageResources("Sanskrit", R.string.SA)); - isoCodeToResources.put("SR", new LanguageResources("Serbian", R.string.SR, - R.drawable.flag_of_serbia)); - isoCodeToResources.put("SK", new LanguageResources("Slovak", R.string.SK, - R.drawable.flag_of_slovakia)); - isoCodeToResources.put("SL", new LanguageResources("Slovenian", R.string.SL, - R.drawable.flag_of_slovenia)); - isoCodeToResources.put("SO", new LanguageResources("Somali", R.string.SO, - R.drawable.flag_of_somalia)); - isoCodeToResources.put("ES", new LanguageResources("Spanish", R.string.ES, - R.drawable.flag_of_spain)); - isoCodeToResources.put("SW", new LanguageResources("Swahili", R.string.SW)); - isoCodeToResources.put("SV", new LanguageResources("Swedish", R.string.SV, - R.drawable.flag_of_sweden)); - isoCodeToResources.put("TL", new LanguageResources("Tagalog", R.string.TL)); - isoCodeToResources.put("TG", new LanguageResources("Tajik", R.string.TG, - R.drawable.flag_of_tajikistan)); - isoCodeToResources.put("TH", new LanguageResources("Thai", R.string.TH, - R.drawable.flag_of_thailand)); - isoCodeToResources.put("BO", new LanguageResources("Tibetan", R.string.BO)); - isoCodeToResources.put("TR", new LanguageResources("Turkish", R.string.TR, - R.drawable.flag_of_turkey)); - isoCodeToResources.put("UK", new LanguageResources("Ukrainian", R.string.UK, - R.drawable.flag_of_ukraine)); - isoCodeToResources.put("UR", new LanguageResources("Urdu", R.string.UR)); - isoCodeToResources.put("VI", new LanguageResources("Vietnamese", R.string.VI, - R.drawable.flag_of_vietnam)); - isoCodeToResources.put("CI", new LanguageResources("Welsh", R.string.CI, - R.drawable.flag_of_wales_2)); - isoCodeToResources.put("YI", new LanguageResources("Yiddish", R.string.YI)); - isoCodeToResources.put("ZU", new LanguageResources("Zulu", R.string.ZU)); - isoCodeToResources.put("AZ", new LanguageResources("Azeri", R.string.AZ, - R.drawable.flag_of_azerbaijan)); - isoCodeToResources.put("EU", new LanguageResources("Basque", R.string.EU, - R.drawable.flag_of_the_basque_country)); - isoCodeToResources.put("BR", new LanguageResources("Breton", R.string.BR)); - isoCodeToResources.put("MR", new LanguageResources("Marathi", R.string.MR)); - isoCodeToResources.put("FO", new LanguageResources("Faroese", R.string.FO)); - isoCodeToResources.put("GL", new LanguageResources("Galician", R.string.GL, - R.drawable.flag_of_galicia)); - isoCodeToResources.put("KA", new LanguageResources("Georgian", R.string.KA, - R.drawable.flag_of_georgia)); - isoCodeToResources.put("HT", new LanguageResources("Haitian Creole", R.string.HT, - R.drawable.flag_of_haiti)); - isoCodeToResources.put("LB", new LanguageResources("Luxembourgish", R.string.LB, - R.drawable.flag_of_luxembourg)); - isoCodeToResources.put("MK", new LanguageResources("Macedonian", R.string.MK, - R.drawable.flag_of_macedonia)); - isoCodeToResources.put("LO", new LanguageResources("Lao", R.string.LO, - R.drawable.flag_of_laos)); - isoCodeToResources.put("ML", new LanguageResources("Malayalam", R.string.ML)); - isoCodeToResources.put("SL", new LanguageResources("Slovenian", R.string.SL, - R.drawable.flag_of_slovenia)); - isoCodeToResources.put("TA", new LanguageResources("Tamil", R.string.TA)); - isoCodeToResources.put("SH", new LanguageResources("Serbo-Croatian", R.string.SH)); - isoCodeToResources.put("SD", new LanguageResources("Sindhi", R.string.SD, R.drawable.flag_of_sindhi)); - - // Hack to allow lower-case ISO codes to work: - for (final String isoCode : new ArrayList(isoCodeToResources.keySet())) { - isoCodeToResources.put(isoCode.toLowerCase(), isoCodeToResources.get(isoCode)); - } - - } - private static final Map registry = new LinkedHashMap(); final String isoCode; -- 2.43.0