From 356e9fbe388457166f154f6b17a1b3707e791a37 Mon Sep 17 00:00:00 2001
From: Jo Grimstad <jo@literacyapp.org>
Date: Mon, 30 Jan 2017 02:18:48 +0300
Subject: [PATCH 1/2] #362 Select number after hearing pronunciation

---
 app/src/main/AndroidManifest.xml              |   3 +
 .../content/task/LetterGraphemeActivity.java  |  29 -----
 .../content/task/NumberGraphemeActivity.java  |  35 +-----
 .../content/task/SelectLetterActivity.java    |   3 +
 .../content/task/SelectNumberActivity.java    | 112 +++++++++---------
 .../res/layout/activity_select_letter.xml     |   2 +-
 .../res/layout/activity_select_number.xml     |   6 +-
 7 files changed, 69 insertions(+), 121 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c2cea6e..dc5f1e7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -58,6 +58,9 @@
         <activity
             android:name=".content.task.SelectLetterActivity"
             android:screenOrientation="fullSensor" />
+        <activity
+            android:name=".content.task.SelectNumberActivity"
+            android:screenOrientation="fullSensor" />
         <activity
             android:name=".content.task.StarActivity"
             android:screenOrientation="fullSensor" />
diff --git a/app/src/main/java/org/literacyapp/content/task/LetterGraphemeActivity.java b/app/src/main/java/org/literacyapp/content/task/LetterGraphemeActivity.java
index b58c14b..870c7dd 100644
--- a/app/src/main/java/org/literacyapp/content/task/LetterGraphemeActivity.java
+++ b/app/src/main/java/org/literacyapp/content/task/LetterGraphemeActivity.java
@@ -16,9 +16,7 @@
 import org.literacyapp.LiteracyApplication;
 import org.literacyapp.R;
 import org.literacyapp.dao.AudioDao;
-import org.literacyapp.dao.JoinVideosWithLettersDao;
 import org.literacyapp.dao.LetterDao;
-import org.literacyapp.dao.VideoDao;
 import org.literacyapp.model.content.Letter;
 import org.literacyapp.model.content.multimedia.Audio;
 import org.literacyapp.util.MediaPlayerHelper;
@@ -35,8 +33,6 @@ public class LetterGraphemeActivity extends AppCompatActivity {
 
     private LetterDao letterDao;
     private AudioDao audioDao;
-    private VideoDao videoDao;
-    private JoinVideosWithLettersDao joinVideosWithLettersDao;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -52,8 +48,6 @@ protected void onCreate(Bundle savedInstanceState) {
         LiteracyApplication literacyApplication = (LiteracyApplication) getApplicationContext();
         letterDao = literacyApplication.getDaoSession().getLetterDao();
         audioDao = literacyApplication.getDaoSession().getAudioDao();
-        videoDao = literacyApplication.getDaoSession().getVideoDao();
-        joinVideosWithLettersDao = literacyApplication.getDaoSession().getJoinVideosWithLettersDao();
     }
 
     @Override
@@ -89,29 +83,6 @@ public void onClick(View view) {
             public void onClick(View view) {
                 Log.i(getClass().getName(), "onClick");
 
-//                // Look up video(s) containing letter
-//                List<Video> videosContainingLetter = new ArrayList<Video>();
-//                List<JoinVideosWithLetters> joinVideosWithLettersList = joinVideosWithLettersDao.queryBuilder()
-//                        .where(JoinVideosWithLettersDao.Properties.LetterId.eq(letter.getId()))
-//                        .list();
-//                Log.d(getClass().getName(), "joinVideosWithLettersList.size(): " + joinVideosWithLettersList.size());
-//                if (!joinVideosWithLettersList.isEmpty()) {
-//                    for (JoinVideosWithLetters joinVideosWithLetters : joinVideosWithLettersList) {
-//                        Video video = videoDao.load(joinVideosWithLetters.getVideoId());
-//                        Log.d(getClass().getName(), "Adding video with id " + video.getId());
-//                        videosContainingLetter.add(video);
-//                    }
-//                }
-//                Log.d(getClass().getName(), "videosContainingLetter.size(): " + videosContainingLetter.size());
-//                if (!videosContainingLetter.isEmpty()) {
-//                    // Redirect to video(s)
-//                    Intent intent = new Intent(getApplicationContext(), VideoActivity.class);
-//                    int randomIndex = (int) (Math.random() * videosContainingLetter.size());
-//                    Video video = videosContainingLetter.get(randomIndex); // TODO: iterate all videos
-//                    intent.putExtra(VideoActivity.EXTRA_KEY_VIDEO_ID, video.getId());
-//                    startActivity(intent);
-//                }
-
                 Intent intent = new Intent(getApplicationContext(), SelectLetterActivity.class);
                 intent.putExtra("letter", letter.getText());
                 startActivity(intent);
diff --git a/app/src/main/java/org/literacyapp/content/task/NumberGraphemeActivity.java b/app/src/main/java/org/literacyapp/content/task/NumberGraphemeActivity.java
index d73f09d..9f195e2 100644
--- a/app/src/main/java/org/literacyapp/content/task/NumberGraphemeActivity.java
+++ b/app/src/main/java/org/literacyapp/content/task/NumberGraphemeActivity.java
@@ -16,20 +16,14 @@
 import org.literacyapp.LiteracyApplication;
 import org.literacyapp.R;
 import org.literacyapp.dao.AudioDao;
-import org.literacyapp.dao.JoinVideosWithNumbersDao;
 import org.literacyapp.dao.NumberDao;
-import org.literacyapp.dao.VideoDao;
 import org.literacyapp.model.content.Number;
 import org.literacyapp.model.content.multimedia.Audio;
-import org.literacyapp.model.content.multimedia.JoinVideosWithNumbers;
-import org.literacyapp.model.content.multimedia.Video;
 import org.literacyapp.util.MediaPlayerHelper;
 import org.literacyapp.util.MultimediaHelper;
 import org.literacyapp.util.TtsHelper;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
 
 public class NumberGraphemeActivity extends AppCompatActivity {
 
@@ -39,8 +33,6 @@ public class NumberGraphemeActivity extends AppCompatActivity {
 
     private NumberDao numberDao;
     private AudioDao audioDao;
-    private VideoDao videoDao;
-    private JoinVideosWithNumbersDao joinVideosWithNumbersDao;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -56,8 +48,6 @@ protected void onCreate(Bundle savedInstanceState) {
         LiteracyApplication literacyApplication = (LiteracyApplication) getApplicationContext();
         numberDao = literacyApplication.getDaoSession().getNumberDao();
         audioDao = literacyApplication.getDaoSession().getAudioDao();
-        videoDao = literacyApplication.getDaoSession().getVideoDao();
-        joinVideosWithNumbersDao = literacyApplication.getDaoSession().getJoinVideosWithNumbersDao();
     }
 
     @Override
@@ -93,28 +83,9 @@ public void onClick(View view) {
             public void onClick(View view) {
                 Log.i(getClass().getName(), "onClick");
 
-                // Look up video(s) containing number
-                List<Video> videosContainingNumber = new ArrayList<Video>();
-                List<JoinVideosWithNumbers> joinVideosWithNumbersList = joinVideosWithNumbersDao.queryBuilder()
-                        .where(JoinVideosWithNumbersDao.Properties.NumberId.eq(number.getId()))
-                        .list();
-                Log.d(getClass().getName(), "joinVideosWithNumbersList.size(): " + joinVideosWithNumbersList.size());
-                if (!joinVideosWithNumbersList.isEmpty()) {
-                    for (JoinVideosWithNumbers joinVideosWithNumbers : joinVideosWithNumbersList) {
-                        Video video = videoDao.load(joinVideosWithNumbers.getVideoId());
-                        Log.d(getClass().getName(), "Adding video with id " + video.getId());
-                        videosContainingNumber.add(video);
-                    }
-                }
-                Log.d(getClass().getName(), "videosContainingNumber.size(): " + videosContainingNumber.size());
-                if (!videosContainingNumber.isEmpty()) {
-                    // Redirect to video(s)
-                    Intent intent = new Intent(getApplicationContext(), VideoActivity.class);
-                    int randomIndex = (int) (Math.random() * videosContainingNumber.size());
-                    Video video = videosContainingNumber.get(randomIndex); // TODO: iterate all videos
-                    intent.putExtra(VideoActivity.EXTRA_KEY_VIDEO_ID, video.getId());
-                    startActivity(intent);
-                }
+                Intent intent = new Intent(getApplicationContext(), SelectNumberActivity.class);
+                intent.putExtra("number", number.getValue());
+                startActivity(intent);
 
                 finish();
             }
diff --git a/app/src/main/java/org/literacyapp/content/task/SelectLetterActivity.java b/app/src/main/java/org/literacyapp/content/task/SelectLetterActivity.java
index 23322a7..76dda0d 100644
--- a/app/src/main/java/org/literacyapp/content/task/SelectLetterActivity.java
+++ b/app/src/main/java/org/literacyapp/content/task/SelectLetterActivity.java
@@ -258,6 +258,9 @@ public void onClick(View view) {
                     Video video = videosContainingLetter.get(randomIndex); // TODO: iterate all videos
                     intent.putExtra(VideoActivity.EXTRA_KEY_VIDEO_ID, video.getId());
                     startActivity(intent);
+                } else {
+                    Intent loadingIntent = new Intent(getApplicationContext(), LoadingActivity.class);
+                    startActivity(loadingIntent);
                 }
 
                 finish();
diff --git a/app/src/main/java/org/literacyapp/content/task/SelectNumberActivity.java b/app/src/main/java/org/literacyapp/content/task/SelectNumberActivity.java
index 921b034..3c77897 100644
--- a/app/src/main/java/org/literacyapp/content/task/SelectNumberActivity.java
+++ b/app/src/main/java/org/literacyapp/content/task/SelectNumberActivity.java
@@ -17,14 +17,14 @@
 import org.literacyapp.LiteracyApplication;
 import org.literacyapp.R;
 import org.literacyapp.dao.AudioDao;
-import org.literacyapp.dao.JoinVideosWithLettersDao;
-import org.literacyapp.dao.LetterDao;
+import org.literacyapp.dao.JoinVideosWithNumbersDao;
+import org.literacyapp.dao.NumberDao;
 import org.literacyapp.dao.VideoDao;
 import org.literacyapp.logic.CurriculumHelper;
 import org.literacyapp.model.Student;
-import org.literacyapp.model.content.Letter;
+import org.literacyapp.model.content.Number;
 import org.literacyapp.model.content.multimedia.Audio;
-import org.literacyapp.model.content.multimedia.JoinVideosWithLetters;
+import org.literacyapp.model.content.multimedia.JoinVideosWithNumbers;
 import org.literacyapp.model.content.multimedia.Video;
 import org.literacyapp.util.MediaPlayerHelper;
 import org.literacyapp.util.MultimediaHelper;
@@ -43,17 +43,17 @@ public class SelectNumberActivity extends AppCompatActivity {
 
     private ImageButton nextButton;
 
-    private LetterDao letterDao;
+    private NumberDao numberDao;
     private AudioDao audioDao;
     private VideoDao videoDao;
-    private JoinVideosWithLettersDao joinVideosWithLettersDao;
+    private JoinVideosWithNumbersDao joinVideosWithNumbersDao;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         Log.i(getClass().getName(), "onCreate");
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.activity_select_letter);
+        setContentView(R.layout.activity_select_number);
 
         rippleBackground = (RippleBackground) findViewById(R.id.rippleBackground);
         listenButton = (Button) findViewById(R.id.listenButton);
@@ -63,10 +63,10 @@ protected void onCreate(Bundle savedInstanceState) {
         nextButton = (ImageButton) findViewById(R.id.nextButton);
 
         LiteracyApplication literacyApplication = (LiteracyApplication) getApplicationContext();
-        letterDao = literacyApplication.getDaoSession().getLetterDao();
+        numberDao = literacyApplication.getDaoSession().getNumberDao();
         audioDao = literacyApplication.getDaoSession().getAudioDao();
         videoDao = literacyApplication.getDaoSession().getVideoDao();
-        joinVideosWithLettersDao = literacyApplication.getDaoSession().getJoinVideosWithLettersDao();
+        joinVideosWithNumbersDao = literacyApplication.getDaoSession().getJoinVideosWithNumbersDao();
     }
 
     @Override
@@ -74,30 +74,30 @@ protected void onStart() {
         Log.i(getClass().getName(), "onStart");
         super.onStart();
 
-        String letterExtra = getIntent().getStringExtra("letter");
-        Log.i(getClass().getName(), "letterExtra: " + letterExtra);
+        int numberExtra = getIntent().getIntExtra("number", -1);
+        Log.i(getClass().getName(), "numberExtra: " + numberExtra);
 
-        final Letter letter = letterDao.queryBuilder()
-                .where(LetterDao.Properties.Text.eq(letterExtra))
+        final Number number = numberDao.queryBuilder()
+                .where(NumberDao.Properties.Value.eq(numberExtra))
                 .unique();
-        Log.i(getClass().getName(), "letter: " + letter);
+        Log.i(getClass().getName(), "number: " + number);
 
         Student student = null;
         // TODO: get current student
-        List<Letter> availableLetters = new CurriculumHelper(getApplicationContext()).getAvailableLetters(student);
-        ArrayList<String> availableLettersStringArrayList = new ArrayList<>();
-        for (Letter availableLetter : availableLetters) {
-            availableLettersStringArrayList.add(availableLetter.getText());
+        List<Number> availableNumbers = new CurriculumHelper(getApplicationContext()).getAvailableNumbers(student);
+        ArrayList<Integer> availableNumbersArrayList = new ArrayList<>();
+        for (Number availableNumber : availableNumbers) {
+            availableNumbersArrayList.add(availableNumber.getValue());
         }
-        Log.i(getClass().getName(), "availableLettersStringArrayList: " + availableLettersStringArrayList);
-        availableLettersStringArrayList.remove(letter.getText());
-        Log.i(getClass().getName(), "availableLettersStringArrayList (after removing current letter): " + availableLettersStringArrayList);
-        int randomIndex = (int) (Math.random() * availableLettersStringArrayList.size());
-        String wrongLetterAlternative = availableLettersStringArrayList.get(randomIndex);
-        Log.i(getClass().getName(), "wrongLetterAlternative: " + wrongLetterAlternative);
+        Log.i(getClass().getName(), "availableNumbersArrayList: " + availableNumbersArrayList);
+        availableNumbersArrayList.remove(number.getValue());
+        Log.i(getClass().getName(), "availableNumbersArrayList (after removing current number): " + availableNumbersArrayList);
+        int randomIndex = (int) (Math.random() * availableNumbersArrayList.size());
+        int wrongNumberAlternative = availableNumbersArrayList.get(randomIndex);
+        Log.i(getClass().getName(), "wrongNumberAlternative: " + wrongNumberAlternative);
         boolean isAlt1Correct = (Math.random() > .5);
         if (isAlt1Correct) {
-            alt1Button.setText(letter.getText());
+            alt1Button.setText(String.valueOf(number.getValue()));
             alt1Button.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -108,7 +108,7 @@ public void onClick(View v) {
                     alt1Button.postDelayed(new Runnable() {
                         @Override
                         public void run() {
-                            playLetterSound(letter);
+                            playNumberSound(number);
 
                             rippleBackground.startRippleAnimation();
                             rippleBackground.postDelayed(new Runnable() {
@@ -123,7 +123,7 @@ public void run() {
                 }
             });
 
-            alt2Button.setText(wrongLetterAlternative);
+            alt2Button.setText(String.valueOf(wrongNumberAlternative));
             alt2Button.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -131,7 +131,7 @@ public void onClick(View v) {
                     alt2Button.postDelayed(new Runnable() {
                         @Override
                         public void run() {
-                            playLetterSound(letter);
+                            playNumberSound(number);
 
                             rippleBackground.startRippleAnimation();
                             rippleBackground.postDelayed(new Runnable() {
@@ -145,7 +145,7 @@ public void run() {
                 }
             });
         } else {
-            alt2Button.setText(letter.getText());
+            alt2Button.setText(String.valueOf(number.getValue()));
             alt2Button.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -156,7 +156,7 @@ public void onClick(View v) {
                     alt2Button.postDelayed(new Runnable() {
                         @Override
                         public void run() {
-                            playLetterSound(letter);
+                            playNumberSound(number);
 
                             rippleBackground.startRippleAnimation();
                             rippleBackground.postDelayed(new Runnable() {
@@ -171,7 +171,7 @@ public void run() {
                 }
             });
 
-            alt1Button.setText(wrongLetterAlternative);
+            alt1Button.setText(String.valueOf(wrongNumberAlternative));
             alt1Button.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -179,7 +179,7 @@ public void onClick(View v) {
                     alt1Button.postDelayed(new Runnable() {
                         @Override
                         public void run() {
-                            playLetterSound(letter);
+                            playNumberSound(number);
 
                             rippleBackground.startRippleAnimation();
                             rippleBackground.postDelayed(new Runnable() {
@@ -194,15 +194,15 @@ public void run() {
             });
         }
 
-//        MediaPlayerHelper.play(getApplicationContext(), R.raw.activity_instruction_letter_identification);
-        MediaPlayer mediaPlayer = MediaPlayer.create(getApplicationContext(), R.raw.activity_instruction_letter_identification);
+//        MediaPlayerHelper.play(getApplicationContext(), R.raw.activity_instruction_number_identification);
+        MediaPlayer mediaPlayer = MediaPlayer.create(getApplicationContext(), R.raw.activity_instruction_number_identification);
         mediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
             @Override
             public void onCompletion(MediaPlayer mediaPlayer) {
                 Log.i(getClass().getName(), "mediaPlayer onCompletion");
                 mediaPlayer.release();
 
-                playLetterSound(letter);
+                playNumberSound(number);
 
                 rippleBackground.startRippleAnimation();
                 rippleBackground.postDelayed(new Runnable() {
@@ -220,7 +220,7 @@ public void run() {
             public void onClick(View v) {
                 Log.i(getClass().getName(), "listenButton onClick");
 
-                playLetterSound(letter);
+                playNumberSound(number);
 
                 rippleBackground.startRippleAnimation();
                 rippleBackground.postDelayed(new Runnable() {
@@ -237,25 +237,25 @@ public void run() {
             public void onClick(View view) {
                 Log.i(getClass().getName(), "onClick");
 
-                // Look up video(s) containing letter
-                List<Video> videosContainingLetter = new ArrayList<Video>();
-                List<JoinVideosWithLetters> joinVideosWithLettersList = joinVideosWithLettersDao.queryBuilder()
-                        .where(JoinVideosWithLettersDao.Properties.LetterId.eq(letter.getId()))
+                // Look up video(s) containing number
+                List<Video> videosContainingNumber = new ArrayList<Video>();
+                List<JoinVideosWithNumbers> joinVideosWithNumbersList = joinVideosWithNumbersDao.queryBuilder()
+                        .where(JoinVideosWithNumbersDao.Properties.NumberId.eq(number.getId()))
                         .list();
-                Log.d(getClass().getName(), "joinVideosWithLettersList.size(): " + joinVideosWithLettersList.size());
-                if (!joinVideosWithLettersList.isEmpty()) {
-                    for (JoinVideosWithLetters joinVideosWithLetters : joinVideosWithLettersList) {
-                        Video video = videoDao.load(joinVideosWithLetters.getVideoId());
+                Log.d(getClass().getName(), "joinVideosWithNumbersList.size(): " + joinVideosWithNumbersList.size());
+                if (!joinVideosWithNumbersList.isEmpty()) {
+                    for (JoinVideosWithNumbers joinVideosWithNumbers : joinVideosWithNumbersList) {
+                        Video video = videoDao.load(joinVideosWithNumbers.getVideoId());
                         Log.d(getClass().getName(), "Adding video with id " + video.getId());
-                        videosContainingLetter.add(video);
+                        videosContainingNumber.add(video);
                     }
                 }
-                Log.d(getClass().getName(), "videosContainingLetter.size(): " + videosContainingLetter.size());
-                if (!videosContainingLetter.isEmpty()) {
+                Log.d(getClass().getName(), "videosContainingNumber.size(): " + videosContainingNumber.size());
+                if (!videosContainingNumber.isEmpty()) {
                     // Redirect to video(s)
                     Intent intent = new Intent(getApplicationContext(), VideoActivity.class);
-                    int randomIndex = (int) (Math.random() * videosContainingLetter.size());
-                    Video video = videosContainingLetter.get(randomIndex); // TODO: iterate all videos
+                    int randomIndex = (int) (Math.random() * videosContainingNumber.size());
+                    Video video = videosContainingNumber.get(randomIndex); // TODO: iterate all videos
                     intent.putExtra(VideoActivity.EXTRA_KEY_VIDEO_ID, video.getId());
                     startActivity(intent);
                 } else {
@@ -268,13 +268,13 @@ public void onClick(View view) {
         });
     }
 
-    private void playLetterSound(Letter letter) {
-        Log.i(getClass().getName(), "playLetterSound");
+    private void playNumberSound(Number number) {
+        Log.i(getClass().getName(), "playNumberSound");
 
         // Look up corresponding Audio
-        Log.d(getClass().getName(), "Looking up \"letter_sound_" + letter.getText() + "\"");
+        Log.d(getClass().getName(), "Looking up \"digit_" + number.getValue() + "\"");
         final Audio audio = audioDao.queryBuilder()
-                .where(AudioDao.Properties.Transcription.eq("letter_sound_" + letter.getText()))
+                .where(AudioDao.Properties.Transcription.eq("digit_" + number.getValue()))
                 .unique();
         Log.i(getClass().getName(), "audio: " + audio);
         if (audio != null) {
@@ -292,18 +292,18 @@ public void onCompletion(MediaPlayer mediaPlayer) {
             mediaPlayer.start();
         } else {
             // Audio not found. Fall-back to application resource.
-            String audioFileName = "letter_sound_" + letter.getText();
+            String audioFileName = "digit_" + number.getValue();
             int resourceId = getResources().getIdentifier(audioFileName, "raw", getPackageName());
             try {
                 if (resourceId != 0) {
                     MediaPlayerHelper.play(getApplicationContext(), resourceId);
                 } else {
                     // Fall-back to TTS
-                    TtsHelper.speak(getApplicationContext(), letter.getText());
+                    TtsHelper.speak(getApplicationContext(), number.getWord().getText());
                 }
             } catch (Resources.NotFoundException e) {
                 // Fall-back to TTS
-                TtsHelper.speak(getApplicationContext(), letter.getText());
+                TtsHelper.speak(getApplicationContext(), number.getWord().getText());
             }
         }
     }
diff --git a/app/src/main/res/layout/activity_select_letter.xml b/app/src/main/res/layout/activity_select_letter.xml
index 045314e..9d97f09 100644
--- a/app/src/main/res/layout/activity_select_letter.xml
+++ b/app/src/main/res/layout/activity_select_letter.xml
@@ -7,7 +7,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".content.task.VisemeActivity">
+    tools:context=".content.task.SelectLetterActivity">
 
     <LinearLayout
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_select_number.xml b/app/src/main/res/layout/activity_select_number.xml
index 045314e..b405480 100644
--- a/app/src/main/res/layout/activity_select_number.xml
+++ b/app/src/main/res/layout/activity_select_number.xml
@@ -7,7 +7,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".content.task.VisemeActivity">
+    tools:context=".content.task.SelectNumberActivity">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -49,14 +49,14 @@
                 android:id="@+id/alt1Button"
                 android:layout_width="256dp"
                 android:layout_height="256dp"
-                android:text="a"
+                android:text="1"
                 android:textSize="96sp"
                 android:textAllCaps="false" />
             <Button
                 android:id="@+id/alt2Button"
                 android:layout_width="256dp"
                 android:layout_height="256dp"
-                android:text="i"
+                android:text="2"
                 android:textSize="96sp"
                 android:textAllCaps="false" />
         </LinearLayout>

From 3459e5d7e380cfd25cb62fc57ee63fbe5370b0cb Mon Sep 17 00:00:00 2001
From: Jo Grimstad <jo@literacyapp.org>
Date: Mon, 30 Jan 2017 02:21:36 +0300
Subject: [PATCH 2/2] Release 1.4.1

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index e5c2043..31450d4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,7 +10,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 23
         versionCode 1004001
-        versionName "1.4.1-SNAPSHOT"
+        versionName "1.4.1"
 
 //        jackOptions {
 //            enabled true