Update AGP; disable lint

#1941 DateUtils test fix

.github/dependabot.yml

@@ -4,3 +4,8 @@ updates:
     directory: "/"
     schedule:
       interval: "monthly"
+    open-pull-requests-limit: 10
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "monthly"

.github/workflows/main.yml

@@ -12,17 +12,17 @@ jobs:
     timeout-minutes: 30
     steps:
     - name: Check out source code
-      uses: actions/checkout@v1
+      uses: actions/checkout@v4
 
     - name: Build project
       run: ./build.sh build
 
     - name: Run Android tests
-      run: ./build.sh android-tests-parallel 28 29 30 31 32 33
+      run: ./build.sh android-tests-parallel 28 29 30 32 33 34
 
     - name: Upload artifacts
       if: always()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: build
         path: |

.gitignore

@@ -17,3 +17,4 @@ node_modules
 *xcuserdata*
 *.sketch
 crowdin.yml
+kotlin-js-store

CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## [2.2.0] -- 2024-01-30
+### Added
+- Add support for Android 14 (@iSoron, @hiqua)
+- Allow user to change app language (@leondzn)
+
+### Fixed
+- Implement workaround to make notifications non-dismissible in Android 14 (@iSoron, #1872)
+- Fix splash screen background color in dark mode (@SIKV, #1888)
+
+## [2.1.3] -- 2023-08-28
+### Fixed
+- Use text input on Samsung devices (@iSoron, #1719)
+- Prevent crash if alarm permission is revoked (@iSoron)
+- Adjust widget colors (@iSoron)
+- Fix bug preventing screens from updating at midnight (@iSoron)
+- Fix skip button in locales that use comma instead of dot (@iSoron, #1721)
+
+## [2.1.2] -- 2023-05-26
+### Fixed
+- Fix bug that caused widget to enter checkmark on wrong date (@iSoron, #1541)
+- Fix widget corners on Android 12 (@iSoron)
+- Fix bug that caused notes to be lost when editing a checkmark (@iSoron, #1566)
+- Prevent soft keyboard from covering entry popup (@iSoron)
+- Accept comma (instead of dot) in certain locales (@iSoron)
+
+### Changed
+- Remove update delay after entering a checkmark (@iSoron)
+
+### Removed
+- Remove stack widgets (@iSoron)
+
+
 ## [2.1.1] -- 2022-09-24
 ### Fixed
 - Fix Tasker plugin (@iSoron, #1503)

README.md

@@ -17,8 +17,8 @@ show you how your habits improved over time. It is completely ad-free and open
 source.
 
 <p align="center">
-  <a href="https://play.google.com/store/apps/details?id=org.isoron.uhabits&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&pcampaignid=MKT-AC-global-none-all-co-pr-py-PartBadges-Oct1515-1"><img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/apps/en-play-badge-border.png" height="75px"/></a>
-  <a href="https://f-droid.org/app/org.isoron.uhabits"><img alt="Get it on F-Droid" src="https://i.imgur.com/baSPE7X.png" height="75px"/></a>
+  <a href="https://play.google.com/store/apps/details?id=org.isoron.uhabits&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&pcampaignid=MKT-AC-global-none-all-co-pr-py-PartBadges-Oct1515-1"><img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" height="80px"/></a>
+  <a href="https://f-droid.org/app/org.isoron.uhabits"><img alt="Get it on F-Droid" src="https://f-droid.org/badge/get-it-on.png" height="80px"/></a>
 </p>
 
 ## Screenshots

build.gradle.kts

@@ -1,11 +1,10 @@
 plugins {
-    val kotlinVersion = "1.7.21"
-    id("com.android.application") version ("7.3.1") apply (false)
+    val kotlinVersion = "1.9.22"
+    id("com.android.application") version "8.4.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 "11.0.0"
+    id("org.jlleitschuh.gradle.ktlint") version "11.6.1"
 }
 
 apply {

build.sh

@@ -64,6 +64,7 @@ fail() {
 core_build() {
     log_info "Building uhabits-core..."
     $GRADLE ktlintCheck || fail
+    $GRADLE lintDebug || fail
     $GRADLE :uhabits-core:build || fail
 }
 
@@ -181,7 +182,7 @@ android_test() {
         OUT_INSTRUMENT=${ANDROID_OUTPUTS_DIR}/instrument-${API}.txt
         OUT_LOGCAT=${ANDROID_OUTPUTS_DIR}/logcat-${API}.txt
         FAILED_TESTS=""
-        for i in {1..5}; do
+        for i in {1..10}; do
             log_info "Running $size instrumented tests (attempt $i)..."
             $ADB shell am instrument \
                 -r -e coverage true -e size "$size" $FAILED_TESTS \
@@ -217,20 +218,28 @@ android_test_parallel() {
         (
             LOG=build/android-test-$API.log
             log_info "API $API: Running tests..."
-            if android_test $API 1>$LOG 2>&1; then
+            android_test $API 1>$LOG 2>&1
+            ret_code=$?
+            if [ $ret_code = 0 ]; then
                 log_info "API $API: Passed"
             else
                 log_error "API $API: Failed"
             fi
             pkill -9 -f ${AVD_PREFIX}${API}
+            exit $ret_code
         )&
 	PIDS+=" $!"
     done
 
     # Check exit codes
-    RET_CODE=0
+    success=0
     for pid in $PIDS; do
-        wait $pid || RET_CODE=1
+        wait $pid
+        ret_code=$?
+        if [ $ret_code != 0 ]; then
+            success=1
+        fi
+        echo pid=$pid ret_code=$ret_code success=$success
     done
 
     # Print all logs
@@ -240,7 +249,7 @@ android_test_parallel() {
         echo "::endgroup::"
     done
 
-    return $RET_CODE
+    return $success
 }
 
 android_build() {

gradle.properties

@@ -3,3 +3,6 @@ org.gradle.daemon=true
 org.gradle.jvmargs=-Xms2048m -Xmx2048m
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

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

uhabits-android/build.gradle.kts

@@ -18,11 +18,10 @@
  */
 
 plugins {
-    id("com.github.triplet.play") version "3.7.0"
-    id("com.android.application")
+    id("com.github.triplet.play") version "3.8.6"
+    id("com.android.application") version "8.4.0"
     id("org.jetbrains.kotlin.android")
     id("org.jetbrains.kotlin.kapt")
-    id("org.jetbrains.kotlin.android.extensions")
     id("org.jlleitschuh.gradle.ktlint")
 }
 
@@ -30,15 +29,27 @@ tasks.compileLint {
     dependsOn("updateTranslators")
 }
 
+/*
+Added on top of kotlinOptions to work around this issue:
+https://youtrack.jetbrains.com/issue/KTIJ-24311/task-current-target-is-17-and-kaptGenerateStubsProductionDebugKotlin-task-current-target-is-1.8-jvm-target-compatibility-should#focus=Comments-27-6798448.0-0
+Updating gradle might fix this, so try again in the future to remove this and run:
+./gradlew --rerun-tasks :uhabits-android:kaptGenerateStubsReleaseKotlin
+If this doesn't produce any warning, try to remove it.
+ */
+kotlin {
+    jvmToolchain(11)
+}
+
 android {
 
-    compileSdk = 32
+    namespace = "org.isoron.uhabits"
+    compileSdk = 34
 
     defaultConfig {
-        versionCode = 20101
-        versionName = "2.1.1"
+        versionCode = 20200
+        versionName = "2.2.0"
         minSdk = 28
-        targetSdk = 31
+        targetSdk = 34
         applicationId = "org.isoron.uhabits"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -70,21 +81,28 @@ android {
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-        targetCompatibility(JavaVersion.VERSION_1_8)
-        sourceCompatibility(JavaVersion.VERSION_1_8)
+        targetCompatibility(JavaVersion.VERSION_11)
+        sourceCompatibility(JavaVersion.VERSION_11)
+    }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
 
     buildFeatures {
         viewBinding = true
     }
+
+    lint {
+        abortOnError = false
+    }
 }
 
 dependencies {
-    val daggerVersion = "2.44.2"
-    val kotlinVersion = "1.7.21"
-    val kxCoroutinesVersion = "1.6.4"
+    val daggerVersion = "2.51.1"
+    val kotlinVersion = "1.9.22"
+    val kxCoroutinesVersion = "1.7.3"
     val ktorVersion = "1.6.8"
-    val espressoVersion = "3.5.0"
+    val espressoVersion = "3.5.1"
 
     androidTestImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion")
     androidTestImplementation("androidx.test.espresso:espresso-core:$espressoVersion")
@@ -92,17 +110,17 @@ dependencies {
     androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito:2.28.3")
     androidTestImplementation("io.ktor:ktor-client-mock:$ktorVersion")
     androidTestImplementation("io.ktor:ktor-jackson:$ktorVersion")
-    androidTestImplementation("androidx.annotation:annotation:1.5.0")
-    androidTestImplementation("androidx.test.ext:junit:1.1.4")
+    androidTestImplementation("androidx.annotation:annotation:1.7.1")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0")
     androidTestImplementation("androidx.test:rules:1.5.0")
-    androidTestImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
+    androidTestImplementation("org.mockito.kotlin:mockito-kotlin:5.2.1")
     compileOnly("javax.annotation:jsr250-api:1.0")
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2")
-    implementation("com.github.AppIntro:AppIntro:6.2.0")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
+    implementation("com.github.AppIntro:AppIntro:6.3.1")
     implementation("com.google.code.findbugs:jsr305:3.0.2")
     implementation("com.google.dagger:dagger:$daggerVersion")
-    implementation("com.google.guava:guava:31.1-android")
+    implementation("com.google.guava:guava:33.1.0-android")
     implementation("io.ktor:ktor-client-android:$ktorVersion")
     implementation("io.ktor:ktor-client-core:$ktorVersion")
     implementation("io.ktor:ktor-client-jackson:$ktorVersion")
@@ -110,17 +128,18 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kxCoroutinesVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kxCoroutinesVersion")
-    implementation("androidx.appcompat:appcompat:1.5.1")
+    implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("androidx.legacy:legacy-preference-v14:1.0.0")
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
-    implementation("com.google.android.material:material:1.7.0")
-    implementation("com.opencsv:opencsv:5.7.1")
+    implementation("com.google.android.material:material:1.11.0")
+    implementation("com.opencsv:opencsv:5.9")
+    implementation("nl.dionsegijn:konfetti-xml:2.0.2")
     implementation(project(":uhabits-core"))
     kapt("com.google.dagger:dagger-compiler:$daggerVersion")
     kaptAndroidTest("com.google.dagger:dagger-compiler:$daggerVersion")
     testImplementation("com.google.dagger:dagger:$daggerVersion")
     testImplementation("junit:junit:4.13.2")
-    testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
+    testImplementation("org.mockito.kotlin:mockito-kotlin:5.2.1")
 }
 
 kapt {

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

@@ -39,6 +39,7 @@ open class BaseUserInterfaceTest {
     private lateinit var prefs: Preferences
     private lateinit var fixtures: HabitFixtures
     private lateinit var cache: HabitCardListCache
+
     @Before
     @Throws(Exception::class)
     fun setUp() {

uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.kt

@@ -153,18 +153,22 @@ open class BaseViewTest : BaseAndroidTest() {
         var filename = filename
         var dir = getSDCardDir("test-screenshots")
         if (dir == null) dir = AndroidDirFinder(targetContext).getFilesDir("test-screenshots")
-        if (dir == null) throw RuntimeException(
-            "Could not find suitable dir for screenshots"
-        )
+        if (dir == null) {
+            throw RuntimeException(
+                "Could not find suitable dir for screenshots"
+            )
+        }
         filename = filename.replace("\\.png$".toRegex(), "$suffix.png")
         val absolutePath = String.format("%s/%s", dir.absolutePath, filename)
         val parent = File(absolutePath).parentFile
-        if (!parent.exists() && !parent.mkdirs()) throw RuntimeException(
-            String.format(
-                "Could not create dir: %s",
-                parent.absolutePath
+        if (!parent.exists() && !parent.mkdirs()) {
+            throw RuntimeException(
+                String.format(
+                    "Could not create dir: %s",
+                    parent.absolutePath
+                )
             )
-        )
+        }
         val out = FileOutputStream(absolutePath)
         bitmap.compress(Bitmap.CompressFormat.PNG, 100, out)
         return absolutePath

uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsActivityTestComponent.kt

@@ -19,7 +19,6 @@
 
 package org.isoron.uhabits
 
-import com.nhaarman.mockitokotlin2.mock
 import dagger.Component
 import dagger.Module
 import dagger.Provides
@@ -35,6 +34,7 @@ import org.isoron.uhabits.inject.ActivityScope
 import org.isoron.uhabits.inject.HabitModule
 import org.isoron.uhabits.inject.HabitsActivityModule
 import org.isoron.uhabits.inject.HabitsApplicationComponent
+import org.mockito.kotlin.mock
 
 @Module
 class TestModule {

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

@@ -20,7 +20,6 @@ package org.isoron.uhabits.acceptance.steps
 
 import android.os.Build
 import android.os.Build.VERSION.SDK_INT
-import android.os.Build.VERSION_CODES
 import androidx.annotation.StringRes
 import androidx.recyclerview.widget.RecyclerView
 import androidx.test.espresso.Espresso
@@ -33,11 +32,11 @@ import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
-import junit.framework.Assert.assertTrue
 import org.hamcrest.CoreMatchers
 import org.isoron.uhabits.BaseUserInterfaceTest
 import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.habits.list.ListHabitsActivity
+import org.junit.Assert.assertTrue
 
 object CommonSteps : BaseUserInterfaceTest() {
     fun pressBack() {
@@ -148,15 +147,19 @@ object CommonSteps : BaseUserInterfaceTest() {
             Screen.LIST_HABITS ->
                 Espresso.onView(ViewMatchers.withClassName(CoreMatchers.endsWith("ListHabitsRootView")))
                     .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
             Screen.SHOW_HABIT ->
                 Espresso.onView(ViewMatchers.withId(R.id.subtitleCard))
                     .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
             Screen.EDIT_HABIT ->
                 Espresso.onView(ViewMatchers.withId(R.id.questionInput))
                     .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
             Screen.SELECT_HABIT_TYPE ->
                 Espresso.onView(ViewMatchers.withText(R.string.yes_or_no_example))
                     .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+
             else -> throw IllegalStateException()
         }
     }

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

@@ -21,9 +21,9 @@ package org.isoron.uhabits.acceptance.steps
 import android.os.Build.VERSION.SDK_INT
 import androidx.test.uiautomator.UiScrollable
 import androidx.test.uiautomator.UiSelector
-import junit.framework.Assert.assertFalse
-import junit.framework.Assert.assertTrue
 import org.isoron.uhabits.BaseUserInterfaceTest
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 
 object WidgetSteps {
     @Throws(Exception::class)

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.kt

@@ -18,6 +18,7 @@
  */
 package org.isoron.uhabits.activities.common.views
 
+import android.view.MotionEvent
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import org.isoron.uhabits.BaseViewTest
@@ -52,7 +53,8 @@ class FrequencyChartTest : BaseViewTest() {
     @Test
     @Throws(Throwable::class)
     fun testRender_withDataOffset() {
-        view.onScroll(null, null, -dpToPixels(150), 0f)
+        val e = MotionEvent.obtain(0, 0, 0, 0f, 0f, 0)
+        view.onScroll(e, e, -dpToPixels(150), 0f)
         view.invalidate()
         assertRenders(view, BASE_PATH + "renderDataOffset.png")
     }

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.kt

@@ -18,6 +18,7 @@
  */
 package org.isoron.uhabits.activities.common.views
 
+import android.view.MotionEvent
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import org.isoron.uhabits.BaseViewTest
@@ -44,7 +45,7 @@ class ScoreChartTest : BaseViewTest() {
             habit = habit,
             firstWeekday = prefs.firstWeekdayInt,
             spinnerPosition = 0,
-            theme = LightTheme(),
+            theme = LightTheme()
         )
         view = ScoreChart(targetContext).apply {
             setScores(state.scores)
@@ -63,7 +64,8 @@ class ScoreChartTest : BaseViewTest() {
     @Test
     @Throws(Throwable::class)
     fun testRender_withDataOffset() {
-        view.onScroll(null, null, -dpToPixels(150), 0f)
+        val e = MotionEvent.obtain(0, 0, 0, 0f, 0f, 0)
+        view.onScroll(e, e, -dpToPixels(150), 0f)
         view.invalidate()
         assertRenders(view, BASE_PATH + "renderDataOffset.png")
     }

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.kt

@@ -30,6 +30,7 @@ import org.junit.runner.RunWith
 @MediumTest
 class StreakChartTest : BaseViewTest() {
     private lateinit var view: StreakChart
+
     @Before
     override fun setUp() {
         super.setUp()

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

@@ -44,7 +44,7 @@ class EntryButtonViewTest : BaseViewTest() {
         view = component.getEntryButtonViewFactory().create().apply {
             value = Entry.NO
             color = PaletteUtils.getAndroidTestColor(5)
-            onToggle = { _, _, _ -> toggled = true }
+            onToggle = { _, _ -> toggled = true }
             onEdit = { edited = true }
         }
         measureView(view, dpToPixels(48), dpToPixels(48))

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

@@ -77,7 +77,7 @@ class EntryPanelViewTest : BaseViewTest() {
     @Test
     fun testToggle() {
         val timestamps = mutableListOf<Timestamp>()
-        view.onToggle = { t, _, _, _ -> timestamps.add(t) }
+        view.onToggle = { t, _, _ -> timestamps.add(t) }
         view.buttons[0].performLongClick()
         view.buttons[2].performLongClick()
         view.buttons[3].performLongClick()
@@ -88,7 +88,7 @@ class EntryPanelViewTest : BaseViewTest() {
     fun testToggle_withOffset() {
         val timestamps = mutableListOf<Timestamp>()
         view.dataOffset = 3
-        view.onToggle = { t, _, _, _ -> timestamps += t }
+        view.onToggle = { t, _, _ -> timestamps += t }
         view.buttons[0].performLongClick()
         view.buttons[2].performLongClick()
         view.buttons[3].performLongClick()

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

@@ -20,15 +20,15 @@ package org.isoron.uhabits.activities.habits.list.views
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.verifyNoMoreInteractions
-import com.nhaarman.mockitokotlin2.whenever
 import org.isoron.uhabits.BaseViewTest
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoMoreInteractions
+import org.mockito.kotlin.whenever
 
 @RunWith(AndroidJUnit4::class)
 @MediumTest

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

@@ -20,9 +20,6 @@ package org.isoron.uhabits.activities.habits.list.views
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
-import com.nhaarman.mockitokotlin2.doReturn
-import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.whenever
 import org.hamcrest.CoreMatchers.equalTo
 import org.hamcrest.MatcherAssert.assertThat
 import org.isoron.uhabits.BaseViewTest
@@ -30,6 +27,9 @@ import org.isoron.uhabits.core.ui.screens.habits.list.HintList
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.whenever
 
 @RunWith(AndroidJUnit4::class)
 @MediumTest

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

@@ -48,7 +48,7 @@ class FrequencyCardViewTest : BaseViewTest() {
             FrequencyCardPresenter.buildState(
                 habit = habit,
                 firstWeekday = 0,
-                theme = LightTheme(),
+                theme = LightTheme()
             )
         )
         measureView(view, 800f, 600f)

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

@@ -49,7 +49,7 @@ class HistoryCardViewTest : BaseViewTest() {
             HistoryCardPresenter.buildState(
                 habit = habit,
                 firstWeekday = SUNDAY,
-                theme = LightTheme(),
+                theme = LightTheme()
             )
         )
         measureView(view, 800f, 600f)

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

@@ -51,7 +51,7 @@ class OverviewCardViewTest : BaseViewTest() {
                 scoreYearDiff = 0.74f,
                 totalCount = 44,
                 color = PaletteColor(7),
-                theme = LightTheme(),
+                theme = LightTheme()
             )
         )
         measureView(view, 800f, 300f)

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

@@ -49,7 +49,7 @@ class ScoreCardViewTest : BaseViewTest() {
                 habit = habit,
                 firstWeekday = 0,
                 spinnerPosition = 0,
-                theme = LightTheme(),
+                theme = LightTheme()
             )
         )
         measureView(view, 800f, 600f)

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

@@ -48,7 +48,7 @@ class StreakCardViewTest : BaseViewTest() {
             StreakCardState(
                 bestStreaks = habit.streaks.getBest(10),
                 color = habit.color,
-                theme = LightTheme(),
+                theme = LightTheme()
             )
         )
         measureView(view, 800f, 600f)

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

@@ -53,7 +53,7 @@ class SubtitleCardViewTest : BaseViewTest() {
                 isNumerical = false,
                 question = "Did you meditate this morning?",
                 reminder = Reminder(8, 30, EVERY_DAY),
-                theme = LightTheme(),
+                theme = LightTheme()
             )
         )
         measureView(view, 800f, 200f)

uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/ListHabitsRegressionTest.kt

@@ -119,7 +119,7 @@ class ListHabitsRegressionTest : BaseUserInterfaceTest() {
             "Wake up early",
             "Meditate",
             "Read books",
-            "Track time",
+            "Track time"
         )
     }
 }

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

@@ -33,9 +33,11 @@ import java.io.IOException
 @MediumTest
 class CheckmarkWidgetViewTest : BaseViewTest() {
     private lateinit var view: CheckmarkWidgetView
+
     @Before
     override fun setUp() {
         super.setUp()
+        similarityCutoff = 0.00025
         setTheme(R.style.WidgetTheme)
         val habit = fixtures.createShortHabit()
         val computedEntries = habit.computedEntries

uhabits-android/src/main/AndroidManifest.xml

@@ -16,13 +16,13 @@
   ~ You should have received a copy of the GNU General Public License along
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.isoron.uhabits">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <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.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
         android:name=".HabitsApplication"
@@ -30,6 +30,7 @@
         android:backupAgent=".HabitsBackupAgent"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/main_activity_title"
+        android:localeConfig="@xml/locales_config"
         android:supportsRtl="true"
         android:theme="@style/AppBaseTheme">
 

uhabits-android/src/main/java/com/android/datetimepicker/date/DayPickerView.java

@@ -22,7 +22,6 @@ import java.util.Locale;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.AttributeSet;

uhabits-android/src/main/java/com/android/datetimepicker/date/MonthView.java

@@ -23,14 +23,13 @@ import android.graphics.Paint.*;
 import android.os.*;
 import androidx.core.view.*;
 import androidx.core.view.accessibility.*;
-import androidx.core.widget.*;
+
 import android.text.format.*;
 import android.view.*;
 import android.view.accessibility.*;
 
 import androidx.customview.widget.ExploreByTouchHelper;
 
-import com.android.*;
 import com.android.datetimepicker.*;
 import com.android.datetimepicker.date.MonthAdapter.*;
 

uhabits-android/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java

@@ -23,7 +23,6 @@ import android.graphics.Paint.*;
 import android.util.*;
 import android.view.*;
 
-import com.android.*;
 import com.android.datetimepicker.*;
 
 import org.isoron.uhabits.R;

uhabits-android/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java

@@ -28,7 +28,6 @@ import android.view.View.*;
 import android.view.accessibility.*;
 import android.widget.*;
 
-import com.android.*;
 import com.android.datetimepicker.*;
 
 import org.isoron.uhabits.R;

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

@@ -60,7 +60,7 @@ class AndroidCanvas : Canvas {
             y1.toDp(),
             x2.toDp(),
             y2.toDp(),
-            paint,
+            paint
         )
     }
 
@@ -69,7 +69,7 @@ class AndroidCanvas : Canvas {
             text,
             x.toDp(),
             y.toDp() + 0.6f * mHeight,
-            textPaint,
+            textPaint
         )
     }
 
@@ -83,7 +83,7 @@ class AndroidCanvas : Canvas {
         y: Double,
         width: Double,
         height: Double,
-        cornerRadius: Double,
+        cornerRadius: Double
     ) {
         paint.style = Paint.Style.FILL
         innerCanvas.drawRoundRect(
@@ -93,7 +93,7 @@ class AndroidCanvas : Canvas {
             (y + height).toDp(),
             cornerRadius.toDp(),
             cornerRadius.toDp(),
-            paint,
+            paint
         )
     }
 
@@ -108,7 +108,7 @@ class AndroidCanvas : Canvas {
             y.toDp(),
             (x + width).toDp(),
             (y + height).toDp(),
-            paint,
+            paint
         )
     }
 
@@ -148,7 +148,7 @@ class AndroidCanvas : Canvas {
         centerY: Double,
         radius: Double,
         startAngle: Double,
-        swipeAngle: Double,
+        swipeAngle: Double
     ) {
         paint.style = Paint.Style.FILL
         innerCanvas.drawArc(
@@ -159,14 +159,14 @@ class AndroidCanvas : Canvas {
             -startAngle.toFloat(),
             -swipeAngle.toFloat(),
             true,
-            paint,
+            paint
         )
     }
 
     override fun fillCircle(
         centerX: Double,
         centerY: Double,
-        radius: Double,
+        radius: Double
     ) {
         paint.style = Paint.Style.FILL
         innerCanvas.drawCircle(centerX.toDp(), centerY.toDp(), radius.toDp(), paint)

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

@@ -33,7 +33,7 @@ import kotlin.math.max
  */
 class AndroidDataView(
     context: Context,
-    attrs: AttributeSet? = null,
+    attrs: AttributeSet? = null
 ) : AndroidView<DataView>(context, attrs),
     GestureDetector.OnGestureListener,
     ValueAnimator.AnimatorUpdateListener {
@@ -44,23 +44,23 @@ class AndroidDataView(
         addUpdateListener(this@AndroidDataView)
     }
 
-    override fun onTouchEvent(event: MotionEvent?) = detector.onTouchEvent(event)
-    override fun onDown(e: MotionEvent?) = true
-    override fun onShowPress(e: MotionEvent?) = Unit
+    override fun onTouchEvent(event: MotionEvent) = detector.onTouchEvent(event)
+    override fun onDown(e: MotionEvent) = true
+    override fun onShowPress(e: MotionEvent) = Unit
 
-    override fun onSingleTapUp(e: MotionEvent?): Boolean {
+    override fun onSingleTapUp(e: MotionEvent): Boolean {
         return handleClick(e, true)
     }
 
-    override fun onLongPress(e: MotionEvent?) {
+    override fun onLongPress(e: MotionEvent) {
         handleClick(e)
     }
 
     override fun onScroll(
         e1: MotionEvent?,
-        e2: MotionEvent?,
+        e2: MotionEvent,
         dx: Float,
-        dy: Float,
+        dy: Float
     ): Boolean {
         if (abs(dx) > abs(dy)) {
             val parent = parent
@@ -80,9 +80,9 @@ class AndroidDataView(
 
     override fun onFling(
         e1: MotionEvent?,
-        e2: MotionEvent?,
+        e2: MotionEvent,
         velocityX: Float,
-        velocityY: Float,
+        velocityY: Float
     ): Boolean {
         scroller.fling(
             scroller.currX,
@@ -100,7 +100,7 @@ class AndroidDataView(
         return false
     }
 
-    override fun onAnimationUpdate(animation: ValueAnimator?) {
+    override fun onAnimationUpdate(animation: ValueAnimator) {
         if (!scroller.isFinished) {
             scroller.computeScrollOffset()
             updateDataOffset()
@@ -127,11 +127,11 @@ class AndroidDataView(
         }
     }
 
-    private fun handleClick(e: MotionEvent?, isSingleTap: Boolean = false): Boolean {
+    private fun handleClick(e: MotionEvent, isSingleTap: Boolean = false): Boolean {
         val x: Float
         val y: Float
         try {
-            val pointerId = e!!.getPointerId(0)
+            val pointerId = e.getPointerId(0)
             x = e.getX(pointerId)
             y = e.getY(pointerId)
         } catch (ex: RuntimeException) {
@@ -140,8 +140,11 @@ class AndroidDataView(
             // e.getPointerId.
             return false
         }
-        if (isSingleTap) view?.onClick(x / canvas.innerDensity, y / canvas.innerDensity)
-        else view?.onLongClick(x / canvas.innerDensity, y / canvas.innerDensity)
+        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/platform/gui/AndroidImage.kt

@@ -47,6 +47,6 @@ fun Color.toInt(): Int {
         (255 * this.alpha).roundToInt(),
         (255 * this.red).roundToInt(),
         (255 * this.green).roundToInt(),
-        (255 * this.blue).roundToInt(),
+        (255 * this.blue).roundToInt()
     )
 }

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

@@ -24,7 +24,7 @@ import android.util.AttributeSet
 
 open class AndroidView<T : View>(
     context: Context,
-    attrs: AttributeSet? = null,
+    attrs: AttributeSet? = null
 ) : android.view.View(context, attrs) {
 
     var view: T? = null

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

@@ -39,7 +39,7 @@ import org.isoron.uhabits.inject.ActivityScope
 class AndroidThemeSwitcher
 constructor(
     @ActivityContext val context: Context,
-    preferences: Preferences,
+    preferences: Preferences
 ) : ThemeSwitcher(preferences) {
 
     override var currentTheme: Theme = LightTheme()

uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.kt

@@ -27,7 +27,7 @@ import org.isoron.uhabits.utils.startActivitySafely
 class AboutScreen(
     private val activity: AboutActivity,
     private val intents: IntentFactory,
-    private val prefs: Preferences,
+    private val prefs: Preferences
 ) {
 
     private var developerCountdown = 5

uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutView.kt

@@ -32,7 +32,7 @@ import org.isoron.uhabits.utils.setupToolbar
 @SuppressLint("ViewConstructor")
 class AboutView(
     context: Context,
-    private val screen: AboutScreen,
+    private val screen: AboutScreen
 ) : FrameLayout(context) {
 
     private var binding = AboutBinding.inflate(LayoutInflater.from(context))
@@ -43,7 +43,7 @@ class AboutView(
             toolbar = binding.toolbar,
             color = PaletteColor(11),
             title = resources.getString(R.string.about),
-            theme = currentTheme(),
+            theme = currentTheme()
         )
         val version = resources.getString(R.string.version_n)
         binding.tvContributors.setOnClickListener { screen.showCodeContributorsWebsite() }

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

@@ -20,109 +20,63 @@
 package org.isoron.uhabits.activities.common.dialogs
 
 import android.app.Dialog
-import android.content.Context
+import android.os.Bundle
 import android.view.LayoutInflater
-import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import androidx.appcompat.app.AppCompatDialogFragment
+import org.isoron.uhabits.HabitsApplication
 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.preferences.Preferences
 import org.isoron.uhabits.databinding.CheckmarkPopupBinding
 import org.isoron.uhabits.utils.InterfaceUtils.getFontAwesome
-import org.isoron.uhabits.utils.dimBehind
-import org.isoron.uhabits.utils.dismissCurrentAndShow
-import org.isoron.uhabits.utils.dp
+import org.isoron.uhabits.utils.getCenter
 import org.isoron.uhabits.utils.sres
 
-const val POPUP_WIDTH = 4 * 48f + 16f
-const val POPUP_HEIGHT = 48f * 2.5f + 8f
+class CheckmarkDialog : AppCompatDialogFragment() {
+    var onToggle: (Int, String, Float, Float) -> Unit = { _, _, _, _ -> }
 
-class CheckmarkPopup(
-    private val context: Context,
-    private val color: Int,
-    private var notes: String,
-    private var value: Int,
-    private val prefs: Preferences,
-    private val anchor: View,
-) {
-    var onToggle: (Int, String) -> Unit = { _, _ -> }
-    private lateinit var dialog: Dialog
-
-    private val view = CheckmarkPopupBinding.inflate(LayoutInflater.from(context)).apply {
-        // Required for round corners
-        container.clipToOutline = true
-    }
-
-    init {
-        view.booleanButtons.visibility = VISIBLE
-        initColors()
-        initTypefaces()
-        hideDisabledButtons()
-        populate()
-    }
-
-    private fun initColors() {
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val appComponent = (requireActivity().application as HabitsApplication).component
+        val prefs = appComponent.preferences
+        val view = CheckmarkPopupBinding.inflate(LayoutInflater.from(context))
+        val color = requireArguments().getInt("color")
         arrayOf(view.yesBtn, view.skipBtn).forEach {
             it.setTextColor(color)
         }
         arrayOf(view.noBtn, view.unknownBtn).forEach {
             it.setTextColor(view.root.sres.getColor(R.attr.contrast60))
         }
-    }
-
-    private fun initTypefaces() {
         arrayOf(view.yesBtn, view.noBtn, view.skipBtn, view.unknownBtn).forEach {
-            it.typeface = getFontAwesome(context)
+            it.typeface = getFontAwesome(requireContext())
         }
-    }
-
-    private fun hideDisabledButtons() {
+        view.notes.setText(requireArguments().getString("notes")!!)
         if (!prefs.isSkipEnabled) view.skipBtn.visibility = GONE
         if (!prefs.areQuestionMarksEnabled) view.unknownBtn.visibility = GONE
-    }
-
-    private fun populate() {
-        val selectedBtn = when (value) {
-            YES_MANUAL -> view.yesBtn
-            YES_AUTO -> view.noBtn
-            NO -> view.noBtn
-            UNKNOWN -> if (prefs.areQuestionMarksEnabled) view.unknownBtn else view.noBtn
-            SKIP -> if (prefs.isSkipEnabled) view.skipBtn else view.noBtn
-            else -> null
-        }
-        view.notes.setText(notes)
-    }
-
-    fun show() {
-        dialog = Dialog(context, android.R.style.Theme_NoTitleBar)
+        view.booleanButtons.visibility = VISIBLE
+        val dialog = Dialog(requireContext())
         dialog.setContentView(view.root)
         dialog.window?.apply {
-            setLayout(
-                view.root.dp(POPUP_WIDTH).toInt(),
-                view.root.dp(POPUP_HEIGHT).toInt()
-            )
             setBackgroundDrawableResource(android.R.color.transparent)
         }
         fun onClick(v: Int) {
-            this.value = v
-            save()
+            val notes = view.notes.text.toString().trim()
+            val location = view.yesBtn.getCenter()
+            onToggle(v, notes, location.x, location.y)
+            requireDialog().dismiss()
         }
         view.yesBtn.setOnClickListener { onClick(YES_MANUAL) }
         view.noBtn.setOnClickListener { onClick(NO) }
         view.skipBtn.setOnClickListener { onClick(SKIP) }
         view.unknownBtn.setOnClickListener { onClick(UNKNOWN) }
-        dialog.setCanceledOnTouchOutside(true)
-        dialog.dimBehind()
-        dialog.dismissCurrentAndShow()
-    }
+        view.notes.setOnEditorActionListener { v, actionId, event ->
+            onClick(requireArguments().getInt("value"))
+            true
+        }
 
-    fun save() {
-        onToggle(value, view.notes.text.toString().trim())
-        dialog.dismiss()
+        return dialog
     }
 }

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

@@ -22,97 +22,101 @@ package org.isoron.uhabits.activities.common.dialogs
 import android.app.Dialog
 import android.os.Bundle
 import android.view.LayoutInflater
-import android.view.View
 import android.widget.EditText
 import android.widget.LinearLayout
 import android.widget.RadioButton
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDialogFragment
-import kotlinx.android.synthetic.main.frequency_picker_dialog.view.*
 import org.isoron.uhabits.R
+import org.isoron.uhabits.databinding.FrequencyPickerDialogBinding
 
 class FrequencyPickerDialog(
     var freqNumerator: Int,
     var freqDenominator: Int
 ) : AppCompatDialogFragment() {
+    private var _binding: FrequencyPickerDialogBinding? = null
+    private val binding get() = _binding!!
 
-    lateinit var contentView: View
     var onFrequencyPicked: (num: Int, den: Int) -> Unit = { _, _ -> }
 
     constructor() : this(1, 1)
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val inflater = LayoutInflater.from(requireActivity())
-        contentView = inflater.inflate(R.layout.frequency_picker_dialog, null)
+        _binding = FrequencyPickerDialogBinding.inflate(LayoutInflater.from(requireActivity()))
 
         addBeforeAfterText(
             this.getString(R.string.every_x_days),
-            contentView.everyXDaysContainer,
+            binding.everyXDaysContainer
         )
 
         addBeforeAfterText(
             this.getString(R.string.x_times_per_week),
-            contentView.xTimesPerWeekContainer,
+            binding.xTimesPerWeekContainer
         )
 
         addBeforeAfterText(
             this.getString(R.string.x_times_per_month),
-            contentView.xTimesPerMonthContainer,
+            binding.xTimesPerMonthContainer
         )
 
         addBeforeAfterText(
             this.getString(R.string.x_times_per_y_days),
-            contentView.xTimesPerYDaysContainer,
+            binding.xTimesPerYDaysContainer
         )
 
-        contentView.everyDayRadioButton.setOnClickListener {
-            check(contentView.everyDayRadioButton)
+        binding.everyDayRadioButton.setOnClickListener {
+            check(binding.everyDayRadioButton)
         }
 
-        contentView.everyXDaysRadioButton.setOnClickListener {
-            check(contentView.everyXDaysRadioButton)
-            val everyXDaysTextView = contentView.everyXDaysTextView
+        binding.everyXDaysRadioButton.setOnClickListener {
+            check(binding.everyXDaysRadioButton)
+            val everyXDaysTextView = binding.everyXDaysTextView
             selectInputField(everyXDaysTextView)
         }
 
-        contentView.everyXDaysTextView.setOnFocusChangeListener { v, hasFocus ->
-            if (hasFocus) check(contentView.everyXDaysRadioButton)
+        binding.everyXDaysTextView.setOnFocusChangeListener { v, hasFocus ->
+            if (hasFocus) check(binding.everyXDaysRadioButton)
         }
 
-        contentView.xTimesPerWeekRadioButton.setOnClickListener {
-            check(contentView.xTimesPerWeekRadioButton)
-            selectInputField(contentView.xTimesPerWeekTextView)
+        binding.xTimesPerWeekRadioButton.setOnClickListener {
+            check(binding.xTimesPerWeekRadioButton)
+            selectInputField(binding.xTimesPerWeekTextView)
         }
 
-        contentView.xTimesPerWeekTextView.setOnFocusChangeListener { v, hasFocus ->
-            if (hasFocus) check(contentView.xTimesPerWeekRadioButton)
+        binding.xTimesPerWeekTextView.setOnFocusChangeListener { v, hasFocus ->
+            if (hasFocus) check(binding.xTimesPerWeekRadioButton)
         }
 
-        contentView.xTimesPerMonthRadioButton.setOnClickListener {
-            check(contentView.xTimesPerMonthRadioButton)
-            selectInputField(contentView.xTimesPerMonthTextView)
+        binding.xTimesPerMonthRadioButton.setOnClickListener {
+            check(binding.xTimesPerMonthRadioButton)
+            selectInputField(binding.xTimesPerMonthTextView)
         }
 
-        contentView.xTimesPerMonthTextView.setOnFocusChangeListener { v, hasFocus ->
-            if (hasFocus) check(contentView.xTimesPerMonthRadioButton)
+        binding.xTimesPerMonthTextView.setOnFocusChangeListener { v, hasFocus ->
+            if (hasFocus) check(binding.xTimesPerMonthRadioButton)
         }
 
-        contentView.xTimesPerYDaysRadioButton.setOnClickListener {
-            check(contentView.xTimesPerYDaysRadioButton)
-            selectInputField(contentView.xTimesPerYDaysXTextView)
+        binding.xTimesPerYDaysRadioButton.setOnClickListener {
+            check(binding.xTimesPerYDaysRadioButton)
+            selectInputField(binding.xTimesPerYDaysXTextView)
         }
 
-        contentView.xTimesPerYDaysXTextView.setOnFocusChangeListener { v, hasFocus ->
-            if (hasFocus) check(contentView.xTimesPerYDaysRadioButton)
+        binding.xTimesPerYDaysXTextView.setOnFocusChangeListener { v, hasFocus ->
+            if (hasFocus) check(binding.xTimesPerYDaysRadioButton)
         }
 
-        contentView.xTimesPerYDaysYTextView.setOnFocusChangeListener { v, hasFocus ->
-            if (hasFocus) check(contentView.xTimesPerYDaysRadioButton)
+        binding.xTimesPerYDaysYTextView.setOnFocusChangeListener { v, hasFocus ->
+            if (hasFocus) check(binding.xTimesPerYDaysRadioButton)
         }
 
         return AlertDialog.Builder(requireActivity())
-            .setView(contentView)
+            .setView(binding.root)
             .setPositiveButton(R.string.save) { _, _ -> onSaveClicked() }
             .create()
     }
@@ -124,7 +128,8 @@ class FrequencyPickerDialog(
         val parts = str.split("%d")
         for (i in parts.indices) {
             container.addView(
-                TextView(activity).apply { text = parts[i].trim() }, 2 * i + 1,
+                TextView(activity).apply { text = parts[i].trim() },
+                2 * i + 1
             )
         }
     }
@@ -133,31 +138,35 @@ class FrequencyPickerDialog(
         var numerator = 1
         var denominator = 1
         when {
-            contentView.everyDayRadioButton.isChecked -> {
+            binding.everyDayRadioButton.isChecked -> {
                 // NOP
             }
-            contentView.everyXDaysRadioButton.isChecked -> {
-                if (contentView.everyXDaysTextView.text.isNotEmpty()) {
-                    denominator = Integer.parseInt(contentView.everyXDaysTextView.text.toString())
+
+            binding.everyXDaysRadioButton.isChecked -> {
+                if (binding.everyXDaysTextView.text.isNotEmpty()) {
+                    denominator = Integer.parseInt(binding.everyXDaysTextView.text.toString())
                 }
             }
-            contentView.xTimesPerWeekRadioButton.isChecked -> {
-                if (contentView.xTimesPerWeekTextView.text.isNotEmpty()) {
-                    numerator = Integer.parseInt(contentView.xTimesPerWeekTextView.text.toString())
+
+            binding.xTimesPerWeekRadioButton.isChecked -> {
+                if (binding.xTimesPerWeekTextView.text.isNotEmpty()) {
+                    numerator = Integer.parseInt(binding.xTimesPerWeekTextView.text.toString())
                     denominator = 7
                 }
             }
-            contentView.xTimesPerYDaysRadioButton.isChecked -> {
-                if (contentView.xTimesPerYDaysXTextView.text.isNotEmpty() && contentView.xTimesPerYDaysYTextView.text.isNotEmpty()) {
+
+            binding.xTimesPerYDaysRadioButton.isChecked -> {
+                if (binding.xTimesPerYDaysXTextView.text.isNotEmpty() && binding.xTimesPerYDaysYTextView.text.isNotEmpty()) {
                     numerator =
-                        Integer.parseInt(contentView.xTimesPerYDaysXTextView.text.toString())
+                        Integer.parseInt(binding.xTimesPerYDaysXTextView.text.toString())
                     denominator =
-                        Integer.parseInt(contentView.xTimesPerYDaysYTextView.text.toString())
+                        Integer.parseInt(binding.xTimesPerYDaysYTextView.text.toString())
                 }
             }
+
             else -> {
-                if (contentView.xTimesPerMonthTextView.text.isNotEmpty()) {
-                    numerator = Integer.parseInt(contentView.xTimesPerMonthTextView.text.toString())
+                if (binding.xTimesPerMonthTextView.text.isNotEmpty()) {
+                    numerator = Integer.parseInt(binding.xTimesPerMonthTextView.text.toString())
                     denominator = 30
                 }
             }
@@ -184,27 +193,27 @@ class FrequencyPickerDialog(
     private fun populateViews() {
         uncheckAll()
         if (freqDenominator == 30 || freqDenominator == 31) {
-            contentView.xTimesPerMonthRadioButton.isChecked = true
-            contentView.xTimesPerMonthTextView.setText(freqNumerator.toString())
-            selectInputField(contentView.xTimesPerMonthTextView)
+            binding.xTimesPerMonthRadioButton.isChecked = true
+            binding.xTimesPerMonthTextView.setText(freqNumerator.toString())
+            selectInputField(binding.xTimesPerMonthTextView)
         } else {
             if (freqNumerator == 1) {
                 if (freqDenominator == 1) {
-                    contentView.everyDayRadioButton.isChecked = true
+                    binding.everyDayRadioButton.isChecked = true
                 } else {
-                    contentView.everyXDaysRadioButton.isChecked = true
-                    contentView.everyXDaysTextView.setText(freqDenominator.toString())
-                    selectInputField(contentView.everyXDaysTextView)
+                    binding.everyXDaysRadioButton.isChecked = true
+                    binding.everyXDaysTextView.setText(freqDenominator.toString())
+                    selectInputField(binding.everyXDaysTextView)
                 }
             } else {
                 if (freqDenominator == 7) {
-                    contentView.xTimesPerWeekRadioButton.isChecked = true
-                    contentView.xTimesPerWeekTextView.setText(freqNumerator.toString())
-                    selectInputField(contentView.xTimesPerWeekTextView)
+                    binding.xTimesPerWeekRadioButton.isChecked = true
+                    binding.xTimesPerWeekTextView.setText(freqNumerator.toString())
+                    selectInputField(binding.xTimesPerWeekTextView)
                 } else {
-                    contentView.xTimesPerYDaysRadioButton.isChecked = true
-                    contentView.xTimesPerYDaysXTextView.setText(freqNumerator.toString())
-                    contentView.xTimesPerYDaysYTextView.setText(freqDenominator.toString())
+                    binding.xTimesPerYDaysRadioButton.isChecked = true
+                    binding.xTimesPerYDaysXTextView.setText(freqNumerator.toString())
+                    binding.xTimesPerYDaysYTextView.setText(freqDenominator.toString())
                 }
             }
         }
@@ -215,10 +224,10 @@ class FrequencyPickerDialog(
     }
 
     private fun uncheckAll() {
-        contentView.everyDayRadioButton.isChecked = false
-        contentView.everyXDaysRadioButton.isChecked = false
-        contentView.xTimesPerWeekRadioButton.isChecked = false
-        contentView.xTimesPerMonthRadioButton.isChecked = false
-        contentView.xTimesPerYDaysRadioButton.isChecked = false
+        binding.everyDayRadioButton.isChecked = false
+        binding.everyXDaysRadioButton.isChecked = false
+        binding.xTimesPerWeekRadioButton.isChecked = false
+        binding.xTimesPerMonthRadioButton.isChecked = false
+        binding.xTimesPerYDaysRadioButton.isChecked = false
     }
 }

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

@@ -69,7 +69,7 @@ class HistoryEditorDialog : AppCompatDialogFragment(), CommandRunner.Listener {
             theme = themeSwitcher.currentTheme,
             today = DateUtils.getTodayWithOffset().toLocalDate(),
             onDateClickedListener = onDateClickedListener ?: object : OnDateClickedListener {},
-            padding = 10.0,
+            padding = 10.0
         )
         dataView = AndroidDataView(requireContext(), null)
         dataView.view = chart!!

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

@@ -0,0 +1,121 @@
+package org.isoron.uhabits.activities.common.dialogs
+
+import android.app.Dialog
+import android.os.Bundle
+import android.provider.Settings
+import android.text.method.DigitsKeyListener
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
+import android.view.inputmethod.EditorInfo
+import androidx.appcompat.app.AppCompatDialogFragment
+import org.isoron.uhabits.HabitsApplication
+import org.isoron.uhabits.R
+import org.isoron.uhabits.core.models.Entry
+import org.isoron.uhabits.databinding.CheckmarkPopupBinding
+import org.isoron.uhabits.utils.InterfaceUtils
+import org.isoron.uhabits.utils.getCenter
+import org.isoron.uhabits.utils.requestFocusWithKeyboard
+import org.isoron.uhabits.utils.sres
+import java.text.DecimalFormat
+import java.text.DecimalFormatSymbols
+import java.text.NumberFormat
+import java.text.ParseException
+
+class NumberDialog : AppCompatDialogFragment() {
+
+    var onToggle: (Double, String, Float, Float) -> Unit = { _, _, _, _ -> }
+    var onDismiss: () -> Unit = {}
+
+    private var originalNotes: String = ""
+    private var originalValue: Double = 0.0
+    private lateinit var view: CheckmarkPopupBinding
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val appComponent = (requireActivity().application as HabitsApplication).component
+        val prefs = appComponent.preferences
+        view = CheckmarkPopupBinding.inflate(LayoutInflater.from(context))
+        arrayOf(view.yesBtn, view.skipBtn).forEach {
+            it.setTextColor(requireArguments().getInt("color"))
+        }
+        arrayOf(view.noBtn, view.unknownBtn).forEach {
+            it.setTextColor(view.root.sres.getColor(R.attr.contrast60))
+        }
+        arrayOf(view.yesBtn, view.noBtn, view.skipBtn, view.unknownBtn).forEach {
+            it.typeface = InterfaceUtils.getFontAwesome(requireContext())
+        }
+        if (!prefs.isSkipEnabled) view.skipBtnNumber.visibility = View.GONE
+        view.numberButtons.visibility = View.VISIBLE
+        fixDecimalSeparator(view)
+        originalNotes = requireArguments().getString("notes")!!
+        originalValue = requireArguments().getDouble("value")
+        view.notes.setText(originalNotes)
+        view.value.setText(
+            when {
+                originalValue < 0.01 -> "0"
+                else -> DecimalFormat("#.##").format(originalValue)
+            }
+        )
+        view.value.setOnKeyListener { _, keyCode, event ->
+            if (event.action == MotionEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER) {
+                save()
+                return@setOnKeyListener true
+            }
+            return@setOnKeyListener false
+        }
+        view.saveBtn.setOnClickListener {
+            save()
+        }
+        view.skipBtnNumber.setOnClickListener {
+            view.value.setText(DecimalFormat("#.###").format((Entry.SKIP.toDouble() / 1000)))
+            save()
+        }
+        view.notes.setOnEditorActionListener { v, actionId, event ->
+            save()
+            true
+        }
+        view.value.requestFocusWithKeyboard()
+        val dialog = Dialog(requireContext())
+        dialog.setContentView(view.root)
+        dialog.window?.apply {
+            setBackgroundDrawableResource(android.R.color.transparent)
+        }
+        dialog.setOnDismissListener { onDismiss() }
+        return dialog
+    }
+
+    private fun fixDecimalSeparator(view: CheckmarkPopupBinding) {
+        // https://stackoverflow.com/a/34256139
+        val separator = DecimalFormatSymbols.getInstance().decimalSeparator
+        view.value.keyListener = DigitsKeyListener.getInstance("0123456789$separator")
+
+        // https://github.com/flutter/flutter/issues/61175
+        val currKeyboard = Settings.Secure.getString(
+            requireContext().contentResolver,
+            Settings.Secure.DEFAULT_INPUT_METHOD
+        )
+        if (currKeyboard.contains("swiftkey") || currKeyboard.contains("samsung")) {
+            view.value.inputType = EditorInfo.TYPE_CLASS_TEXT
+        }
+    }
+
+    fun save() {
+        var value = originalValue
+        try {
+            val numberFormat = NumberFormat.getInstance()
+            val valueStr = view.value.text.toString()
+            value = if (valueStr.isNotEmpty()) {
+                numberFormat.parse(valueStr)!!.toDouble()
+            } else {
+                Entry.UNKNOWN.toDouble() / 1000
+            }
+        } catch (e: ParseException) {
+            // NOP
+        }
+        val notes = view.notes.text.toString()
+        val location = view.saveBtn.getCenter()
+        onToggle(value, notes, location.x, location.y)
+        requireDialog().dismiss()
+    }
+}

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

@@ -1,116 +0,0 @@
-/*
- * 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.app.Dialog
-import android.content.Context
-import android.view.KeyEvent.KEYCODE_ENTER
-import android.view.LayoutInflater
-import android.view.MotionEvent.ACTION_DOWN
-import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import org.isoron.uhabits.core.models.Entry
-import org.isoron.uhabits.core.preferences.Preferences
-import org.isoron.uhabits.databinding.CheckmarkPopupBinding
-import org.isoron.uhabits.utils.dimBehind
-import org.isoron.uhabits.utils.dismissCurrentAndShow
-import org.isoron.uhabits.utils.dp
-import org.isoron.uhabits.utils.requestFocusWithKeyboard
-import java.text.DecimalFormat
-
-class NumberPopup(
-    private val context: Context,
-    private var notes: String,
-    private var value: Double,
-    private val prefs: Preferences,
-    private val anchor: View,
-) {
-    var onToggle: (Double, String) -> Unit = { _, _ -> }
-    var onDismiss: () -> Unit = {}
-    private val originalValue = value
-    private lateinit var dialog: Dialog
-
-    private val view = CheckmarkPopupBinding.inflate(LayoutInflater.from(context)).apply {
-        // Required for round corners
-        container.clipToOutline = true
-    }
-
-    init {
-        view.numberButtons.visibility = VISIBLE
-        hideDisabledButtons()
-        populate()
-    }
-
-    private fun hideDisabledButtons() {
-        if (!prefs.isSkipEnabled) view.skipBtnNumber.visibility = GONE
-    }
-
-    private fun populate() {
-        view.notes.setText(notes)
-        view.value.setText(
-            when {
-                value < 0.01 -> "0"
-                else -> DecimalFormat("#.##").format(value)
-            }
-        )
-    }
-
-    fun show() {
-        dialog = Dialog(context, android.R.style.Theme_NoTitleBar)
-        dialog.setContentView(view.root)
-        dialog.window?.apply {
-            setLayout(
-                view.root.dp(POPUP_WIDTH).toInt(),
-                view.root.dp(POPUP_HEIGHT).toInt()
-            )
-            setBackgroundDrawableResource(android.R.color.transparent)
-        }
-        dialog.setOnDismissListener {
-            onDismiss()
-        }
-
-        view.value.setOnKeyListener { _, keyCode, event ->
-            if (event.action == ACTION_DOWN && keyCode == KEYCODE_ENTER) {
-                save()
-                return@setOnKeyListener true
-            }
-            return@setOnKeyListener false
-        }
-        view.saveBtn.setOnClickListener {
-            save()
-        }
-        view.skipBtnNumber.setOnClickListener {
-            view.value.setText((Entry.SKIP.toDouble() / 1000).toString())
-            save()
-        }
-        view.value.requestFocusWithKeyboard()
-        dialog.setCanceledOnTouchOutside(true)
-        dialog.dimBehind()
-        dialog.dismissCurrentAndShow()
-    }
-
-    fun save() {
-        val value = view.value.text.toString().toDoubleOrNull() ?: originalValue
-        val notes = view.notes.text.toString()
-        onToggle(value, notes)
-        dialog.dismiss()
-    }
-}

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

@@ -181,8 +181,9 @@ class FrequencyChart : ScrollableChart {
             rect[0f, 0f, baseSize.toFloat()] = baseSize.toFloat()
             rect.offset(prevRect!!.left, prevRect!!.top + baseSize * j)
             val i = localeWeekdayList[j] % 7
-            if (values != null)
+            if (values != null) {
                 drawMarker(canvas, rect, values[i], weekDaysInMonth[i])
+            }
             rect.offset(0f, rowHeight)
         }
         drawFooter(canvas, rect, date)
@@ -196,12 +197,14 @@ class FrequencyChart : ScrollableChart {
             rect.centerY() - 0.1f * em,
             pText!!
         )
-        if (date[Calendar.MONTH] == 1) canvas.drawText(
-            dfYear!!.format(time),
-            rect.centerX(),
-            rect.centerY() + 0.9f * em,
-            pText!!
-        )
+        if (date[Calendar.MONTH] == 1) {
+            canvas.drawText(
+                dfYear!!.format(time),
+                rect.centerX(),
+                rect.centerY() + 0.9f * em,
+                pText!!
+            )
+        }
     }
 
     private fun drawGrid(canvas: Canvas, rGrid: RectF?) {

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

@@ -58,6 +58,7 @@ class RingView : View {
     private var em = 0f
     private var text: String?
     private var textSize: Float
+    private var isStrokedTextEnabled: Boolean = false
     private var enableFontAwesome = false
     private var internalDrawingCache: Bitmap? = null
     private var cacheCanvas: Canvas? = null
@@ -131,6 +132,10 @@ class RingView : View {
         invalidate()
     }
 
+    fun setIsStrokedTextEnabled(isStroked: Boolean) {
+        this.isStrokedTextEnabled = isStroked
+    }
+
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
         val activeCanvas: Canvas?
@@ -148,13 +153,23 @@ class RingView : View {
         pRing!!.color = inactiveColor!!
         activeCanvas.drawArc(rect!!, angle - 90, 360 - angle, true, pRing!!)
         if (thickness > 0) {
-            if (isTransparencyEnabled) pRing!!.xfermode = XFERMODE_CLEAR else pRing!!.color =
-                backgroundColor!!
+            if (isTransparencyEnabled) {
+                pRing!!.xfermode = XFERMODE_CLEAR
+            } else {
+                pRing!!.color =
+                    backgroundColor!!
+            }
             rect!!.inset(thickness, thickness)
             activeCanvas.drawArc(rect!!, 0f, 360f, true, pRing!!)
             pRing!!.xfermode = null
             pRing!!.color = color
             pRing!!.textSize = textSize
+
+            if (isStrokedTextEnabled) {
+                pRing!!.style = Paint.Style.STROKE
+                pRing!!.strokeWidth = textSize / 15f
+            }
+
             if (enableFontAwesome) pRing!!.typeface = getFontAwesome(context)
             activeCanvas.drawText(
                 text!!,

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

@@ -65,7 +65,7 @@ abstract class ScrollableChart : View, GestureDetector.OnGestureListener, Animat
     }
 
     override fun onFling(
-        e1: MotionEvent,
+        e1: MotionEvent?,
         e2: MotionEvent,
         velocityX: Float,
         velocityY: Float
@@ -116,7 +116,7 @@ abstract class ScrollableChart : View, GestureDetector.OnGestureListener, Animat
         return BundleSavedState(superState, bundle)
     }
 
-    override fun onScroll(e1: MotionEvent?, e2: MotionEvent?, dx: Float, dy: Float): Boolean {
+    override fun onScroll(e1: MotionEvent?, e2: MotionEvent, dx: Float, dy: Float): Boolean {
         var dx = dx
         if (scrollerBucketSize == 0) return false
         if (abs(dx) > abs(dy)) {

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

@@ -35,11 +35,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.DialogFragment
 import com.android.datetimepicker.time.RadialPickerLayout
 import com.android.datetimepicker.time.TimePickerDialog
-import kotlinx.android.synthetic.main.activity_edit_habit.nameInput
-import kotlinx.android.synthetic.main.activity_edit_habit.notesInput
-import kotlinx.android.synthetic.main.activity_edit_habit.questionInput
-import kotlinx.android.synthetic.main.activity_edit_habit.targetInput
-import kotlinx.android.synthetic.main.activity_edit_habit.unitInput
 import org.isoron.platform.gui.toInt
 import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.R
@@ -271,9 +266,9 @@ class EditHabitActivity : AppCompatActivity() {
             habit.copyFrom(original)
         }
 
-        habit.name = nameInput.text.trim().toString()
-        habit.question = questionInput.text.trim().toString()
-        habit.description = notesInput.text.trim().toString()
+        habit.name = binding.nameInput.text.trim().toString()
+        habit.question = binding.questionInput.text.trim().toString()
+        habit.description = binding.notesInput.text.trim().toString()
         habit.color = color
         if (reminderHour >= 0) {
             habit.reminder = Reminder(reminderHour, reminderMin, reminderDays)
@@ -283,9 +278,9 @@ class EditHabitActivity : AppCompatActivity() {
 
         habit.frequency = Frequency(freqNum, freqDen)
         if (habitType == HabitType.NUMERICAL) {
-            habit.targetValue = targetInput.text.toString().toDouble()
+            habit.targetValue = binding.targetInput.text.toString().toDouble()
             habit.targetType = targetType
-            habit.unit = unitInput.text.trim().toString()
+            habit.unit = binding.unitInput.text.trim().toString()
         }
         habit.type = habitType
 
@@ -308,13 +303,13 @@ class EditHabitActivity : AppCompatActivity() {
 
     private fun validate(): Boolean {
         var isValid = true
-        if (nameInput.text.isEmpty()) {
-            nameInput.error = getFormattedValidationError(R.string.validation_cannot_be_blank)
+        if (binding.nameInput.text.isEmpty()) {
+            binding.nameInput.error = getFormattedValidationError(R.string.validation_cannot_be_blank)
             isValid = false
         }
         if (habitType == HabitType.NUMERICAL) {
-            if (targetInput.text.isEmpty()) {
-                targetInput.error = getString(R.string.validation_cannot_be_blank)
+            if (binding.targetInput.text.isEmpty()) {
+                binding.targetInput.error = getString(R.string.validation_cannot_be_blank)
                 isValid = false
             }
         }

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

@@ -19,12 +19,17 @@
 
 package org.isoron.uhabits.activities.habits.list
 
+import android.Manifest.permission.POST_NOTIFICATIONS
 import android.content.Intent
+import android.content.pm.PackageManager.PERMISSION_GRANTED
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
+import androidx.activity.result.contract.ActivityResultContracts.RequestPermission
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat.checkSelfPermission
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import org.isoron.uhabits.BaseExceptionHandler
@@ -40,6 +45,7 @@ import org.isoron.uhabits.inject.ActivityContextModule
 import org.isoron.uhabits.inject.DaggerHabitsActivityComponent
 import org.isoron.uhabits.inject.HabitsActivityComponent
 import org.isoron.uhabits.inject.HabitsApplicationComponent
+import org.isoron.uhabits.utils.dismissCurrentDialog
 import org.isoron.uhabits.utils.restartWithFade
 
 class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
@@ -55,6 +61,16 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
     lateinit var midnightTimer: MidnightTimer
     private val scope = CoroutineScope(Dispatchers.Main)
 
+    private var permissionAlreadyRequested = false
+    private val permissionLauncher =
+        registerForActivityResult(RequestPermission()) { isGranted: Boolean ->
+            if (isGranted) {
+                scheduleReminders()
+            } else {
+                Log.i("ListHabitsActivity", "POST_NOTIFICATIONS denied")
+            }
+        }
+
     private lateinit var menu: ListHabitsMenu
 
     override fun onQuestionMarksChanged() {
@@ -91,6 +107,7 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
         midnightTimer.onPause()
         screen.onDetached()
         adapter.cancelRefresh()
+        dismissCurrentDialog()
         super.onPause()
     }
 
@@ -99,6 +116,26 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
         screen.onAttached()
         rootView.postInvalidate()
         midnightTimer.onResume()
+
+        if (appComponent.reminderScheduler.hasHabitsWithReminders()) {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+                scheduleReminders()
+            } else {
+                if (checkSelfPermission(this, POST_NOTIFICATIONS) == PERMISSION_GRANTED) {
+                    scheduleReminders()
+                } else {
+                    // If we have not requested the permission yet, request it. Otherwide do
+                    // nothing. This check is necessary to avoid an infinite onResume loop in case
+                    // the user denies the permission.
+                    if (!permissionAlreadyRequested) {
+                        Log.i("ListHabitsActivity", "Requestion permission: POST_NOTIFICATIONS")
+                        permissionLauncher.launch(POST_NOTIFICATIONS)
+                        permissionAlreadyRequested = true
+                    }
+                }
+            }
+        }
+
         taskRunner.run {
             try {
                 AutoBackup(this@ListHabitsActivity).run()
@@ -114,6 +151,10 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
         super.onResume()
     }
 
+    private fun scheduleReminders() {
+        appComponent.reminderScheduler.scheduleAll()
+    }
+
     override fun onCreateOptionsMenu(m: Menu): Boolean {
         menu.onCreate(menuInflater, m)
         return true
@@ -124,6 +165,7 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
         return menu.onItemSelected(item)
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(request: Int, result: Int, data: Intent?) {
         super.onActivityResult(request, result, data)
         screen.onResult(request, result, data)

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

@@ -23,6 +23,7 @@ import android.content.Context
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import android.widget.FrameLayout
 import android.widget.RelativeLayout
+import nl.dionsegijn.konfetti.xml.KonfettiView
 import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.common.views.ScrollableChart
 import org.isoron.uhabits.activities.common.views.TaskProgressBar
@@ -69,6 +70,9 @@ class ListHabitsRootView @Inject constructor(
     val listView: HabitCardListView = habitCardListViewFactory.create()
     val llEmpty = EmptyListView(context)
     val tbar = buildToolbar()
+    val konfettiView = KonfettiView(context).apply {
+        translationZ = 10f
+    }
     val progressBar = TaskProgressBar(context, runner)
     val hintView: HintView
     val header = HeaderView(context, preferences, midnightTimer)
@@ -80,6 +84,7 @@ class ListHabitsRootView @Inject constructor(
 
         val rootView = RelativeLayout(context).apply {
             background = sres.getDrawable(R.attr.windowBackgroundColor)
+            addAtTop(konfettiView)
             addAtTop(tbar)
             addBelow(header, tbar)
             addBelow(listView, header, height = MATCH_PARENT)
@@ -94,7 +99,7 @@ class ListHabitsRootView @Inject constructor(
             title = resources.getString(R.string.main_activity_title),
             color = PaletteColor(17),
             displayHomeAsUpEnabled = false,
-            theme = currentTheme(),
+            theme = currentTheme()
         )
         addView(rootView, MATCH_PARENT, MATCH_PARENT)
         listAdapter.setListView(listView)

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

@@ -22,14 +22,18 @@ package org.isoron.uhabits.activities.habits.list
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import dagger.Lazy
+import nl.dionsegijn.konfetti.core.Party
+import nl.dionsegijn.konfetti.core.Position
+import nl.dionsegijn.konfetti.core.emitter.Emitter
 import org.isoron.platform.gui.toInt
 import org.isoron.uhabits.R
-import org.isoron.uhabits.activities.common.dialogs.CheckmarkPopup
+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.NumberPopup
+import org.isoron.uhabits.activities.common.dialogs.NumberDialog
 import org.isoron.uhabits.activities.habits.edit.HabitTypeDialog
 import org.isoron.uhabits.activities.habits.list.views.HabitCardListAdapter
 import org.isoron.uhabits.core.commands.ArchiveHabitsCommand
@@ -62,6 +66,7 @@ import org.isoron.uhabits.intents.IntentFactory
 import org.isoron.uhabits.tasks.ExportDBTaskFactory
 import org.isoron.uhabits.tasks.ImportDataTask
 import org.isoron.uhabits.tasks.ImportDataTaskFactory
+import org.isoron.uhabits.utils.ColorUtils
 import org.isoron.uhabits.utils.copyTo
 import org.isoron.uhabits.utils.currentTheme
 import org.isoron.uhabits.utils.dismissCurrentAndShow
@@ -71,6 +76,7 @@ import org.isoron.uhabits.utils.showSendEmailScreen
 import org.isoron.uhabits.utils.showSendFileScreen
 import java.io.File
 import java.io.IOException
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 const val RESULT_IMPORT_DATA = 101
@@ -95,7 +101,7 @@ class ListHabitsScreen
     private val colorPickerFactory: ColorPickerDialogFactory,
     private val behavior: Lazy<ListHabitsBehavior>,
     private val preferences: Preferences,
-    private val rootView: Lazy<ListHabitsRootView>,
+    private val rootView: Lazy<ListHabitsRootView>
 ) : CommandRunner.Listener,
     ListHabitsBehavior.Screen,
     ListHabitsMenuBehavior.Screen,
@@ -217,6 +223,28 @@ class ListHabitsScreen
         activity.showSendFileScreen(filename)
     }
 
+    override fun showConfetti(color: PaletteColor, x: Float, y: Float) {
+        val baseColor = themeSwitcher.currentTheme!!.color(color).toInt()
+        rootView.get().konfettiView.start(
+            Party(
+                speed = 0f,
+                maxSpeed = 16f,
+                damping = 0.9f,
+                spread = 360,
+                angle = 0,
+                colors = listOf(
+                    ColorUtils.changeHue(baseColor, 180f),
+                    ColorUtils.changeHue(baseColor, 20f),
+                    ColorUtils.changeHue(baseColor, -20f),
+                    baseColor
+                ),
+                position = Position.Absolute(x, y),
+                emitter = Emitter(duration = 25, TimeUnit.MILLISECONDS).max(25),
+                timeToLive = 0
+            )
+        )
+    }
+
     override fun showSettingsScreen() {
         val intent = intentFactory.startSettingsActivity(activity)
         activity.startActivityForResult(intent, REQUEST_SETTINGS)
@@ -233,17 +261,14 @@ class ListHabitsScreen
         notes: String,
         callback: ListHabitsBehavior.NumberPickerCallback
     ) {
-        val view = rootView.get()
-        NumberPopup(
-            context = context,
-            prefs = preferences,
-            anchor = view,
-            notes = notes,
-            value = value,
-        ).apply {
-            onToggle = { value, notes -> callback.onNumberPicked(value, notes) }
-            show()
+        val fm = (context as AppCompatActivity).supportFragmentManager
+        val dialog = NumberDialog()
+        dialog.arguments = Bundle().apply {
+            putDouble("value", value)
+            putString("notes", notes)
         }
+        dialog.onToggle = { v, n, x, y -> callback.onNumberPicked(v, n, x, y) }
+        dialog.dismissCurrentAndShow(fm, "numberDialog")
     }
 
     override fun showCheckmarkPopup(
@@ -252,18 +277,16 @@ class ListHabitsScreen
         color: PaletteColor,
         callback: ListHabitsBehavior.CheckMarkDialogCallback
     ) {
-        val view = rootView.get()
-        CheckmarkPopup(
-            context = context,
-            prefs = preferences,
-            anchor = view,
-            color = view.currentTheme().color(color).toInt(),
-            notes = notes,
-            value = selectedValue,
-        ).apply {
-            onToggle = { value, notes -> callback.onNotesSaved(value, notes) }
-            show()
+        val theme = rootView.get().currentTheme()
+        val fm = (context as AppCompatActivity).supportFragmentManager
+        val dialog = CheckmarkDialog()
+        dialog.arguments = Bundle().apply {
+            putInt("color", theme.color(color).toInt())
+            putInt("value", selectedValue)
+            putString("notes", notes)
         }
+        dialog.onToggle = { v, n, x, y -> callback.onNotesSaved(v, n, x, y) }
+        dialog.dismissCurrentAndShow(fm, "checkmarkDialog")
     }
 
     private fun getExecuteString(command: Command): String? {
@@ -325,8 +348,11 @@ class ListHabitsScreen
     private fun onExportDB() {
         taskRunner.execute(
             exportDBFactory.create { filename ->
-                if (filename != null) activity.showSendFileScreen(filename)
-                else activity.showMessage(activity.resources.getString(R.string.could_not_export))
+                if (filename != null) {
+                    activity.showSendFileScreen(filename)
+                } else {
+                    activity.showMessage(activity.resources.getString(R.string.could_not_export))
+                }
             }
         )
     }

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

@@ -60,8 +60,11 @@ abstract class ButtonPanelView<T : View>(
         repeat(buttonCount) { buttons.add(createButton()) }
 
         removeAllViews()
-        if (reverse) buttons.reversed().forEach { addView(it) }
-        else buttons.forEach { addView(it) }
+        if (reverse) {
+            buttons.reversed().forEach { addView(it) }
+        } else {
+            buttons.forEach { addView(it) }
+        }
         setupButtons()
         requestLayout()
     }

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

@@ -44,8 +44,6 @@ import org.isoron.uhabits.utils.sres
 import org.isoron.uhabits.utils.toMeasureSpec
 import javax.inject.Inject
 
-const val TOGGLE_DELAY_MILLIS = 2000L
-
 class CheckmarkButtonViewFactory
 @Inject constructor(
     @ActivityContext val context: Context,
@@ -79,7 +77,7 @@ class CheckmarkButtonView(
             invalidate()
         }
 
-    var onToggle: (Int, String, Long) -> Unit = { _, _, _ -> }
+    var onToggle: (Int, String) -> Unit = { _, _ -> }
 
     var onEdit: () -> Unit = { }
 
@@ -90,25 +88,31 @@ class CheckmarkButtonView(
         setOnLongClickListener(this)
     }
 
-    fun performToggle(delay: Long) {
+    fun performToggle() {
         value = Entry.nextToggleValue(
             value = value,
             isSkipEnabled = preferences.isSkipEnabled,
             areQuestionMarksEnabled = preferences.areQuestionMarksEnabled
         )
-        onToggle(value, notes, delay)
+        onToggle(value, notes)
         performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
         invalidate()
     }
 
     override fun onClick(v: View) {
-        if (preferences.isShortToggleEnabled) performToggle(TOGGLE_DELAY_MILLIS)
-        else onEdit()
+        if (preferences.isShortToggleEnabled) {
+            performToggle()
+        } else {
+            onEdit()
+        }
     }
 
     override fun onLongClick(v: View): Boolean {
-        if (preferences.isShortToggleEnabled) onEdit()
-        else performToggle(TOGGLE_DELAY_MILLIS)
+        if (preferences.isShortToggleEnabled) {
+            onEdit()
+        } else {
+            performToggle()
+        }
         return true
     }
 
@@ -142,8 +146,11 @@ class CheckmarkButtonView(
             paint.color = when (value) {
                 YES_MANUAL, YES_AUTO, SKIP -> color
                 NO -> {
-                    if (preferences.areQuestionMarksEnabled) mediumContrastColor
-                    else lowContrastColor
+                    if (preferences.areQuestionMarksEnabled) {
+                        mediumContrastColor
+                    } else {
+                        lowContrastColor
+                    }
                 }
                 else -> lowContrastColor
             }
@@ -151,8 +158,11 @@ class CheckmarkButtonView(
                 SKIP -> R.string.fa_skipped
                 NO -> R.string.fa_times
                 UNKNOWN -> {
-                    if (preferences.areQuestionMarksEnabled) R.string.fa_question
-                    else R.string.fa_times
+                    if (preferences.areQuestionMarksEnabled) {
+                        R.string.fa_question
+                    } else {
+                        R.string.fa_times
+                    }
                 }
                 else -> R.string.fa_check
             }

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

@@ -60,7 +60,7 @@ class CheckmarkPanelView(
             setupButtons()
         }
 
-    var onToggle: (Timestamp, Int, String, Long) -> Unit = { _, _, _, _ -> }
+    var onToggle: (Timestamp, Int, String) -> Unit = { _, _, _ -> }
         set(value) {
             field = value
             setupButtons()
@@ -89,7 +89,7 @@ class CheckmarkPanelView(
                 else -> ""
             }
             button.color = color
-            button.onToggle = { value, notes, delay -> onToggle(timestamp, value, notes, delay) }
+            button.onToggle = { value, notes -> onToggle(timestamp, value, notes) }
             button.onEdit = { onEdit(timestamp) }
         }
     }

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

@@ -156,10 +156,11 @@ class HabitCardListController @Inject constructor(
         }
 
         private fun notifyListener() {
-            if (activeMode is SelectionMode)
+            if (activeMode is SelectionMode) {
                 selectionMenu.get().onSelectionChange()
-            else
+            } else {
                 selectionMenu.get().onSelectionFinish()
+            }
         }
     }
 }

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

@@ -20,6 +20,7 @@
 package org.isoron.uhabits.activities.habits.list.views
 
 import android.content.Context
+import android.graphics.PointF
 import android.graphics.text.LineBreaker.BREAK_STRATEGY_BALANCED
 import android.os.Build
 import android.os.Build.VERSION.SDK_INT
@@ -57,13 +58,6 @@ class HabitCardViewFactory
     fun create() = HabitCardView(context, checkmarkPanelFactory, numberPanelFactory, behavior)
 }
 
-data class DelayedToggle(
-    var habit: Habit,
-    var timestamp: Timestamp,
-    var value: Int,
-    var notes: String
-)
-
 class HabitCardView(
     @ActivityContext context: Context,
     checkmarkPanelFactory: CheckmarkPanelViewFactory,
@@ -136,7 +130,6 @@ class HabitCardView(
     private var scoreRing: RingView
 
     private var currentToggleTaskId = 0
-    private var queuedToggles = mutableListOf<DelayedToggle>()
 
     init {
         scoreRing = RingView(context).apply {
@@ -160,11 +153,18 @@ class HabitCardView(
         }
 
         checkmarkPanel = checkmarkPanelFactory.create().apply {
-            onToggle = { timestamp, value, notes, delay ->
-                if (delay > 0) triggerRipple(timestamp)
+            onToggle = { timestamp, value, notes ->
+                triggerRipple(timestamp)
+                val location = getAbsoluteButtonLocation(timestamp)
                 habit?.let {
-                    val taskId = queueToggle(it, timestamp, value, notes);
-                    { runPendingToggles(taskId) }.delay(delay)
+                    behavior.onToggle(
+                        it,
+                        timestamp,
+                        value,
+                        notes,
+                        location.x,
+                        location.y
+                    )
                 }
             }
             onEdit = { timestamp ->
@@ -205,25 +205,6 @@ class HabitCardView(
         addView(innerFrame)
     }
 
-    @Synchronized
-    private fun runPendingToggles(id: Int) {
-        if (currentToggleTaskId != id) return
-        for ((h, t, v, n) in queuedToggles) behavior.onToggle(h, t, v, n)
-        queuedToggles.clear()
-    }
-
-    @Synchronized
-    private fun queueToggle(
-        it: Habit,
-        timestamp: Timestamp,
-        value: Int,
-        notes: String,
-    ): Int {
-        currentToggleTaskId += 1
-        queuedToggles.add(DelayedToggle(it, timestamp, value, notes))
-        return currentToggleTaskId
-    }
-
     override fun onModelChange() {
         Handler(Looper.getMainLooper()).post {
             habit?.let { copyAttributesFrom(it) }
@@ -236,12 +217,27 @@ class HabitCardView(
     }
 
     fun triggerRipple(timestamp: Timestamp) {
+        val location = getRelativeButtonLocation(timestamp)
+        triggerRipple(location.x, location.y)
+    }
+
+    private fun getRelativeButtonLocation(timestamp: Timestamp): PointF {
         val today = DateUtils.getTodayWithOffset()
         val offset = timestamp.daysUntil(today) - dataOffset
         val button = checkmarkPanel.buttons[offset]
         val y = button.height / 2.0f
         val x = checkmarkPanel.x + button.x + (button.width / 2).toFloat()
-        triggerRipple(x, y)
+        return PointF(x, y)
+    }
+
+    private fun getAbsoluteButtonLocation(timestamp: Timestamp): PointF {
+        val containerLocation = IntArray(2)
+        this.getLocationOnScreen(containerLocation)
+        val relButtonLocation = getRelativeButtonLocation(timestamp)
+        return PointF(
+            containerLocation[0].toFloat() + relButtonLocation.x,
+            containerLocation[1].toFloat() - relButtonLocation.y
+        )
     }
 
     override fun onAttachedToWindow() {
@@ -255,7 +251,6 @@ class HabitCardView(
     }
 
     private fun copyAttributesFrom(h: Habit) {
-
         fun getActiveColor(habit: Habit): Int {
             return when (habit.isArchived) {
                 true -> sres.getColor(R.attr.contrast60)
@@ -301,7 +296,6 @@ class HabitCardView(
     }
 
     private fun updateBackground(isSelected: Boolean) {
-
         val background = when (isSelected) {
             true -> R.drawable.selected_box
             false -> R.drawable.ripple

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

@@ -124,15 +124,20 @@ class HeaderView(
                 rect.set(0f, 0f, width, height)
                 rect.offset(canvas.width.toFloat() - dp(3.0f), 0f)
 
-                if (isReversed) rect.offset(-(index + 1) * width, 0f)
-                else rect.offset((index - buttonCount) * width, 0f)
+                if (isReversed) {
+                    rect.offset(-(index + 1) * width, 0f)
+                } else {
+                    rect.offset((index - buttonCount) * width, 0f)
+                }
 
-                if (isRTL()) rect.set(
-                    canvas.width - rect.right,
-                    rect.top,
-                    canvas.width - rect.left,
-                    rect.bottom
-                )
+                if (isRTL()) {
+                    rect.set(
+                        canvas.width - rect.right,
+                        rect.top,
+                        canvas.width - rect.left,
+                        rect.bottom
+                    )
+                }
 
                 val y1 = rect.centerY() - 0.25 * em
                 val y2 = rect.centerY() + 1.25 * em

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

@@ -34,10 +34,10 @@ 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.CheckmarkPopup
+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.NumberPopup
+import org.isoron.uhabits.activities.common.dialogs.NumberDialog
 import org.isoron.uhabits.core.commands.Command
 import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.models.Habit
@@ -51,6 +51,7 @@ import org.isoron.uhabits.core.ui.views.OnDateClickedListener
 import org.isoron.uhabits.intents.IntentFactory
 import org.isoron.uhabits.utils.currentTheme
 import org.isoron.uhabits.utils.dismissCurrentAndShow
+import org.isoron.uhabits.utils.dismissCurrentDialog
 import org.isoron.uhabits.utils.showMessage
 import org.isoron.uhabits.utils.showSendFileScreen
 import org.isoron.uhabits.widgets.WidgetUpdater
@@ -87,7 +88,7 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
             habit = habit,
             habitList = habitList,
             preferences = preferences,
-            screen = screen,
+            screen = screen
         )
 
         view = ShowHabitView(this)
@@ -98,13 +99,13 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
             habitList = habitList,
             screen = screen,
             system = HabitsDirFinder(AndroidDirFinder(this)),
-            taskRunner = appComponent.taskRunner,
+            taskRunner = appComponent.taskRunner
         )
 
         menu = ShowHabitMenu(
             activity = this,
             presenter = menuPresenter,
-            preferences = preferences,
+            preferences = preferences
         )
 
         view.setListener(presenter)
@@ -129,6 +130,7 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
     }
 
     override fun onPause() {
+        dismissCurrentDialog()
         commandRunner.removeListener(this)
         super.onPause()
     }
@@ -148,7 +150,7 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
                     ShowHabitPresenter.buildState(
                         habit = habit,
                         preferences = preferences,
-                        theme = themeSwitcher.currentTheme,
+                        theme = themeSwitcher.currentTheme
                     )
                 )
             }
@@ -170,41 +172,32 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
         override fun showNumberPopup(
             value: Double,
             notes: String,
-            preferences: Preferences,
             callback: ListHabitsBehavior.NumberPickerCallback
         ) {
-            val anchor = getPopupAnchor() ?: return
-            NumberPopup(
-                context = this@ShowHabitActivity,
-                prefs = preferences,
-                notes = notes,
-                anchor = anchor,
-                value = value,
-            ).apply {
-                onToggle = { v, n -> callback.onNumberPicked(v, n) }
-                show()
+            val dialog = NumberDialog()
+            dialog.arguments = Bundle().apply {
+                putDouble("value", value)
+                putString("notes", notes)
             }
+            dialog.onToggle = { v, n, x, y -> callback.onNumberPicked(v, n, x, y) }
+            dialog.dismissCurrentAndShow(supportFragmentManager, "numberDialog")
         }
 
         override fun showCheckmarkPopup(
             selectedValue: Int,
             notes: String,
-            preferences: Preferences,
             color: PaletteColor,
             callback: ListHabitsBehavior.CheckMarkDialogCallback
         ) {
-            val anchor = getPopupAnchor() ?: return
-            CheckmarkPopup(
-                context = this@ShowHabitActivity,
-                prefs = preferences,
-                notes = notes,
-                color = view.currentTheme().color(color).toInt(),
-                anchor = anchor,
-                value = selectedValue,
-            ).apply {
-                onToggle = { v, n -> callback.onNotesSaved(v, n) }
-                show()
+            val theme = view.currentTheme()
+            val dialog = CheckmarkDialog()
+            dialog.arguments = Bundle().apply {
+                putInt("color", theme.color(color).toInt())
+                putInt("value", selectedValue)
+                putString("notes", notes)
             }
+            dialog.onToggle = { v, n, x, y -> callback.onNotesSaved(v, n, x, y) }
+            dialog.dismissCurrentAndShow(supportFragmentManager, "checkmarkDialog")
         }
 
         private fun getPopupAnchor(): View? {

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

@@ -28,7 +28,7 @@ import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitMenuPresenter
 class ShowHabitMenu(
     val activity: ShowHabitActivity,
     val presenter: ShowHabitMenuPresenter,
-    val preferences: Preferences,
+    val preferences: Preferences
 ) {
     fun onCreateOptionsMenu(menu: Menu): Boolean {
         activity.menuInflater.inflate(R.menu.show_habit, menu)

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

@@ -39,7 +39,7 @@ class ShowHabitView(context: Context) : FrameLayout(context) {
             binding.toolbar,
             title = data.title,
             color = data.color,
-            theme = data.theme,
+            theme = data.theme
         )
         binding.subtitleCard.setState(data.subtitle)
         binding.overviewCard.setState(data.overview)

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

@@ -38,7 +38,7 @@ class BarCardView(context: Context, attrs: AttributeSet) : LinearLayout(context,
 
     fun setState(state: BarCardState) {
         val androidColor = state.theme.color(state.color).toInt()
-        binding.chart.view = BarChart(state.theme, JavaLocalDateFormatter(Locale.US)).apply {
+        binding.chart.view = BarChart(state.theme, JavaLocalDateFormatter(Locale.getDefault())).apply {
             series = mutableListOf(state.entries.map { it.value / 1000.0 })
             colors = mutableListOf(theme.color(state.color.paletteIndex))
             axis = state.entries.map { it.timestamp.toLocalDate() }
@@ -63,7 +63,7 @@ class BarCardView(context: Context, attrs: AttributeSet) : LinearLayout(context,
                 parent: AdapterView<*>?,
                 view: View?,
                 position: Int,
-                id: Long,
+                id: Long
             ) {
                 presenter.onBoolSpinnerPosition(position)
             }
@@ -77,7 +77,7 @@ class BarCardView(context: Context, attrs: AttributeSet) : LinearLayout(context,
                     parent: AdapterView<*>?,
                     view: View?,
                     position: Int,
-                    id: Long,
+                    id: Long
                 ) {
                     presenter.onNumericalSpinnerPosition(position)
                 }

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

@@ -45,7 +45,7 @@ class HistoryCardView(context: Context, attrs: AttributeSet) : LinearLayout(cont
             series = state.series,
             defaultSquare = state.defaultSquare,
             notesIndicators = state.notesIndicators,
-            firstWeekday = state.firstWeekday,
+            firstWeekday = state.firstWeekday
         )
         binding.chart.postInvalidate()
     }

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

@@ -52,7 +52,7 @@ class SubtitleCardView(context: Context, attrs: AttributeSet) : LinearLayout(con
         binding.frequencyLabel.text = formatFrequency(
             state.frequency.numerator,
             state.frequency.denominator,
-            resources,
+            resources
         )
         binding.questionLabel.setTextColor(color)
         binding.questionLabel.text = state.question

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

@@ -40,7 +40,7 @@ class SettingsActivity : AppCompatActivity() {
             toolbar = binding.toolbar,
             title = resources.getString(R.string.settings),
             color = PaletteColor(11),
-            theme = themeSwitcher.currentTheme,
+            theme = themeSwitcher.currentTheme
         )
         setContentView(binding.root)
     }

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

@@ -53,6 +53,8 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
     private var ringtoneManager: RingtoneManager? = null
     private lateinit var prefs: Preferences
     private var widgetUpdater: WidgetUpdater? = null
+
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == RINGTONE_REQUEST_CODE) {
             ringtoneManager!!.update(data)

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

@@ -32,7 +32,7 @@ class EditSettingActivity : AppCompatActivity() {
         val habits = app.component.habitList.getFiltered(
             HabitMatcher(
                 isArchivedAllowed = false,
-                isCompletedAllowed = true,
+                isCompletedAllowed = true
             )
         )
         AndroidThemeSwitcher(this, app.component.preferences).apply()
@@ -43,7 +43,7 @@ class EditSettingActivity : AppCompatActivity() {
             context = this,
             habitList = app.component.habitList,
             onSave = controller::onSave,
-            args = args,
+            args = args
         )
         setContentView(view)
     }

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

@@ -54,7 +54,7 @@ class EditSettingRootView(
             title = resources.getString(R.string.app_name),
             color = PaletteColor(11),
             displayHomeAsUpEnabled = false,
-            theme = currentTheme(),
+            theme = currentTheme()
         )
         populateHabitSpinner()
         binding.habitSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
@@ -69,7 +69,7 @@ class EditSettingRootView(
             val habit = habitList.getByPosition(binding.habitSpinner.selectedItemPosition)
             val action = mapSpinnerPositionToAction(
                 isNumerical = habit.isNumerical,
-                itemPosition = binding.actionSpinner.selectedItemPosition,
+                itemPosition = binding.actionSpinner.selectedItemPosition
             )
             onSave(habit, action)
         }

uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidCursor.kt

@@ -27,22 +27,34 @@ class AndroidCursor(private val cursor: android.database.Cursor) : Cursor {
     override fun moveToNext() = cursor.moveToNext()
 
     override fun getInt(index: Int): Int? {
-        return if (cursor.isNull(index)) null
-        else cursor.getInt(index)
+        return if (cursor.isNull(index)) {
+            null
+        } else {
+            cursor.getInt(index)
+        }
     }
 
     override fun getLong(index: Int): Long? {
-        return if (cursor.isNull(index)) null
-        else cursor.getLong(index)
+        return if (cursor.isNull(index)) {
+            null
+        } else {
+            cursor.getLong(index)
+        }
     }
 
     override fun getDouble(index: Int): Double? {
-        return if (cursor.isNull(index)) null
-        else cursor.getDouble(index)
+        return if (cursor.isNull(index)) {
+            null
+        } else {
+            cursor.getDouble(index)
+        }
     }
 
     override fun getString(index: Int): String? {
-        return if (cursor.isNull(index)) null
-        else cursor.getString(index)
+        return if (cursor.isNull(index)) {
+            null
+        } else {
+            cursor.getString(index)
+        }
     }
 }

uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabase.kt

@@ -26,7 +26,7 @@ import java.io.File
 
 class AndroidDatabase(
     private val db: SQLiteDatabase,
-    override val file: File?,
+    override val file: File?
 ) : Database {
 
     override fun beginTransaction() = db.beginTransaction()
@@ -45,7 +45,7 @@ class AndroidDatabase(
         tableName: String,
         values: Map<String, Any?>,
         where: String,
-        vararg params: String,
+        vararg params: String
     ): Int {
         val contValues = mapToContentValues(values)
         return db.update(tableName, contValues, where, params)
@@ -59,7 +59,7 @@ class AndroidDatabase(
     override fun delete(
         tableName: String,
         where: String,
-        vararg params: String,
+        vararg params: String
     ) {
         db.delete(tableName, where, params)
     }

uhabits-android/src/main/java/org/isoron/uhabits/database/AndroidDatabaseOpener.kt

@@ -30,7 +30,7 @@ class AndroidDatabaseOpener @Inject constructor() : DatabaseOpener {
             db = SQLiteDatabase.openDatabase(
                 file.absolutePath,
                 null,
-                SQLiteDatabase.OPEN_READWRITE,
+                SQLiteDatabase.OPEN_READWRITE
             ),
             file = file
         )

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

@@ -25,5 +25,6 @@ import dagger.Provides
 @Module
 class ActivityContextModule(
     @get:Provides
-    @get:ActivityContext val context: Context
+    @get:ActivityContext
+    val context: Context
 )

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

@@ -26,5 +26,6 @@ import dagger.Provides
 class AppContextModule(
     @get:Provides
     @get:AppContext
-    @param:AppContext val context: Context
+    @param:AppContext
+    val context: Context
 )

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

@@ -53,8 +53,9 @@ class IntentParser
         var timestamp = intent.getLongExtra("timestamp", today)
         timestamp = DateUtils.getStartOfDay(timestamp)
 
-        if (timestamp < 0 || timestamp > today)
+        if (timestamp < 0 || timestamp > today) {
             throw IllegalArgumentException("timestamp is not valid")
+        }
 
         return Timestamp(timestamp)
     }

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

@@ -25,6 +25,7 @@ import android.app.AlarmManager.RTC_WAKEUP
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Context.ALARM_SERVICE
+import android.os.Build
 import android.util.Log
 import org.isoron.uhabits.core.AppScope
 import org.isoron.uhabits.core.models.Habit
@@ -56,6 +57,10 @@ class IntentScheduler
             )
             return SchedulerResult.IGNORED
         }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && !manager.canScheduleExactAlarms()) {
+            Log.e("IntentScheduler", "No permission to schedule exact alarms")
+            return SchedulerResult.IGNORED
+        }
         manager.setExactAndAllowWhileIdle(alarmType, timestamp, intent)
         return SchedulerResult.OK
     }

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

@@ -96,7 +96,6 @@ class AndroidNotificationTray
         timestamp: Timestamp,
         disableSound: Boolean = false
     ): Notification {
-
         val addRepetitionAction = Action(
             R.drawable.ic_action_check,
             context.getString(R.string.yes),
@@ -146,8 +145,9 @@ class AndroidNotificationTray
                 .addAction(removeRepetitionAction)
         }
 
-        if (!disableSound)
+        if (!disableSound) {
             builder.setSound(ringtoneManager.getURI())
+        }
 
         if (SDK_INT < Build.VERSION_CODES.S) {
             val snoozeAction = Action(

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

@@ -61,8 +61,9 @@ class RingtoneManager
             "pref_ringtone_uri",
             defaultRingtoneUri.toString()
         )!!
-        if (prefRingtoneUri.isNotEmpty())
+        if (prefRingtoneUri.isNotEmpty()) {
             ringtoneUri = Uri.parse(prefRingtoneUri)
+        }
 
         return ringtoneUri
     }

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

@@ -103,7 +103,9 @@ class SnoozeDelayPickerActivity : FragmentActivity(), OnItemClickListener {
         if (snoozeValues[position] >= 0) {
             reminderController!!.onSnoozeDelayPicked(habit!!, snoozeValues[position])
             finish()
-        } else showTimePicker()
+        } else {
+            showTimePicker()
+        }
     }
 
     override fun finish() {

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

@@ -66,7 +66,13 @@ class ReminderController @Inject constructor(
     }
 
     fun onDismiss(habit: Habit) {
-        notificationTray.cancel(habit)
+        if (preferences.shouldMakeNotificationsSticky()) {
+            // This is a workaround to keep sticky notifications non-dismissible in Android 14+.
+            // If the notification is dismissed, we immediately reshow it.
+            notificationTray.reshow(habit)
+        } else {
+            notificationTray.cancel(habit)
+        }
     }
 
     private fun showSnoozeDelayPicker(habit: Habit, context: Context) {

uhabits-android/src/main/java/org/isoron/uhabits/tasks/AndroidTaskRunner.kt

@@ -60,12 +60,14 @@ class AndroidTaskRunner : TaskRunner {
             publishProgress(progress)
         }
 
+        @Deprecated("Deprecated in Java")
         override fun doInBackground(vararg params: Void?): Void? {
             if (isCancelled) return null
             task.doInBackground()
             return null
         }
 
+        @Deprecated("Deprecated in Java")
         override fun onPostExecute(aVoid: Void?) {
             if (isCancelled) return
             task.onPostExecute()
@@ -74,6 +76,7 @@ class AndroidTaskRunner : TaskRunner {
             for (l in listeners) l.onTaskFinished(task)
         }
 
+        @Deprecated("Deprecated in Java")
         override fun onPreExecute() {
             if (isCancelled) return
             for (l in listeners) l.onTaskStarted(task)
@@ -82,6 +85,7 @@ class AndroidTaskRunner : TaskRunner {
             task.onPreExecute()
         }
 
+        @Deprecated("Deprecated in Java")
         override fun onProgressUpdate(vararg values: Int?) {
             values[0]?.let { task.onProgressUpdate(it) }
         }

uhabits-android/src/main/java/org/isoron/uhabits/tasks/ExportDBTaskFactory.kt

@@ -27,7 +27,7 @@ import javax.inject.Inject
 class ExportDBTaskFactory
 @Inject constructor(
     @AppContext private val context: Context,
-    private val system: AndroidDirFinder,
+    private val system: AndroidDirFinder
 ) {
     fun create(listener: ExportDBTask.Listener) = ExportDBTask(context, system, listener)
 }

uhabits-android/src/main/java/org/isoron/uhabits/tasks/ImportDataTaskFactory.kt

@@ -27,7 +27,7 @@ import javax.inject.Inject
 class ImportDataTaskFactory
 @Inject constructor(
     private val importer: GenericImporter,
-    private val modelFactory: ModelFactory,
+    private val modelFactory: ModelFactory
 ) {
     fun create(file: File, listener: ImportDataTask.Listener) =
         ImportDataTask(importer, modelFactory, file, listener)

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

@@ -24,6 +24,7 @@ import org.jetbrains.annotations.Contract
 
 object AttributeSetUtils {
     const val ISORON_NAMESPACE = "http://isoron.org/android"
+
     @JvmStatic
     fun getAttribute(
         context: Context,

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

@@ -36,6 +36,13 @@ object ColorUtils {
         return a or r or g or b
     }
 
+    fun changeHue(color: Int, delta: Float): Int {
+        val hsv = FloatArray(3)
+        Color.colorToHSV(color, hsv)
+        hsv[0] = (hsv[0] + delta).mod(360f)
+        return Color.HSVToColor(hsv)
+    }
+
     @JvmStatic
     fun setAlpha(color: Int, newAlpha: Float): Int {
         val intAlpha = (newAlpha * 255).toInt()

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

@@ -33,6 +33,7 @@ import java.text.SimpleDateFormat
 
 object DatabaseUtils {
     private var opener: HabitsDatabaseOpener? = null
+
     @JvmStatic
     fun getDatabaseFile(context: Context): File {
         val databaseFilename = databaseFilename

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

@@ -6,16 +6,24 @@ import androidx.fragment.app.FragmentManager
 import java.lang.ref.WeakReference
 
 var currentDialog: WeakReference<Dialog> = WeakReference(null)
+var currentDialogFragment: WeakReference<DialogFragment> = WeakReference(null)
+
+fun dismissCurrentDialog() {
+    currentDialog.get()?.dismiss()
+    currentDialog = WeakReference(null)
+    currentDialogFragment.get()?.dismiss()
+    currentDialogFragment = WeakReference(null)
+}
 
 fun Dialog.dismissCurrentAndShow() {
-    currentDialog.get()?.dismiss()
+    dismissCurrentDialog()
     currentDialog = WeakReference(this)
     show()
 }
 
 fun DialogFragment.dismissCurrentAndShow(fragmentManager: FragmentManager, tag: String) {
-    currentDialog.get()?.dismiss()
+    dismissCurrentDialog()
+    currentDialogFragment = WeakReference(this)
     show(fragmentManager, tag)
     fragmentManager.executePendingTransactions()
-    currentDialog = WeakReference(this.dialog)
 }

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

@@ -26,6 +26,7 @@ import android.content.Intent
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
+import android.graphics.PointF
 import android.graphics.drawable.ColorDrawable
 import android.os.Handler
 import android.os.SystemClock
@@ -61,7 +62,6 @@ fun RelativeLayout.addBelow(
     height: Int = WRAP_CONTENT,
     applyCustomRules: (params: RelativeLayout.LayoutParams) -> Unit = {}
 ) {
-
     view.layoutParams = RelativeLayout.LayoutParams(width, height).apply {
         addRule(BELOW, subject.id)
         applyCustomRules(this)
@@ -75,7 +75,6 @@ fun RelativeLayout.addAtBottom(
     width: Int = MATCH_PARENT,
     height: Int = WRAP_CONTENT
 ) {
-
     view.layoutParams = RelativeLayout.LayoutParams(width, height).apply {
         addRule(ALIGN_PARENT_BOTTOM)
     }
@@ -88,7 +87,6 @@ fun RelativeLayout.addAtTop(
     width: Int = MATCH_PARENT,
     height: Int = WRAP_CONTENT
 ) {
-
     view.layoutParams = RelativeLayout.LayoutParams(width, height).apply {
         addRule(ALIGN_PARENT_TOP)
     }
@@ -138,7 +136,11 @@ fun Activity.startActivitySafely(intent: Intent) {
     }
 }
 
-fun Activity.showSendEmailScreen(@StringRes toId: Int, @StringRes subjectId: Int, content: String?) {
+fun Activity.showSendEmailScreen(
+    @StringRes toId: Int,
+    @StringRes subjectId: Int,
+    content: String?
+) {
     val to = this.getString(toId)
     val subject = this.getString(subjectId)
     this.startActivity(
@@ -159,7 +161,7 @@ fun Activity.restartWithFade(cls: Class<*>?) {
             overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out)
             startActivity(Intent(this, cls))
         },
-        500,
+        500
     ) // HACK: Let the menu disappear first
 }
 
@@ -168,7 +170,7 @@ fun View.setupToolbar(
     title: String,
     color: PaletteColor,
     theme: Theme,
-    displayHomeAsUpEnabled: Boolean = true,
+    displayHomeAsUpEnabled: Boolean = true
 ) {
     toolbar.elevation = InterfaceUtils.dpToPixels(context, 2f)
     val res = StyledResources(context)
@@ -235,3 +237,11 @@ fun View.requestFocusWithKeyboard() {
         dispatchTouchEvent(MotionEvent.obtain(time, time, MotionEvent.ACTION_UP, 0f, 0f, 0))
     }, 250)
 }
+
+fun View.getCenter(): PointF {
+    val viewLocation = IntArray(2)
+    this.getLocationOnScreen(viewLocation)
+    viewLocation[0] += this.width / 2
+    viewLocation[1] -= this.height / 2
+    return PointF(viewLocation[0].toFloat(), viewLocation[1].toFloat())
+}

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

@@ -147,10 +147,11 @@ abstract class BaseWidget(val context: Context, val id: Int, val stacked: Boolea
 
     protected val preferedBackgroundAlpha: Int
         get() {
-            return if (stacked)
+            return if (stacked) {
                 255
-            else
+            } else {
                 prefs.widgetOpacity
+            }
         }
 
     init {

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

@@ -33,7 +33,7 @@ open class CheckmarkWidget(
     context: Context,
     widgetId: Int,
     protected val habit: Habit,
-    stacked: Boolean = false,
+    stacked: Boolean = false
 ) : BaseWidget(context, widgetId, stacked) {
 
     override val defaultHeight: Int = 125
@@ -41,7 +41,7 @@ open class CheckmarkWidget(
 
     override fun getOnClickPendingIntent(context: Context): PendingIntent? {
         return if (habit.isNumerical) {
-            pendingIntentFactory.showNumberPicker(habit, DateUtils.getToday())
+            pendingIntentFactory.showNumberPicker(habit, DateUtils.getTodayWithOffset())
         } else {
             pendingIntentFactory.toggleCheckmark(habit, null)
         }

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

@@ -23,7 +23,10 @@ import android.content.Context
 class CheckmarkWidgetProvider : BaseWidgetProvider() {
     override fun getWidgetFromId(context: Context, id: Int): BaseWidget {
         val habits = getHabitsFromWidgetId(id)
-        return if (habits.size == 1) CheckmarkWidget(context, id, habits[0])
-        else StackWidget(context, id, StackWidgetType.CHECKMARK, habits)
+        return if (habits.size == 1) {
+            CheckmarkWidget(context, id, habits[0])
+        } else {
+            StackWidget(context, id, StackWidgetType.CHECKMARK, habits)
+        }
     }
 }