Merge branch 'dev' into 2kotlin-androidbase

android/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java

@@ -878,7 +878,7 @@ public class TimePickerDialog extends AppCompatDialogFragment implements OnValue
             // When the first digit is 2, the second digit may be 4-5.
             secondDigit = new Node(k4, k5);
             firstDigit.addChild(secondDigit);
-            // We must now be followd by the last minute digit. E.g. 2:40, 2:53.
+            // We must now be followed by the last minute digit. E.g. 2:40, 2:53.
             secondDigit.addChild(minuteSecondDigit);
 
             // The first digit may be 3-9.

android/build.sh

@@ -50,10 +50,6 @@ log_info() {
 }
 
 fail() {
-	if [ ! -z ${AVD_NAME} ]; then
-		stop_emulator
-		stop_gradle_daemon
-	fi
     log_error "BUILD FAILED"
     exit 1
 }
@@ -64,22 +60,6 @@ if [ ! -z $RELEASE ]; then
 fi
 
 
-start_emulator() {
-	log_info "Starting emulator ($AVD_NAME)"
-	$EMULATOR -avd ${AVD_NAME} -port ${AVD_SERIAL} -no-audio -no-window &
-	$ADB wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done; input keyevent 82'
-}
-
-stop_emulator() {
-	log_info "Stopping emulator"
-	$ADB emu kill
-}
-
-stop_gradle_daemon() {
-	log_info "Stopping gradle daemon"
-	$GRADLE --stop
-}
-
 run_adb_as_root() {
     log_info "Running adb as root"
     $ADB root
@@ -113,12 +93,6 @@ build_instrumentation_apk() {
     fi
 }
 
-clean_output_dir() {
-	log_info "Cleaning output directory"
-	rm -rf ${OUTPUTS_DIR}
-	mkdir -p ${OUTPUTS_DIR}
-}
-
 uninstall_apk() {
     log_info "Uninstalling existing APK"
     $ADB uninstall ${PACKAGE_NAME}
@@ -152,10 +126,10 @@ run_instrumented_tests() {
     log_info "Running instrumented tests"
     $ADB shell am instrument \
         -r -e coverage true -e size $SIZE \
-		-w ${PACKAGE_NAME}.test/android.support.test.runner.AndroidJUnitRunner \
+        -w ${PACKAGE_NAME}.test/androidx.test.runner.AndroidJUnitRunner \
         | tee ${OUTPUTS_DIR}/instrument.txt
 
-	if grep FAILURES $OUTPUTS_DIR/instrument.txt; then
+    if grep "\(INSTRUMENTATION_STATUS_CODE.*-1\|FAILURES\)" $OUTPUTS_DIR/instrument.txt; then
         log_error "Some instrumented tests failed"
         fetch_images
         fetch_logcat
@@ -225,19 +199,26 @@ run_tests() {
 }
 
 parse_opts() {
-	OPTS=`getopt -o ur --long uninstall-first,release -n 'build.sh' -- "$@"`
+    OPTS=`getopt -o r --long release -n 'build.sh' -- "$@"`
     if [ $? != 0 ] ; then exit 1; fi
     eval set -- "$OPTS" 
 
     while true; do
         case "$1" in
-			-u | --uninstall-first ) UNINSTALL_FIRST=1; shift ;;
             -r | --release ) RELEASE=1; shift ;;
             * ) break ;;
         esac
     done    
 }
 
+remove_build_dir() {
+    rm -rfv build
+    rm -rfv android-base/build
+    rm -rfv android-pickers/build
+    rm -rfv uhabits-android/build
+    rm -rfv uhabits-core/build
+}
+
 case "$1" in
     build)
         shift; parse_opts $*
@@ -248,33 +229,6 @@ case "$1" in
         #generate_coverage_badge
         ;;
 
-	ci-tests)
-		if [ -z $3 ]; then
-			cat <<- END
-				Usage: $0 ci-tests AVD_NAME AVD_SERIAL [options]
-
-				Parameters:
-				    AVD_NAME    name of the virtual android device to start
-				    AVD_SERIAL  adb port to use (e.g. 5560)
-
-				Options:
-				    -u  --uninstall-first  Uninstall existing APK first
-				    -r  --release          Test release APK, instead of debug
-			END
-			exit 1
-		fi
-
-		shift; AVD_NAME=$1
-		shift; AVD_SERIAL=$1
-		shift; parse_opts $*
-		ADB="${ADB} -s emulator-${AVD_SERIAL}"
-
-		start_emulator
-		run_tests medium
-		stop_emulator
-		stop_gradle_daemon
-		;;
-
     medium-tests)
         shift; parse_opts $*
         run_tests medium
@@ -299,20 +253,27 @@ case "$1" in
         install_apk
         ;;
     
+    clean)
+        remove_build_dir
+        ;;
+
     *)
-		cat <<- END
+cat <<END
 Usage: $0 <command> [options]
 Builds, installs and tests Loop Habit Tracker
 
 Commands:
-			    ci-tests      Start emulator silently, run tests then kill emulator
-			    local-tests   Run all tests on connected device
-			    install       Install app on connected device
-			    fetch-images  Fetches failed view test images from device
     accept-images     Copies fetched images to corresponding assets folder
+    build             Build APK and run JVM tests
+    clean             Remove build directory
+    fetch-images      Fetches failed view test images from device
+    install           Install app on connected device
+    large-tests       Run large-sized tests on connected device
+    medium-tests      Run medium-sized tests on connected device
 
 Options:
     -r  --release       Build and test release APK, instead of debug
 END
         exit 1
+        ;;
 esac

android/tools/coverage-badge/badge.py

@@ -55,7 +55,7 @@ def get_total(report):
 
 def get_color(total):
     """
-    Return color for current coverage precent
+    Return color for current coverage percent
     """
     try:
         xtotal = int(total)

android/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportCSVTaskTest.java

@@ -1,61 +0,0 @@
-/*
- * 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.tasks;
-
-import androidx.test.filters.*;
-import androidx.test.runner.*;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.isoron.uhabits.*;
-import org.junit.*;
-import org.junit.runner.*;
-
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class ExportCSVTaskTest extends BaseAndroidTest
-{
-    @Before
-    @Override
-    public void setUp()
-    {
-        super.setUp();
-    }
-
-//    @Test
-//    public void testExportCSV() throws Throwable
-//    {
-//        fixtures.purgeHabits(habitList);
-//        fixtures.createShortHabit();
-//
-//        List<Habit> selected = new LinkedList<>();
-//        for (Habit h : habitList) selected.add(h);
-//        File outputDir = new AndroidDirFinder(targetContext).getFilesDir("CSV");
-//        assertNotNull(outputDir);
-//
-//        taskRunner.execute(
-//            new ExportCSVTask(habitList, selected, outputDir, archiveFilename -> {
-//                assertThat(archiveFilename, is(not(nullValue())));
-//                File f = new File(archiveFilename);
-//                assertTrue(f.exists());
-//                assertTrue(f.canRead());
-//            }));
-//    }
-}

android/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportDBTaskTest.java

@@ -1,57 +0,0 @@
-/*
- * 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.tasks;
-
-import androidx.test.filters.*;
-import androidx.test.runner.*;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.isoron.uhabits.*;
-import org.junit.*;
-import org.junit.runner.*;
-
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class ExportDBTaskTest extends BaseAndroidTest
-{
-    @Override
-    @Before
-    public void setUp()
-    {
-        super.setUp();
-    }
-
-//    @Test
-//    public void testExportCSV() throws Throwable
-//    {
-//        ExportDBTask task =
-//            new ExportDBTask(targetContext, new AndroidDirFinder(targetContext),
-//                filename ->
-//                {
-//                    assertNotNull(filename);
-//                    File f = new File(filename);
-//                    assertTrue(f.exists());
-//                    assertTrue(f.canRead());
-//                });
-//
-//        taskRunner.execute(task);
-//    }
-}

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

@@ -123,7 +123,7 @@
     <string-array name="targetIntervals" translatable="false">
         <item>daily</item>
         <item>weekly</item>
-        <item>montly</item>
+        <item>monthly</item>
     </string-array>
 
     <string name="snooze_interval_default" translatable="false">15</string>

android/uhabits-core/src/main/java/org/isoron/uhabits/core/database/Repository.java

@@ -57,7 +57,7 @@ public class Repository<T>
      * Returns all records matching the given SQL query.
      * <p>
      * The query should only contain the "where" part of the SQL query, and
-     * optinally the "order by" part. "Group by" is not allowed. If no matching
+     * optionally the "order by" part. "Group by" is not allowed. If no matching
      * records are found, returns an empty list.
      */
     @NonNull

android/uhabits-core/src/main/java/org/isoron/uhabits/core/models/StreakList.java

@@ -123,7 +123,7 @@ public abstract class StreakList
      * habit to not performing a habit, and vice-versa.
      *
      * @param beginning the timestamp for the first checkmark
-     * @param checks    the checkmarks, ordered by decresing timestamp
+     * @param checks    the checkmarks, ordered by decreasing timestamp
      * @return the list of transitions
      */
     @NonNull

docs/BUILD.md

@@ -32,7 +32,7 @@ The repository will be downloaded to the directory `uhabits`. The Android files
 1. Launch Android Studio and select "Open an existing Android Studio project".
 2. When the IDE asks you for the project location, select `uhabits/android` and click "Ok".
 3. Android Studio will spend some time indexing the project. When this is complete, click the toolbar icon "Sync Project with Gradle File", located near the right corner of the top toolbar.
-4. The operation will likely fail several times due to missing Android SDK components. Each time it fails, click the link "Install missing platforms", "Instal build tools", etc, and try again.
+4. The operation will likely fail several times due to missing Android SDK components. Each time it fails, click the link "Install missing platforms", "Install build tools", etc, and try again.
 5. To test the application, create a virtual Android device using the menu "Tools" and "AVD Manager". The default options should work fine, but free to customize the device.
 6. Click the menu "Run" and "uhabits-android". The application should launch.