summaryrefslogtreecommitdiff
path: root/src/ui/android
diff options
context:
space:
mode:
authorkr.angelov <kr.angelov@gmail.com>2014-04-24 08:03:29 +0000
committerkr.angelov <kr.angelov@gmail.com>2014-04-24 08:03:29 +0000
commit6808c3c98213c35d24ae4166004a3591fc0aa4b4 (patch)
tree5646ddb4847d52286c2f2a60adc911ff4abdc02b /src/ui/android
parent81c2184923c9adf66539c4038eeaa305bea2188d (diff)
a small fix to avoid showing * in some translations
Diffstat (limited to 'src/ui/android')
-rw-r--r--src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java10
-rw-r--r--src/ui/android/src/org/grammaticalframework/ui/android/ConversationView.java10
2 files changed, 10 insertions, 10 deletions
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 3fd5788f9..fee767b31 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/AlternativesActivity.java
@@ -200,17 +200,17 @@ public class AlternativesActivity extends ListActivity {
phrase = phrase.substring(2);
}
- // parse error or unknown translations (in []) present, darkest red color
- else if (phrase.contains("parse error:") || phrase.contains("[")) {
- descView.setBackgroundDrawable(getResources().getDrawable(R.drawable.second_person_worst_utterance_bg));
- }
-
// parse by chunks, marked by *, red color
else if (phrase.charAt(0) == '*') {
descView.setBackgroundDrawable(getResources().getDrawable(R.drawable.second_person_chunk_utterance_bg));
phrase = phrase.substring(2);
}
+ // parse error or unknown translations (in []) present, darkest red color
+ else if (phrase.contains("parse error:") || phrase.contains("[")) {
+ descView.setBackgroundDrawable(getResources().getDrawable(R.drawable.second_person_worst_utterance_bg));
+ }
+
// parse by domain grammar, marked by +, green color
else if (phrase.charAt(0) == '+') {
descView.setBackgroundDrawable(getResources().getDrawable(R.drawable.second_person_best_utterance_bg));
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 b36555706..5800498fe 100644
--- a/src/ui/android/src/org/grammaticalframework/ui/android/ConversationView.java
+++ b/src/ui/android/src/org/grammaticalframework/ui/android/ConversationView.java
@@ -132,17 +132,17 @@ public class ConversationView extends ScrollView {
target = target.subSequence(2, target.length()) ;
}
- // parse error or unknown translations (in []) present, darkest red color
- else if (target.toString().contains("parse error:") || target.toString().contains("[")) {
- view.setBackgroundDrawable(getResources().getDrawable(R.drawable.second_person_worst_utterance_bg));
- }
-
// parse by chunks, marked by *, red color
else if (target.charAt(0) == '*') {
view.setBackgroundDrawable(getResources().getDrawable(R.drawable.second_person_chunk_utterance_bg));
target = target.subSequence(2, target.length()) ;
}
+ // parse error or unknown translations (in []) present, darkest red color
+ else if (target.toString().contains("parse error:") || target.toString().contains("[")) {
+ view.setBackgroundDrawable(getResources().getDrawable(R.drawable.second_person_worst_utterance_bg));
+ }
+
// parse by domain grammar, marked by +, green color
else if (target.charAt(0) == '+') {
view.setBackgroundDrawable(getResources().getDrawable(R.drawable.second_person_best_utterance_bg));