diff --git a/src/ui/android/AndroidManifest.xml b/src/ui/android/AndroidManifest.xml index ab9dc4e7e..459ea601c 100644 --- a/src/ui/android/AndroidManifest.xml +++ b/src/ui/android/AndroidManifest.xml @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/src/ui/android/res/drawable/second_person_best_utterance_bg.xml b/src/ui/android/res/drawable/second_person_best_utterance_bg.xml new file mode 100644 index 000000000..9eb02aef1 --- /dev/null +++ b/src/ui/android/res/drawable/second_person_best_utterance_bg.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/src/ui/android/res/drawable/second_person_chunk_utterance_bg.xml b/src/ui/android/res/drawable/second_person_chunk_utterance_bg.xml new file mode 100644 index 000000000..d10d67122 --- /dev/null +++ b/src/ui/android/res/drawable/second_person_chunk_utterance_bg.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/src/ui/android/res/drawable/second_person_utterance_bg.xml b/src/ui/android/res/drawable/second_person_utterance_bg.xml index 4acf07c67..e07cc10b3 100644 --- a/src/ui/android/res/drawable/second_person_utterance_bg.xml +++ b/src/ui/android/res/drawable/second_person_utterance_bg.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/src/ui/android/res/layout/second_person_best_utterance.xml b/src/ui/android/res/layout/second_person_best_utterance.xml new file mode 100644 index 000000000..58d2d76a8 --- /dev/null +++ b/src/ui/android/res/layout/second_person_best_utterance.xml @@ -0,0 +1,12 @@ + + diff --git a/src/ui/android/res/layout/second_person_chunk_utterance.xml b/src/ui/android/res/layout/second_person_chunk_utterance.xml new file mode 100644 index 000000000..6810f32da --- /dev/null +++ b/src/ui/android/res/layout/second_person_chunk_utterance.xml @@ -0,0 +1,12 @@ + + diff --git a/src/ui/android/src/org/grammaticalframework/ui/android/ConversationView.java b/src/ui/android/src/org/grammaticalframework/ui/android/ConversationView.java index 9c046858b..96bcbabb9 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/ConversationView.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/ConversationView.java @@ -94,9 +94,31 @@ public class ConversationView extends ScrollView { }); } - public void addSecondPersonUtterance(CharSequence text) { - TextView view = (TextView) - mInflater.inflate(R.layout.second_person_utterance, mContent, false); + public CharSequence addSecondPersonUtterance(CharSequence text) { + + // parse by chunks, marked by *, red colour + TextView view ; + if (text.charAt(0) == '*') { + view = (TextView) + mInflater.inflate(R.layout.second_person_chunk_utterance, mContent, false) ; + text = text.subSequence(2, text.length()) ; + } + // parse error or unknown translations (in []) present, red colour + else if (text.toString().contains("parse error:") || text.toString().contains("[")) { + view = (TextView) + mInflater.inflate(R.layout.second_person_chunk_utterance, mContent, false) ; + } + // parse by domain grammar, marked by +, green colour + else if (text.charAt(0) == '+') { + view = (TextView) + mInflater.inflate(R.layout.second_person_best_utterance, mContent, false) ; + text = text.subSequence(2, text.length()) ; + } + // parse by resource grammar, no mark, yellow colour + else + view = (TextView) + mInflater.inflate(R.layout.second_person_utterance, mContent, false); + view.setText(text); mContent.addView(view); post(new Runnable() { @@ -104,6 +126,7 @@ public class ConversationView extends ScrollView { fullScroll(FOCUS_DOWN); } }); + return text ; } public void updateLastUtterance(CharSequence text, Object lexicon) { 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 f75f82cf4..2653b77ec 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java @@ -280,8 +280,8 @@ public class MainActivity extends Activity { private void outputText(String text) { if (DBG) Log.d(TAG, "Speaking: " + text); - mConversationView.addSecondPersonUtterance(text); - mTts.speak(getTargetLanguageCode(), text); + CharSequence text2 = mConversationView.addSecondPersonUtterance(text); + mTts.speak(getTargetLanguageCode(), text2.toString()); } private class SpeechInputListener implements ASR.Listener { 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 747942679..b7bb53199 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/Translator.java @@ -29,7 +29,7 @@ public class Translator { private static final String TAG = "Translator"; - // /* + /* // old @@ -47,22 +47,22 @@ public class Translator { new Language("sv-SE", "Swedish", "ParseSwe", R.xml.qwerty), new Language("fi-FI", "Finnish", "ParseFin", R.xml.qwerty), }; - // */ + */ - /* + // /* // new // TODO: allow changing - private String mGrammar = "TransEngFinSwe.pgf"; + private String mGrammar = "App.pgf" ; // TODO: build dynamically? private Language[] mLanguages = { - new Language("en-US", "English", "NDTransEng", R.xml.qwerty), - // new Language("cmn-Hans-CN", "Chinese", "ParseChi", R.xml.qwerty), - new Language("sv-SE", "Swedish", "NDTransSwe", R.xml.qwerty), - new Language("fi-FI", "Finnish", "NDTransFin", R.xml.qwerty), + new Language("en-US", "English", "AppEng", R.xml.qwerty), + new Language("cmn-Hans-CN", "Chinese", "AppChi", R.xml.qwerty), + new Language("sv-SE", "Swedish", "AppSwe", R.xml.qwerty), + new Language("fi-FI", "Finnish", "AppFin", R.xml.qwerty), }; - */ + // */ private Context mContext; @@ -318,6 +318,7 @@ public class Translator { } public List lookupMorpho(String sentence) { + Log.e(TAG, "lookupMorpho " + getSourceConcr()); return getSourceConcr().lookupMorpho(sentence); }