Updating forked dev

build.gradle.kts

@@ -1,11 +1,11 @@
 plugins {
     val kotlinVersion = "1.5.0"
-    id("com.android.application") version ("7.0.2") apply (false)
+    id("com.android.application") version ("7.0.3") apply (false)
     id("org.jetbrains.kotlin.android") version kotlinVersion apply (false)
     id("org.jetbrains.kotlin.kapt") version kotlinVersion apply (false)
     id("org.jetbrains.kotlin.android.extensions") version kotlinVersion apply (false)
     id("org.jetbrains.kotlin.multiplatform") version kotlinVersion apply (false)
-    id("org.jlleitschuh.gradle.ktlint") version "10.1.0"
+    id("org.jlleitschuh.gradle.ktlint") version "10.2.1"
 }
 
 apply {
@@ -18,7 +18,6 @@ allprojects {
         mavenCentral()
         maven(url = "https://plugins.gradle.org/m2/")
         maven(url = "https://oss.sonatype.org/content/repositories/snapshots/")
-        maven(url = "https://kotlin.bintray.com/ktor")
-        maven(url = "https://kotlin.bintray.com/kotlin-js-wrappers")
+        maven(url = "https://jitpack.io")
     }
 }

gradle.properties

@@ -1,5 +1,5 @@
 org.gradle.parallel=false
 org.gradle.daemon=true
-org.gradle.jvmargs=-Xms2048m -Xmx2048m -XX:MaxPermSize=2048m
+org.gradle.jvmargs=-Xms2048m -Xmx2048m
 android.useAndroidX=true
 android.enableJetifier=true

uhabits-android/build.gradle.kts

@@ -18,7 +18,7 @@
  */
 
 plugins {
-    id("com.github.triplet.play") version "3.6.0"
+    id("com.github.triplet.play") version "3.7.0"
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("org.jetbrains.kotlin.kapt")
@@ -32,13 +32,13 @@ tasks.compileLint {
 
 android {
 
-    compileSdk = 30
+    compileSdk = 31
 
     defaultConfig {
         versionCode = 20003
         versionName = "2.0.3"
         minSdk = 23
-        targetSdk = 30
+        targetSdk = 31
         applicationId = "org.isoron.uhabits"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -86,10 +86,10 @@ android {
 }
 
 dependencies {
-    val daggerVersion = "2.38.1"
-    val kotlinVersion = "1.5.30"
-    val kxCoroutinesVersion = "1.5.1"
-    val ktorVersion = "1.6.3"
+    val daggerVersion = "2.41"
+    val kotlinVersion = "1.6.10"
+    val kxCoroutinesVersion = "1.6.0"
+    val ktorVersion = "1.6.7"
     val espressoVersion = "3.4.0"
 
     androidTestImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion")
@@ -98,29 +98,29 @@ dependencies {
     androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito:2.28.1")
     androidTestImplementation("io.ktor:ktor-client-mock:$ktorVersion")
     androidTestImplementation("io.ktor:ktor-jackson:$ktorVersion")
-    androidTestImplementation("androidx.annotation:annotation:1.2.0")
+    androidTestImplementation("androidx.annotation:annotation:1.3.0")
     androidTestImplementation("androidx.test.ext:junit:1.1.3")
     androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0")
     androidTestImplementation("androidx.test:rules:1.4.0")
     androidTestImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
     compileOnly("javax.annotation:jsr250-api:1.0")
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
-    implementation("com.github.paolorotolo:appintro:4.1.0")
+    implementation("com.github.AppIntro:AppIntro:6.2.0")
     implementation("com.google.code.findbugs:jsr305:3.0.2")
     implementation("com.google.dagger:dagger:$daggerVersion")
-    implementation("com.google.guava:guava:30.1.1-android")
+    implementation("com.google.guava:guava:31.1-android")
     implementation("io.ktor:ktor-client-android:$ktorVersion")
     implementation("io.ktor:ktor-client-core:$ktorVersion")
     implementation("io.ktor:ktor-client-jackson:$ktorVersion")
     implementation("io.ktor:ktor-client-json:$ktorVersion")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kxCoroutinesVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kxCoroutinesVersion")
-    implementation("androidx.appcompat:appcompat:1.3.1")
+    implementation("androidx.appcompat:appcompat:1.4.1")
     implementation("androidx.legacy:legacy-preference-v14:1.0.0")
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
-    implementation("com.google.android.material:material:1.4.0")
-    implementation("com.opencsv:opencsv:5.5.1")
+    implementation("com.google.android.material:material:1.5.0")
+    implementation("com.opencsv:opencsv:5.6")
     implementation(project(":uhabits-core"))
     kapt("com.google.dagger:dagger-compiler:$daggerVersion")
     kaptAndroidTest("com.google.dagger:dagger-compiler:$daggerVersion")

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

@@ -55,6 +55,7 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 @LargeTest
 class HabitsTest : BaseUserInterfaceTest() {
+
     @Test
     @Throws(Exception::class)
     fun shouldCreateHabit() {
@@ -180,6 +181,8 @@ class HabitsTest : BaseUserInterfaceTest() {
         longPressCheckmarks("Wake up early", count = 2)
         clickText("Wake up early")
         verifyShowsScreen(SHOW_HABIT)
+        // TODO: find a better way than sleeping in tests
+        Thread.sleep(2001L)
         verifyDisplaysText("10%")
     }
 
@@ -194,6 +197,8 @@ class HabitsTest : BaseUserInterfaceTest() {
         verifyDoesNotDisplayText("Track time")
         verifyDisplaysText("Wake up early")
         longPressCheckmarks("Wake up early", count = 1)
+        // TODO: find a better way than sleeping in tests
+        Thread.sleep(2001L)
         verifyDoesNotDisplayText("Wake up early")
         clickMenu(TOGGLE_COMPLETED)
         verifyDisplaysText("Track time")

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt

@@ -24,6 +24,7 @@ import androidx.test.filters.MediumTest
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.isoron.uhabits.BaseViewTest
+import org.isoron.uhabits.core.models.NumericalHabitType
 import org.isoron.uhabits.utils.PaletteUtils
 import org.junit.Before
 import org.junit.Test
@@ -42,6 +43,7 @@ class NumberButtonViewTest : BaseViewTest() {
         super.setUp()
         view = component.getNumberButtonViewFactory().create().apply {
             units = "steps"
+            targetType = NumericalHabitType.AT_LEAST
             threshold = 100.0
             color = PaletteUtils.getAndroidTestColor(8)
             onEdit = { edited = true }
@@ -74,10 +76,10 @@ class NumberButtonViewTest : BaseViewTest() {
     }
 
     @Test
-    fun testRender_emptyUnits() {
+    fun testRender_atMostAboveThreshold() {
         view.value = 500.0
-        view.units = ""
-        assertRenders(view, "$PATH/render_unitless.png")
+        view.targetType = NumericalHabitType.AT_MOST
+        assertRenders(view, "$PATH/render_at_most_above.png")
     }
 
     @Test
@@ -86,22 +88,35 @@ class NumberButtonViewTest : BaseViewTest() {
         assertRenders(view, "$PATH/render_below.png")
     }
 
+    @Test
+    fun testRender_atMostBetweenThresholds() {
+        view.value = 110.0
+        view.targetType = NumericalHabitType.AT_MOST
+        assertRenders(view, "$PATH/render_at_most_between.png")
+    }
+
     @Test
     fun testRender_zero() {
         view.value = 0.0
         assertRenders(view, "$PATH/render_zero.png")
     }
 
     @Test
-    fun testClick_shortToggleDisabled() {
-        prefs.isShortToggleEnabled = false
-        view.performClick()
-        assertFalse(edited)
+    fun testRender_atMostBelowThreshold() {
+        view.value = 0.0
+        view.targetType = NumericalHabitType.AT_MOST
+        assertRenders(view, "$PATH/render_at_most_below.png")
+    }
+
+    @Test
+    fun testRender_emptyUnits() {
+        view.value = 500.0
+        view.units = ""
+        assertRenders(view, "$PATH/render_unitless.png")
     }
 
     @Test
-    fun testClick_shortToggleEnabled() {
-        prefs.isShortToggleEnabled = true
+    fun testClick() {
         view.performClick()
         assertTrue(edited)
     }

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt

@@ -24,6 +24,7 @@ import androidx.test.filters.MediumTest
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.isoron.uhabits.BaseViewTest
+import org.isoron.uhabits.core.models.NumericalHabitType
 import org.isoron.uhabits.core.models.Timestamp
 import org.isoron.uhabits.utils.PaletteUtils
 import org.junit.After
@@ -55,6 +56,7 @@ class NumberPanelViewTest : BaseViewTest() {
             buttonCount = 4
             color = PaletteUtils.getAndroidTestColor(7)
             units = "steps"
+            targetType = NumericalHabitType.AT_LEAST
             threshold = 5000.0
         }
         view.onAttachedToWindow()

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardViewTest.kt

@@ -53,8 +53,6 @@ class SubtitleCardViewTest : BaseViewTest() {
                 isNumerical = false,
                 question = "Did you meditate this morning?",
                 reminder = Reminder(8, 30, EVERY_DAY),
-                unit = "",
-                targetValue = 0.0,
                 theme = LightTheme(),
             )
         )

uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.kt

@@ -61,7 +61,7 @@ class PerformanceTest : BaseAndroidTest() {
         val habit = fixtures.createEmptyHabit()
         for (i in 0..4999) {
             val timestamp: Timestamp = Timestamp(i * DAY_LENGTH)
-            CreateRepetitionCommand(habitList, habit, timestamp, 1).run()
+            CreateRepetitionCommand(habitList, habit, timestamp, 1, "").run()
         }
         db.setTransactionSuccessful()
         db.endTransaction()

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

@@ -24,8 +24,8 @@ import android.widget.FrameLayout
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import org.hamcrest.CoreMatchers
-import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.MatcherAssert.assertThat
 import org.isoron.uhabits.BaseViewTest
 import org.isoron.uhabits.R

uhabits-android/src/main/AndroidManifest.xml

@@ -17,9 +17,10 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="org.isoron.uhabits">
 
+    <uses-permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
@@ -48,11 +49,11 @@
             android:name=".activities.habits.list.ListHabitsActivity"
             android:exported="true"
             android:label="@string/main_activity_title"
-            android:launchMode="singleTop">
-        </activity>
+            android:launchMode="singleTop" />
 
         <activity-alias
             android:name=".MainActivity"
+            android:exported="true"
             android:label="@string/main_activity_title"
             android:launchMode="singleTop"
             android:targetActivity=".activities.habits.list.ListHabitsActivity">
@@ -85,6 +86,7 @@
 
         <activity
             android:name=".widgets.activities.HabitPickerDialog"
+            android:exported="true"
             android:theme="@style/Theme.AppCompat.Light.Dialog">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
@@ -93,6 +95,7 @@
 
         <activity
             android:name=".widgets.activities.BooleanHabitPickerDialog"
+            android:exported="true"
             android:theme="@style/Theme.AppCompat.Light.Dialog">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
@@ -101,6 +104,7 @@
 
         <activity
             android:name=".widgets.activities.NumericalHabitPickerDialog"
+            android:exported="true"
             android:theme="@style/Theme.AppCompat.Light.Dialog">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
@@ -117,9 +121,10 @@
 
         <activity
             android:name=".widgets.activities.NumericalCheckmarkWidgetActivity"
+            android:excludeFromRecents="true"
+            android:exported="true"
             android:label="NumericalCheckmarkWidget"
             android:noHistory="true"
-            android:excludeFromRecents="true"
             android:theme="@style/Theme.AppCompat.Light.Dialog">
             <intent-filter>
                 <action android:name="org.isoron.uhabits.ACTION_SHOW_NUMERICAL_VALUE_ACTIVITY" />
@@ -128,13 +133,14 @@
 
         <activity
             android:name=".notifications.SnoozeDelayPickerActivity"
-            android:taskAffinity=""
             android:excludeFromRecents="true"
             android:launchMode="singleInstance"
+            android:taskAffinity=""
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
         <receiver
             android:name=".widgets.CheckmarkWidgetProvider"
+            android:exported="true"
             android:label="@string/checkmark">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -152,6 +158,7 @@
 
         <receiver
             android:name=".widgets.HistoryWidgetProvider"
+            android:exported="true"
             android:label="@string/history">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -164,6 +171,7 @@
 
         <receiver
             android:name=".widgets.ScoreWidgetProvider"
+            android:exported="true"
             android:label="@string/score">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -176,6 +184,7 @@
 
         <receiver
             android:name=".widgets.StreakWidgetProvider"
+            android:exported="true"
             android:label="@string/streaks">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -188,6 +197,7 @@
 
         <receiver
             android:name=".widgets.FrequencyWidgetProvider"
+            android:exported="true"
             android:label="@string/frequency">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -200,6 +210,7 @@
 
         <receiver
             android:name=".widgets.TargetWidgetProvider"
+            android:exported="true"
             android:label="@string/target">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -210,13 +221,17 @@
                 android:resource="@xml/widget_target_info" />
         </receiver>
 
-        <receiver android:name=".receivers.ReminderReceiver">
+        <receiver
+            android:name=".receivers.ReminderReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".receivers.WidgetReceiver">
+        <receiver android:name=".receivers.WidgetReceiver"
+            android:exported="true"
+            android:permission="false">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
                 <action android:name="org.isoron.uhabits.ACTION_SET_NUMERICAL_VALUE" />
@@ -267,7 +282,7 @@
         <!-- Locale/Tasker -->
         <receiver
             android:name=".automation.FireSettingReceiver"
-            android:exported="true">
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING" />
             </intent-filter>