diff options
| author | kr.angelov <kr.angelov@gmail.com> | 2014-04-24 18:50:20 +0000 |
|---|---|---|
| committer | kr.angelov <kr.angelov@gmail.com> | 2014-04-24 18:50:20 +0000 |
| commit | 2c9906336d93cb9dea531147e1e80745e0550cd7 (patch) | |
| tree | 6872ff70bc4bf3a5f4c904c8dd58d76d54617427 /src/ui | |
| parent | e891e99725956dc7802dcff67112432790af6450 (diff) | |
a better solution for restoring the state of the main activity when the device is flipped. This one doesn't require hacks.
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/android/res/layout/first_person_utterance.xml | 1 | ||||
| -rw-r--r-- | src/ui/android/src/org/grammaticalframework/ui/android/ConversationView.java | 37 |
2 files changed, 16 insertions, 22 deletions
diff --git a/src/ui/android/res/layout/first_person_utterance.xml b/src/ui/android/res/layout/first_person_utterance.xml index be3b0eb08..97171149c 100644 --- a/src/ui/android/res/layout/first_person_utterance.xml +++ b/src/ui/android/res/layout/first_person_utterance.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <EditText xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/input_text" android:layout_height="wrap_content" android:layout_width="wrap_content" android:layout_marginBottom="16dp" 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 5800498fe..a69821528 100644 --- a/src/ui/android/src/org/grammaticalframework/ui/android/ConversationView.java +++ b/src/ui/android/src/org/grammaticalframework/ui/android/ConversationView.java @@ -205,26 +205,21 @@ public class ConversationView extends ScrollView { } public void restoreConversation(Bundle state) { - final ArrayList<String> firstPersonUtterances = state.getStringArrayList("first_person_uterances"); - final ArrayList<String> secondPersonUtterances = state.getStringArrayList("second_person_uterances"); - final ArrayList<Object> translationAlternatives= (ArrayList<Object>) state.getSerializable("translation_alternatives"); - - post(new Runnable() { - @Override - public void run() { - int i = 0; - while (i < firstPersonUtterances.size() && - i < Math.min(secondPersonUtterances.size(), translationAlternatives.size())) { - String text = firstPersonUtterances.get(i); - addFirstPersonUtterance(text, false); - - String translation = secondPersonUtterances.get(i); - Object alternatives = translationAlternatives.get(i); - addSecondPersonUtterance(text, translation, alternatives); - - i++; - } - } - }); + ArrayList<String> firstPersonUtterances = state.getStringArrayList("first_person_uterances"); + ArrayList<String> secondPersonUtterances = state.getStringArrayList("second_person_uterances"); + ArrayList<Object> translationAlternatives= (ArrayList<Object>) state.getSerializable("translation_alternatives"); + + int i = 0; + while (i < firstPersonUtterances.size() && + i < Math.min(secondPersonUtterances.size(), translationAlternatives.size())) { + String text = firstPersonUtterances.get(i); + addFirstPersonUtterance(text, false); + + String translation = secondPersonUtterances.get(i); + Object alternatives = translationAlternatives.get(i); + addSecondPersonUtterance(text, translation, alternatives); + + i++; + } } } |
