From a2fb1bf5f23db0282feb0ab5bf2f25fe1fdf1a22 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Wed, 10 Dec 2014 13:21:18 +0000 Subject: rename HLCompiler to GFTranslator --- src/ui/android/.project | 2 +- src/ui/android/AndroidManifest.xml | 6 +++--- src/ui/android/project.properties | 2 +- src/ui/android/res/drawable-hdpi/ic_app.png | Bin 1544 -> 2458 bytes src/ui/android/res/drawable-mdpi/ic_app.png | Bin 1162 -> 1502 bytes src/ui/android/res/drawable-xhdpi/ic_app.png | Bin 2284 -> 3672 bytes src/ui/android/res/drawable-xxhdpi/ic_app.png | Bin 3683 -> 6265 bytes src/ui/android/res/values/strings.xml | 2 +- .../ui/android/AlternativesActivity.java | 2 +- .../grammaticalframework/ui/android/GFTranslator.java | 16 ++++++++++++++++ .../grammaticalframework/ui/android/HLCompiler.java | 16 ---------------- .../grammaticalframework/ui/android/MainActivity.java | 2 +- .../ui/android/TranslatorInputMethodService.java | 2 +- .../ui/android/TranslatorKeyboard.java | 2 +- .../ui/android/TranslatorKeyboardView.java | 4 ++-- 15 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 src/ui/android/src/org/grammaticalframework/ui/android/GFTranslator.java delete mode 100644 src/ui/android/src/org/grammaticalframework/ui/android/HLCompiler.java (limited to 'src/ui') diff --git a/src/ui/android/.project b/src/ui/android/.project index bde0bfac1..abf063e43 100644 --- a/src/ui/android/.project +++ b/src/ui/android/.project @@ -1,6 +1,6 @@ - HLCompiler + GFTranslator diff --git a/src/ui/android/AndroidManifest.xml b/src/ui/android/AndroidManifest.xml index f8fa83a49..a2127be9c 100644 --- a/src/ui/android/AndroidManifest.xml +++ b/src/ui/android/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:theme="@style/AppTheme" android:name="GFTranslator"> diff --git a/src/ui/android/project.properties b/src/ui/android/project.properties index 6e18427a4..3409f0811 100644 --- a/src/ui/android/project.properties +++ b/src/ui/android/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-21 +target=android-20 diff --git a/src/ui/android/res/drawable-hdpi/ic_app.png b/src/ui/android/res/drawable-hdpi/ic_app.png index 6760bc456..8d9bdd820 100644 Binary files a/src/ui/android/res/drawable-hdpi/ic_app.png and b/src/ui/android/res/drawable-hdpi/ic_app.png differ diff --git a/src/ui/android/res/drawable-mdpi/ic_app.png b/src/ui/android/res/drawable-mdpi/ic_app.png index 99aaf67bc..923d0fe91 100644 Binary files a/src/ui/android/res/drawable-mdpi/ic_app.png and b/src/ui/android/res/drawable-mdpi/ic_app.png differ diff --git a/src/ui/android/res/drawable-xhdpi/ic_app.png b/src/ui/android/res/drawable-xhdpi/ic_app.png index a6d509f71..f7eb06682 100644 Binary files a/src/ui/android/res/drawable-xhdpi/ic_app.png and b/src/ui/android/res/drawable-xhdpi/ic_app.png differ diff --git a/src/ui/android/res/drawable-xxhdpi/ic_app.png b/src/ui/android/res/drawable-xxhdpi/ic_app.png index d51650e25..6154d852a 100644 Binary files a/src/ui/android/res/drawable-xxhdpi/ic_app.png and b/src/ui/android/res/drawable-xxhdpi/ic_app.png differ diff --git a/src/ui/android/res/values/strings.xml b/src/ui/android/res/values/strings.xml index 26db54a03..ca103623e 100644 --- a/src/ui/android/res/values/strings.xml +++ b/src/ui/android/res/values/strings.xml @@ -1,6 +1,6 @@ - Human Language Compiler + GF Offline Translator Microphone Switch languages diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java b/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java index 0bebbc3ea..e5d691820 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java @@ -33,7 +33,7 @@ public class AlternativesActivity extends ListActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_lexical_entry); - mTranslator = ((HLCompiler) getApplicationContext()).getTranslator(); + mTranslator = ((GFTranslator) getApplicationContext()).getTranslator(); mShowLanguageView = (LanguageSelector) findViewById(R.id.show_language); mShowLanguageView.setLanguages(mTranslator.getAvailableLanguages()); diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/GFTranslator.java b/src/ui/android/src/org/grammaticalframework/ui/android/GFTranslator.java new file mode 100644 index 000000000..ee4cbc092 --- /dev/null +++ b/src/ui/android/src/org/grammaticalframework/ui/android/GFTranslator.java @@ -0,0 +1,16 @@ +package org.grammaticalframework.ui.android; + +import android.app.Application; + +public class GFTranslator extends Application { + private Translator mTranslator; + + @Override + public void onCreate() { + mTranslator = new Translator(this); + } + + public Translator getTranslator() { + return mTranslator; + } +} diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/HLCompiler.java b/src/ui/android/src/org/grammaticalframework/ui/android/HLCompiler.java deleted file mode 100644 index 2e5b16df4..000000000 --- a/src/ui/android/src/org/grammaticalframework/ui/android/HLCompiler.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.grammaticalframework.ui.android; - -import android.app.Application; - -public class HLCompiler extends Application { - private Translator mTranslator; - - @Override - public void onCreate() { - mTranslator = new Translator(this); - } - - public Translator getTranslator() { - return mTranslator; - } -} diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java b/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java index f448efb44..1d0bcd592 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java @@ -103,7 +103,7 @@ public class MainActivity extends Activity { mTts = new TTS(this); - mTranslator = ((HLCompiler) getApplicationContext()).getTranslator(); + mTranslator = ((GFTranslator) getApplicationContext()).getTranslator(); mSourceLanguageView.setLanguages(mTranslator.getAvailableLanguages()); mSourceLanguageView.setOnLanguageSelectedListener(new OnLanguageSelectedListener() { diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java index 58d2e6518..d621e2f69 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java @@ -41,7 +41,7 @@ public class TranslatorInputMethodService extends InputMethodService public void onCreate() { super.onCreate(); - mTranslator = ((HLCompiler) getApplicationContext()).getTranslator(); + mTranslator = ((GFTranslator) getApplicationContext()).getTranslator(); mSymbolsPage1Keyboard = null; mSymbolsPage2Keyboard = null; diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboard.java b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboard.java index 3eeb1be1e..876f660da 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboard.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboard.java @@ -24,7 +24,7 @@ public class TranslatorKeyboard extends Keyboard { public TranslatorKeyboard(Context context, int xmlLayoutResId, int modeId) { super(context, xmlLayoutResId, modeId); - mTranslator = ((HLCompiler) context.getApplicationContext()).getTranslator(); + mTranslator = ((GFTranslator) context.getApplicationContext()).getTranslator(); updateLanguageKeyLabels(); } diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java index 8e05623f5..943c48d35 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java @@ -20,12 +20,12 @@ public class TranslatorKeyboardView extends KeyboardView { public TranslatorKeyboardView(Context context, AttributeSet attrs) { super(context, attrs); - mTranslator = ((HLCompiler) context.getApplicationContext()).getTranslator(); + mTranslator = ((GFTranslator) context.getApplicationContext()).getTranslator(); } public TranslatorKeyboardView(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); - mTranslator = ((HLCompiler) context.getApplicationContext()).getTranslator(); + mTranslator = ((GFTranslator) context.getApplicationContext()).getTranslator(); } private PopupWindow mLanguagesPopup = null; -- cgit v1.2.3