Merge tag 'v1.5.0' into dev

Version 1.5.0

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+### 1.5.0 (May 15, 2016)
+
+* Add night mode, with AMOLED support
+* Backport material design to older devices
+* Display more information on statistics screen
+* Display score on main screen and checkmark widget
+* Make widgets react immediately to touch
+* Reschedule reminders after reboot
+* Pick first day of the week according to country
+* Add option to reverse order of days on main screen
+* Add option to change notification sounds
+* Add Catalan, Indonesian, Turkish, Ukrainian translations
+* Switch between Simplified/Traditional Chinese according to country
+
 ### 1.4.1 (April 9, 2016)
 
 * Show error message on widgets, instead of crashing

app/src/androidTest/java/org/isoron/uhabits/unit/views/HabitHistoryViewTest.java

@@ -89,7 +89,7 @@ public class HabitHistoryViewTest extends ViewTest
     public void tapDate_withEditableView() throws Throwable
     {
         view.setIsEditable(true);
-        tap(view, 360, 36); // today's square
+        tap(view, 340, 40); // today's square
         waitForAsyncTasks();
 
         long today = DateHelper.getStartOfToday();
@@ -103,8 +103,8 @@ public class HabitHistoryViewTest extends ViewTest
 
         view.setIsEditable(true);
         tap(view, 118, 13); // header
-        tap(view, 360, 60); // tomorrow's square
+        tap(view, 336, 60); // tomorrow's square
-        tap(view, 390, 60); // right axis
+        tap(view, 370, 60); // right axis
         waitForAsyncTasks();
 
         int actualCheckmarkValues[] = habit.checkmarks.getAllValues();
@@ -115,7 +115,7 @@ public class HabitHistoryViewTest extends ViewTest
     public void tapDate_withReadOnlyView() throws Throwable
     {
         view.setIsEditable(false);
-        tap(view, 360, 36);
+        tap(view, 340, 40); // today's square
         waitForAsyncTasks();
 
         long today = DateHelper.getStartOfToday();

app/src/main/AndroidManifest.xml

@@ -21,8 +21,8 @@
 <manifest
     package="org.isoron.uhabits"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="15"
+    android:versionCode="16"
-    android:versionName="1.4.1">
+    android:versionName="1.5.0">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
 

app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java

@@ -134,10 +134,9 @@ public class HabitHistoryView extends ScrollableDataView implements HabitDataVie
         setScrollerBucketSize((int) baseSize);
 
         squareSpacing = UIHelper.dpToPixels(getContext(), 1.0f);
-        float minTextSize = getResources().getDimension(R.dimen.tinyTextSize);
         float maxTextSize = getResources().getDimension(R.dimen.regularTextSize);
-        float textSize = height * 0.045f;
+        float textSize = height * 0.06f;
-        textSize = Math.max(Math.min(textSize, maxTextSize), minTextSize);
+        textSize = Math.min(textSize, maxTextSize);
 
         pSquareFg.setTextSize(textSize);
         pTextHeader.setTextSize(textSize);

app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java

@@ -151,10 +151,9 @@ public class HabitScoreView extends ScrollableDataView implements HabitDataView
     {
         if(height < 9) height = 200;
 
-        float minTextSize = getResources().getDimension(R.dimen.tinyTextSize);
+        float maxTextSize = getResources().getDimension(R.dimen.tinyTextSize);
-        float maxTextSize = getResources().getDimension(R.dimen.regularTextSize);
+        float textSize = height * 0.06f;
-        float textSize = height * 0.045f;
+        pText.setTextSize(Math.min(textSize, maxTextSize));
-        pText.setTextSize(Math.max(Math.min(textSize, maxTextSize), minTextSize));
         em = pText.getFontSpacing();
 
         footerHeight = (int)(3 * em);