Merge remote-tracking branch 'origin/numerical' into dev

android/build.sh

@@ -71,12 +71,12 @@ build_apk() {
 
     if [ ! -z $RELEASE ]; then
         log_info "Building release APK"
-        ./gradlew assembleRelease
+        $GRADLE assembleRelease
         cp -v uhabits-android/build/outputs/apk/release/uhabits-android-release.apk build/loop-$VERSION-release.apk
     fi
 
     log_info "Building debug APK"
-    ./gradlew assembleDebug --stacktrace || fail
+    $GRADLE assembleDebug --stacktrace || fail
     cp -v uhabits-android/build/outputs/apk/debug/uhabits-android-debug.apk build/loop-$VERSION-debug.apk
 }
 

android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitFixtures.java

@@ -78,15 +78,49 @@ public class HabitFixtures
         return habit;
     }
 
+    public Habit createVeryLongHabit()
+    {
+        Habit habit = createEmptyHabit();
+        habit.setFrequency(new Frequency(1, 2));
+        habit.setColor(11);
+
+        Timestamp today = DateUtils.getToday();
+        int marks[] = {0, 3, 5, 6, 7, 10, 13, 14, 15, 18, 21, 22, 23, 24, 27, 28, 30, 31, 34, 37,
+                       39, 42, 43, 46, 47, 48, 51, 52, 54, 55, 57, 59, 62, 65, 68, 71, 73, 76, 79,
+                       80, 81, 83, 85, 86, 89, 90, 91, 94, 96, 98, 100, 103, 104, 106, 109, 111,
+                       112, 113, 115, 117, 120, 123, 126, 129, 132, 134, 136, 139, 141, 142, 145,
+                       148, 149, 151, 152, 154, 156, 157, 159, 161, 162, 163, 164, 166, 168, 170,
+                       172, 173, 174, 175, 176, 178, 180, 181, 184, 185, 188, 189, 190, 191, 194,
+                       195, 197, 198, 199, 200, 202, 205, 208, 211, 213, 215, 216, 218, 220, 222,
+                       223, 225, 227, 228, 230, 231, 232, 234, 235, 238, 241, 242, 244, 247, 250,
+                       251, 253, 254, 257, 260, 261, 263, 264, 266, 269, 272, 273, 276, 279, 281,
+                       284, 285, 288, 291, 292, 294, 296, 297, 299, 300, 301, 303, 306, 307, 308,
+                       309, 310, 313, 316, 319, 322, 324, 326, 329, 330, 332, 334, 335, 337, 338,
+                       341, 344, 345, 346, 347, 350, 352, 355, 358, 360, 361, 362, 363, 365, 368,
+                       371, 373, 374, 376, 379, 380, 382, 384, 385, 387, 389, 390, 392, 393, 395,
+                       396, 399, 401, 404, 407, 410, 411, 413, 414, 416, 417, 419, 420, 423, 424,
+                       427, 429, 431, 433, 436, 439, 440, 442, 445, 447, 450, 453, 454, 456, 459,
+                       460, 461, 464, 466, 468, 470, 473, 474, 475, 477, 479, 481, 482, 483, 486,
+                       489, 491, 493, 495, 497, 498, 500, 503, 504, 507, 510, 511, 512, 515, 518,
+                       519, 521, 522, 525, 528, 531, 532, 534, 537, 539, 541, 543, 544, 547, 550,
+                       551, 554, 556, 557, 560, 561, 564, 567, 568, 569, 570, 572, 575, 576, 579,
+                       582, 583, 584, 586, 589};
+
+        for (int mark : marks)
+            habit.getRepetitions().toggle(today.minus(mark));
+
+        return habit;
+    }
+
     public Habit createLongNumericalHabit()
     {
         Habit habit = modelFactory.buildHabit();
-        habit.setName("Take a walk");
+        habit.setName("Read");
-        habit.setQuestion("How many steps did you walk today?");
+        habit.setQuestion("How many pages did you walk today?");
         habit.setType(Habit.NUMBER_HABIT);
         habit.setTargetType(Habit.AT_LEAST);
         habit.setTargetValue(200.0);
-        habit.setUnit("steps");
+        habit.setUnit("pages");
         habitList.add(habit);
 
         Timestamp timestamp = DateUtils.getToday();

android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java

@@ -51,11 +51,12 @@ public class CheckmarkWidgetTest extends BaseViewTest
     {
         super.setUp();
         setTheme(R.style.WidgetTheme);
+        prefs.setWidgetOpacity(255);
 
-        habit = fixtures.createShortHabit();
+        habit = fixtures.createVeryLongHabit();
         checkmarks = habit.getCheckmarks();
         CheckmarkWidget widget = new CheckmarkWidget(targetContext, 0, habit);
-        view = convertToView(widget, 200, 250);
+        view = convertToView(widget, 150, 200);
 
         assertThat(checkmarks.getTodayValue(), equalTo(CHECKED_EXPLICITLY));
     }

android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java

@@ -47,8 +47,9 @@ public class FrequencyWidgetTest extends BaseViewTest
     {
         super.setUp();
         setTheme(R.style.WidgetTheme);
+        prefs.setWidgetOpacity(255);
 
-        habit = fixtures.createLongHabit();
+        habit = fixtures.createVeryLongHabit();
         FrequencyWidget widget = new FrequencyWidget(targetContext, 0, habit, Calendar.SUNDAY);
         view = convertToView(widget, 400, 400);
     }
@@ -59,9 +60,9 @@ public class FrequencyWidgetTest extends BaseViewTest
         assertWidgetProviderIsInstalled(FrequencyWidgetProvider.class);
     }
 
-//    @Test
+    @Test
-//    public void testRender() throws Exception
+    public void testRender() throws Exception
-//    {
+    {
-//        assertRenders(view, PATH + "render.png");
+        assertRenders(view, PATH + "render.png");
-//    }
+    }
 }

android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java

@@ -27,6 +27,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.utils.*;
 import org.junit.*;
 import org.junit.runner.*;
 
@@ -47,8 +48,9 @@ public class HistoryWidgetTest extends BaseViewTest
     {
         super.setUp();
         setTheme(R.style.WidgetTheme);
+        prefs.setWidgetOpacity(255);
 
-        habit = fixtures.createLongHabit();
+        habit = fixtures.createVeryLongHabit();
         HistoryWidget widget = new HistoryWidget(targetContext, 0, habit, Calendar.SUNDAY);
         view = convertToView(widget, 400, 400);
     }
@@ -59,9 +61,9 @@ public class HistoryWidgetTest extends BaseViewTest
         assertWidgetProviderIsInstalled(HistoryWidgetProvider.class);
     }
 
-//    @Test
+    @Test
-//    public void testRender() throws Exception
+    public void testRender() throws Exception
-//    {
+    {
-//        assertRenders(view, PATH + "render.png");
+        assertRenders(view, PATH + "render.png");
-//    }
+    }
 }

android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java

@@ -45,8 +45,9 @@ public class ScoreWidgetTest extends BaseViewTest
     {
         super.setUp();
         setTheme(R.style.WidgetTheme);
+        prefs.setWidgetOpacity(255);
 
-        habit = fixtures.createLongHabit();
+        habit = fixtures.createVeryLongHabit();
         ScoreWidget widget = new ScoreWidget(targetContext, 0, habit);
         view = convertToView(widget, 400, 400);
     }
@@ -57,9 +58,9 @@ public class ScoreWidgetTest extends BaseViewTest
         assertWidgetProviderIsInstalled(ScoreWidgetProvider.class);
     }
 
-//    @Test
+    @Test
-//    public void testRender() throws Exception
+    public void testRender() throws Exception
-//    {
+    {
-//        assertRenders(view, PATH + "render.png");
+        assertRenders(view, PATH + "render.png");
-//    }
+    }
 }

android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java

@@ -45,8 +45,9 @@ public class StreakWidgetTest extends BaseViewTest
     {
         super.setUp();
         setTheme(R.style.WidgetTheme);
+        prefs.setWidgetOpacity(255);
 
-        habit = fixtures.createLongHabit();
+        habit = fixtures.createVeryLongHabit();
         StreakWidget widget = new StreakWidget(targetContext, 0, habit);
         view = convertToView(widget, 400, 400);
     }
@@ -57,9 +58,9 @@ public class StreakWidgetTest extends BaseViewTest
         assertWidgetProviderIsInstalled(StreakWidgetProvider.class);
     }
 
-//    @Test
+    @Test
-//    public void testRender() throws Exception
+    public void testRender() throws Exception
-//    {
+    {
-//        assertRenders(view, PATH + "render.png");
+        assertRenders(view, PATH + "render.png");
-//    }
+    }
 }

android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/TargetWidgetTest.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ *
+ * This file is part of Loop Habit Tracker.
+ *
+ * Loop Habit Tracker is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Loop Habit Tracker is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.isoron.uhabits.widgets;
+
+import android.widget.*;
+
+import androidx.test.ext.junit.runners.*;
+import androidx.test.filters.*;
+
+import org.isoron.uhabits.*;
+import org.isoron.uhabits.core.models.*;
+import org.junit.*;
+import org.junit.runner.*;
+
+@RunWith(AndroidJUnit4.class)
+@MediumTest
+public class TargetWidgetTest extends BaseViewTest
+{
+    private static final String PATH = "widgets/TargetWidget/";
+
+    private Habit habit;
+
+    private FrameLayout view;
+
+    @Override
+    public void setUp()
+    {
+        super.setUp();
+        setTheme(R.style.WidgetTheme);
+        prefs.setWidgetOpacity(255);
+
+        habit = fixtures.createLongNumericalHabit();
+        habit.setColor(11);
+        TargetWidget widget = new TargetWidget(targetContext, 0, habit);
+        view = convertToView(widget, 400, 400);
+    }
+
+    @Test
+    public void testIsInstalled()
+    {
+        assertWidgetProviderIsInstalled(TargetWidgetProvider.class);
+    }
+
+    @Test
+    public void testRender() throws Exception
+    {
+        assertRenders(view, PATH + "render.png");
+    }
+}

android/uhabits-android/src/main/AndroidManifest.xml

@@ -100,6 +100,14 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".widgets.activities.NumericalHabitPickerDialog"
+            android:theme="@style/Theme.AppCompat.Light.Dialog">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+            </intent-filter>
+        </activity>
+
         <activity
             android:name=".activities.about.AboutActivity"
             android:label="@string/about">
@@ -198,7 +206,7 @@
 
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/widget_frequency_info" />
+                android:resource="@xml/widget_target_info" />
         </receiver>
 
         <receiver android:name=".receivers.ReminderReceiver">

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java

@@ -85,6 +85,8 @@ public class HistoryChart extends ScrollableChart
 
     private int reverseTextColor;
 
+    private int backgroundColor;
+
     private boolean isEditable;
 
     private String previousMonth;
@@ -383,7 +385,7 @@ public class HistoryChart extends ScrollableChart
                 pSquareBg.setColor(colors[0]);
                 pSquareFg.setColor(textColors[1]);
             }
-            else if(checkmark < target)
+            else if ((isNumerical && checkmark < target) || checkmark != CHECKED_EXPLICITLY)
             {
                 pSquareBg.setColor(colors[1]);
                 pSquareFg.setColor(textColors[2]);
@@ -400,7 +402,7 @@ public class HistoryChart extends ScrollableChart
 
         if (!isNumerical && checkmark == SKIPPED)
         {
-            pSquareBg.setColor(colors[0]);
+            pSquareBg.setColor(backgroundColor);
             pSquareBg.setStrokeWidth(columnWidth * 0.025f);
 
             canvas.save();
@@ -457,6 +459,8 @@ public class HistoryChart extends ScrollableChart
         int green = Color.green(primaryColor);
         int blue = Color.blue(primaryColor);
 
+        backgroundColor = res.getColor(R.attr.cardBgColor);
+
         if (isBackgroundTransparent)
         {
             colors = new int[3];

android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.kt

@@ -109,6 +109,7 @@ class CheckmarkButtonView(
             }
             val id = when (value) {
                 SKIPPED -> R.string.fa_skipped
+                CHECKED_IMPLICITLY -> R.string.fa_skipped
                 UNCHECKED -> R.string.fa_times
                 else -> R.string.fa_check
             }

android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/BooleanHabitPickerDialog.kt

@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2016-2020 Álinson Santos Xavier <isoron@gmail.com>
- *
- * This file is part of Loop Habit Tracker.
- *
- * Loop Habit Tracker is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Loop Habit Tracker is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.widgets.activities
-
-class BooleanHabitPickerDialog : HabitPickerDialog() {
-    override fun shouldHideNumerical() = true
-}

android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/activities/HabitPickerDialog.kt

@@ -30,6 +30,16 @@ import org.isoron.uhabits.core.preferences.*
 import org.isoron.uhabits.widgets.*
 import java.util.*
 
+class BooleanHabitPickerDialog : HabitPickerDialog() {
+    override fun shouldHideNumerical() = true
+    override fun getEmptyMessage() = R.string.no_boolean_habits
+}
+
+class NumericalHabitPickerDialog : HabitPickerDialog() {
+    override fun shouldHideBoolean() = true
+    override fun getEmptyMessage() = R.string.no_numerical_habits
+}
+
 open class HabitPickerDialog : Activity() {
 
     private var widgetId = 0
@@ -37,6 +47,8 @@ open class HabitPickerDialog : Activity() {
     private lateinit var widgetUpdater: WidgetUpdater
 
     protected open fun shouldHideNumerical() = false
+    protected open fun shouldHideBoolean() = false
+    protected open fun getEmptyMessage() = R.string.no_habits
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -52,10 +64,17 @@ open class HabitPickerDialog : Activity() {
         for (h in habitList) {
             if (h.isArchived) continue
             if (h.isNumerical and shouldHideNumerical()) continue
+            if (!h.isNumerical and shouldHideBoolean()) continue
             habitIds.add(h.id!!)
             habitNames.add(h.name)
         }
 
+        if (habitNames.isEmpty()) {
+            setContentView(R.layout.widget_empty_activity)
+            findViewById<TextView>(R.id.message).setText(getEmptyMessage())
+            return;
+        }
+
         setContentView(R.layout.widget_configure_activity)
         val listView = findViewById<ListView>(R.id.listView)
         val saveButton = findViewById<Button>(R.id.buttonSave)

android/uhabits-android/src/main/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetView.java

@@ -116,8 +116,8 @@ public class CheckmarkWidgetView extends HabitWidgetView {
         if (isNumerical) return NumberButtonViewKt.toShortString(checkmarkValue / 1000.0);
         switch (checkmarkState) {
             case Checkmark.CHECKED_EXPLICITLY:
-            case Checkmark.CHECKED_IMPLICITLY:
                 return getResources().getString(R.string.fa_check);
+            case Checkmark.CHECKED_IMPLICITLY:
             case Checkmark.SKIPPED:
                 return getResources().getString(R.string.fa_skipped);
             case Checkmark.UNCHECKED:

android/uhabits-android/src/main/res/layout/widget_empty_activity.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016-2020 Álinson Santos Xavier <isoron@gmail.com>
+  ~
+  ~ This file is part of Loop Habit Tracker.
+  ~
+  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by the
+  ~ Free Software Foundation, either version 3 of the License, or (at your
+  ~ option) any later version.
+  ~
+  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+  ~ more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License along
+  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/message"
+        android:layout_width="250dp"
+        android:layout_height="150dp"
+        android:textSize="@dimen/regularTextSize"
+        android:text="@string/no_habits"
+        android:gravity="center"
+        />
+
+</FrameLayout>

android/uhabits-android/src/main/res/values/strings.xml

@@ -195,4 +195,7 @@
     <string name="validation_cannot_be_blank">Cannot be blank</string>
     <string name="today">Today</string>
     <string name="enter">Enter</string>
+    <string name="no_habits">No habits found</string>
+    <string name="no_numerical_habits">No measurable habits found</string>
+    <string name="no_boolean_habits">No yes-or-no habits found</string>
 </resources>

android/uhabits-android/src/main/res/values/styles.xml

@@ -23,6 +23,7 @@
         <item name="android:dialogTheme">@style/Theme.AppCompat.Light.Dialog</item>
         <item name="android:alertDialogTheme">@style/Theme.AppCompat.Light.Dialog</item>
         <item name="android:navigationBarColor">?attr/colorPrimary</item>
+        <item name="android:itemBackground">?attr/highContrastReverseTextColor</item>
 
         <item name="windowActionModeOverlay">true</item>
         <item name="actionModeBackground">@color/blue_grey_700</item>

android/uhabits-android/src/main/res/xml/widget_frequency_info.xml

@@ -21,8 +21,8 @@
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
                     android:minHeight="80dp"
                     android:minWidth="80dp"
-                    android:minResizeWidth="40dp"
+                    android:minResizeWidth="80dp"
-                    android:minResizeHeight="40dp"
+                    android:minResizeHeight="80dp"
                     android:initialLayout="@layout/widget_graph"
                     android:previewImage="@drawable/widget_preview_frequency"
                     android:resizeMode="vertical|horizontal"

android/uhabits-android/src/main/res/xml/widget_history_info.xml

@@ -21,7 +21,7 @@
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
                     android:minHeight="80dp"
                     android:minWidth="80dp"
-                    android:minResizeWidth="40dp"
+                    android:minResizeWidth="80dp"
                     android:minResizeHeight="80dp"
                     android:initialLayout="@layout/widget_graph"
                     android:previewImage="@drawable/widget_preview_history"

android/uhabits-android/src/main/res/xml/widget_score_info.xml

@@ -21,7 +21,7 @@
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
                     android:minHeight="80dp"
                     android:minWidth="80dp"
-                    android:minResizeWidth="40dp"
+                    android:minResizeWidth="80dp"
                     android:minResizeHeight="80dp"
                     android:initialLayout="@layout/widget_graph"
                     android:previewImage="@drawable/widget_preview_score"

android/uhabits-android/src/main/res/xml/widget_streak_info.xml

@@ -21,8 +21,8 @@
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
                     android:minHeight="80dp"
                     android:minWidth="80dp"
-                    android:minResizeWidth="40dp"
+                    android:minResizeWidth="80dp"
-                    android:minResizeHeight="40dp"
+                    android:minResizeHeight="80dp"
                     android:initialLayout="@layout/widget_graph"
                     android:previewImage="@drawable/widget_preview_streaks"
                     android:resizeMode="vertical|horizontal"