Merge branch 'release/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

README.md

@@ -54,6 +54,7 @@ source.
 [![Habit strength][screen3th]][screen3]
 [![Habit history and streaks][screen4th]][screen4]
 [![Widgets][screen5th]][screen5]
+[![Night mode][screen6th]][screen6]
 
 ## Installing
 
@@ -71,7 +72,8 @@ contribute, even if you are not a software developer.
 * **Report bugs, suggest features.** The easiest way to contribute is to simply
   use the app and let us know if you find any problems or have any suggestions
   to improve it. You can either use the link inside the app, or open an issue
-  at GitHub.
+  at GitHub. If you would like to receive the newest versions of the app
+  earlier than everyone else, [join our open beta on Google Play][beta].
 
 * **Spread the word.** If you like the app, share it with your family, friends
   and colleagues. You can also rate and review the app on Google Play Store, to help
@@ -105,14 +107,17 @@ contribute, even if you are not a software developer.
 [screen3]: screenshots/original/uhabits3.png
 [screen4]: screenshots/original/uhabits4.png
 [screen5]: screenshots/original/uhabits5.png
+[screen6]: screenshots/original/uhabits6.png
 [screen1th]: screenshots/thumbs/uhabits1.png
 [screen2th]: screenshots/thumbs/uhabits2.png
 [screen3th]: screenshots/thumbs/uhabits3.png
 [screen4th]: screenshots/thumbs/uhabits4.png
 [screen5th]: screenshots/thumbs/uhabits5.png
+[screen6th]: screenshots/thumbs/uhabits6.png
 [poedit]: https://poeditor.com/join/project/8DWX5pfjS0
 [playstore]: https://play.google.com/store/apps/details?id=org.isoron.uhabits
 [releases]: https://github.com/iSoron/uhabits/releases
 [fdroid]: http://f-droid.org/app/org.isoron.uhabits
 [dev-guide]: https://github.com/iSoron/uhabits/wiki/Developer-guidelines
 [build]: https://github.com/iSoron/uhabits/wiki/Developer-guidelines#building
+[beta]: https://play.google.com/apps/testing/org.isoron.uhabits

app/build.gradle

@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         applicationId "org.isoron.uhabits"
         minSdkVersion 15
         targetSdkVersion 23
 
-        buildConfigField "Integer", "databaseVersion", "13"
+        buildConfigField "Integer", "databaseVersion", "14"
         buildConfigField "String", "databaseFilename", "\"uhabits.db\""
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -32,18 +32,31 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:23.1.1'
+    compile 'com.android.support:support-v4:23.3.0'
+    compile 'com.android.support:appcompat-v7:23.3.0'
+    compile 'com.android.support:design:23.3.0'
+    compile 'com.android.support:preference-v14:23.3.0'
     compile 'com.github.paolorotolo:appintro:3.4.0'
     compile 'org.apmem.tools:layouts:1.10@aar'
     compile 'com.opencsv:opencsv:3.7'
     compile project(':libs:drag-sort-listview:library')
     compile files('libs/ActiveAndroid.jar')
 
-    androidTestCompile 'com.android.support:support-annotations:23.1.1'
-    androidTestCompile 'com.android.support.test:runner:0.4.1'
-    androidTestCompile 'com.android.support.test:rules:0.4.1'
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
-    androidTestCompile 'com.android.support.test.espresso:espresso-intents:2.2.1'
+    androidTestCompile 'com.android.support:support-annotations:23.3.0'
+    androidTestCompile 'com.android.support.test:runner:0.5'
+    androidTestCompile 'com.android.support.test:rules:0.5'
+
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.1') {
+        exclude group: 'com.android.support'
+    }
+
+    androidTestCompile('com.android.support.test.espresso:espresso-intents:2.2.1') {
+        exclude group: 'com.android.support'
+    }
+
+    androidTestCompile('com.android.support.test.espresso:espresso-contrib:2.2.1') {
+        exclude group: 'com.android.support'
+    }
 }
 
 

app/src/androidTest/java/org/isoron/uhabits/BaseTest.java

@@ -25,6 +25,7 @@
 import android.support.test.InstrumentationRegistry;
 
 import org.isoron.uhabits.helpers.DateHelper;
+import org.isoron.uhabits.helpers.UIHelper;
 import org.isoron.uhabits.tasks.BaseTask;
 import org.junit.Before;
 
@@ -50,6 +51,7 @@ public void setup()
         targetContext = InstrumentationRegistry.getTargetContext();
         testContext = InstrumentationRegistry.getContext();
 
+        UIHelper.setFixedTheme(R.style.AppBaseTheme);
         DateHelper.setFixedLocalTime(FIXED_LOCAL_TIME);
     }
 

app/src/androidTest/java/org/isoron/uhabits/ui/MainActivityActions.java

@@ -20,6 +20,7 @@
 package org.isoron.uhabits.ui;
 
 import android.support.test.espresso.NoMatchingViewException;
+import android.support.test.espresso.contrib.RecyclerViewActions;
 
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.models.Habit;
@@ -31,20 +32,23 @@
 
 import static android.support.test.espresso.Espresso.onData;
 import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.Espresso.openContextualActionModeOverflowMenu;
 import static android.support.test.espresso.Espresso.pressBack;
 import static android.support.test.espresso.action.ViewActions.click;
 import static android.support.test.espresso.action.ViewActions.longClick;
 import static android.support.test.espresso.action.ViewActions.replaceText;
 import static android.support.test.espresso.assertion.ViewAssertions.matches;
 import static android.support.test.espresso.matcher.RootMatchers.isPlatformPopup;
 import static android.support.test.espresso.matcher.ViewMatchers.Visibility.VISIBLE;
+import static android.support.test.espresso.matcher.ViewMatchers.hasDescendant;
 import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
 import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription;
 import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static android.support.test.espresso.matcher.ViewMatchers.withParent;
 import static android.support.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
@@ -168,13 +172,13 @@ public static void deleteHabit(String name)
     public static void deleteHabits(List<String> names)
     {
         selectHabits(names);
-        clickActionModeMenuItem(R.string.delete);
+        clickMenuItem(R.string.delete);
         onView(withText("OK"))
                 .perform(click());
         assertHabitsDontExist(names);
     }
 
-    public static void clickActionModeMenuItem(int stringId)
+    public static void clickMenuItem(int stringId)
     {
         try
         {
@@ -188,9 +192,34 @@ public static void clickActionModeMenuItem(int stringId)
             }
             catch(Exception e2)
             {
-                openContextualActionModeOverflowMenu();
-                onView(withText(stringId)).perform(click());
+                clickHiddenMenuItem(stringId);
             }
         }
     }
+
+    private static void clickHiddenMenuItem(int stringId)
+    {
+        try
+        {
+            // Try the ActionMode overflow menu first
+            onView(allOf(withContentDescription("More options"), withParent(withParent(
+                    withClassName(containsString("Action")))))).perform(click());
+        }
+        catch (Exception e1)
+        {
+            // Try the toolbar overflow menu
+            onView(allOf(withContentDescription("More options"), withParent(withParent(
+                    withClassName(containsString("Toolbar")))))).perform(click());
+        }
+
+        onView(withText(stringId)).perform(click());
+    }
+
+    public static void clickSettingsItem(String text)
+    {
+        onView(withClassName(containsString("RecyclerView")))
+                .perform(RecyclerViewActions.actionOnItem(
+                        hasDescendant(withText(containsString(text))),
+                        click()));
+    }
 }

app/src/androidTest/java/org/isoron/uhabits/ui/MainTest.java

@@ -45,7 +45,6 @@
 
 import static android.support.test.espresso.Espresso.onData;
 import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
 import static android.support.test.espresso.Espresso.pressBack;
 import static android.support.test.espresso.action.ViewActions.click;
 import static android.support.test.espresso.action.ViewActions.longClick;
@@ -61,23 +60,22 @@
 import static android.support.test.espresso.matcher.ViewMatchers.isRoot;
 import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
 import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.startsWith;
-import static org.isoron.uhabits.ui.HabitMatchers.isPreferenceWithText;
 import static org.isoron.uhabits.ui.HabitMatchers.withName;
 import static org.isoron.uhabits.ui.HabitViewActions.clickAtRandomLocations;
 import static org.isoron.uhabits.ui.HabitViewActions.toggleAllCheckmarks;
 import static org.isoron.uhabits.ui.MainActivityActions.addHabit;
 import static org.isoron.uhabits.ui.MainActivityActions.assertHabitExists;
 import static org.isoron.uhabits.ui.MainActivityActions.assertHabitsDontExist;
 import static org.isoron.uhabits.ui.MainActivityActions.assertHabitsExist;
-import static org.isoron.uhabits.ui.MainActivityActions.clickActionModeMenuItem;
+import static org.isoron.uhabits.ui.MainActivityActions.clickMenuItem;
+import static org.isoron.uhabits.ui.MainActivityActions.clickSettingsItem;
 import static org.isoron.uhabits.ui.MainActivityActions.deleteHabit;
 import static org.isoron.uhabits.ui.MainActivityActions.deleteHabits;
 import static org.isoron.uhabits.ui.MainActivityActions.selectHabit;
@@ -152,20 +150,16 @@ public void testArchiveHabits()
 
         selectHabits(names);
 
-        clickActionModeMenuItem(R.string.archive);
+        clickMenuItem(R.string.archive);
         assertHabitsDontExist(names);
 
-        openActionBarOverflowOrOptionsMenu(targetContext);
-        onView(withText(R.string.show_archived))
-                .perform(click());
+        clickMenuItem(R.string.show_archived);
 
         assertHabitsExist(names);
         selectHabits(names);
-        clickActionModeMenuItem(R.string.unarchive);
+        clickMenuItem(R.string.unarchive);
 
-        openActionBarOverflowOrOptionsMenu(targetContext);
-        onView(withText(R.string.show_archived))
-                .perform(click());
+        clickMenuItem(R.string.show_archived);
 
         assertHabitsExist(names);
         deleteHabits(names);
@@ -227,7 +221,7 @@ public void testEditHabit()
                 .onChildView(withId(R.id.label))
                 .perform(longClick());
 
-        clickActionModeMenuItem(R.string.edit);
+        clickMenuItem(R.string.edit);
 
         String modifiedName = "Modified " + new Random().nextInt(10000);
         typeHabitData(modifiedName, "", "1", "1");
@@ -238,7 +232,7 @@ public void testEditHabit()
         assertHabitExists(modifiedName);
 
         selectHabit(modifiedName);
-        clickActionModeMenuItem(R.string.color_picker_default_title);
+        clickMenuItem(R.string.color_picker_default_title);
         pressBack();
 
         deleteHabit(modifiedName);
@@ -272,8 +266,7 @@ public void testEditHistory()
     @Test
     public void testSettings()
     {
-        openActionBarOverflowOrOptionsMenu(targetContext);
-        onView(withText(R.string.settings)).perform(click());
+        clickMenuItem(R.string.settings);
     }
 
     /**
@@ -282,8 +275,7 @@ public void testSettings()
     @Test
     public void testAbout()
     {
-        openActionBarOverflowOrOptionsMenu(targetContext);
-        onView(withText(R.string.about)).perform(click());
+        clickMenuItem(R.string.about);
         onView(isRoot()).perform(swipeUp());
     }
 
@@ -293,8 +285,7 @@ public void testAbout()
     @Test
     public void testHelp()
     {
-        openActionBarOverflowOrOptionsMenu(targetContext);
-        onView(withText(R.string.help)).perform(click());
+        clickMenuItem(R.string.help);
         intended(hasAction(Intent.ACTION_VIEW));
     }
 
@@ -307,20 +298,18 @@ public void testExportImportDB()
     {
         String name = addHabit();
 
-        openActionBarOverflowOrOptionsMenu(targetContext);
-        onView(withText(R.string.settings)).perform(click());
+        clickMenuItem(R.string.settings);
 
         String date = DateHelper.getBackupDateFormat().format(DateHelper.getLocalTime());
         date = date.substring(0, date.length() - 2);
 
-        onData(isPreferenceWithText("Export full backup")).perform(click());
+        clickSettingsItem("Export full backup");
         intended(hasAction(Intent.ACTION_SEND));
 
         deleteHabit(name);
 
-        openActionBarOverflowOrOptionsMenu(targetContext);
-        onView(withText(R.string.settings)).perform(click());
-        onData(isPreferenceWithText("Import data")).perform(click());
+        clickMenuItem(R.string.settings);
+        clickSettingsItem("Import data");
 
         onData(allOf(is(instanceOf(String.class)), startsWith("Backups")))
                 .perform(click());
@@ -339,9 +328,8 @@ public void testExportImportDB()
     public void testExportCSV()
     {
         addHabit();
-        openActionBarOverflowOrOptionsMenu(targetContext);
-        onView(withText(R.string.settings)).perform(click());
-        onData(isPreferenceWithText("Export as CSV")).perform(click());
+        clickMenuItem(R.string.settings);
+        clickSettingsItem("Export as CSV");
         intended(hasAction(Intent.ACTION_SEND));
     }
 
@@ -351,9 +339,8 @@ public void testExportCSV()
     @Test
     public void testGenerateBugReport()
     {
-        openActionBarOverflowOrOptionsMenu(targetContext);
-        onView(withText(R.string.settings)).perform(click());
-        onData(isPreferenceWithText("Generate bug report")).perform(click());
+        clickMenuItem(R.string.settings);
+        clickSettingsItem("Generate bug report");
         intended(hasAction(Intent.ACTION_SENDTO));
     }
 }

app/src/androidTest/java/org/isoron/uhabits/unit/HabitFixtures.java

@@ -23,7 +23,6 @@
 import android.support.annotation.Nullable;
 import android.util.Log;
 
-import org.isoron.uhabits.helpers.ColorHelper;
 import org.isoron.uhabits.helpers.DatabaseHelper;
 import org.isoron.uhabits.helpers.DateHelper;
 import org.isoron.uhabits.models.Habit;
@@ -66,7 +65,7 @@ public static Habit createEmptyHabit()
         Habit habit = new Habit();
         habit.name = "Meditate";
         habit.description = "Did you meditate this morning?";
-        habit.color = ColorHelper.palette[3];
+        habit.color = 3;
         habit.freqNum = 1;
         habit.freqDen = 1;
         habit.save();
@@ -78,7 +77,7 @@ public static Habit createLongHabit()
         Habit habit = createEmptyHabit();
         habit.freqNum = 3;
         habit.freqDen = 7;
-        habit.color = ColorHelper.palette[4];
+        habit.color = 4;
         habit.save();
 
         long day = DateHelper.millisecondsInOneDay;