Remove dependabot

Fix the misalignment of "About" page in RTL language

.github/dependabot.yml

@@ -1,11 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "gradle"
-    directory: "/"
-    schedule:
-      interval: "monthly"
-    open-pull-requests-limit: 10
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "monthly"

.github/workflows/main.yml

@@ -22,7 +22,7 @@ jobs:
 
     - name: Upload artifacts
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: build
         path: |

build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    val kotlinVersion = "1.9.21"
-    id("com.android.application") version "8.1.4" 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.multiplatform") version kotlinVersion apply (false)

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
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-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

@@ -19,7 +19,7 @@
 
 plugins {
     id("com.github.triplet.play") version "3.8.6"
-    id("com.android.application") version "8.1.4"
+    id("com.android.application") version "8.4.0"
     id("org.jetbrains.kotlin.android")
     id("org.jetbrains.kotlin.kapt")
     id("org.jlleitschuh.gradle.ktlint")
@@ -44,12 +44,14 @@ android {
 
     namespace = "org.isoron.uhabits"
     compileSdk = 34
+    // compileSdkPreview = "VanillaIceCream"
 
     defaultConfig {
         versionCode = 20200
         versionName = "2.2.0"
         minSdk = 28
         targetSdk = 34
+        // targetSdkPreview = "VanillaIceCream"
         applicationId = "org.isoron.uhabits"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -91,11 +93,15 @@ android {
     buildFeatures {
         viewBinding = true
     }
+
+    lint {
+        abortOnError = false
+    }
 }
 
 dependencies {
-    val daggerVersion = "2.48.1"
-    val kotlinVersion = "1.9.21"
+    val daggerVersion = "2.51.1"
+    val kotlinVersion = "1.9.22"
     val kxCoroutinesVersion = "1.7.3"
     val ktorVersion = "1.6.8"
     val espressoVersion = "3.5.1"
@@ -106,17 +112,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.7.0")
+    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("org.mockito.kotlin:mockito-kotlin:5.1.0")
+    androidTestImplementation("org.mockito.kotlin:mockito-kotlin:5.2.1")
     compileOnly("javax.annotation:jsr250-api:1.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:32.1.3-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")
@@ -127,14 +133,15 @@ dependencies {
     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.10.0")
+    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("org.mockito.kotlin:mockito-kotlin:5.1.0")
+    testImplementation("org.mockito.kotlin:mockito-kotlin:5.2.1")
 }
 
 kapt {

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

@@ -26,6 +26,7 @@ import org.isoron.uhabits.BuildConfig
 import org.isoron.uhabits.R
 import org.isoron.uhabits.core.models.PaletteColor
 import org.isoron.uhabits.databinding.AboutBinding
+import org.isoron.uhabits.utils.applyRootViewInsets
 import org.isoron.uhabits.utils.currentTheme
 import org.isoron.uhabits.utils.setupToolbar
 
@@ -54,5 +55,6 @@ class AboutView(
         binding.tvTranslate.setOnClickListener { screen.showTranslationWebsite() }
         binding.tvVersion.setOnClickListener { screen.onPressDeveloperCountdown() }
         binding.tvVersion.text = String.format(version, BuildConfig.VERSION_NAME)
+        applyRootViewInsets()
     }
 }

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

@@ -33,17 +33,19 @@ import org.isoron.uhabits.core.models.Entry.Companion.UNKNOWN
 import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL
 import org.isoron.uhabits.databinding.CheckmarkPopupBinding
 import org.isoron.uhabits.utils.InterfaceUtils.getFontAwesome
+import org.isoron.uhabits.utils.getCenter
 import org.isoron.uhabits.utils.sres
 
 class CheckmarkDialog : AppCompatDialogFragment() {
-    var onToggle: (Int, String) -> Unit = { _, _ -> }
+    var onToggle: (Int, String, Float, Float) -> Unit = { _, _, _, _ -> }
 
     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(requireArguments().getInt("color"))
+            it.setTextColor(color)
         }
         arrayOf(view.noBtn, view.unknownBtn).forEach {
             it.setTextColor(view.root.sres.getColor(R.attr.contrast60))
@@ -62,7 +64,8 @@ class CheckmarkDialog : AppCompatDialogFragment() {
         }
         fun onClick(v: Int) {
             val notes = view.notes.text.toString().trim()
-            onToggle(v, notes)
+            val location = view.yesBtn.getCenter()
+            onToggle(v, notes, location.x, location.y)
             requireDialog().dismiss()
         }
         view.yesBtn.setOnClickListener { onClick(YES_MANUAL) }

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

@@ -15,6 +15,7 @@ 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
@@ -24,7 +25,7 @@ import java.text.ParseException
 
 class NumberDialog : AppCompatDialogFragment() {
 
-    var onToggle: (Double, String) -> Unit = { _, _ -> }
+    var onToggle: (Double, String, Float, Float) -> Unit = { _, _, _, _ -> }
     var onDismiss: () -> Unit = {}
 
     private var originalNotes: String = ""
@@ -104,12 +105,17 @@ class NumberDialog : AppCompatDialogFragment() {
         try {
             val numberFormat = NumberFormat.getInstance()
             val valueStr = view.value.text.toString()
-            value = numberFormat.parse(valueStr)!!.toDouble()
+            value = if (valueStr.isNotEmpty()) {
+                numberFormat.parse(valueStr)!!.toDouble()
+            } else {
+                Entry.UNKNOWN.toDouble() / 1000
+            }
         } catch (e: ParseException) {
             // NOP
         }
         val notes = view.notes.text.toString()
-        onToggle(value, notes)
+        val location = view.saveBtn.getCenter()
+        onToggle(value, notes, location.x, location.y)
         requireDialog().dismiss()
     }
 }

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?
@@ -159,6 +164,12 @@ class RingView : View {
             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/habits/edit/EditHabitActivity.kt

@@ -22,7 +22,6 @@ package org.isoron.uhabits.activities.habits.edit
 import android.annotation.SuppressLint
 import android.content.res.ColorStateList
 import android.content.res.Resources
-import android.graphics.Color
 import android.os.Bundle
 import android.text.Html
 import android.text.Spanned
@@ -53,7 +52,8 @@ import org.isoron.uhabits.core.models.PaletteColor
 import org.isoron.uhabits.core.models.Reminder
 import org.isoron.uhabits.core.models.WeekdayList
 import org.isoron.uhabits.databinding.ActivityEditHabitBinding
-import org.isoron.uhabits.utils.ColorUtils
+import org.isoron.uhabits.utils.applyRootViewInsets
+import org.isoron.uhabits.utils.applyToolbarInsets
 import org.isoron.uhabits.utils.dismissCurrentAndShow
 import org.isoron.uhabits.utils.formatTime
 import org.isoron.uhabits.utils.toFormattedString
@@ -94,6 +94,8 @@ class EditHabitActivity : AppCompatActivity() {
         themeSwitcher.apply()
 
         binding = ActivityEditHabitBinding.inflate(layoutInflater)
+        binding.root.applyRootViewInsets()
+        binding.toolbar.applyToolbarInsets()
         setContentView(binding.root)
 
         if (intent.hasExtra("habitId")) {
@@ -352,8 +354,7 @@ class EditHabitActivity : AppCompatActivity() {
         androidColor = themeSwitcher.currentTheme.color(color).toInt()
         binding.colorButton.backgroundTintList = ColorStateList.valueOf(androidColor)
         if (!themeSwitcher.isNightMode) {
-            val darkerAndroidColor = ColorUtils.mixColors(Color.BLACK, androidColor, 0.15f)
-            window.statusBarColor = darkerAndroidColor
+            window.statusBarColor = androidColor
             binding.toolbar.setBackgroundColor(androidColor)
         }
     }

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

@@ -45,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.applyRootViewInsets
 import org.isoron.uhabits.utils.dismissCurrentDialog
 import org.isoron.uhabits.utils.restartWithFade
 
@@ -100,6 +101,7 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
         menu = component.listHabitsMenu
         Thread.setDefaultUncaughtExceptionHandler(BaseExceptionHandler(this))
         component.listHabitsBehavior.onStartup()
+        rootView.applyRootViewInsets()
         setContentView(rootView)
     }
 

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)

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

@@ -25,6 +25,9 @@ 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.CheckmarkDialog
@@ -63,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
@@ -72,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
@@ -218,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)
@@ -240,7 +267,7 @@ class ListHabitsScreen
             putDouble("value", value)
             putString("notes", notes)
         }
-        dialog.onToggle = { v, n -> callback.onNumberPicked(v, n) }
+        dialog.onToggle = { v, n, x, y -> callback.onNumberPicked(v, n, x, y) }
         dialog.dismissCurrentAndShow(fm, "numberDialog")
     }
 
@@ -258,7 +285,7 @@ class ListHabitsScreen
             putInt("value", selectedValue)
             putString("notes", notes)
         }
-        dialog.onToggle = { v, n -> callback.onNotesSaved(v, n) }
+        dialog.onToggle = { v, n, x, y -> callback.onNotesSaved(v, n, x, y) }
         dialog.dismissCurrentAndShow(fm, "checkmarkDialog")
     }
 

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
@@ -154,7 +155,17 @@ class HabitCardView(
         checkmarkPanel = checkmarkPanelFactory.create().apply {
             onToggle = { timestamp, value, notes ->
                 triggerRipple(timestamp)
-                habit?.let { behavior.onToggle(it, timestamp, value, notes) }
+                val location = getAbsoluteButtonLocation(timestamp)
+                habit?.let {
+                    behavior.onToggle(
+                        it,
+                        timestamp,
+                        value,
+                        notes,
+                        location.x,
+                        location.y
+                    )
+                }
             }
             onEdit = { timestamp ->
                 triggerRipple(timestamp)
@@ -206,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() {

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

@@ -49,6 +49,7 @@ import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitMenuPresenter
 import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitPresenter
 import org.isoron.uhabits.core.ui.views.OnDateClickedListener
 import org.isoron.uhabits.intents.IntentFactory
+import org.isoron.uhabits.utils.applyRootViewInsets
 import org.isoron.uhabits.utils.currentTheme
 import org.isoron.uhabits.utils.dismissCurrentAndShow
 import org.isoron.uhabits.utils.dismissCurrentDialog
@@ -109,6 +110,7 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
         )
 
         view.setListener(presenter)
+        view.applyRootViewInsets()
         setContentView(view)
     }
 
@@ -179,7 +181,7 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
                 putDouble("value", value)
                 putString("notes", notes)
             }
-            dialog.onToggle = { v, n -> callback.onNumberPicked(v, n) }
+            dialog.onToggle = { v, n, x, y -> callback.onNumberPicked(v, n, x, y) }
             dialog.dismissCurrentAndShow(supportFragmentManager, "numberDialog")
         }
 
@@ -196,7 +198,7 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
                 putInt("value", selectedValue)
                 putString("notes", notes)
             }
-            dialog.onToggle = { v, n -> callback.onNotesSaved(v, n) }
+            dialog.onToggle = { v, n, x, y -> callback.onNotesSaved(v, n, x, y) }
             dialog.dismissCurrentAndShow(supportFragmentManager, "checkmarkDialog")
         }
 

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

@@ -25,12 +25,14 @@ import android.widget.FrameLayout
 import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitPresenter
 import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitState
 import org.isoron.uhabits.databinding.ShowHabitBinding
+import org.isoron.uhabits.utils.applyToolbarInsets
 import org.isoron.uhabits.utils.setupToolbar
 
 class ShowHabitView(context: Context) : FrameLayout(context) {
     private val binding = ShowHabitBinding.inflate(LayoutInflater.from(context))
 
     init {
+        binding.toolbar.applyToolbarInsets()
         addView(binding.root)
     }
 

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

@@ -26,6 +26,7 @@ import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.AndroidThemeSwitcher
 import org.isoron.uhabits.core.models.PaletteColor
 import org.isoron.uhabits.databinding.SettingsActivityBinding
+import org.isoron.uhabits.utils.applyRootViewInsets
 import org.isoron.uhabits.utils.setupToolbar
 
 class SettingsActivity : AppCompatActivity() {
@@ -42,6 +43,7 @@ class SettingsActivity : AppCompatActivity() {
             color = PaletteColor(11),
             theme = themeSwitcher.currentTheme
         )
+        binding.root.applyRootViewInsets()
         setContentView(binding.root)
     }
 }

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

@@ -24,6 +24,7 @@ import androidx.appcompat.app.AppCompatActivity
 import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.activities.AndroidThemeSwitcher
 import org.isoron.uhabits.core.models.HabitMatcher
+import org.isoron.uhabits.utils.applyRootViewInsets
 
 class EditSettingActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -45,6 +46,7 @@ class EditSettingActivity : AppCompatActivity() {
             onSave = controller::onSave,
             args = args
         )
+        view.applyRootViewInsets()
         setContentView(view)
     }
 }

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/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
@@ -45,6 +46,8 @@ import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.core.content.FileProvider
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import com.google.android.material.snackbar.Snackbar
 import org.isoron.platform.gui.toInt
 import org.isoron.uhabits.HabitsApplication
@@ -135,7 +138,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(
@@ -175,10 +182,10 @@ fun View.setupToolbar(
     } else {
         theme.color(color).toInt()
     }
-    val darkerColor = ColorUtils.mixColors(toolbarColor, Color.BLACK, 0.75f)
     toolbar.background = ColorDrawable(toolbarColor)
+    toolbar.applyToolbarInsets()
     val activity = context as AppCompatActivity
-    activity.window.statusBarColor = darkerColor
+    activity.window.statusBarColor = toolbarColor
     activity.setSupportActionBar(toolbar)
     activity.supportActionBar?.setDisplayHomeAsUpEnabled(displayHomeAsUpEnabled)
 }
@@ -232,3 +239,33 @@ 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())
+}
+
+fun View.applyRootViewInsets() {
+    ViewCompat.setOnApplyWindowInsetsListener(this) { view, insets ->
+        val systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+        val displayCutoutInsets = insets.getInsets(WindowInsetsCompat.Type.displayCutout())
+        val left = maxOf(systemBarsInsets.left, displayCutoutInsets.left)
+        val right = maxOf(systemBarsInsets.right, displayCutoutInsets.right)
+        view.setPadding(left, 0, right, 0)
+        view.background = ColorDrawable(Color.BLACK)
+        insets
+    }
+}
+
+fun View.applyToolbarInsets() {
+    ViewCompat.setOnApplyWindowInsetsListener(this) { view, insets ->
+        val systemBarsInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+        val displayCutoutInsets = insets.getInsets(WindowInsetsCompat.Type.displayCutout())
+        val top = maxOf(systemBarsInsets.top, displayCutoutInsets.top)
+        view.setPadding(0, top, 0, 0)
+        insets
+    }
+}

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

@@ -68,13 +68,13 @@ class CheckmarkWidgetView : HabitWidgetView {
         val fgColor: Int
         setShadowAlpha(0x4f)
         when (entryState) {
-            YES_MANUAL, SKIP -> {
+            YES_MANUAL, SKIP, YES_AUTO -> {
                 bgColor = activeColor
                 fgColor = res.getColor(R.attr.contrast0)
                 backgroundPaint!!.color = bgColor
                 frame!!.setBackgroundDrawable(background)
             }
-            YES_AUTO, NO, UNKNOWN -> {
+            NO, UNKNOWN -> {
                 bgColor = res.getColor(R.attr.cardBgColor)
                 fgColor = res.getColor(R.attr.contrast60)
             }
@@ -87,12 +87,23 @@ class CheckmarkWidgetView : HabitWidgetView {
         ring.setColor(fgColor)
         ring.setBackgroundColor(bgColor)
         ring.setText(text)
+        ring.setIsStrokedTextEnabled(strokedTextEnabled)
         label.text = name
         label.setTextColor(fgColor)
         requestLayout()
         postInvalidate()
     }
 
+    private val strokedTextEnabled: Boolean
+        get() = if (isNumerical) {
+            false
+        } else {
+            when (entryState) {
+                YES_AUTO -> true
+                else -> false
+            }
+        }
+
     private val text: String
         get() = if (isNumerical) {
             (max(0, entryValue) / 1000.0).toShortString()

uhabits-android/src/main/res/layout/activity_edit_habit.xml

@@ -18,7 +18,8 @@
   ~ with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -61,8 +62,10 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        android:background="?attr/contrast0">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -265,4 +268,4 @@
         </LinearLayout>
     </ScrollView>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>

uhabits-android/src/main/res/layout/automation.xml

@@ -58,7 +58,10 @@
 
     <LinearLayout
         android:id="@+id/formPanel"
-        style="@style/dialogFormPanel">
+        style="@style/dialogFormPanel"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:background="?attr/contrast0">
 
         <FrameLayout style="@style/FormOuterBox">
             <LinearLayout style="@style/FormInnerBox">

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

@@ -226,6 +226,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:paddingTop">6dp</item>
         <item name="android:paddingBottom">6dp</item>
+        <item name="android:textAlignment">viewStart</item>
     </style>
 
     <style name="About.Item.Language">
@@ -233,6 +234,7 @@
         <item name="android:textSize">@dimen/smallTextSize</item>
         <item name="android:gravity">center</item>
         <item name="android:background">?attr/contrast20</item>
+        <item name="android:textAlignment">viewStart</item>
     </style>
 
     <style name="About.Item.Clickable">
@@ -243,7 +245,7 @@
 
     <style name="Toolbar">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">?actionBarSize</item>
+        <item name="android:layout_height">wrap_content</item>
         <item name="android:background">?colorPrimary</item>
         <item name="android:theme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
     </style>

uhabits-core/build.gradle.kts

@@ -44,10 +44,10 @@ kotlin {
         val jvmMain by getting {
             dependencies {
                 implementation(kotlin("stdlib-jdk8"))
-                compileOnly("com.google.dagger:dagger:2.48.1")
-                implementation("com.google.guava:guava:32.1.3-android")
+                compileOnly("com.google.dagger:dagger:2.51.1")
+                implementation("com.google.guava:guava:33.1.0-android")
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3")
-                implementation("androidx.annotation:annotation:1.7.0")
+                implementation("androidx.annotation:annotation:1.7.1")
                 implementation("com.google.code.findbugs:jsr305:3.0.2")
                 implementation("com.opencsv:opencsv:5.9")
                 implementation("commons-codec:commons-codec:1.16.0")
@@ -59,10 +59,10 @@ kotlin {
             dependencies {
                 implementation(kotlin("test"))
                 implementation(kotlin("test-junit"))
-                implementation("org.xerial:sqlite-jdbc:3.42.0.0")
+                implementation("org.xerial:sqlite-jdbc:3.45.1.0")
                 implementation("org.hamcrest:hamcrest:2.2")
                 implementation("org.apache.commons:commons-io:1.3.2")
-                implementation("org.mockito.kotlin:mockito-kotlin:5.1.0")
+                implementation("org.mockito.kotlin:mockito-kotlin:5.2.1")
                 implementation("org.junit.jupiter:junit-jupiter:5.10.1")
             }
         }

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt

@@ -61,7 +61,7 @@ data class Habit(
         return if (isNumerical) {
             when (targetType) {
                 NumericalHabitType.AT_LEAST -> value / 1000.0 >= targetValue
-                NumericalHabitType.AT_MOST -> value / 1000.0 <= targetValue
+                NumericalHabitType.AT_MOST -> value != Entry.UNKNOWN && value / 1000.0 <= targetValue
             }
         } else {
             value != Entry.NO && value != Entry.UNKNOWN

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt

@@ -20,9 +20,12 @@ package org.isoron.uhabits.core.ui.screens.habits.list
 
 import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.commands.CreateRepetitionCommand
+import org.isoron.uhabits.core.models.Entry.Companion.YES_MANUAL
 import org.isoron.uhabits.core.models.Habit
 import org.isoron.uhabits.core.models.HabitList
 import org.isoron.uhabits.core.models.HabitType
+import org.isoron.uhabits.core.models.NumericalHabitType.AT_LEAST
+import org.isoron.uhabits.core.models.NumericalHabitType.AT_MOST
 import org.isoron.uhabits.core.models.PaletteColor
 import org.isoron.uhabits.core.models.Timestamp
 import org.isoron.uhabits.core.preferences.Preferences
@@ -52,8 +55,16 @@ open class ListHabitsBehavior @Inject constructor(
         val entry = habit.computedEntries.get(timestamp!!)
         if (habit.type == HabitType.NUMERICAL) {
             val oldValue = entry.value.toDouble() / 1000
-            screen.showNumberPopup(oldValue, entry.notes) { newValue: Double, newNotes: String ->
+            screen.showNumberPopup(oldValue, entry.notes) { newValue: Double, newNotes: String, x: Float, y: Float ->
                 val value = (newValue * 1000).roundToInt()
+                if (newValue != oldValue) {
+                    if (
+                        (habit.targetType == AT_LEAST && newValue >= habit.targetValue) ||
+                        (habit.targetType == AT_MOST && newValue <= habit.targetValue)
+                    ) {
+                        screen.showConfetti(habit.color, x, y)
+                    }
+                }
                 commandRunner.run(CreateRepetitionCommand(habitList, habit, timestamp, value, newNotes))
             }
         } else {
@@ -61,7 +72,8 @@ open class ListHabitsBehavior @Inject constructor(
                 entry.value,
                 entry.notes,
                 habit.color
-            ) { newValue, newNotes ->
+            ) { newValue: Int, newNotes: String, x: Float, y: Float ->
+                if (newValue != entry.value && newValue == YES_MANUAL) screen.showConfetti(habit.color, x, y)
                 commandRunner.run(CreateRepetitionCommand(habitList, habit, timestamp, newValue, newNotes))
             }
         }
@@ -117,10 +129,11 @@ open class ListHabitsBehavior @Inject constructor(
         if (prefs.isFirstRun) onFirstRun()
     }
 
-    fun onToggle(habit: Habit, timestamp: Timestamp, value: Int, notes: String) {
+    fun onToggle(habit: Habit, timestamp: Timestamp, value: Int, notes: String, x: Float, y: Float) {
         commandRunner.run(
             CreateRepetitionCommand(habitList, habit, timestamp, value, notes)
         )
+        if (value == YES_MANUAL) screen.showConfetti(habit.color, x, y)
     }
 
     enum class Message {
@@ -144,12 +157,22 @@ open class ListHabitsBehavior @Inject constructor(
     }
 
     fun interface NumberPickerCallback {
-        fun onNumberPicked(newValue: Double, notes: String)
+        fun onNumberPicked(
+            newValue: Double,
+            notes: String,
+            x: Float,
+            y: Float
+        )
         fun onNumberPickerDismissed() {}
     }
 
     fun interface CheckMarkDialogCallback {
-        fun onNotesSaved(value: Int, notes: String)
+        fun onNotesSaved(
+            value: Int,
+            notes: String,
+            x: Float,
+            y: Float
+        )
         fun onNotesDismissed() {}
     }
 
@@ -170,5 +193,6 @@ open class ListHabitsBehavior @Inject constructor(
         )
         fun showSendBugReportToDeveloperScreen(log: String)
         fun showSendFileScreen(filename: String)
+        fun showConfetti(color: PaletteColor, x: Float, y: Float)
     }
 }

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt

@@ -98,7 +98,7 @@ class HistoryCardPresenter(
             entry.value,
             entry.notes,
             habit.color
-        ) { newValue, newNotes ->
+        ) { newValue, newNotes, _: Float, _: Float ->
             commandRunner.run(
                 CreateRepetitionCommand(
                     habitList,
@@ -135,7 +135,7 @@ class HistoryCardPresenter(
         screen.showNumberPopup(
             value = oldValue / 1000.0,
             notes = entry.notes
-        ) { newValue: Double, newNotes: String ->
+        ) { newValue: Double, newNotes: String, _: Float, _: Float ->
             val thousands = (newValue * 1000).roundToInt()
             commandRunner.run(
                 CreateRepetitionCommand(

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehaviorTest.kt

@@ -84,7 +84,7 @@ class ListHabitsBehaviorTest : BaseUnitTest() {
             eq(""),
             picker.capture()
         )
-        picker.lastValue.onNumberPicked(100.0, "")
+        picker.lastValue.onNumberPicked(100.0, "", 0f, 0f)
         val today = getTodayWithOffset()
         assertThat(habit2.computedEntries.get(today).value, equalTo(100000))
     }
@@ -168,7 +168,9 @@ class ListHabitsBehaviorTest : BaseUnitTest() {
             habit = habit1,
             timestamp = getToday(),
             value = Entry.NO,
-            notes = ""
+            notes = "",
+            x = 0f,
+            y = 0f
         )
         assertFalse(habit1.isCompletedToday())
     }

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/utils/DateUtilsTest.kt

@@ -120,10 +120,15 @@ class DateUtilsTest : BaseUnitTest() {
 
     @Test
     fun getWeekdaysInMonth() {
-        val february = GregorianCalendar(2018, Calendar.FEBRUARY, 1)
-        val leapFebruary = GregorianCalendar(2020, Calendar.FEBRUARY, 1)
-        val month = GregorianCalendar(2020, Calendar.APRIL, 1)
-        val longMonth = GregorianCalendar(2020, Calendar.AUGUST, 1)
+        fun getCalendarUTC(year: Int, month: Int, dayOfMonth: Int) =
+            GregorianCalendar(year, month, dayOfMonth).apply {
+                timeZone = TimeZone.getTimeZone("UTC")
+            }
+
+        val february = getCalendarUTC(2018, Calendar.FEBRUARY, 1)
+        val leapFebruary = getCalendarUTC(2020, Calendar.FEBRUARY, 1)
+        val month = getCalendarUTC(2020, Calendar.APRIL, 1)
+        val longMonth = getCalendarUTC(2020, Calendar.AUGUST, 1)
 
         assertThat(
             arrayOf(4, 4, 4, 4, 4, 4, 4),

uhabits-server/build.gradle.kts

@@ -38,9 +38,9 @@ application {
 
 dependencies {
     val ktorVersion = "1.6.8"
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.21")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.22")
     implementation("io.ktor:ktor-server-netty:$ktorVersion")
-    implementation("ch.qos.logback:logback-classic:1.4.13")
+    implementation("ch.qos.logback:logback-classic:1.4.14")
     implementation("io.ktor:ktor-server-core:$ktorVersion")
     implementation("io.ktor:ktor-html-builder:$ktorVersion")
     implementation("io.ktor:ktor-jackson:$ktorVersion")
@@ -49,7 +49,7 @@ dependencies {
     implementation("io.prometheus:simpleclient_httpserver:0.16.0")
     implementation("io.prometheus:simpleclient_hotspot:0.16.0")
     testImplementation("io.ktor:ktor-server-tests:$ktorVersion")
-    testImplementation("org.mockito.kotlin:mockito-kotlin:5.1.0")
+    testImplementation("org.mockito.kotlin:mockito-kotlin:5.2.1")
     testImplementation(kotlin("test"))
     testImplementation(kotlin("test-junit"))
 }