msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

a better solution for restoring the state of the main activity when the device is flipped. This one doesn't require hacks.

Browse Source
This commit is contained in:
kr.angelov
2014-04-24 18:50:20 +00:00
parent 54a77ee7d9
commit 1aab6f57ce
2 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ui/android/res/layout/first_person_utterance.xml
View File

@@ -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"

31
src/ui/android/src/org/grammaticalframework/ui/android/ConversationView.java
View File

@@ -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");
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");
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);
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);
String translation = secondPersonUtterances.get(i);
Object alternatives = translationAlternatives.get(i);
addSecondPersonUtterance(text, translation, alternatives);
i++;
}
}
});
i++;
}
}
}