Merge branch 'dev' into feature/sync

This reverts commit da018fc64d.

.github/workflows/main.yml

@@ -13,10 +13,10 @@ jobs:
     - name: Check out source code
       uses: actions/checkout@v1
 
-    - name: Install Java Development Kit 11
+    - name: Install Java Development Kit 1.8
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 1.8
 
     - name: Build Project
       run: ./build.sh build

README.md

@@ -90,7 +90,7 @@ contribute, even if you are not a software developer.
   is already completed, you are also very welcome to join and proofread it.
 
 * **Write some code.** If you are an Android developer, you are very welcome to
-  contribute with code. Please see the [guidelines](https://github.com/iSoron/uhabits/blob/dev/docs/GUIDELINES.md).
+  contribute with code. Please see `docs/GUIDELINES.md`.
 
 ## License
 

build.gradle.kts

@@ -1,11 +1,11 @@
 plugins {
     val kotlinVersion = "1.5.0"
-    id("com.android.application") version ("7.0.3") apply (false)
+    id("com.android.application") version ("4.2.0") 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.2.0"
+    id("org.jlleitschuh.gradle.ktlint") version "10.1.0"
 }
 
 apply {
@@ -15,9 +15,11 @@ apply {
 allprojects {
     repositories {
         google()
+        jcenter()
         mavenCentral()
         maven(url = "https://plugins.gradle.org/m2/")
         maven(url = "https://oss.sonatype.org/content/repositories/snapshots/")
-        maven(url = "https://jitpack.io")
+        maven(url = "https://kotlin.bintray.com/ktor")
+        maven(url = "https://kotlin.bintray.com/kotlin-js-wrappers")
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -1,6 +1,7 @@
 pluginManagement {
     repositories {
         gradlePluginPortal()
+        jcenter()
         google()
     }
     resolutionStrategy.eachPlugin {

uhabits-android/build.gradle.kts

@@ -1,3 +1,5 @@
+
+
 /*
  * Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
  *
@@ -18,7 +20,7 @@
  */
 
 plugins {
-    id("com.github.triplet.play") version "3.7.0"
+    id("com.github.triplet.play") version "3.5.0"
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("org.jetbrains.kotlin.kapt")
@@ -32,15 +34,15 @@ tasks.compileLint {
 
 android {
 
-    compileSdk = 31
+    compileSdkVersion(30)
 
     defaultConfig {
-        versionCode = 20003
-        versionName = "2.0.3"
-        minSdk = 23
-        targetSdk = 31
-        applicationId = "org.isoron.uhabits"
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        versionCode(20003)
+        versionName("2.0.3")
+        minSdkVersion(23)
+        targetSdkVersion(30)
+        applicationId("org.isoron.uhabits")
+        testInstrumentationRunner("androidx.test.runner.AndroidJUnitRunner")
     }
 
     signingConfigs {
@@ -56,7 +58,7 @@ android {
 
     buildTypes {
         getByName("release") {
-            isMinifyEnabled = true
+            minifyEnabled(true)
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.txt")
             if (signingConfigs.findByName("release") != null) {
                 signingConfig = signingConfigs.getByName("release")
@@ -68,7 +70,7 @@ android {
         }
     }
 
-    lint {
+    lintOptions {
         isCheckReleaseBuilds = false
         isAbortOnError = false
         disable("GoogleAppIndexingWarning")
@@ -86,10 +88,10 @@ android {
 }
 
 dependencies {
-    val daggerVersion = "2.40.3"
-    val kotlinVersion = "1.6.0"
-    val kxCoroutinesVersion = "1.5.2"
-    val ktorVersion = "1.6.6"
+    val daggerVersion = "2.38.1"
+    val kotlinVersion = "1.5.21"
+    val kxCoroutinesVersion = "1.5.1"
+    val ktorVersion = "1.6.2"
     val espressoVersion = "3.4.0"
 
     androidTestImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion")
@@ -98,17 +100,17 @@ 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.3.0")
+    androidTestImplementation("androidx.annotation:annotation:1.2.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.AppIntro:AppIntro:6.1.0")
+    implementation("com.github.paolorotolo:appintro:4.1.0")
     implementation("com.google.code.findbugs:jsr305:3.0.2")
     implementation("com.google.dagger:dagger:$daggerVersion")
-    implementation("com.google.guava:guava:31.0.1-android")
+    implementation("com.google.guava:guava:30.1.1-android")
     implementation("io.ktor:ktor-client-android:$ktorVersion")
     implementation("io.ktor:ktor-client-core:$ktorVersion")
     implementation("io.ktor:ktor-client-jackson:$ktorVersion")
@@ -120,7 +122,8 @@ dependencies {
     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.2")
+    implementation("com.google.zxing:core:3.4.1")
+    implementation("com.opencsv:opencsv:5.5.1")
     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,7 +55,6 @@ import org.junit.runner.RunWith
 @RunWith(AndroidJUnit4::class)
 @LargeTest
 class HabitsTest : BaseUserInterfaceTest() {
-
     @Test
     @Throws(Exception::class)
     fun shouldCreateHabit() {
@@ -181,8 +180,6 @@ 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%")
     }
 
@@ -197,8 +194,6 @@ 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,7 +24,6 @@ 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
@@ -43,7 +42,6 @@ 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 }
@@ -76,10 +74,10 @@ class NumberButtonViewTest : BaseViewTest() {
     }
 
     @Test
-    fun testRender_atMostAboveThreshold() {
+    fun testRender_emptyUnits() {
         view.value = 500.0
-        view.targetType = NumericalHabitType.AT_MOST
-        assertRenders(view, "$PATH/render_at_most_above.png")
+        view.units = ""
+        assertRenders(view, "$PATH/render_unitless.png")
     }
 
     @Test
@@ -88,13 +86,6 @@ 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
@@ -102,21 +93,15 @@ class NumberButtonViewTest : BaseViewTest() {
     }
 
     @Test
-    fun testRender_atMostBelowThreshold() {
-        view.value = 0.0
-        view.targetType = NumericalHabitType.AT_MOST
-        assertRenders(view, "$PATH/render_at_most_below.png")
+    fun testClick_shortToggleDisabled() {
+        prefs.isShortToggleEnabled = false
+        view.performClick()
+        assertFalse(edited)
     }
 
     @Test
-    fun testRender_emptyUnits() {
-        view.value = 500.0
-        view.units = ""
-        assertRenders(view, "$PATH/render_unitless.png")
-    }
-
-    @Test
-    fun testClick() {
+    fun testClick_shortToggleEnabled() {
+        prefs.isShortToggleEnabled = true
         view.performClick()
         assertTrue(edited)
     }

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

@@ -24,7 +24,6 @@ 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
@@ -56,7 +55,6 @@ 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,6 +53,8 @@ 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/sync/RemoteSyncServerTest.kt

@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
+ *
+ * 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.sync
+
+import androidx.test.filters.MediumTest
+import com.fasterxml.jackson.databind.ObjectMapper
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.mock.MockEngine
+import io.ktor.client.engine.mock.MockRequestHandleScope
+import io.ktor.client.engine.mock.respond
+import io.ktor.client.engine.mock.respondError
+import io.ktor.client.engine.mock.respondOk
+import io.ktor.client.features.json.JsonFeature
+import io.ktor.client.request.HttpRequestData
+import io.ktor.client.request.HttpResponseData
+import io.ktor.http.HttpStatusCode
+import io.ktor.http.fullPath
+import io.ktor.http.headersOf
+import kotlinx.coroutines.runBlocking
+import org.isoron.uhabits.BaseAndroidTest
+import org.isoron.uhabits.core.sync.AbstractSyncServer
+import org.isoron.uhabits.core.sync.GetDataVersionResponse
+import org.isoron.uhabits.core.sync.KeyNotFoundException
+import org.isoron.uhabits.core.sync.RegisterReponse
+import org.isoron.uhabits.core.sync.ServiceUnavailable
+import org.isoron.uhabits.core.sync.SyncData
+import org.junit.Test
+
+@MediumTest
+class RemoteSyncServerTest : BaseAndroidTest() {
+
+    private val mapper = ObjectMapper()
+    val data = SyncData(1, "Hello world")
+
+    @Test
+    fun when_register_succeeds_should_return_key() = runBlocking {
+        val server = server("/register") {
+            respondWithJson(RegisterReponse("ABCDEF"))
+        }
+        assertEquals("ABCDEF", server.register())
+    }
+
+    @Test(expected = ServiceUnavailable::class)
+    fun when_register_fails_should_raise_correct_exception() = runBlocking {
+        val server = server("/register") {
+            respondError(HttpStatusCode.ServiceUnavailable)
+        }
+        server.register()
+        return@runBlocking
+    }
+
+    @Test
+    fun when_get_data_version_succeeds_should_return_version() = runBlocking {
+        server("/db/ABC/version") {
+            respondWithJson(GetDataVersionResponse(5))
+        }.apply {
+            assertEquals(5, getDataVersion("ABC"))
+        }
+        return@runBlocking
+    }
+
+    @Test(expected = ServiceUnavailable::class)
+    fun when_get_data_version_with_server_error_should_raise_exception() = runBlocking {
+        server("/db/ABC/version") {
+            respondError(HttpStatusCode.InternalServerError)
+        }.apply {
+            getDataVersion("ABC")
+        }
+        return@runBlocking
+    }
+
+    @Test(expected = KeyNotFoundException::class)
+    fun when_get_data_version_with_invalid_key_should_raise_exception() = runBlocking {
+        server("/db/ABC/version") {
+            respondError(HttpStatusCode.NotFound)
+        }.apply {
+            getDataVersion("ABC")
+        }
+        return@runBlocking
+    }
+
+    @Test
+    fun when_get_data_succeeds_should_return_data() = runBlocking {
+        server("/db/ABC") {
+            respondWithJson(data)
+        }.apply {
+            assertEquals(data, getData("ABC"))
+        }
+        return@runBlocking
+    }
+
+    @Test(expected = KeyNotFoundException::class)
+    fun when_get_data_with_invalid_key_should_raise_exception() = runBlocking {
+        server("/db/ABC") {
+            respondError(HttpStatusCode.NotFound)
+        }.apply {
+            getData("ABC")
+        }
+        return@runBlocking
+    }
+
+    @Test
+    fun when_put_succeeds_should_not_raise_exceptions() = runBlocking {
+        server("/db/ABC") {
+            respondOk()
+        }.apply {
+            put("ABC", data)
+        }
+        return@runBlocking
+    }
+
+    private fun server(
+        expectedPath: String,
+        action: MockRequestHandleScope.(HttpRequestData) -> HttpResponseData
+    ): AbstractSyncServer {
+        return RemoteSyncServer(
+            httpClient = HttpClient(MockEngine) {
+                install(JsonFeature)
+                engine {
+                    addHandler { request ->
+                        when (request.url.fullPath) {
+                            expectedPath -> action(request)
+                            else -> error("unexpected call: ${request.url.fullPath}")
+                        }
+                    }
+                }
+            },
+            preferences = prefs
+        )
+    }
+
+    private fun MockRequestHandleScope.respondWithJson(content: Any) =
+        respond(
+            mapper.writeValueAsBytes(content),
+            headers = headersOf("Content-Type" to listOf("application/json"))
+        )
+}

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.equalTo
 import org.hamcrest.CoreMatchers.`is`
+import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.isoron.uhabits.BaseViewTest
 import org.isoron.uhabits.R

uhabits-android/src/main/AndroidManifest.xml

@@ -17,12 +17,13 @@
   ~ 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" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:name=".HabitsApplication"
@@ -41,6 +42,14 @@
                 android:value=".activities.habits.list.ListHabitsActivity" />
         </activity>
 
+        <activity
+            android:name=".activities.sync.SyncActivity"
+            android:exported="true">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".activities.settings.SettingsActivity" />
+        </activity>
+
         <meta-data
             android:name="com.google.android.backup.api_key"
             android:value="AEdPqrEAAAAI6aeWncbnMNo8E5GWeZ44dlc5cQ7tCROwFhOtiw" />
@@ -49,11 +58,21 @@
             android:name=".activities.habits.list.ListHabitsActivity"
             android:exported="true"
             android:label="@string/main_activity_title"
-            android:launchMode="singleTop" />
+            android:launchMode="singleTop">
+            <tools:validation testUrl="https://loophabits.org/sync/123" />
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data
+                    android:scheme="https"
+                    android:host="loophabits.org"
+                    android:pathPrefix="/sync" />
+            </intent-filter>
+        </activity>
 
         <activity-alias
             android:name=".MainActivity"
-            android:exported="true"
             android:label="@string/main_activity_title"
             android:launchMode="singleTop"
             android:targetActivity=".activities.habits.list.ListHabitsActivity">
@@ -86,7 +105,6 @@
 
         <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" />
@@ -95,7 +113,6 @@
 
         <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" />
@@ -104,7 +121,6 @@
 
         <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" />
@@ -121,10 +137,9 @@
 
         <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" />
@@ -133,14 +148,13 @@
 
         <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" />
@@ -158,7 +172,6 @@
 
         <receiver
             android:name=".widgets.HistoryWidgetProvider"
-            android:exported="true"
             android:label="@string/history">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -171,7 +184,6 @@
 
         <receiver
             android:name=".widgets.ScoreWidgetProvider"
-            android:exported="true"
             android:label="@string/score">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -184,7 +196,6 @@
 
         <receiver
             android:name=".widgets.StreakWidgetProvider"
-            android:exported="true"
             android:label="@string/streaks">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -197,7 +208,6 @@
 
         <receiver
             android:name=".widgets.FrequencyWidgetProvider"
-            android:exported="true"
             android:label="@string/frequency">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -210,7 +220,6 @@
 
         <receiver
             android:name=".widgets.TargetWidgetProvider"
-            android:exported="true"
             android:label="@string/target">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -221,17 +230,13 @@
                 android:resource="@xml/widget_target_info" />
         </receiver>
 
-        <receiver
-            android:name=".receivers.ReminderReceiver"
-            android:exported="true">
+        <receiver android:name=".receivers.ReminderReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".receivers.WidgetReceiver"
-            android:exported="true"
-            android:permission="false">
+        <receiver android:name=".receivers.WidgetReceiver">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
                 <action android:name="org.isoron.uhabits.ACTION_SET_NUMERICAL_VALUE" />
@@ -282,7 +287,7 @@
         <!-- Locale/Tasker -->
         <receiver
             android:name=".automation.FireSettingReceiver"
-            android:exported="false">
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING" />
             </intent-filter>

uhabits-android/src/main/java/org/isoron/platform/gui/AndroidDataView.kt

@@ -49,12 +49,23 @@ class AndroidDataView(
     override fun onShowPress(e: MotionEvent?) = Unit
 
     override fun onSingleTapUp(e: MotionEvent?): Boolean {
-        return handleClick(e, true)
+        val x: Float
+        val y: Float
+        try {
+            val pointerId = e!!.getPointerId(0)
+            x = e.getX(pointerId)
+            y = e.getY(pointerId)
+        } catch (ex: RuntimeException) {
+            // Android often throws IllegalArgumentException here. Apparently,
+            // the pointer id may become invalid shortly after calling
+            // e.getPointerId.
+            return false
+        }
+        view?.onClick(x / canvas.innerDensity, y / canvas.innerDensity)
+        return true
     }
 
-    override fun onLongPress(e: MotionEvent?) {
-        handleClick(e)
-    }
+    override fun onLongPress(e: MotionEvent?) = Unit
 
     override fun onScroll(
         e1: MotionEvent?,
@@ -126,22 +137,4 @@ class AndroidDataView(
             }
         }
     }
-
-    private fun handleClick(e: MotionEvent?, isSingleTap: Boolean = false): Boolean {
-        val x: Float
-        val y: Float
-        try {
-            val pointerId = e!!.getPointerId(0)
-            x = e.getX(pointerId)
-            y = e.getY(pointerId)
-        } catch (ex: RuntimeException) {
-            // Android often throws IllegalArgumentException here. Apparently,
-            // the pointer id may become invalid shortly after calling
-            // e.getPointerId.
-            return false
-        }
-        if (isSingleTap) view?.onClick(x / canvas.innerDensity, y / canvas.innerDensity)
-        else view?.onLongClick(x / canvas.innerDensity, y / canvas.innerDensity)
-        return true
-    }
 }

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkDialog.kt

@@ -1,116 +0,0 @@
-package org.isoron.uhabits.activities.common.dialogs
-
-import android.content.Context
-import android.graphics.Typeface
-import android.view.LayoutInflater
-import android.view.View
-import android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
-import android.widget.Button
-import androidx.appcompat.app.AlertDialog
-import org.isoron.platform.gui.toInt
-import org.isoron.uhabits.R
-import org.isoron.uhabits.core.models.Entry.Companion.NO
-import org.isoron.uhabits.core.models.Entry.Companion.SKIP
-import org.isoron.uhabits.core.models.Entry.Companion.UNKNOWN
-import org.isoron.uhabits.core.models.Entry.Companion.YES_AUTO
-import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL
-import org.isoron.uhabits.core.models.PaletteColor
-import org.isoron.uhabits.core.preferences.Preferences
-import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior
-import org.isoron.uhabits.core.ui.views.Theme
-import org.isoron.uhabits.databinding.CheckmarkDialogBinding
-import org.isoron.uhabits.inject.ActivityContext
-import org.isoron.uhabits.utils.InterfaceUtils
-import org.isoron.uhabits.utils.StyledResources
-import javax.inject.Inject
-
-class CheckmarkDialog
-@Inject constructor(
-    @ActivityContext private val context: Context,
-    private val preferences: Preferences,
-) : View.OnClickListener {
-
-    private lateinit var binding: CheckmarkDialogBinding
-    private lateinit var fontAwesome: Typeface
-    private val allButtons = mutableListOf<Button>()
-    private var selectedButton: Button? = null
-
-    fun create(
-        value: Int,
-        notes: String,
-        dateString: String,
-        paletteColor: PaletteColor,
-        callback: ListHabitsBehavior.CheckMarkDialogCallback,
-        theme: Theme,
-    ): AlertDialog {
-        binding = CheckmarkDialogBinding.inflate(LayoutInflater.from(context))
-        fontAwesome = InterfaceUtils.getFontAwesome(context)!!
-        binding.etNotes.append(notes)
-        setUpButtons(value, theme.color(paletteColor).toInt())
-
-        val dialog = AlertDialog.Builder(context)
-            .setView(binding.root)
-            .setTitle(dateString)
-            .setPositiveButton(R.string.save) { _, _ ->
-                val newValue = when (selectedButton?.id) {
-                    R.id.yesBtn -> YES_MANUAL
-                    R.id.noBtn -> NO
-                    R.id.skippedBtn -> SKIP
-                    else -> UNKNOWN
-                }
-                callback.onNotesSaved(newValue, binding.etNotes.text.toString())
-            }
-            .setNegativeButton(android.R.string.cancel) { _, _ ->
-                callback.onNotesDismissed()
-            }
-            .setOnDismissListener {
-                callback.onNotesDismissed()
-            }
-            .create()
-
-        dialog.setOnShowListener {
-            binding.etNotes.requestFocus()
-            dialog.window?.setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_VISIBLE)
-        }
-
-        return dialog
-    }
-
-    private fun setUpButtons(value: Int, color: Int) {
-        val sres = StyledResources(context)
-        val mediumContrastColor = sres.getColor(R.attr.contrast60)
-        setButtonAttrs(binding.yesBtn, color)
-        setButtonAttrs(binding.noBtn, mediumContrastColor)
-        setButtonAttrs(binding.skippedBtn, color, visible = preferences.isSkipEnabled)
-        setButtonAttrs(binding.questionBtn, mediumContrastColor, visible = preferences.areQuestionMarksEnabled)
-        when (value) {
-            UNKNOWN -> if (preferences.areQuestionMarksEnabled) {
-                binding.questionBtn.performClick()
-            } else {
-                binding.noBtn.performClick()
-            }
-            SKIP -> binding.skippedBtn.performClick()
-            YES_MANUAL -> binding.yesBtn.performClick()
-            YES_AUTO, NO -> binding.noBtn.performClick()
-        }
-    }
-
-    private fun setButtonAttrs(button: Button, color: Int, visible: Boolean = true) {
-        button.apply {
-            visibility = if (visible) View.VISIBLE else View.GONE
-            typeface = fontAwesome
-            setTextColor(color)
-            setOnClickListener(this@CheckmarkDialog)
-        }
-        allButtons.add(button)
-    }
-
-    override fun onClick(v: View?) {
-        allButtons.forEach {
-            if (v?.id == it.id) {
-                it.isSelected = true
-                selectedButton = it
-            } else it.isSelected = false
-        }
-    }
-}

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmSyncKeyDialog.kt

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
+ *
+ * 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.common.dialogs
+
+import android.content.Context
+import android.content.DialogInterface
+import androidx.appcompat.app.AlertDialog
+import org.isoron.uhabits.R
+import org.isoron.uhabits.core.ui.callbacks.OnConfirmedCallback
+import org.isoron.uhabits.inject.ActivityContext
+
+class ConfirmSyncKeyDialog(
+    @ActivityContext context: Context,
+    callback: OnConfirmedCallback
+) : AlertDialog(context) {
+    init {
+        setTitle(R.string.device_sync)
+        val res = context.resources
+        setMessage(res.getString(R.string.sync_confirm))
+        setButton(
+            BUTTON_POSITIVE,
+            res.getString(R.string.yes)
+        ) { dialog: DialogInterface?, which: Int -> callback.onConfirmed() }
+        setButton(
+            BUTTON_NEGATIVE,
+            res.getString(R.string.no)
+        ) { dialog: DialogInterface?, which: Int -> }
+    }
+}

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt

@@ -21,6 +21,7 @@ package org.isoron.uhabits.activities.common.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.EditText
@@ -43,7 +44,7 @@ class FrequencyPickerDialog(
     constructor() : this(1, 1)
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val inflater = LayoutInflater.from(requireActivity())
+        val inflater = LayoutInflater.from(activity!!)
         contentView = inflater.inflate(R.layout.frequency_picker_dialog, null)
 
         addBeforeAfterText(
@@ -61,19 +62,15 @@ class FrequencyPickerDialog(
             contentView.xTimesPerMonthContainer,
         )
 
-        addBeforeAfterText(
-            this.getString(R.string.x_times_per_y_days),
-            contentView.xTimesPerYDaysContainer,
-        )
-
         contentView.everyDayRadioButton.setOnClickListener {
             check(contentView.everyDayRadioButton)
+            unfocusAll()
         }
 
         contentView.everyXDaysRadioButton.setOnClickListener {
             check(contentView.everyXDaysRadioButton)
             val everyXDaysTextView = contentView.everyXDaysTextView
-            selectInputField(everyXDaysTextView)
+            focus(everyXDaysTextView)
         }
 
         contentView.everyXDaysTextView.setOnFocusChangeListener { v, hasFocus ->
@@ -82,7 +79,7 @@ class FrequencyPickerDialog(
 
         contentView.xTimesPerWeekRadioButton.setOnClickListener {
             check(contentView.xTimesPerWeekRadioButton)
-            selectInputField(contentView.xTimesPerWeekTextView)
+            focus(contentView.xTimesPerWeekTextView)
         }
 
         contentView.xTimesPerWeekTextView.setOnFocusChangeListener { v, hasFocus ->
@@ -91,27 +88,14 @@ class FrequencyPickerDialog(
 
         contentView.xTimesPerMonthRadioButton.setOnClickListener {
             check(contentView.xTimesPerMonthRadioButton)
-            selectInputField(contentView.xTimesPerMonthTextView)
+            focus(contentView.xTimesPerMonthTextView)
         }
 
         contentView.xTimesPerMonthTextView.setOnFocusChangeListener { v, hasFocus ->
             if (hasFocus) check(contentView.xTimesPerMonthRadioButton)
         }
 
-        contentView.xTimesPerYDaysRadioButton.setOnClickListener {
-            check(contentView.xTimesPerYDaysRadioButton)
-            selectInputField(contentView.xTimesPerYDaysXTextView)
-        }
-
-        contentView.xTimesPerYDaysXTextView.setOnFocusChangeListener { v, hasFocus ->
-            if (hasFocus) check(contentView.xTimesPerYDaysRadioButton)
-        }
-
-        contentView.xTimesPerYDaysYTextView.setOnFocusChangeListener { v, hasFocus ->
-            if (hasFocus) check(contentView.xTimesPerYDaysRadioButton)
-        }
-
-        return AlertDialog.Builder(requireActivity())
+        return AlertDialog.Builder(activity!!)
             .setView(contentView)
             .setPositiveButton(R.string.save) { _, _ -> onSaveClicked() }
             .create()
@@ -122,11 +106,12 @@ class FrequencyPickerDialog(
         container: LinearLayout
     ) {
         val parts = str.split("%d")
-        for (i in parts.indices) {
-            container.addView(
-                TextView(activity).apply { text = parts[i].trim() }, 2 * i + 1,
-            )
-        }
+        container.addView(
+            TextView(activity).apply { text = parts[0].trim() }, 1,
+        )
+        container.addView(
+            TextView(activity).apply { text = parts[1].trim() }, 3,
+        )
     }
 
     private fun onSaveClicked() {
@@ -147,12 +132,6 @@ class FrequencyPickerDialog(
                     denominator = 7
                 }
             }
-            contentView.xTimesPerYDaysRadioButton.isChecked -> {
-                if (contentView.xTimesPerYDaysXTextView.text.isNotEmpty() && contentView.xTimesPerYDaysYTextView.text.isNotEmpty()) {
-                    numerator = Integer.parseInt(contentView.xTimesPerYDaysXTextView.text.toString())
-                    denominator = Integer.parseInt(contentView.xTimesPerYDaysYTextView.text.toString())
-                }
-            }
             else -> {
                 if (contentView.xTimesPerMonthTextView.text.isNotEmpty()) {
                     numerator = Integer.parseInt(contentView.xTimesPerMonthTextView.text.toString())
@@ -168,10 +147,10 @@ class FrequencyPickerDialog(
         dismiss()
     }
 
-    private fun check(view: RadioButton) {
+    private fun check(view: RadioButton?) {
         uncheckAll()
-        view.isChecked = true
-        view.requestFocus()
+        view?.isChecked = true
+        view?.requestFocus()
     }
 
     override fun onResume() {
@@ -184,7 +163,7 @@ class FrequencyPickerDialog(
         if (freqDenominator == 30 || freqDenominator == 31) {
             contentView.xTimesPerMonthRadioButton.isChecked = true
             contentView.xTimesPerMonthTextView.setText(freqNumerator.toString())
-            selectInputField(contentView.xTimesPerMonthTextView)
+            focus(contentView.xTimesPerMonthTextView)
         } else {
             if (freqNumerator == 1) {
                 if (freqDenominator == 1) {
@@ -192,23 +171,23 @@ class FrequencyPickerDialog(
                 } else {
                     contentView.everyXDaysRadioButton.isChecked = true
                     contentView.everyXDaysTextView.setText(freqDenominator.toString())
-                    selectInputField(contentView.everyXDaysTextView)
+                    focus(contentView.everyXDaysTextView)
                 }
             } else {
                 if (freqDenominator == 7) {
                     contentView.xTimesPerWeekRadioButton.isChecked = true
                     contentView.xTimesPerWeekTextView.setText(freqNumerator.toString())
-                    selectInputField(contentView.xTimesPerWeekTextView)
+                    focus(contentView.xTimesPerWeekTextView)
                 } else {
-                    contentView.xTimesPerYDaysRadioButton.isChecked = true
-                    contentView.xTimesPerYDaysXTextView.setText(freqNumerator.toString())
-                    contentView.xTimesPerYDaysYTextView.setText(freqDenominator.toString())
+                    Log.w("FrequencyPickerDialog", "Unknown frequency: $freqNumerator/$freqDenominator")
+                    contentView.everyDayRadioButton.isChecked = true
                 }
             }
         }
     }
 
-    private fun selectInputField(view: EditText) {
+    private fun focus(view: EditText) {
+        view.requestFocus()
         view.setSelection(view.text.length)
     }
 
@@ -217,6 +196,11 @@ class FrequencyPickerDialog(
         contentView.everyXDaysRadioButton.isChecked = false
         contentView.xTimesPerWeekRadioButton.isChecked = false
         contentView.xTimesPerMonthRadioButton.isChecked = false
-        contentView.xTimesPerYDaysRadioButton.isChecked = false
+    }
+
+    private fun unfocusAll() {
+        contentView.everyXDaysTextView.clearFocus()
+        contentView.xTimesPerWeekTextView.clearFocus()
+        contentView.xTimesPerMonthTextView.clearFocus()
     }
 }

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt

@@ -62,11 +62,9 @@ class HistoryEditorDialog : AppCompatDialogFragment(), CommandRunner.Listener {
             firstWeekday = preferences.firstWeekday,
             paletteColor = habit.color,
             series = emptyList(),
-            defaultSquare = HistoryChart.Square.OFF,
-            notesIndicators = emptyList(),
             theme = themeSwitcher.currentTheme,
             today = DateUtils.getTodayWithOffset().toLocalDate(),
-            onDateClickedListener = onDateClickedListener ?: object : OnDateClickedListener {},
+            onDateClickedListener = onDateClickedListener ?: OnDateClickedListener { },
             padding = 10.0,
         )
         dataView = AndroidDataView(context!!, null)
@@ -103,8 +101,6 @@ class HistoryEditorDialog : AppCompatDialogFragment(), CommandRunner.Listener {
             theme = LightTheme()
         )
         chart?.series = model.series
-        chart?.defaultSquare = model.defaultSquare
-        chart?.notesIndicators = model.notesIndicators
         dataView.postInvalidate()
     }
 

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt

@@ -19,11 +19,9 @@
 
 package org.isoron.uhabits.activities.common.dialogs
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.content.DialogInterface
 import android.text.InputFilter
-import android.text.Spanned
 import android.view.LayoutInflater
 import android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
 import android.view.inputmethod.EditorInfo
@@ -35,7 +33,6 @@ import org.isoron.uhabits.R
 import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior
 import org.isoron.uhabits.inject.ActivityContext
 import org.isoron.uhabits.utils.InterfaceUtils
-import java.text.DecimalFormatSymbols
 import javax.inject.Inject
 import kotlin.math.roundToLong
 
@@ -43,30 +40,18 @@ class NumberPickerFactory
 @Inject constructor(
     @ActivityContext private val context: Context
 ) {
-
     fun create(
         value: Double,
         unit: String,
-        notes: String,
-        dateString: String,
         callback: ListHabitsBehavior.NumberPickerCallback
     ): AlertDialog {
+
         val inflater = LayoutInflater.from(context)
         val view = inflater.inflate(R.layout.number_picker_dialog, null)
 
         val picker = view.findViewById<NumberPicker>(R.id.picker)
         val picker2 = view.findViewById<NumberPicker>(R.id.picker2)
-        val etNotes = view.findViewById<EditText>(R.id.etNotes)
-
-        val watcherFilter: InputFilter = SeparatorWatcherInputFilter(picker2)
-        val numberPickerInputText = getNumberPickerInputText(picker)
-
-        // watch the unfiltered input before the filters remove a possible separator from it
-        numberPickerInputText.filters = arrayOf(watcherFilter).plus(numberPickerInputText.filters)
-
-        view.findViewById<TextView>(R.id.tvUnit).text = unit
-        view.findViewById<TextView>(R.id.tvSeparator).text =
-            DecimalFormatSymbols.getInstance().decimalSeparator.toString()
+        val tvUnit = view.findViewById<TextView>(R.id.tvUnit)
 
         val intValue = (value * 100).roundToLong().toInt()
 
@@ -76,22 +61,20 @@ class NumberPickerFactory
         picker.wrapSelectorWheel = false
 
         picker2.minValue = 0
-        picker2.maxValue = 99
-        picker2.setFormatter { v -> String.format("%02d", v) }
-        picker2.value = intValue % 100
+        picker2.maxValue = 19
+        picker2.setFormatter { v -> String.format("%02d", 5 * v) }
+        picker2.value = intValue % 100 / 5
+        refreshInitialValue(picker2)
+
+        tvUnit.text = unit
 
-        etNotes.setText(notes)
         val dialog = AlertDialog.Builder(context)
             .setView(view)
-            .setTitle(dateString)
-            .setPositiveButton(R.string.save) { _, _ ->
+            .setTitle(R.string.change_value)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
                 picker.clearFocus()
-                val v = picker.value + 0.01 * picker2.value
-                val note = etNotes.text.toString()
-                callback.onNumberPicked(v, note)
-            }
-            .setNegativeButton(android.R.string.cancel) { _, _ ->
-                callback.onNumberPickerDismissed()
+                val v = picker.value + 0.05 * picker2.value
+                callback.onNumberPicked(v)
             }
             .setOnDismissListener {
                 callback.onNumberPickerDismissed()
@@ -106,50 +89,20 @@ class NumberPickerFactory
         InterfaceUtils.setupEditorAction(
             picker
         ) { _, actionId, _ ->
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
+            if (actionId == EditorInfo.IME_ACTION_DONE)
                 dialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick()
-            }
-            false
-        }
-
-        InterfaceUtils.setupEditorAction(
-            picker2
-        ) { _, actionId, _ ->
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
-                dialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick()
-            }
             false
         }
 
         return dialog
     }
 
-    @SuppressLint("DiscouragedPrivateApi")
-    private fun getNumberPickerInputText(picker: NumberPicker): EditText {
+    private fun refreshInitialValue(picker: NumberPicker) {
+        // Workaround for Android bug:
+        // https://code.google.com/p/android/issues/detail?id=35482
         val f = NumberPicker::class.java.getDeclaredField("mInputText")
         f.isAccessible = true
-        return f.get(picker) as EditText
-    }
-}
-
-class SeparatorWatcherInputFilter(private val nextPicker: NumberPicker) : InputFilter {
-    override fun filter(
-        source: CharSequence?,
-        start: Int,
-        end: Int,
-        dest: Spanned?,
-        dstart: Int,
-        dend: Int
-    ): CharSequence {
-        if (source == null || source.isEmpty()) {
-            return ""
-        }
-        for (c in source) {
-            if (c == DecimalFormatSymbols.getInstance().decimalSeparator || c == '.' || c == ',') {
-                nextPicker.performLongClick()
-                break
-            }
-        }
-        return source
+        val inputText = f.get(picker) as EditText
+        inputText.filters = arrayOfNulls<InputFilter>(0)
     }
 }

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt

@@ -69,7 +69,7 @@ fun formatFrequency(freqNum: Int, freqDen: Int, resources: Resources) = when {
     freqNum == 1 && freqDen == 7 -> resources.getString(R.string.every_week)
     freqNum == 1 && freqDen > 1 -> resources.getString(R.string.every_x_days, freqDen)
     freqDen == 7 -> resources.getString(R.string.x_times_per_week, freqNum)
-    else -> resources.getString(R.string.x_times_per_y_days, freqNum, freqDen)
+    else -> "$freqNum/$freqDen"
 }
 
 class EditHabitActivity : AppCompatActivity() {
@@ -88,7 +88,6 @@ class EditHabitActivity : AppCompatActivity() {
     var reminderHour = -1
     var reminderMin = -1
     var reminderDays: WeekdayList = WeekdayList.EVERY_DAY
-    var targetType = NumericalHabitType.AT_LEAST
 
     override fun onCreate(state: Bundle?) {
         super.onCreate(state)
@@ -108,7 +107,6 @@ class EditHabitActivity : AppCompatActivity() {
             color = habit.color
             freqNum = habit.frequency.numerator
             freqDen = habit.frequency.denominator
-            targetType = habit.targetType
             habit.reminder?.let {
                 reminderHour = it.hour
                 reminderMin = it.minute
@@ -140,7 +138,6 @@ class EditHabitActivity : AppCompatActivity() {
             HabitType.YES_NO -> {
                 binding.unitOuterBox.visibility = View.GONE
                 binding.targetOuterBox.visibility = View.GONE
-                binding.targetTypeOuterBox.visibility = View.GONE
             }
             HabitType.NUMERICAL -> {
                 binding.nameInput.hint = getString(R.string.measurable_short_example)
@@ -175,23 +172,6 @@ class EditHabitActivity : AppCompatActivity() {
             dialog.show(supportFragmentManager, "frequencyPicker")
         }
 
-        populateTargetType()
-        binding.targetTypePicker.setOnClickListener {
-            val builder = AlertDialog.Builder(this)
-            val arrayAdapter = ArrayAdapter<String>(this, android.R.layout.select_dialog_item)
-            arrayAdapter.add(getString(R.string.target_type_at_least))
-            arrayAdapter.add(getString(R.string.target_type_at_most))
-            builder.setAdapter(arrayAdapter) { dialog, which ->
-                targetType = when (which) {
-                    0 -> NumericalHabitType.AT_LEAST
-                    else -> NumericalHabitType.AT_MOST
-                }
-                populateTargetType()
-                dialog.dismiss()
-            }
-            builder.show()
-        }
-
         binding.numericalFrequencyPicker.setOnClickListener {
             val builder = AlertDialog.Builder(this)
             val arrayAdapter = ArrayAdapter<String>(this, android.R.layout.select_dialog_item)
@@ -282,7 +262,7 @@ class EditHabitActivity : AppCompatActivity() {
         habit.frequency = Frequency(freqNum, freqDen)
         if (habitType == HabitType.NUMERICAL) {
             habit.targetValue = targetInput.text.toString().toDouble()
-            habit.targetType = targetType
+            habit.targetType = NumericalHabitType.AT_LEAST
             habit.unit = unitInput.text.trim().toString()
         }
         habit.type = habitType
@@ -344,13 +324,6 @@ class EditHabitActivity : AppCompatActivity() {
         }
     }
 
-    private fun populateTargetType() {
-        binding.targetTypePicker.text = when (targetType) {
-            NumericalHabitType.AT_MOST -> getString(R.string.target_type_at_most)
-            else -> getString(R.string.target_type_at_least)
-        }
-    }
-
     private fun updateColors() {
         androidColor = themeSwitcher.currentTheme.color(color).toInt()
         binding.colorButton.backgroundTintList = ColorStateList.valueOf(androidColor)

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

@@ -26,10 +26,12 @@ import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import org.isoron.uhabits.BaseExceptionHandler
 import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.activities.habits.list.views.HabitCardListAdapter
 import org.isoron.uhabits.core.preferences.Preferences
+import org.isoron.uhabits.core.sync.SyncManager
 import org.isoron.uhabits.core.tasks.TaskRunner
 import org.isoron.uhabits.core.ui.ThemeSwitcher.Companion.THEME_DARK
 import org.isoron.uhabits.core.utils.MidnightTimer
@@ -47,13 +49,13 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
     lateinit var screen: ListHabitsScreen
     lateinit var prefs: Preferences
     lateinit var midnightTimer: MidnightTimer
+    lateinit var syncManager: SyncManager
     private val scope = CoroutineScope(Dispatchers.Main)
 
     private lateinit var menu: ListHabitsMenu
 
     override fun onQuestionMarksChanged() {
         invalidateOptionsMenu()
-        menu.behavior.onPreferencesChanged()
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -69,6 +71,7 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
 
         prefs = appComponent.preferences
         prefs.addListener(this)
+        syncManager = appComponent.syncManager
         pureBlack = prefs.isPureBlackEnabled
         midnightTimer = appComponent.midnightTimer
         rootView = component.listHabitsRootView
@@ -83,8 +86,11 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
 
     override fun onPause() {
         midnightTimer.onPause()
-        screen.onDetached()
+        screen.onDettached()
         adapter.cancelRefresh()
+        scope.launch {
+            syncManager.onPause()
+        }
         super.onPause()
     }
 
@@ -93,6 +99,9 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
         screen.onAttached()
         rootView.postInvalidate()
         midnightTimer.onResume()
+        scope.launch {
+            syncManager.onResume()
+        }
         taskRunner.run {
             AutoBackup(this@ListHabitsActivity).run()
         }

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

@@ -39,7 +39,7 @@ class ListHabitsMenu @Inject constructor(
     @ActivityContext context: Context,
     private val preferences: Preferences,
     private val themeSwitcher: ThemeSwitcher,
-    val behavior: ListHabitsMenuBehavior
+    private val behavior: ListHabitsMenuBehavior
 ) {
     val activity = (context as AppCompatActivity)
 

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

@@ -22,12 +22,13 @@ package org.isoron.uhabits.activities.habits.list
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
 import dagger.Lazy
 import org.isoron.uhabits.R
-import org.isoron.uhabits.activities.common.dialogs.CheckmarkDialog
 import org.isoron.uhabits.activities.common.dialogs.ColorPickerDialogFactory
 import org.isoron.uhabits.activities.common.dialogs.ConfirmDeleteDialog
+import org.isoron.uhabits.activities.common.dialogs.ConfirmSyncKeyDialog
 import org.isoron.uhabits.activities.common.dialogs.NumberPickerFactory
 import org.isoron.uhabits.activities.habits.edit.HabitTypeDialog
 import org.isoron.uhabits.activities.habits.list.views.HabitCardListAdapter
@@ -52,6 +53,8 @@ import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior.Message
 import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior.Message.FILE_NOT_RECOGNIZED
 import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior.Message.IMPORT_FAILED
 import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior.Message.IMPORT_SUCCESSFUL
+import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior.Message.SYNC_ENABLED
+import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior.Message.SYNC_KEY_ALREADY_INSTALLED
 import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsMenuBehavior
 import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsSelectionMenuBehavior
 import org.isoron.uhabits.inject.ActivityContext
@@ -90,7 +93,6 @@ class ListHabitsScreen
     private val importTaskFactory: ImportDataTaskFactory,
     private val colorPickerFactory: ColorPickerDialogFactory,
     private val numberPickerFactory: NumberPickerFactory,
-    private val checkMarkDialog: CheckmarkDialog,
     private val behavior: Lazy<ListHabitsBehavior>
 ) : CommandRunner.Listener,
     ListHabitsBehavior.Screen,
@@ -101,9 +103,17 @@ class ListHabitsScreen
 
     fun onAttached() {
         commandRunner.addListener(this)
+        if (activity.intent.action == "android.intent.action.VIEW") {
+            val uri = activity.intent.data!!.toString()
+            val parts = uri.replace(Regex("^.*sync/"), "").split("#")
+            val syncKey = parts[0]
+            val encKey = parts[1]
+            Log.i("ListHabitsScreen", "sync: $syncKey enc: $encKey")
+            behavior.get().onSyncKeyOffer(syncKey, encKey)
+        }
     }
 
-    fun onDetached() {
+    fun onDettached() {
         commandRunner.removeListener(this)
     }
 
@@ -198,6 +208,8 @@ class ListHabitsScreen
                     DATABASE_REPAIRED -> R.string.database_repaired
                     COULD_NOT_GENERATE_BUG_REPORT -> R.string.bug_report_failed
                     FILE_NOT_RECOGNIZED -> R.string.file_not_recognized
+                    SYNC_ENABLED -> R.string.sync_enabled
+                    SYNC_KEY_ALREADY_INSTALLED -> R.string.sync_key_already_installed
                 }
             )
         )
@@ -227,28 +239,13 @@ class ListHabitsScreen
     override fun showNumberPicker(
         value: Double,
         unit: String,
-        notes: String,
-        dateString: String,
         callback: ListHabitsBehavior.NumberPickerCallback
     ) {
-        numberPickerFactory.create(value, unit, notes, dateString, callback).show()
+        numberPickerFactory.create(value, unit, callback).show()
     }
 
-    override fun showCheckmarkDialog(
-        value: Int,
-        notes: String,
-        dateString: String,
-        color: PaletteColor,
-        callback: ListHabitsBehavior.CheckMarkDialogCallback
-    ) {
-        checkMarkDialog.create(
-            value,
-            notes,
-            dateString,
-            color,
-            callback,
-            themeSwitcher.currentTheme!!,
-        ).show()
+    override fun showConfirmInstallSyncKey(callback: OnConfirmedCallback) {
+        ConfirmSyncKeyDialog(activity, callback).show()
     }
 
     private fun getExecuteString(command: Command): String? {

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

@@ -37,9 +37,9 @@ import org.isoron.uhabits.core.models.Entry.Companion.YES_AUTO
 import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.inject.ActivityContext
-import org.isoron.uhabits.utils.drawNotesIndicator
+import org.isoron.uhabits.utils.dim
 import org.isoron.uhabits.utils.getFontAwesome
-import org.isoron.uhabits.utils.sp
+import org.isoron.uhabits.utils.showMessage
 import org.isoron.uhabits.utils.sres
 import org.isoron.uhabits.utils.toMeasureSpec
 import javax.inject.Inject
@@ -71,15 +71,7 @@ class CheckmarkButtonView(
             invalidate()
         }
 
-    var hasNotes = false
-        set(value) {
-            field = value
-            invalidate()
-        }
-
     var onToggle: (Int) -> Unit = {}
-
-    var onEdit: () -> Unit = {}
     private var drawer = Drawer()
 
     init {
@@ -89,11 +81,11 @@ class CheckmarkButtonView(
     }
 
     fun performToggle() {
-        value = Entry.nextToggleValue(
-            value = value,
-            isSkipEnabled = preferences.isSkipEnabled,
-            areQuestionMarksEnabled = preferences.areQuestionMarksEnabled
-        )
+        value = if (preferences.isSkipEnabled) {
+            Entry.nextToggleValueWithSkip(value)
+        } else {
+            Entry.nextToggleValueWithoutSkip(value)
+        }
         onToggle(value)
         performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
         invalidate()
@@ -101,12 +93,11 @@ class CheckmarkButtonView(
 
     override fun onClick(v: View) {
         if (preferences.isShortToggleEnabled) performToggle()
-        else onEdit()
+        else showMessage(resources.getString(R.string.long_press_to_toggle))
     }
 
     override fun onLongClick(v: View): Boolean {
-        if (preferences.isShortToggleEnabled) onEdit()
-        else performToggle()
+        performToggle()
         return true
     }
 
@@ -154,11 +145,6 @@ class CheckmarkButtonView(
                 }
                 else -> R.string.fa_check
             }
-            paint.textSize = when {
-                id == R.string.fa_question -> sp(12.0f)
-                value == YES_AUTO -> sp(13.0f)
-                else -> sp(14.0f)
-            }
             if (value == YES_AUTO) {
                 paint.strokeWidth = 5f
                 paint.style = Paint.Style.STROKE
@@ -167,6 +153,11 @@ class CheckmarkButtonView(
                 paint.style = Paint.Style.FILL
             }
 
+            paint.textSize = when (id) {
+                UNKNOWN -> dim(R.dimen.smallerTextSize)
+                else -> dim(R.dimen.smallTextSize)
+            }
+
             val label = resources.getString(id)
             val em = paint.measureText("m")
 
@@ -179,8 +170,6 @@ class CheckmarkButtonView(
                 paint.style = Paint.Style.FILL
                 canvas.drawText(label, rect.centerX(), rect.centerY(), paint)
             }
-
-            drawNotesIndicator(canvas, color, em, hasNotes)
         }
     }
 }

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

@@ -54,24 +54,12 @@ class CheckmarkPanelView(
             setupButtons()
         }
 
-    var notesIndicators = BooleanArray(0)
-        set(values) {
-            field = values
-            setupButtons()
-        }
-
     var onToggle: (Timestamp, Int) -> Unit = { _, _ -> }
         set(value) {
             field = value
             setupButtons()
         }
 
-    var onEdit: (Timestamp) -> Unit = {}
-        set(value) {
-            field = value
-            setupButtons()
-        }
-
     override fun createButton(): CheckmarkButtonView = buttonFactory.create()
 
     @Synchronized
@@ -84,13 +72,8 @@ class CheckmarkPanelView(
                 index + dataOffset < values.size -> values[index + dataOffset]
                 else -> UNKNOWN
             }
-            button.hasNotes = when {
-                index + dataOffset < notesIndicators.size -> notesIndicators[index + dataOffset]
-                else -> false
-            }
             button.color = color
             button.onToggle = { value -> onToggle(timestamp, value) }
-            button.onEdit = { onEdit(timestamp) }
         }
     }
 }

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

@@ -124,9 +124,8 @@ class HabitCardListAdapter @Inject constructor(
         val habit = cache.getHabitByPosition(position)
         val score = cache.getScore(habit!!.id!!)
         val checkmarks = cache.getCheckmarks(habit.id!!)
-        val notesIndicators = cache.getNoteIndicators(habit.id!!)
         val selected = selected.contains(habit)
-        listView!!.bindCardView(holder, habit, score, checkmarks, notesIndicators, selected)
+        listView!!.bindCardView(holder, habit, score, checkmarks, selected)
     }
 
     override fun onViewAttachedToWindow(holder: HabitCardViewHolder) {

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

@@ -87,7 +87,6 @@ class HabitCardListView(
         habit: Habit,
         score: Double,
         checkmarks: IntArray,
-        notesIndicators: BooleanArray,
         selected: Boolean
     ): View {
         val cardView = holder.itemView as HabitCardView
@@ -99,7 +98,6 @@ class HabitCardListView(
         cardView.score = score
         cardView.unit = habit.unit
         cardView.threshold = habit.targetValue / habit.frequency.denominator
-        cardView.notesIndicators = notesIndicators
 
         val detector = GestureDetector(context, CardViewGestureDetector(holder))
         cardView.setOnTouchListener { _, ev ->

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

@@ -57,12 +57,6 @@ class HabitCardViewFactory
     fun create() = HabitCardView(context, checkmarkPanelFactory, numberPanelFactory, behavior)
 }
 
-data class DelayedToggle(
-    var habit: Habit,
-    var timestamp: Timestamp,
-    var value: Int
-)
-
 class HabitCardView(
     @ActivityContext context: Context,
     checkmarkPanelFactory: CheckmarkPanelViewFactory,
@@ -121,22 +115,12 @@ class HabitCardView(
             numberPanel.threshold = value
         }
 
-    var notesIndicators
-        get() = checkmarkPanel.notesIndicators
-        set(values) {
-            checkmarkPanel.notesIndicators = values
-            numberPanel.notesIndicators = values
-        }
-
     var checkmarkPanel: CheckmarkPanelView
     private var numberPanel: NumberPanelView
     private var innerFrame: LinearLayout
     private var label: TextView
     private var scoreRing: RingView
 
-    private var currentToggleTaskId = 0
-    private var queuedToggles = mutableListOf<DelayedToggle>()
-
     init {
         scoreRing = RingView(context).apply {
             val thickness = dp(3f)
@@ -159,14 +143,7 @@ class HabitCardView(
         checkmarkPanel = checkmarkPanelFactory.create().apply {
             onToggle = { timestamp, value ->
                 triggerRipple(timestamp)
-                habit?.let {
-                    val taskId = queueToggle(it, timestamp, value);
-                    { runPendingToggles(taskId) }.delay(TOGGLE_DELAY_MILLIS)
-                }
-            }
-            onEdit = { timestamp ->
-                triggerRipple(timestamp)
-                habit?.let { behavior.onEdit(it, timestamp) }
+                habit?.let { behavior.onToggle(it, timestamp, value) }
             }
         }
 
@@ -202,24 +179,6 @@ class HabitCardView(
         addView(innerFrame)
     }
 
-    @Synchronized
-    private fun runPendingToggles(id: Int) {
-        if (currentToggleTaskId != id) return
-        for ((h, t, v) in queuedToggles) behavior.onToggle(h, t, v)
-        queuedToggles.clear()
-    }
-
-    @Synchronized
-    private fun queueToggle(
-        it: Habit,
-        timestamp: Timestamp,
-        value: Int
-    ): Int {
-        currentToggleTaskId += 1
-        queuedToggles.add(DelayedToggle(it, timestamp, value))
-        return currentToggleTaskId
-    }
-
     override fun onModelChange() {
         Handler(Looper.getMainLooper()).post {
             habit?.let { copyAttributesFrom(it) }
@@ -277,7 +236,6 @@ class HabitCardView(
         numberPanel.apply {
             color = c
             units = h.unit
-            targetType = h.targetType
             threshold = h.targetValue
             visibility = when (h.isNumerical) {
                 true -> View.VISIBLE
@@ -304,12 +262,4 @@ class HabitCardView(
         }
         innerFrame.setBackgroundResource(background)
     }
-
-    companion object {
-        const val TOGGLE_DELAY_MILLIS = 2000L
-
-        fun (() -> Unit).delay(delayInMillis: Long) {
-            Handler(Looper.getMainLooper()).postDelayed(this, delayInMillis)
-        }
-    }
 }

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

@@ -29,15 +29,13 @@ import android.view.View
 import android.view.View.OnClickListener
 import android.view.View.OnLongClickListener
 import org.isoron.uhabits.R
-import org.isoron.uhabits.core.models.NumericalHabitType
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.inject.ActivityContext
 import org.isoron.uhabits.utils.InterfaceUtils.getDimension
+import org.isoron.uhabits.utils.StyledResources
 import org.isoron.uhabits.utils.dim
-import org.isoron.uhabits.utils.drawNotesIndicator
 import org.isoron.uhabits.utils.getFontAwesome
-import org.isoron.uhabits.utils.sres
-import java.lang.Double.max
+import org.isoron.uhabits.utils.showMessage
 import java.text.DecimalFormat
 import javax.inject.Inject
 
@@ -90,22 +88,11 @@ class NumberButtonView(
             invalidate()
         }
 
-    var targetType = NumericalHabitType.AT_LEAST
-        set(value) {
-            field = value
-            invalidate()
-        }
-
     var units = ""
         set(value) {
             field = value
             invalidate()
         }
-    var hasNotes = false
-        set(value) {
-            field = value
-            invalidate()
-        }
 
     var onEdit: () -> Unit = {}
     private var drawer: Drawer = Drawer(context)
@@ -116,7 +103,8 @@ class NumberButtonView(
     }
 
     override fun onClick(v: View) {
-        onEdit()
+        if (preferences.isShortToggleEnabled) onEdit()
+        else showMessage(resources.getString(R.string.long_press_to_edit))
     }
 
     override fun onLongClick(v: View): Boolean {
@@ -139,6 +127,7 @@ class NumberButtonView(
 
         private val em: Float
         private val rect: RectF = RectF()
+        private val sr = StyledResources(context)
 
         private val lowContrast: Int
         private val mediumContrast: Int
@@ -159,23 +148,15 @@ class NumberButtonView(
 
         init {
             em = pNumber.measureText("m")
-            lowContrast = sres.getColor(R.attr.contrast40)
-            mediumContrast = sres.getColor(R.attr.contrast60)
+            lowContrast = sr.getColor(R.attr.contrast40)
+            mediumContrast = sr.getColor(R.attr.contrast60)
         }
 
         fun draw(canvas: Canvas) {
-            var activeColor = if (targetType == NumericalHabitType.AT_LEAST) {
-                when {
-                    value < 0.0 && preferences.areQuestionMarksEnabled -> lowContrast
-                    max(0.0, value) >= threshold -> color
-                    else -> mediumContrast
-                }
-            } else {
-                when {
-                    value < 0.0 && preferences.areQuestionMarksEnabled -> lowContrast
-                    value <= threshold -> color
-                    else -> mediumContrast
-                }
+            val activeColor = when {
+                value <= 0.0 -> lowContrast
+                value < threshold -> mediumContrast
+                else -> color
             }
 
             val label: String
@@ -215,8 +196,6 @@ class NumberButtonView(
                 rect.offset(0f, 1.3f * em)
                 canvas.drawText(units, rect.centerX(), rect.centerY(), pUnit)
             }
-
-            drawNotesIndicator(canvas, color, em, hasNotes)
         }
     }
 }

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

@@ -20,7 +20,6 @@
 package org.isoron.uhabits.activities.habits.list.views
 
 import android.content.Context
-import org.isoron.uhabits.core.models.NumericalHabitType
 import org.isoron.uhabits.core.models.Timestamp
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.core.utils.DateUtils
@@ -48,12 +47,6 @@ class NumberPanelView(
             setupButtons()
         }
 
-    var targetType = NumericalHabitType.AT_LEAST
-        set(value) {
-            field = value
-            setupButtons()
-        }
-
     var threshold = 0.0
         set(value) {
             field = value
@@ -72,12 +65,6 @@ class NumberPanelView(
             setupButtons()
         }
 
-    var notesIndicators = BooleanArray(0)
-        set(values) {
-            field = values
-            setupButtons()
-        }
-
     var onEdit: (Timestamp) -> Unit = {}
         set(value) {
             field = value
@@ -96,12 +83,7 @@ class NumberPanelView(
                 index + dataOffset < values.size -> values[index + dataOffset]
                 else -> 0.0
             }
-            button.hasNotes = when {
-                index + dataOffset < notesIndicators.size -> notesIndicators[index + dataOffset]
-                else -> false
-            }
             button.color = color
-            button.targetType = targetType
             button.threshold = threshold
             button.units = units
             button.onEdit = { onEdit(timestamp) }

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt

@@ -32,14 +32,12 @@ import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.AndroidThemeSwitcher
 import org.isoron.uhabits.activities.HabitsDirFinder
-import org.isoron.uhabits.activities.common.dialogs.CheckmarkDialog
 import org.isoron.uhabits.activities.common.dialogs.ConfirmDeleteDialog
 import org.isoron.uhabits.activities.common.dialogs.HistoryEditorDialog
 import org.isoron.uhabits.activities.common.dialogs.NumberPickerFactory
 import org.isoron.uhabits.core.commands.Command
 import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.models.Habit
-import org.isoron.uhabits.core.models.PaletteColor
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.core.ui.callbacks.OnConfirmedCallback
 import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior
@@ -166,29 +164,9 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
         override fun showNumberPicker(
             value: Double,
             unit: String,
-            notes: String,
-            dateString: String,
             callback: ListHabitsBehavior.NumberPickerCallback,
         ) {
-            NumberPickerFactory(this@ShowHabitActivity).create(value, unit, notes, dateString, callback).show()
-        }
-
-        override fun showCheckmarkDialog(
-            value: Int,
-            notes: String,
-            dateString: String,
-            preferences: Preferences,
-            color: PaletteColor,
-            callback: ListHabitsBehavior.CheckMarkDialogCallback
-        ) {
-            CheckmarkDialog(this@ShowHabitActivity, preferences).create(
-                value,
-                notes,
-                dateString,
-                color,
-                callback,
-                themeSwitcher.currentTheme!!,
-            ).show()
+            NumberPickerFactory(this@ShowHabitActivity).create(value, unit, callback).show()
         }
 
         override fun showEditHabitScreen(habit: Habit) {

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardView.kt

@@ -43,8 +43,6 @@ class HistoryCardView(context: Context, attrs: AttributeSet) : LinearLayout(cont
             theme = state.theme,
             dateFormatter = JavaLocalDateFormatter(Locale.getDefault()),
             series = state.series,
-            defaultSquare = state.defaultSquare,
-            notesIndicators = state.notesIndicators,
             firstWeekday = state.firstWeekday,
         )
         binding.chart.postInvalidate()

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardView.kt

@@ -28,7 +28,6 @@ import org.isoron.platform.gui.toInt
 import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.habits.edit.formatFrequency
 import org.isoron.uhabits.activities.habits.list.views.toShortString
-import org.isoron.uhabits.core.models.NumericalHabitType
 import org.isoron.uhabits.core.ui.screens.habits.show.views.SubtitleCardState
 import org.isoron.uhabits.databinding.ShowHabitSubtitleBinding
 import org.isoron.uhabits.utils.InterfaceUtils
@@ -66,12 +65,7 @@ class SubtitleCardView(context: Context, attrs: AttributeSet) : LinearLayout(con
         binding.questionLabel.visibility = View.VISIBLE
         binding.targetIcon.visibility = View.VISIBLE
         binding.targetText.visibility = View.VISIBLE
-        if (state.isNumerical) {
-            binding.targetIcon.text = when (state.targetType) {
-                NumericalHabitType.AT_LEAST -> resources.getString(R.string.fa_arrow_circle_up)
-                else -> resources.getString(R.string.fa_arrow_circle_down)
-            }
-        } else {
+        if (!state.isNumerical) {
             binding.targetIcon.visibility = View.GONE
             binding.targetText.visibility = View.GONE
         }

uhabits-android/src/main/java/org/isoron/uhabits/activities/intro/IntroActivity.kt

@@ -21,9 +21,8 @@ package org.isoron.uhabits.activities.intro
 
 import android.graphics.Color
 import android.os.Bundle
-import androidx.fragment.app.Fragment
-import com.github.appintro.AppIntro2
-import com.github.appintro.AppIntroFragment
+import com.github.paolorotolo.appintro.AppIntro2
+import com.github.paolorotolo.appintro.AppIntroFragment
 import org.isoron.uhabits.R
 
 /**
@@ -31,9 +30,7 @@ import org.isoron.uhabits.R
  * launched for the first time.
  */
 class IntroActivity : AppIntro2() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+    override fun init(savedInstanceState: Bundle?) {
         showStatusBar(false)
 
         addSlide(
@@ -64,13 +61,11 @@ class IntroActivity : AppIntro2() {
         )
     }
 
-    override fun onDonePressed(currentFragment: Fragment?) {
-        super.onDonePressed(currentFragment)
+    override fun onNextPressed() {}
+
+    override fun onDonePressed() {
         finish()
     }
 
-    override fun onSkipPressed(currentFragment: Fragment?) {
-        super.onSkipPressed(currentFragment)
-        finish()
-    }
+    override fun onSlideChanged() {}
 }

uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt

@@ -19,6 +19,7 @@
 package org.isoron.uhabits.activities.settings
 
 import android.app.backup.BackupManager
+import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener
@@ -27,6 +28,7 @@ import android.os.Build.VERSION
 import android.os.Bundle
 import android.provider.Settings
 import android.util.Log
+import androidx.preference.CheckBoxPreference
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceCategory
@@ -41,6 +43,7 @@ import org.isoron.uhabits.activities.habits.list.RESULT_REPAIR_DB
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.core.ui.NotificationTray
 import org.isoron.uhabits.core.utils.DateUtils.Companion.getLongWeekdayNames
+import org.isoron.uhabits.intents.IntentFactory
 import org.isoron.uhabits.notifications.AndroidNotificationTray.Companion.createAndroidNotificationChannel
 import org.isoron.uhabits.notifications.RingtoneManager
 import org.isoron.uhabits.widgets.WidgetUpdater
@@ -97,6 +100,13 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
             intent.putExtra(Settings.EXTRA_CHANNEL_ID, NotificationTray.REMINDERS_CHANNEL_ID)
             startActivity(intent)
             return true
+        } else if (key == "pref_sync_enabled_dummy") {
+            if (prefs.isSyncEnabled) {
+                prefs.disableSync()
+            } else {
+                val context: Context? = activity
+                context!!.startActivity(IntentFactory().startSyncActivity(context))
+            }
         }
         return super.onPreferenceTreeClick(preference)
     }
@@ -111,6 +121,7 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
             devCategory.isVisible = false
         }
         updateWeekdayPreference()
+        updateSyncPreferences()
 
         if (VERSION.SDK_INT < Build.VERSION_CODES.O)
             findPreference("reminderCustomize").isVisible = false
@@ -119,6 +130,12 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
         }
     }
 
+    private fun updateSyncPreferences() {
+        findPreference("pref_sync_display").isVisible = prefs.isSyncEnabled
+        (findPreference("pref_sync_enabled_dummy") as CheckBoxPreference).isChecked =
+            prefs.isSyncEnabled
+    }
+
     private fun updateWeekdayPreference() {
         val weekdayPref = findPreference("pref_first_weekday") as ListPreference
         val currentFirstWeekday = prefs.firstWeekday.daysSinceSunday + 1
@@ -140,6 +157,7 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
         }
         BackupManager.dataChanged("org.isoron.uhabits")
         updateWeekdayPreference()
+        updateSyncPreferences()
     }
 
     private fun setResultOnPreferenceClick(key: String, result: Int) {

uhabits-android/src/main/java/org/isoron/uhabits/activities/sync/SyncActivity.kt

@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
+ *
+ * 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.sync
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Color
+import android.os.Bundle
+import android.text.Html
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import com.google.zxing.BarcodeFormat
+import com.google.zxing.qrcode.QRCodeWriter
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.invoke
+import kotlinx.coroutines.launch
+import org.isoron.uhabits.HabitsApplication
+import org.isoron.uhabits.R
+import org.isoron.uhabits.activities.AndroidThemeSwitcher
+import org.isoron.uhabits.core.models.PaletteColor
+import org.isoron.uhabits.core.ui.screens.sync.SyncBehavior
+import org.isoron.uhabits.databinding.ActivitySyncBinding
+import org.isoron.uhabits.sync.RemoteSyncServer
+import org.isoron.uhabits.utils.InterfaceUtils.getFontAwesome
+import org.isoron.uhabits.utils.setupToolbar
+import org.isoron.uhabits.utils.showMessage
+
+class SyncActivity : AppCompatActivity(), SyncBehavior.Screen {
+
+    private lateinit var binding: ActivitySyncBinding
+    private lateinit var behavior: SyncBehavior
+
+    private val scope = CoroutineScope(Dispatchers.Main)
+
+    override fun onCreate(savedInstance: Bundle?) {
+        super.onCreate(savedInstance)
+        val component = (application as HabitsApplication).component
+        val preferences = component.preferences
+        val server = RemoteSyncServer(preferences = preferences)
+        val themeSwitcher = AndroidThemeSwitcher(this, component.preferences)
+        themeSwitcher.apply()
+
+        behavior = SyncBehavior(this, preferences, server, component.logging)
+        binding = ActivitySyncBinding.inflate(layoutInflater)
+        binding.errorIcon.typeface = getFontAwesome(this)
+        binding.root.setupToolbar(
+            toolbar = binding.toolbar,
+            color = PaletteColor(11),
+            title = resources.getString(R.string.device_sync),
+            theme = themeSwitcher.currentTheme,
+        )
+        binding.syncLink.setOnClickListener { copyToClipboard() }
+        binding.instructions.text = Html.fromHtml(resources.getString(R.string.sync_instructions))
+        setContentView(binding.root)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        scope.launch {
+            behavior.onResume()
+        }
+    }
+
+    private fun copyToClipboard() {
+        val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        clipboard.setPrimaryClip(ClipData.newPlainText("Loop Sync Link", binding.syncLink.text))
+        showMessage(resources.getString(R.string.copied_to_the_clipboard))
+    }
+
+    suspend fun generateQR(msg: String): Bitmap = Dispatchers.IO {
+        val writer = QRCodeWriter()
+        val matrix = writer.encode(msg, BarcodeFormat.QR_CODE, 1024, 1024)
+        val height = matrix.height
+        val width = matrix.width
+        val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.RGB_565)
+        val bgColor = Color.WHITE
+        val fgColor = Color.BLACK
+        for (x in 0 until width) {
+            for (y in 0 until height) {
+                val color = if (matrix.get(x, y)) fgColor else bgColor
+                bitmap.setPixel(x, y, color)
+            }
+        }
+        return@IO bitmap
+    }
+
+    suspend fun showQR(msg: String) {
+        binding.progress.visibility = View.GONE
+        binding.qrCode.visibility = View.VISIBLE
+        binding.qrCode.setImageBitmap(generateQR(msg))
+    }
+
+    override suspend fun showLoadingScreen() {
+        binding.qrCode.visibility = View.GONE
+        binding.progress.visibility = View.VISIBLE
+        binding.errorPanel.visibility = View.GONE
+    }
+
+    override suspend fun showErrorScreen() {
+        binding.qrCode.visibility = View.GONE
+        binding.progress.visibility = View.GONE
+        binding.errorPanel.visibility = View.VISIBLE
+    }
+
+    override suspend fun showLink(link: String) {
+        binding.qrCode.visibility = View.GONE
+        binding.progress.visibility = View.VISIBLE
+        binding.errorPanel.visibility = View.GONE
+        binding.syncLink.text = link
+        showQR(link)
+    }
+}

uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingActivity.kt

@@ -23,17 +23,17 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.activities.AndroidThemeSwitcher
-import org.isoron.uhabits.core.models.HabitMatcher
+import org.isoron.uhabits.core.models.HabitMatcherBuilder
 
 class EditSettingActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val app = applicationContext as HabitsApplication
         val habits = app.component.habitList.getFiltered(
-            HabitMatcher(
-                isArchivedAllowed = false,
-                isCompletedAllowed = true,
-            )
+            HabitMatcherBuilder()
+                .setArchivedAllowed(false)
+                .setCompletedAllowed(true)
+                .build()
         )
         AndroidThemeSwitcher(this, app.component.preferences).apply()
 

uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsApplicationComponent.kt

@@ -29,6 +29,7 @@ import org.isoron.uhabits.core.models.ModelFactory
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.core.preferences.WidgetPreferences
 import org.isoron.uhabits.core.reminders.ReminderScheduler
+import org.isoron.uhabits.core.sync.SyncManager
 import org.isoron.uhabits.core.tasks.TaskRunner
 import org.isoron.uhabits.core.ui.NotificationTray
 import org.isoron.uhabits.core.ui.screens.habits.list.HabitCardListCache
@@ -63,4 +64,5 @@ interface HabitsApplicationComponent {
     val taskRunner: TaskRunner
     val widgetPreferences: WidgetPreferences
     val widgetUpdater: WidgetUpdater
+    val syncManager: SyncManager
 }

uhabits-android/src/main/java/org/isoron/uhabits/inject/HabitsModule.kt

@@ -19,6 +19,7 @@
 
 package org.isoron.uhabits.inject
 
+import android.content.Context
 import dagger.Module
 import dagger.Provides
 import org.isoron.uhabits.core.AppScope
@@ -33,6 +34,8 @@ import org.isoron.uhabits.core.models.sqlite.SQLiteHabitList
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.core.preferences.WidgetPreferences
 import org.isoron.uhabits.core.reminders.ReminderScheduler
+import org.isoron.uhabits.core.sync.AbstractSyncServer
+import org.isoron.uhabits.core.sync.NetworkManager
 import org.isoron.uhabits.core.tasks.TaskRunner
 import org.isoron.uhabits.core.ui.NotificationTray
 import org.isoron.uhabits.database.AndroidDatabase
@@ -41,6 +44,8 @@ import org.isoron.uhabits.intents.IntentScheduler
 import org.isoron.uhabits.io.AndroidLogging
 import org.isoron.uhabits.notifications.AndroidNotificationTray
 import org.isoron.uhabits.preferences.SharedPreferencesStorage
+import org.isoron.uhabits.sync.AndroidNetworkManager
+import org.isoron.uhabits.sync.RemoteSyncServer
 import org.isoron.uhabits.utils.DatabaseUtils
 import java.io.File
 
@@ -109,6 +114,18 @@ class HabitsModule(dbFile: File) {
         return AndroidLogging()
     }
 
+    @Provides
+    @AppScope
+    fun getNetworkManager(@AppContext context: Context): NetworkManager {
+        return AndroidNetworkManager(context)
+    }
+
+    @Provides
+    @AppScope
+    fun getSyncServer(preferences: Preferences): AbstractSyncServer {
+        return RemoteSyncServer(preferences)
+    }
+
     @Provides
     @AppScope
     fun getDatabase(): Database {

uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentFactory.kt

@@ -28,6 +28,7 @@ import org.isoron.uhabits.activities.habits.edit.EditHabitActivity
 import org.isoron.uhabits.activities.habits.show.ShowHabitActivity
 import org.isoron.uhabits.activities.intro.IntroActivity
 import org.isoron.uhabits.activities.settings.SettingsActivity
+import org.isoron.uhabits.activities.sync.SyncActivity
 import org.isoron.uhabits.core.models.Habit
 import javax.inject.Inject
 
@@ -100,4 +101,8 @@ class IntentFactory
         intent.putExtra("habitType", habitType)
         return intent
     }
+
+    fun startSyncActivity(context: Context): Intent {
+        return Intent(context, SyncActivity::class.java)
+    }
 }

uhabits-android/src/main/java/org/isoron/uhabits/intents/IntentScheduler.kt

@@ -25,6 +25,8 @@ import android.app.AlarmManager.RTC_WAKEUP
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Context.ALARM_SERVICE
+import android.os.Build.VERSION.SDK_INT
+import android.os.Build.VERSION_CODES.M
 import android.util.Log
 import org.isoron.uhabits.core.AppScope
 import org.isoron.uhabits.core.models.Habit
@@ -56,7 +58,10 @@ class IntentScheduler
             )
             return SchedulerResult.IGNORED
         }
-        manager.setExactAndAllowWhileIdle(alarmType, timestamp, intent)
+        if (SDK_INT >= M)
+            manager.setExactAndAllowWhileIdle(alarmType, timestamp, intent)
+        else
+            manager.setExact(alarmType, timestamp, intent)
         return SchedulerResult.OK
     }
 

uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt

@@ -20,7 +20,6 @@
 package org.isoron.uhabits.intents
 
 import android.app.PendingIntent
-import android.app.PendingIntent.FLAG_IMMUTABLE
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.app.PendingIntent.getBroadcast
 import android.content.Context
@@ -50,7 +49,7 @@ class PendingIntentFactory
                 action = WidgetReceiver.ACTION_ADD_REPETITION
                 if (timestamp != null) putExtra("timestamp", timestamp.unixTime)
             },
-            FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT
+            FLAG_UPDATE_CURRENT
         )
 
     fun dismissNotification(habit: Habit): PendingIntent =
@@ -61,7 +60,7 @@ class PendingIntentFactory
                 action = WidgetReceiver.ACTION_DISMISS_REMINDER
                 data = Uri.parse(habit.uriString)
             },
-            FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT
+            FLAG_UPDATE_CURRENT
         )
 
     fun removeRepetition(habit: Habit, timestamp: Timestamp?): PendingIntent =
@@ -73,7 +72,7 @@ class PendingIntentFactory
                 data = Uri.parse(habit.uriString)
                 if (timestamp != null) putExtra("timestamp", timestamp.unixTime)
             },
-            FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT
+            FLAG_UPDATE_CURRENT
         )
 
     fun showHabit(habit: Habit): PendingIntent =
@@ -85,7 +84,7 @@ class PendingIntentFactory
                     habit
                 )
             )
-            .getPendingIntent(0, FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT)!!
+            .getPendingIntent(0, FLAG_UPDATE_CURRENT)!!
 
     fun showReminder(
         habit: Habit,
@@ -101,7 +100,7 @@ class PendingIntentFactory
                 putExtra("timestamp", timestamp)
                 putExtra("reminderTime", reminderTime)
             },
-            FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT
+            FLAG_UPDATE_CURRENT
         )
 
     fun snoozeNotification(habit: Habit): PendingIntent =
@@ -112,7 +111,7 @@ class PendingIntentFactory
                 data = Uri.parse(habit.uriString)
                 action = ReminderReceiver.ACTION_SNOOZE_REMINDER
             },
-            FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT
+            FLAG_UPDATE_CURRENT
         )
 
     fun toggleCheckmark(habit: Habit, timestamp: Long?): PendingIntent =
@@ -124,7 +123,7 @@ class PendingIntentFactory
                 action = WidgetReceiver.ACTION_TOGGLE_REPETITION
                 if (timestamp != null) putExtra("timestamp", timestamp)
             },
-            FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT
+            FLAG_UPDATE_CURRENT
         )
 
     fun setNumericalValue(
@@ -143,7 +142,7 @@ class PendingIntentFactory
                 putExtra("numericalValue", numericalValue)
                 if (timestamp != null) putExtra("timestamp", timestamp)
             },
-            FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT
+            FLAG_UPDATE_CURRENT
         )
 
     fun updateWidgets(): PendingIntent =
@@ -153,6 +152,6 @@ class PendingIntentFactory
             Intent(context, WidgetReceiver::class.java).apply {
                 action = WidgetReceiver.ACTION_UPDATE_WIDGETS_VALUE
             },
-            FLAG_IMMUTABLE or FLAG_UPDATE_CURRENT
+            FLAG_UPDATE_CURRENT
         )
 }

uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt

@@ -153,15 +153,13 @@ class AndroidNotificationTray
         if (preferences.shouldMakeNotificationsLed())
             builder.setLights(Color.RED, 1000, 1000)
 
-        if (SDK_INT < Build.VERSION_CODES.S) {
-            val snoozeAction = Action(
-                R.drawable.ic_action_snooze,
-                context.getString(R.string.snooze),
-                pendingIntents.snoozeNotification(habit)
-            )
-            wearableExtender.addAction(snoozeAction)
-            builder.addAction(snoozeAction)
-        }
+        val snoozeAction = Action(
+            R.drawable.ic_action_snooze,
+            context.getString(R.string.snooze),
+            pendingIntents.snoozeNotification(habit)
+        )
+        wearableExtender.addAction(snoozeAction)
+        builder.addAction(snoozeAction)
 
         builder.extend(wearableExtender)
         return builder.build()

uhabits-android/src/main/java/org/isoron/uhabits/receivers/ReminderReceiver.kt

@@ -22,8 +22,6 @@ import android.content.BroadcastReceiver
 import android.content.ContentUris
 import android.content.Context
 import android.content.Intent
-import android.os.Build
-import android.os.Build.VERSION.SDK_INT
 import android.util.Log
 import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.core.models.Habit
@@ -78,21 +76,8 @@ class ReminderReceiver : BroadcastReceiver() {
                 }
                 ACTION_SNOOZE_REMINDER -> {
                     if (habit == null) return
-                    if (SDK_INT < Build.VERSION_CODES.S) {
-                        Log.d(
-                            "ReminderReceiver",
-                            String.format("onSnoozePressed habit=%d", habit.id)
-                        )
-                        reminderController.onSnoozePressed(habit, context)
-                    } else {
-                        Log.w(
-                            "ReminderReceiver",
-                            String.format(
-                                "onSnoozePressed habit=%d, should be deactivated in recent versions.",
-                                habit.id
-                            )
-                        )
-                    }
+                    Log.d("ReminderReceiver", String.format("onSnoozePressed habit=%d", habit.id))
+                    reminderController.onSnoozePressed(habit, context)
                 }
                 Intent.ACTION_BOOT_COMPLETED -> {
                     Log.d("ReminderReceiver", "onBootCompleted")

uhabits-android/src/main/java/org/isoron/uhabits/sync/AndroidNetworkManager.kt

@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
+ *
+ * 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.sync
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkRequest
+import org.isoron.uhabits.core.sync.NetworkManager
+
+class AndroidNetworkManager(
+    val context: Context,
+) : NetworkManager, ConnectivityManager.NetworkCallback() {
+
+    val listeners = mutableListOf<NetworkManager.Listener>()
+    var connected = false
+
+    init {
+        val cm = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        cm.registerNetworkCallback(NetworkRequest.Builder().build(), this)
+    }
+
+    override fun addListener(listener: NetworkManager.Listener) {
+        if (connected) listener.onNetworkAvailable()
+        else listener.onNetworkLost()
+        listeners.add(listener)
+    }
+
+    override fun remoteListener(listener: NetworkManager.Listener) {
+        listeners.remove(listener)
+    }
+
+    override fun onAvailable(network: Network) {
+        connected = true
+        for (l in listeners) l.onNetworkAvailable()
+    }
+
+    override fun onLost(network: Network) {
+        connected = false
+        for (l in listeners) l.onNetworkLost()
+    }
+}

uhabits-android/src/main/java/org/isoron/uhabits/sync/RemoteSyncServer.kt

@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
+ *
+ * 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.sync
+
+import android.util.Log
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.android.Android
+import io.ktor.client.features.ClientRequestException
+import io.ktor.client.features.ServerResponseException
+import io.ktor.client.features.json.JsonFeature
+import io.ktor.client.request.get
+import io.ktor.client.request.header
+import io.ktor.client.request.post
+import io.ktor.client.request.put
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.invoke
+import org.isoron.uhabits.core.preferences.Preferences
+import org.isoron.uhabits.core.sync.AbstractSyncServer
+import org.isoron.uhabits.core.sync.EditConflictException
+import org.isoron.uhabits.core.sync.GetDataVersionResponse
+import org.isoron.uhabits.core.sync.KeyNotFoundException
+import org.isoron.uhabits.core.sync.RegisterReponse
+import org.isoron.uhabits.core.sync.ServiceUnavailable
+import org.isoron.uhabits.core.sync.SyncData
+
+class RemoteSyncServer(
+    private val preferences: Preferences,
+    private val httpClient: HttpClient = HttpClient(Android) {
+        install(JsonFeature)
+    }
+) : AbstractSyncServer {
+
+    override suspend fun register(): String = Dispatchers.IO {
+        try {
+            val url = "${preferences.syncBaseURL}/register"
+            Log.i("RemoteSyncServer", "POST $url")
+            val response: RegisterReponse = httpClient.post(url)
+            return@IO response.key
+        } catch (e: ServerResponseException) {
+            throw ServiceUnavailable()
+        }
+    }
+
+    override suspend fun put(key: String, newData: SyncData) = Dispatchers.IO {
+        try {
+            val url = "${preferences.syncBaseURL}/db/$key"
+            Log.i("RemoteSyncServer", "PUT $url")
+            val response: String = httpClient.put(url) {
+                header("Content-Type", "application/json")
+                body = newData
+            }
+        } catch (e: ServerResponseException) {
+            throw ServiceUnavailable()
+        } catch (e: ClientRequestException) {
+            Log.w("RemoteSyncServer", "ClientRequestException", e)
+            if (e.message!!.contains("409")) throw EditConflictException()
+            if (e.message!!.contains("404")) throw KeyNotFoundException()
+            throw e
+        }
+    }
+
+    override suspend fun getData(key: String): SyncData = Dispatchers.IO {
+        try {
+            val url = "${preferences.syncBaseURL}/db/$key"
+            Log.i("RemoteSyncServer", "GET $url")
+            return@IO httpClient.get<SyncData>(url)
+        } catch (e: ServerResponseException) {
+            throw ServiceUnavailable()
+        } catch (e: ClientRequestException) {
+            Log.w("RemoteSyncServer", "ClientRequestException", e)
+            throw KeyNotFoundException()
+        }
+    }
+
+    override suspend fun getDataVersion(key: String): Long = Dispatchers.IO {
+        try {
+            val url = "${preferences.syncBaseURL}/db/$key/version"
+            Log.i("RemoteSyncServer", "GET $url")
+            val response: GetDataVersionResponse = httpClient.get(url)
+            return@IO response.version
+        } catch (e: ServerResponseException) {
+            throw ServiceUnavailable()
+        } catch (e: ClientRequestException) {
+            Log.w("RemoteSyncServer", "ClientRequestException", e)
+            throw KeyNotFoundException()
+        }
+    }
+}

uhabits-android/src/main/java/org/isoron/uhabits/utils/ViewExtensions.kt

@@ -22,9 +22,7 @@ package org.isoron.uhabits.utils
 import android.app.Activity
 import android.content.ActivityNotFoundException
 import android.content.Intent
-import android.graphics.Canvas
 import android.graphics.Color
-import android.graphics.Paint
 import android.graphics.drawable.ColorDrawable
 import android.os.Handler
 import android.view.LayoutInflater
@@ -201,15 +199,5 @@ fun View.dim(id: Int) = InterfaceUtils.getDimension(context, id)
 fun View.sp(value: Float) = InterfaceUtils.spToPixels(context, value)
 fun View.dp(value: Float) = InterfaceUtils.dpToPixels(context, value)
 fun View.str(id: Int) = resources.getString(id)
-
-fun View.drawNotesIndicator(canvas: Canvas, color: Int, size: Float, hasNotes: Boolean) {
-    val pNotesIndicator = Paint()
-    pNotesIndicator.color = color
-    if (hasNotes) {
-        val cy = 0.8f * size
-        canvas.drawCircle(width.toFloat() - cy, cy, 8f, pNotesIndicator)
-    }
-}
-
 val View.sres: StyledResources
     get() = StyledResources(context)

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

@@ -56,10 +56,7 @@ class HistoryWidget(
             theme = WidgetTheme(),
         )
         (widgetView.dataView as AndroidDataView).apply {
-            val historyChart = (this.view as HistoryChart)
-            historyChart.series = model.series
-            historyChart.defaultSquare = model.defaultSquare
-            historyChart.notesIndicators = model.notesIndicators
+            (this.view as HistoryChart).series = model.series
         }
     }
 
@@ -74,8 +71,6 @@ class HistoryWidget(
                     dateFormatter = JavaLocalDateFormatter(Locale.getDefault()),
                     firstWeekday = prefs.firstWeekday,
                     series = listOf(),
-                    defaultSquare = HistoryChart.Square.OFF,
-                    notesIndicators = listOf(),
                 )
             }
         ).apply {

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

@@ -26,8 +26,8 @@ import android.content.Intent
 import android.net.Uri
 import android.view.View
 import android.widget.RemoteViews
-import org.isoron.platform.utils.StringUtils
 import org.isoron.uhabits.core.models.Habit
+import org.isoron.uhabits.core.utils.StringUtils
 
 class StackWidget(
     context: Context,

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

@@ -27,11 +27,11 @@ import android.util.Log
 import android.widget.RemoteViews
 import android.widget.RemoteViewsService
 import android.widget.RemoteViewsService.RemoteViewsFactory
-import org.isoron.platform.utils.StringUtils.Companion.splitLongs
 import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.core.models.Habit
 import org.isoron.uhabits.core.models.HabitNotFoundException
 import org.isoron.uhabits.core.preferences.Preferences
+import org.isoron.uhabits.core.utils.StringUtils.Companion.splitLongs
 import org.isoron.uhabits.utils.InterfaceUtils.dpToPixels
 import java.util.ArrayList
 

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

@@ -60,8 +60,8 @@ class NumericalCheckmarkWidgetActivity : Activity(), ListHabitsBehavior.NumberPi
         SystemUtils.unlockScreen(this)
     }
 
-    override fun onNumberPicked(newValue: Double, notes: String) {
-        behavior.setValue(data.habit, data.timestamp, (newValue * 1000).toInt(), notes)
+    override fun onNumberPicked(newValue: Double) {
+        behavior.setValue(data.habit, data.timestamp, (newValue * 1000).toInt())
         widgetUpdater.updateWidgets()
         finish()
     }
@@ -79,8 +79,6 @@ class NumericalCheckmarkWidgetActivity : Activity(), ListHabitsBehavior.NumberPi
         numberPickerFactory.create(
             entry.value / 1000.0,
             data.habit.unit,
-            entry.notes,
-            today.toDialogDateString(),
             this
         ).show()
     }

uhabits-android/src/main/res/drawable-anydpi/ic_arrow_down_dark.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF"
+    android:alpha="0.8">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z"/>
+</vector>

uhabits-android/src/main/res/drawable-anydpi/ic_arrow_down_light.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#333333"
+    android:alpha="0.6">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z"/>
+</vector>

uhabits-android/src/main/res/drawable-anydpi/ic_arrow_up_dark.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF"
+    android:alpha="0.8">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z"/>
+</vector>

uhabits-android/src/main/res/drawable-anydpi/ic_arrow_up_light.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#333333"
+    android:alpha="0.6">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z"/>
+</vector>