diff options
| author | kr.angelov <kr.angelov@gmail.com> | 2014-04-03 14:22:44 +0000 |
|---|---|---|
| committer | kr.angelov <kr.angelov@gmail.com> | 2014-04-03 14:22:44 +0000 |
| commit | 3f990602527195f1a24414ba27a496a33eaf5936 (patch) | |
| tree | 66acb40548d8e2be0e7b74b06d14cdf096cc0ec9 /src | |
| parent | 6a8f271ba58988bed87607ecc625ca7a571bfc5c (diff) | |
added help view in the android app. The help itself is not very useful right now
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/android/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/ui/android/assets/help_content.html | 5 | ||||
| -rw-r--r-- | src/ui/android/res/menu/main.xml | 2 | ||||
| -rw-r--r-- | src/ui/android/res/values/strings.xml | 1 | ||||
| -rw-r--r-- | src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java | 4 | ||||
| -rw-r--r-- | src/ui/android/src/org/grammaticalframework/ui/android/Translator.java | 7 |
6 files changed, 13 insertions, 7 deletions
diff --git a/src/ui/android/AndroidManifest.xml b/src/ui/android/AndroidManifest.xml index 25c85c52b..0752ab2c9 100644 --- a/src/ui/android/AndroidManifest.xml +++ b/src/ui/android/AndroidManifest.xml @@ -26,6 +26,7 @@ </intent-filter> </activity> <activity android:name="LexicalEntryActivity"></activity> + <activity android:name="HelpActivity"></activity> <service android:name="TranslatorInputMethodService" android:permission="android.permission.BIND_INPUT_METHOD"> <intent-filter> diff --git a/src/ui/android/assets/help_content.html b/src/ui/android/assets/help_content.html new file mode 100644 index 000000000..8d0e37970 --- /dev/null +++ b/src/ui/android/assets/help_content.html @@ -0,0 +1,5 @@ +<html> + <body> + <p>Sorry, we can't help you</p> + </body> +</html> diff --git a/src/ui/android/res/menu/main.xml b/src/ui/android/res/menu/main.xml index 0f628e334..7f5a4c4f7 100644 --- a/src/ui/android/res/menu/main.xml +++ b/src/ui/android/res/menu/main.xml @@ -1,4 +1,6 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" > <item android:id="@+id/input_mode" android:title="@string/keyboard_input"/> + <item android:id="@+id/help" + android:title="@string/help"/> </menu> diff --git a/src/ui/android/res/values/strings.xml b/src/ui/android/res/values/strings.xml index 06303d412..768ef60a4 100644 --- a/src/ui/android/res/values/strings.xml +++ b/src/ui/android/res/values/strings.xml @@ -7,6 +7,7 @@ <string name="open_image">Opening</string> <string name="mic_input">Speech Input</string> <string name="keyboard_input">Keyboard Input</string> + <string name="help">Help</string> <string name="global_preferences_key">org.grammaticalframework.ui.android.GLOBAL_PREFERENCES</string> <!-- Labels on soft keys --> 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 ce8d16190..11cac6c25 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java @@ -185,6 +185,10 @@ public class MainActivity extends Activity { editor.commit(); return true; + case R.id.help: + Intent myIntent = new Intent(MainActivity.this, HelpActivity.class); + MainActivity.this.startActivity(myIntent); + return true; default: return super.onOptionsItemSelected(item); } diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java index 61e2437b4..c1fd3b485 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java @@ -2,8 +2,6 @@ package org.grammaticalframework.ui.android; import android.content.Context; import android.content.SharedPreferences; -import android.content.res.XmlResourceParser; -import android.text.TextUtils; import android.util.Log; import android.view.inputmethod.CompletionInfo; @@ -13,18 +11,13 @@ import org.grammaticalframework.pgf.FullFormEntry; import org.grammaticalframework.pgf.MorphoAnalysis; import org.grammaticalframework.pgf.PGF; import org.grammaticalframework.pgf.ParseError; -import org.xmlpull.v1.XmlPullParserException; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.Comparator; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.PriorityQueue; public class Translator { |