Merge pull request #547 from recheej/rechee/add_notes

Add Notes to Habits.

Author: iSoron

android/uhabits-android/build.gradle

@@ -87,6 +87,7 @@ dependencies {
     implementation "com.google.code.gson:gson:2.8.5"
     implementation "com.google.code.findbugs:jsr305:3.0.2"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KOTLIN_VERSION"
+    implementation "androidx.constraintlayout:constraintlayout:2.0.0-beta4"
 
     compileOnly "javax.annotation:jsr250-api:1.0"
     compileOnly "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION"

android/uhabits-android/src/androidTest/assets/views-v26/habits/show/NotesCard/render-empty-description.png

@@ -39,6 +39,7 @@
 public class BaseUserInterfaceTest
 {
     private static final String PKG = "org.isoron.uhabits";
+    public static final String EMPTY_DESCRIPTION_HABIT_NAME = "Read books";
 
     public static UiDevice device;
 
@@ -96,25 +97,29 @@ private void resetState() throws Exception
 
         Habit h1 = fixtures.createEmptyHabit();
         h1.setName("Wake up early");
-        h1.setDescription("Did you wake up early today?");
+        h1.setQuestion("Did you wake up early today?");
+        h1.setDescription("test description 1");
         h1.setColor(5);
         habitList.update(h1);
 
         Habit h2 = fixtures.createShortHabit();
         h2.setName("Track time");
-        h2.setDescription("Did you track your time?");
+        h2.setQuestion("Did you track your time?");
+        h2.setDescription("test description 2");
         h2.setColor(5);
         habitList.update(h2);
 
         Habit h3 = fixtures.createLongHabit();
         h3.setName("Meditate");
-        h3.setDescription("Did meditate today?");
+        h3.setQuestion("Did meditate today?");
+        h3.setDescription("test description 3");
         h3.setColor(10);
         habitList.update(h3);
 
         Habit h4 = fixtures.createEmptyHabit();
-        h4.setName("Read books");
-        h4.setDescription("Did you read books today?");
+        h4.setName(EMPTY_DESCRIPTION_HABIT_NAME);
+        h4.setQuestion("Did you read books today?");
+        h4.setDescription("");
         h4.setColor(2);
         habitList.update(h4);
     }

android/uhabits-android/src/androidTest/assets/views-v26/habits/show/NotesCard/render.png

@@ -52,7 +52,8 @@ public Habit createEmptyHabit(Long id)
     {
         Habit habit = modelFactory.buildHabit();
         habit.setName("Meditate");
-        habit.setDescription("Did you meditate this morning?");
+        habit.setQuestion("Did you meditate this morning?");
+        habit.setDescription("This is a test description");
         habit.setColor(5);
         habit.setFrequency(Frequency.DAILY);
         habit.setId(id);
@@ -81,7 +82,7 @@ public Habit createLongNumericalHabit()
     {
         Habit habit = modelFactory.buildHabit();
         habit.setName("Take a walk");
-        habit.setDescription("How many steps did you walk today?");
+        habit.setQuestion("How many steps did you walk today?");
         habit.setType(Habit.NUMBER_HABIT);
         habit.setTargetType(Habit.AT_LEAST);
         habit.setTargetValue(200.0);
@@ -103,7 +104,7 @@ public Habit createShortHabit()
     {
         Habit habit = modelFactory.buildHabit();
         habit.setName("Wake up early");
-        habit.setDescription("Did you wake up before 6am?");
+        habit.setQuestion("Did you wake up before 6am?");
         habit.setFrequency(new Frequency(2, 3));
         habitList.add(habit);
 

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

@@ -20,7 +20,6 @@
 package org.isoron.uhabits.acceptance;
 
 import androidx.test.filters.*;
-import androidx.test.runner.*;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
@@ -39,22 +38,33 @@
 public class HabitsTest extends BaseUserInterfaceTest
 {
     @Test
-    public void shouldCreateHabit() throws Exception
+    public void shouldCreateHabit() throws Exception {
+        shouldCreateHabit("this is a test description");
+    }
+
+    @Test
+    public void shouldCreateHabitBlankDescription() throws Exception {
+        shouldCreateHabit("");
+    }
+
+    private void shouldCreateHabit(String description) throws Exception
     {
         launchApp();
 
         verifyShowsScreen(LIST_HABITS);
         clickMenu(ADD);
 
         verifyShowsScreen(EDIT_HABIT);
-        typeName("Hello world");
+        String testName = "Hello world";
+        typeName(testName);
         typeQuestion("Did you say hello to the world today?");
+        typeDescription(description);
         pickFrequency("Every week");
         pickColor(5);
         clickSave();
 
         verifyShowsScreen(LIST_HABITS);
-        verifyDisplaysText("Hello world");
+        verifyDisplaysText(testName);
     }
 
     @Test
@@ -81,7 +91,16 @@ public void shouldDeleteHabit() throws Exception
     }
 
     @Test
-    public void shouldEditHabit() throws Exception
+    public void shouldEditHabit() throws Exception {
+        shouldEditHabit("this is a test description");
+    }
+
+    @Test
+    public void shouldEditHabitBlankDescription() throws Exception {
+        shouldEditHabit("");
+    }
+
+    private void shouldEditHabit(String description) throws Exception
     {
         launchApp();
 
@@ -92,6 +111,7 @@ public void shouldEditHabit() throws Exception
         verifyShowsScreen(EDIT_HABIT);
         typeName("Take a walk");
         typeQuestion("Did you take a walk today?");
+        typeDescription(description);
         clickSave();
 
         verifyShowsScreen(LIST_HABITS);
@@ -174,4 +194,12 @@ public void shouldHideCompleted() throws Exception
         verifyDisplaysText("Track time");
         verifyDisplaysText("Wake up early");
     }
+
+    @Test
+    public void shouldHideNotesCard() throws Exception
+    {
+        launchApp();
+        clickText(EMPTY_DESCRIPTION_HABIT_NAME);
+        verifyShowsScreen(SHOW_HABIT, false);
+    }
 }

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

@@ -19,14 +19,16 @@
 
 package org.isoron.uhabits.acceptance.steps;
 
+import android.view.View;
+
 import androidx.annotation.StringRes;
 import androidx.test.espresso.*;
 import androidx.test.espresso.contrib.*;
 import androidx.test.uiautomator.*;
-import androidx.appcompat.widget.*;
 
 import androidx.recyclerview.widget.RecyclerView;
 
+import org.hamcrest.Matcher;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.habits.list.*;
@@ -153,7 +155,11 @@ public enum Screen
         LIST_HABITS, SHOW_HABIT, EDIT_HABIT
     }
 
-    public static void verifyShowsScreen(Screen screen)
+    public static void verifyShowsScreen(Screen screen) {
+        verifyShowsScreen(screen, true);
+    }
+
+    public static void verifyShowsScreen(Screen screen, boolean notesCardVisibleExpected)
     {
         switch(screen)
         {
@@ -163,10 +169,14 @@ public static void verifyShowsScreen(Screen screen)
                 break;
 
             case SHOW_HABIT:
+                Matcher<View> noteCardViewMatcher = notesCardVisibleExpected ? isDisplayed() :
+                        withEffectiveVisibility(Visibility.GONE);
                 onView(withId(R.id.subtitleCard)).check(matches(isDisplayed()));
+                onView(withId(R.id.notesCard)).check(matches(noteCardViewMatcher));
                 break;
 
             case EDIT_HABIT:
+                onView(withId(R.id.tvQuestion)).check(matches(isDisplayed()));
                 onView(withId(R.id.tvDescription)).check(matches(isDisplayed()));
                 break;
         }

android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java

@@ -55,7 +55,12 @@ public static void typeName(String name)
 
     public static void typeQuestion(String name)
     {
-        typeTextWithId(R.id.tvDescription, name);
+        typeTextWithId(R.id.tvQuestion, name);
+    }
+
+    public static void typeDescription(String description)
+    {
+        typeTextWithId(R.id.tvDescription, description);
     }
 
     public static void setReminder()

android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2016 Álinson Santos Xavier <[email protected]>
+ *
+ * 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.activities.habits.show.views;
+
+import android.view.LayoutInflater;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.MediumTest;
+
+import org.isoron.uhabits.BaseViewTest;
+import org.isoron.uhabits.R;
+import org.isoron.uhabits.core.models.Habit;
+import org.isoron.uhabits.core.models.Reminder;
+import org.isoron.uhabits.core.models.WeekdayList;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@MediumTest
+public class NotesCardTest extends BaseViewTest
+{
+    public static final String PATH = "habits/show/NotesCard/";
+
+    private NotesCard view;
+
+    private Habit habit;
+
+    @Before
+    @Override
+    public void setUp()
+    {
+        super.setUp();
+
+        habit = fixtures.createLongHabit();
+        habit.setReminder(new Reminder(8, 30, WeekdayList.EVERY_DAY));
+
+        view = LayoutInflater
+            .from(targetContext)
+            .inflate(R.layout.show_habit, null)
+            .findViewById(R.id.notesCard);
+
+        view.setHabit(habit);
+        view.refreshData();
+
+        measureView(view, 800, 200);
+    }
+
+    @Test
+    public void testRender() throws Exception
+    {
+        assertRenders(view, PATH + "render.png");
+    }
+
+    @Test
+    public void testRenderEmptyDescription() throws Exception
+    {
+        habit.setDescription("");
+        view.refreshData();
+        assertRenders(view, PATH + "render-empty-description.png");
+    }
+}

android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java

@@ -49,7 +49,7 @@ public void setUp()
         habit = fixtures.createLongHabit();
         habit.setReminder(new Reminder(8, 30, WeekdayList.EVERY_DAY));
 
-        view = (SubtitleCard) LayoutInflater
+        view = LayoutInflater
             .from(targetContext)
             .inflate(R.layout.show_habit, null)
             .findViewById(R.id.subtitleCard);