From c032781095d14352ac12b3a4f4ce19ca43473122 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Tue, 22 Apr 2014 11:53:16 +0000 Subject: rename DGTranslator to Human Language Compiler. Added a new logo --- src/ui/android/.project | 2 +- src/ui/android/AndroidManifest.xml | 4 ++-- src/ui/android/hlc.svg | 10 ++++++++++ src/ui/android/res/drawable-hdpi/dg_short.png | Bin 2310 -> 0 bytes src/ui/android/res/drawable-hdpi/ic_app.png | Bin 0 -> 1544 bytes src/ui/android/res/drawable-mdpi/dg_short.png | Bin 1495 -> 0 bytes src/ui/android/res/drawable-mdpi/ic_app.png | Bin 0 -> 1162 bytes src/ui/android/res/drawable-xhdpi/dg_short.png | Bin 2948 -> 0 bytes src/ui/android/res/drawable-xhdpi/ic_app.png | Bin 0 -> 2284 bytes src/ui/android/res/drawable-xxhdpi/dg_short.png | Bin 4403 -> 0 bytes src/ui/android/res/drawable-xxhdpi/ic_app.png | Bin 0 -> 3683 bytes src/ui/android/res/values/strings.xml | 2 +- .../ui/android/AlternativesActivity.java | 2 +- .../grammaticalframework/ui/android/DGTranslator.java | 16 ---------------- .../org/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 ++-- 19 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 src/ui/android/hlc.svg delete mode 100644 src/ui/android/res/drawable-hdpi/dg_short.png create mode 100644 src/ui/android/res/drawable-hdpi/ic_app.png delete mode 100644 src/ui/android/res/drawable-mdpi/dg_short.png create mode 100644 src/ui/android/res/drawable-mdpi/ic_app.png delete mode 100644 src/ui/android/res/drawable-xhdpi/dg_short.png create mode 100644 src/ui/android/res/drawable-xhdpi/ic_app.png delete mode 100644 src/ui/android/res/drawable-xxhdpi/dg_short.png create mode 100644 src/ui/android/res/drawable-xxhdpi/ic_app.png delete mode 100644 src/ui/android/src/org/grammaticalframework/ui/android/DGTranslator.java create mode 100644 src/ui/android/src/org/grammaticalframework/ui/android/HLCompiler.java (limited to 'src/ui/android') diff --git a/src/ui/android/.project b/src/ui/android/.project index 229b4b1c7..bde0bfac1 100644 --- a/src/ui/android/.project +++ b/src/ui/android/.project @@ -1,6 +1,6 @@ - DGTranslator + HLCompiler diff --git a/src/ui/android/AndroidManifest.xml b/src/ui/android/AndroidManifest.xml index 7f9bbe99e..1327aa12a 100644 --- a/src/ui/android/AndroidManifest.xml +++ b/src/ui/android/AndroidManifest.xml @@ -13,9 +13,9 @@ + android:theme="@style/AppTheme" android:name="HLCompiler"> diff --git a/src/ui/android/hlc.svg b/src/ui/android/hlc.svg new file mode 100644 index 000000000..e61e41c19 --- /dev/null +++ b/src/ui/android/hlc.svg @@ -0,0 +1,10 @@ + + + + + + Digital Grammar Logo + + + diff --git a/src/ui/android/res/drawable-hdpi/dg_short.png b/src/ui/android/res/drawable-hdpi/dg_short.png deleted file mode 100644 index e46987046..000000000 Binary files a/src/ui/android/res/drawable-hdpi/dg_short.png and /dev/null differ diff --git a/src/ui/android/res/drawable-hdpi/ic_app.png b/src/ui/android/res/drawable-hdpi/ic_app.png new file mode 100644 index 000000000..6760bc456 Binary files /dev/null and b/src/ui/android/res/drawable-hdpi/ic_app.png differ diff --git a/src/ui/android/res/drawable-mdpi/dg_short.png b/src/ui/android/res/drawable-mdpi/dg_short.png deleted file mode 100644 index 76ca3c8af..000000000 Binary files a/src/ui/android/res/drawable-mdpi/dg_short.png and /dev/null differ diff --git a/src/ui/android/res/drawable-mdpi/ic_app.png b/src/ui/android/res/drawable-mdpi/ic_app.png new file mode 100644 index 000000000..99aaf67bc Binary files /dev/null and b/src/ui/android/res/drawable-mdpi/ic_app.png differ diff --git a/src/ui/android/res/drawable-xhdpi/dg_short.png b/src/ui/android/res/drawable-xhdpi/dg_short.png deleted file mode 100644 index 97ace9ecc..000000000 Binary files a/src/ui/android/res/drawable-xhdpi/dg_short.png and /dev/null differ diff --git a/src/ui/android/res/drawable-xhdpi/ic_app.png b/src/ui/android/res/drawable-xhdpi/ic_app.png new file mode 100644 index 000000000..a6d509f71 Binary files /dev/null and b/src/ui/android/res/drawable-xhdpi/ic_app.png differ diff --git a/src/ui/android/res/drawable-xxhdpi/dg_short.png b/src/ui/android/res/drawable-xxhdpi/dg_short.png deleted file mode 100644 index c829baa9d..000000000 Binary files a/src/ui/android/res/drawable-xxhdpi/dg_short.png and /dev/null differ diff --git a/src/ui/android/res/drawable-xxhdpi/ic_app.png b/src/ui/android/res/drawable-xxhdpi/ic_app.png new file mode 100644 index 000000000..d51650e25 Binary files /dev/null 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 f1a679244..de23c3be0 100644 --- a/src/ui/android/res/values/strings.xml +++ b/src/ui/android/res/values/strings.xml @@ -1,6 +1,6 @@ - Language Compiler + Human Language Compiler 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 ca956b58f..80bf19e7e 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 = ((DGTranslator) getApplicationContext()).getTranslator(); + mTranslator = ((HLCompiler) getApplicationContext()).getTranslator(); mShowLanguageView = (LanguageSelector) findViewById(R.id.show_language); mShowLanguageView.setLanguages(mTranslator.getAvailableLanguages()); diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/DGTranslator.java b/src/ui/android/src/org/grammaticalframework/ui/android/DGTranslator.java deleted file mode 100644 index 7141041d5..000000000 --- a/src/ui/android/src/org/grammaticalframework/ui/android/DGTranslator.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.grammaticalframework.ui.android; - -import android.app.Application; - -public class DGTranslator 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 new file mode 100644 index 000000000..7141041d5 --- /dev/null +++ b/src/ui/android/src/org/grammaticalframework/ui/android/HLCompiler.java @@ -0,0 +1,16 @@ +package org.grammaticalframework.ui.android; + +import android.app.Application; + +public class DGTranslator 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 fb84fa6cb..2bb0db0b6 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java @@ -133,7 +133,7 @@ public class MainActivity extends Activity { mTts = new TTS(this); - mTranslator = ((DGTranslator) getApplicationContext()).getTranslator(); + mTranslator = ((HLCompiler) 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 6b01ef67c..70f6d1e5d 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 = ((DGTranslator) getApplicationContext()).getTranslator(); + mTranslator = ((HLCompiler) 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 f3c41a52f..3eeb1be1e 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 = ((DGTranslator) context.getApplicationContext()).getTranslator(); + mTranslator = ((HLCompiler) 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 0c98f0827..8e05623f5 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 = ((DGTranslator) context.getApplicationContext()).getTranslator(); + mTranslator = ((HLCompiler) context.getApplicationContext()).getTranslator(); } public TranslatorKeyboardView(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); - mTranslator = ((DGTranslator) context.getApplicationContext()).getTranslator(); + mTranslator = ((HLCompiler) context.getApplicationContext()).getTranslator(); } private PopupWindow mLanguagesPopup = null; -- cgit v1.2.3