Merge branch 'dev'

tkrajina · Mar 14, 2017 · b7e85b1 · b7e85b1
2 parents a5fd016 + c0d4a0d
commit b7e85b1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/...sentencesapp/src/main/java/info/puzz/a10000sentences/activities/SentenceQuizActivity.java b/...sentencesapp/src/main/java/info/puzz/a10000sentences/activities/SentenceQuizActivity.java
@@ -4,6 +4,7 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.databinding.DataBindingUtil;
+import android.media.AudioManager;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -155,6 +156,7 @@ public void onClick(View view) {
         });
 
         adjustFontSize();
+        setVolumeControlStream(AudioManager.STREAM_MUSIC);
     }
 
     private void setupAnswerButtons() {

diff --git a/10000sentencesapp/src/main/java/info/puzz/a10000sentences/logic/StatsService.java b/10000sentencesapp/src/main/java/info/puzz/a10000sentences/logic/StatsService.java
@@ -140,7 +140,7 @@ public int getStreakDays(int maxDays) {
         long startFrom = c.getTimeInMillis();
         // Do not start from 0 here because the current date can still change:
         for (int i = 0; i < maxDays; i++) {
-            long from = startFrom - TimeUnit.DAYS.toMillis(i + 2);
+            long from = startFrom - TimeUnit.DAYS.toMillis(i + 1);
             long to = from + TimeUnit.DAYS.toMillis(1);
             int count = new Select()
                     .from(SentenceHistory.class)

diff --git a/10000sentencesapp/src/main/res/layout/activity_sentence_quiz.xml b/10000sentencesapp/src/main/res/layout/activity_sentence_quiz.xml
@@ -54,6 +54,7 @@
                         <com.joanzapata.iconify.widget.IconTextView
                             android:id="@+id/target_sentence"
                             android:textColor="@color/colorPrimaryDark"
+                            android:textIsSelectable="true"
                             android:shadowDx="3"
                             android:shadowDy="3"
                             android:shadowRadius="1"