From fec73af6650880d3fd3f5ec4f01cbecd40649cf4 Mon Sep 17 00:00:00 2001
From: getgo-nobugs <hhx3396@vip.qq.com>
Date: Sun, 28 Jul 2024 11:16:23 +0800
Subject: [PATCH 01/12] Update styles.xml

---
 uhabits-android/src/main/res/values/styles.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/uhabits-android/src/main/res/values/styles.xml b/uhabits-android/src/main/res/values/styles.xml
index a06043963..79e0b641c 100644
--- a/uhabits-android/src/main/res/values/styles.xml
+++ b/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">

From 22331ed364a3a7c749bdcdc40e0690f2d5314365 Mon Sep 17 00:00:00 2001
From: "Alinson S. Xavier" <git@axavier.org>
Date: Sat, 8 Feb 2025 07:42:34 -0600
Subject: [PATCH 02/12] Remove dependabot

---
 .github/dependabot.yml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index 430126a0e..000000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -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"

From 280a5ddceb8d02ced6c89ff3f978dfd27dbdad7a Mon Sep 17 00:00:00 2001
From: "Alinson S. Xavier" <git@axavier.org>
Date: Sat, 8 Feb 2025 20:58:23 -0600
Subject: [PATCH 03/12] Bump targedSdk to 35

---
 uhabits-android/build.gradle.kts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts
index 894c0b4ec..289f0fe43 100644
--- a/uhabits-android/build.gradle.kts
+++ b/uhabits-android/build.gradle.kts
@@ -43,15 +43,14 @@ kotlin {
 android {
 
     namespace = "org.isoron.uhabits"
-    compileSdk = 34
+    compileSdk = 35
     // compileSdkPreview = "VanillaIceCream"
 
     defaultConfig {
         versionCode = 20200
         versionName = "2.2.0"
         minSdk = 28
-        targetSdk = 34
-        // targetSdkPreview = "VanillaIceCream"
+        targetSdk = 35
         applicationId = "org.isoron.uhabits"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

From 14dbf90c232a0832657f7062c6cca44bf0338b01 Mon Sep 17 00:00:00 2001
From: "Alinson S. Xavier" <git@axavier.org>
Date: Sat, 8 Feb 2025 21:12:11 -0600
Subject: [PATCH 04/12] Upgrade Kotlin, AGP

---
 build.gradle.kts                                              | 4 ++--
 gradle/wrapper/gradle-wrapper.properties                      | 2 +-
 uhabits-android/build.gradle.kts                              | 2 +-
 .../activities/common/dialogs/ColorPickerDialogFactory.kt     | 3 ++-
 .../isoron/uhabits/activities/habits/list/views/HeaderView.kt | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c5279d865..6ead66e55 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    val kotlinVersion = "1.9.22"
-    id("com.android.application") version "8.4.0" apply (false)
+    val kotlinVersion = "2.1.10"
+    id("com.android.application") version "8.8.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)
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 17655d0ef..1e2fbf0d4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts
index 289f0fe43..118c1b6bf 100644
--- a/uhabits-android/build.gradle.kts
+++ b/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.4.0"
+    id("com.android.application") version "8.8.0"
     id("org.jetbrains.kotlin.android")
     id("org.jetbrains.kotlin.kapt")
     id("org.jlleitschuh.gradle.ktlint")
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.kt
index e4cfa015b..700af3438 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.kt
@@ -19,6 +19,7 @@
 package org.isoron.uhabits.activities.common.dialogs
 
 import android.content.Context
+import com.android.colorpicker.ColorPickerDialog.SIZE_SMALL
 import org.isoron.platform.gui.toInt
 import org.isoron.uhabits.R
 import org.isoron.uhabits.core.models.PaletteColor
@@ -39,7 +40,7 @@ class ColorPickerDialogFactory @Inject constructor(@param:ActivityContext privat
             res.getPalette(),
             androidColor,
             4,
-            com.android.colorpicker.ColorPickerDialog.SIZE_SMALL
+            SIZE_SMALL
         )
         return dialog
     }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt
index c11c1bbba..30583ad4c 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt
@@ -141,7 +141,7 @@ class HeaderView(
 
                 val y1 = rect.centerY() - 0.25 * em
                 val y2 = rect.centerY() + 1.25 * em
-                val lines = DateUtils.formatHeaderDate(day).toUpperCase().split("\n")
+                val lines = DateUtils.formatHeaderDate(day).uppercase().split("\n")
                 canvas.drawText(lines[0], rect.centerX(), y1.toFloat(), paint)
                 canvas.drawText(lines[1], rect.centerX(), y2.toFloat(), paint)
                 day.add(GregorianCalendar.DAY_OF_MONTH, -1)

From 451b536e71ff987ed4022739fbc72e353b421526 Mon Sep 17 00:00:00 2001
From: "Alinson S. Xavier" <git@axavier.org>
Date: Sat, 8 Feb 2025 21:37:16 -0600
Subject: [PATCH 05/12] Upgrade dependencies

---
 uhabits-android/build.gradle.kts              | 28 ++++++++-----------
 .../uhabits/acceptance/steps/CommonSteps.kt   |  2 +-
 uhabits-core/build.gradle.kts                 |  4 +--
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts
index 118c1b6bf..c599664c1 100644
--- a/uhabits-android/build.gradle.kts
+++ b/uhabits-android/build.gradle.kts
@@ -18,7 +18,6 @@
  */
 
 plugins {
-    id("com.github.triplet.play") version "3.8.6"
     id("com.android.application") version "8.8.0"
     id("org.jetbrains.kotlin.android")
     id("org.jetbrains.kotlin.kapt")
@@ -100,10 +99,10 @@ android {
 
 dependencies {
     val daggerVersion = "2.51.1"
-    val kotlinVersion = "1.9.22"
-    val kxCoroutinesVersion = "1.7.3"
+    val kotlinVersion = "2.1.10"
+    val kxCoroutinesVersion = "1.10.1"
     val ktorVersion = "1.6.8"
-    val espressoVersion = "3.5.1"
+    val espressoVersion = "3.6.1"
 
     androidTestImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion")
     androidTestImplementation("androidx.test.espresso:espresso-core:$espressoVersion")
@@ -112,12 +111,12 @@ dependencies {
     androidTestImplementation("io.ktor:ktor-client-mock:$ktorVersion")
     androidTestImplementation("io.ktor:ktor-jackson:$ktorVersion")
     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.2.1")
+    androidTestImplementation("androidx.test.ext:junit:1.2.1")
+    androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0")
+    androidTestImplementation("androidx.test:rules:1.6.1")
+    androidTestImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
     compileOnly("javax.annotation:jsr250-api:1.0")
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
     implementation("com.github.AppIntro:AppIntro:6.3.1")
     implementation("com.google.code.findbugs:jsr305:3.0.2")
     implementation("com.google.dagger:dagger:$daggerVersion")
@@ -129,10 +128,10 @@ 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.6.1")
+    implementation("androidx.appcompat:appcompat:1.7.0")
     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.11.0")
+    implementation("com.google.android.material:material:1.12.0")
     implementation("com.opencsv:opencsv:5.9")
     implementation("nl.dionsegijn:konfetti-xml:2.0.2")
     implementation(project(":uhabits-core"))
@@ -140,14 +139,9 @@ dependencies {
     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.2.1")
+    testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
 }
 
 kapt {
     correctErrorTypes = true
 }
-
-play {
-    serviceAccountCredentials.set(file("../.secret/gcp-key.json"))
-    track.set("alpha")
-}
diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.kt
index 4a89cc748..652bc7510 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.kt
@@ -132,7 +132,7 @@ object CommonSteps : BaseUserInterfaceTest() {
     }
 
     @Throws(Exception::class)
-    fun verifyOpensWebsite(url: String?) {
+    fun verifyOpensWebsite(url: String) {
         var browserPkg = "org.chromium.webview_shell"
         if (SDK_INT <= Build.VERSION_CODES.M) {
             browserPkg = "com.android.browser"
diff --git a/uhabits-core/build.gradle.kts b/uhabits-core/build.gradle.kts
index 930b7819a..226cc9989 100644
--- a/uhabits-core/build.gradle.kts
+++ b/uhabits-core/build.gradle.kts
@@ -46,7 +46,7 @@ kotlin {
                 implementation(kotlin("stdlib-jdk8"))
                 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("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.1")
                 implementation("androidx.annotation:annotation:1.7.1")
                 implementation("com.google.code.findbugs:jsr305:3.0.2")
                 implementation("com.opencsv:opencsv:5.9")
@@ -62,7 +62,7 @@ kotlin {
                 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.2.1")
+                implementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
                 implementation("org.junit.jupiter:junit-jupiter:5.10.1")
             }
         }

From 62d9d29e91e0d40281466fcc21efdae9842b0aa4 Mon Sep 17 00:00:00 2001
From: CM <33868517+MacroController@users.noreply.github.com>
Date: Sun, 9 Feb 2025 04:48:23 +0100
Subject: [PATCH 06/12] [Fix] Markdown linter problems (#2084)

* MD024

* MD033

* MD034

* MD036

* MD040

* MD045

* MD046

---------

Co-authored-by: MacroController <anonymous@github.com>
---
 NOTICE.md     | 24 ++++++++++++------------
 README.md     | 35 +++++++++++++----------------------
 docs/BUILD.md | 24 +++++++++++-------------
 3 files changed, 36 insertions(+), 47 deletions(-)

diff --git a/NOTICE.md b/NOTICE.md
index d28f35a31..e4c1ba3b0 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1,6 +1,6 @@
 # Copyright Notices
 
-### ActiveAndroid
+## ActiveAndroid
 
 <https://github.com/pardom/ActiveAndroid>
 
@@ -18,7 +18,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 
-### Android Open Source Project
+## Android Open Source Project
 
 <https://source.android.com/>
 
@@ -36,7 +36,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 
-### FontAwesome
+## FontAwesome
 
 <http://fontawesome.io>
 
@@ -59,7 +59,7 @@ under the SIL OFL 1.1.
     requirement for fonts to remain under this license does not apply
     to any document created using the fonts or their derivatives.
 
-### Material Design Icons
+## Material Design Icons
 
 <https://github.com/google/material-design-icons>
 
@@ -67,7 +67,7 @@ Material design icons are the official icon set from Google that are designed
 under the material design guidelines. Available under the Creative Common
 Attribution 4.0 International License (CC-BY 4.0).
 
-### Android Flow Layout
+## Android Flow Layout
 
 <https://github.com/ApmeM/android-flowlayout>
 
@@ -87,7 +87,7 @@ Extended linear layout that wrap its content when there is no place in the curre
     License for the specific language governing permissions and limitations
     under the License.
 
-### Dagger 2
+## Dagger 2
 
 <https://github.com/google/dagger>
 
@@ -108,7 +108,7 @@ A fast dependency injector for Android and Java.
        See the License for the specific language governing permissions and
        limitations under the License.
 
-### AutoFactory
+## AutoFactory
 
 <https://github.com/google/auto/tree/master/factory>
 
@@ -128,7 +128,7 @@ A source code generator for JSR-330-compatible factories.
        See the License for the specific language governing permissions and
        limitations under the License.
 
-### Retrolambda
+## Retrolambda
 
 <https://github.com/orfjackal/retrolambda>
 
@@ -138,7 +138,7 @@ Backport of Java 8's lambda expressions to Java 7, 6 and 5
     This software is released under the Apache License 2.0.
     The license text is at http://www.apache.org/licenses/LICENSE-2.0
 
-### PebbleKit SDK
+## PebbleKit SDK
 
 <https://github.com/pebble/pebble-android-sdk/>
 
@@ -147,7 +147,7 @@ Android PebbleKit SDK to talk to the Pebble via Bluetooth
     The MIT License (MIT)
     Copyright (c) 2014 - 2015 Pebble Technology
 
-### AppIntro
+## AppIntro
 
 <https://github.com/PaoloRotolo/AppIntro>
 
@@ -168,7 +168,7 @@ Make a cool intro for your Android app.
 	See the License for the specific language governing permissions and
 	limitations under the License.
 
-### ButterKnife
+## ButterKnife
 
 <https://github.com/JakeWharton/butterknife>
 
@@ -188,7 +188,7 @@ Bind Android views and callbacks to fields and methods
 	See the License for the specific language governing permissions and
 	limitations under the License.
 
-### opencsv
+## opencsv
 
 <http://opencsv.sourceforge.net/>
 
diff --git a/README.md b/README.md
index 9ebbb7380..01e57c5f6 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
 <h1 align="center">Loop Habit Tracker</h1>
 <p align="center">
   <a href="https://github.com/iSoron/uhabits/actions?query=workflow%3A%22Build+%26+Test%22">
-    <img src="https://github.com/iSoron/uhabits/workflows/Build%20&%20Test/badge.svg" />
+    <img alt="Build & Test" src="https://github.com/iSoron/uhabits/workflows/Build%20&%20Test/badge.svg" />
   </a>
   <a href="https://github.com/iSoron/uhabits/releases/latest">
-    <img src="https://img.shields.io/github/v/release/iSoron/uhabits" />
+    <img alt="release" src="https://img.shields.io/github/v/release/iSoron/uhabits" />
   </a>
   <a href="https://github.com/iSoron/uhabits/discussions">
-    <img src="https://img.shields.io/badge/GitHub-Discussions-%23fc4ebc" />
+    <img alt="GitHub" src="https://img.shields.io/badge/GitHub-Discussions-%23fc4ebc" />
   </a>
 </p>
 
@@ -32,32 +32,23 @@ source.
 
 ## Features
 
-* <b>Beautiful, minimalistic and lightweight interface.</b>
-Loop has an elegant and minimalistic interface that is very easy to use, even for first-time users. Highly optimized for speed, the app works well even on older phones.
+* **Beautiful, minimalistic and lightweight interface.** Loop has an elegant and minimalistic interface that is very easy to use, even for first-time users. Highly optimized for speed, the app works well even on older phones.
 
-* <b>Habit score.</b>
-Loop has an advanced formula for calculating the strength of your habits. Every repetition makes your habit stronger and every missed day makes it weaker. A few missed days after a long streak, however, will not completely destroy your progress, unlike many other don't-break-the-chain apps.
+* **Habit score.** Loop has an advanced formula for calculating the strength of your habits. Every repetition makes your habit stronger and every missed day makes it weaker. A few missed days after a long streak, however, will not completely destroy your progress, unlike many other don't-break-the-chain apps.
 
-* <b>Flexible schedules.</b>
-In addition to daily habits, Loop supports habits with more complex schedules, such as 3 times per week or every other day.
+* **Flexible schedules.** In addition to daily habits, Loop supports habits with more complex schedules, such as 3 times per week or every other day.
 
-* <b>Reminders.</b>
-Schedule notifications to remind you of your habits. Each habit can have its own reminder, at a chosen time of the day. Easily check or dismiss your habit directly from the notification.
+* **Reminders.** Schedule notifications to remind you of your habits. Each habit can have its own reminder, at a chosen time of the day. Easily check or dismiss your habit directly from the notification.
 
-* <b>Widgets.</b>
-Be reminded of your habits whenever you unlock your phone. Colorful widgets allow you to track your habits directly from your home screen, without even opening the app.
+* **Widgets.** Be reminded of your habits whenever you unlock your phone. Colorful widgets allow you to track your habits directly from your home screen, without even opening the app.
 
-* <b>Take control of your data.</b>
-If you want to further analyze your data, or move it to another service, Loop allows you to export it to spreadsheets (CSV) or to a database file (SQLite). For power users, checkmarks can be added through other apps, such as Tasker.
+* **Take control of your data.** If you want to further analyze your data, or move it to another service, Loop allows you to export it to spreadsheets (CSV) or to a database file (SQLite). For power users, checkmarks can be added through other apps, such as Tasker.
 
-* <b>No limitations.</b>
-Track as many habits as you wish. Loop imposes no artificial limits on how many habits you can have. All features are available to all users. There are no in-app purchases.
+* **No limitations.** Track as many habits as you wish. Loop imposes no artificial limits on how many habits you can have. All features are available to all users. There are no in-app purchases.
 
-* <b>Completely ad-free and open source.</b>
-There are no advertisements, annoying notifications or intrusive permissions in this app, and there will never be. The app is completely open-source (GPLv3).
+* **Completely ad-free and open source.** There are no advertisements, annoying notifications or intrusive permissions in this app, and there will never be. The app is completely open-source (GPLv3).
 
-* <b>Works offline and respects your privacy.</b>
-Loop doesn't require an Internet connection or online account registration. Your confidential data is never sent to anyone. Neither the developers nor any third-parties have access to it.
+* **Works offline and respects your privacy.** Loop doesn't require an Internet connection or online account registration. Your confidential data is never sent to anyone. Neither the developers nor any third-parties have access to it.
 
 ## Installing
 
@@ -94,7 +85,7 @@ contribute, even if you are not a software developer.
 
 ## License
 
-<img align="right" src="https://www.gnu.org/graphics/gplv3-88x31.png">
+<img align="right" alt="GPL v3" src="https://www.gnu.org/graphics/gplv3-88x31.png">
 
   Copyright (C) 2016-2021 Álinson Santos Xavier <isoron@gmail.com>
 
diff --git a/docs/BUILD.md b/docs/BUILD.md
index ad0d93d1c..df1a682d4 100644
--- a/docs/BUILD.md
+++ b/docs/BUILD.md
@@ -9,17 +9,17 @@ This pages describes how to download and build the app from the source code. If
 
 ## Build using Android Studio
 
-**Step 1: Install git**
+### Step 1: Install git
 
 The package `git` is required for downloading the source code of the app and submitting changes GitHub. Please see [the git book](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) for further instructions. If you are planning to submit pull requests in the future, it is recommended to [generate and configure your SSH keys](https://help.github.com/en/github/authenticating-to-github/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent).
 
-**Step 2: Download and install Android Studio**
+### Step 2: Download and install Android Studio
 
 Although Android Studio can be downloaded [from their official website](https://developer.android.com/studio/), a much better option is to install it through [JetBrains Toolbox](https://www.jetbrains.com/toolbox-app/). This tool, developed by the same developers of Android Studio, allows you to easily upgrade and downgrade the IDE, or switch between stable, beta and canary versions. After downloading and installing JetBrains Toolbox, simply click the install button near Android Studio to install the newest stable version of IDE. Beta and canary versions have not been tested and may not work correctly.
 
 After installation, launch Android Studio. If this is the first time you launch it, you will need to go through a wizard to setup the IDE. The default options should work fine. The wizard will download all additional components necessary for development, including the emulator, so it may take a while.
 
-**Step 3: Download the source code**
+### Step 3: Download the source code
 
 To create a complete copy of the source code repository, open the terminal (Linux/macOS) or Git Bash (Windows), navigate to the desired folder, then run:
 ```bash
@@ -27,7 +27,7 @@ git clone https://github.com/iSoron/uhabits.git
 ```
 The repository will be downloaded to the directory `uhabits`.
 
-**Step 4: Open and run the project on Android Studio**
+### Step 4: Open and run the project on Android Studio
 
 1. Launch Android Studio and select "Open an existing Android Studio project".
 2. When the IDE asks you for the project location, select `uhabits` and click "Ok".
@@ -41,7 +41,7 @@ The repository will be downloaded to the directory `uhabits`.
 
 The following instructions were tested on **Ubuntu Linux 18.04 LTS** and may need to be modified for other operating systems.
 
-**Step 1: Install basic packages**
+### Step 1: Install basic packages
 
 To build the application, some basic packages are required. The package `git` is required to download the source code, while `openjdk-8-jdk-headless` is required for compiling Java and Kotlin files.
 
@@ -53,14 +53,14 @@ sudo apt-get install -y git openjdk-8-jdk-headless
 **IMPORTANT:** Newer JDK versions have not been tested and may not work correctly.
 
 
-**Step 2: Install Android SDK tools**
+### Step 2: Install Android SDK tools
 
 The Android SDK tools contains many necessary tools for developing and debugging Android applications. It can be obtained as part of Android Studio, but, for simple command line usage, it can also be downloaded individually.
 
-1. Download the file `sdk-tools-linux-4333796.zip` (or a newer version) from https://developer.android.com/studio/#downloads, and extract it somewhere. In this guide, we assume that it was extracted to `/opt/android-sdk/tools`; that is, the script `/opt/android-sdk/tools/bin/sdkmanager` should exist.
+1. Download the file `sdk-tools-linux-4333796.zip` (or a newer version) from <https://developer.android.com/studio/#downloads>, and extract it somewhere. In this guide, we assume that it was extracted to `/opt/android-sdk/tools`; that is, the script `/opt/android-sdk/tools/bin/sdkmanager` should exist.
 
 2. Append the following lines to `~/.profile`, so that other tools can locate your Android SDK installation. It is necessary to restart your terminal for these changes to take effect.
-```
+```bash
 export PATH="$PATH:/opt/android-sdk/tools/bin"
 export PATH="$PATH:/opt/android-sdk/platform-tools"
 export ANDROID_HOME="/opt/android-sdk"
@@ -71,7 +71,7 @@ export ANDROID_HOME="/opt/android-sdk"
 yes | sdkmanager --licenses
 ```
 
-**Step 3: Download the source code**
+### Step 3: Download the source code
 
 To create a complete copy of the source code repository, navigate to your home directory and run:
 ```bash
@@ -79,13 +79,11 @@ git clone https://github.com/iSoron/uhabits.git
 ```
 The repository will be downloaded to the directory `uhabits`.
 
-**Step 4: Compile the source code**
+### Step 4: Compile the source code
 
 1. Navigate to the directory `uhabits`
 2. Run `./gradlew assembleDebug --stacktrace`
 
-If the compilation is successful, a debug APK will be generated somewhere inside the folder `uhabits-android/build/`. Currently, the full path is the following, but it may change in the future:
+If the compilation is successful, a debug APK will be generated somewhere inside the folder `uhabits-android/build/`. Currently, the full path is `./uhabits-android/build/outputs/apk/debug/uhabits-android-debug.apk`, but it may change in the future.
 
-    ./uhabits-android/build/outputs/apk/debug/uhabits-android-debug.apk
-    
 The APK can be installed using the tool `adb`, which should have been automatically installed at `/opt/android-sdk/platform-tools/adb` during compilation of the project.

From 37219cb13f0ceb5026ea451f339171183ba7e437 Mon Sep 17 00:00:00 2001
From: Jakub Kalinowski <kalj@netcompany.com>
Date: Mon, 16 Dec 2024 18:34:09 +0100
Subject: [PATCH 07/12] Ignoring isCompleted for AT_MOST habits

---
 .../java/org/isoron/uhabits/core/ui/NotificationTray.kt        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/NotificationTray.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/NotificationTray.kt
index da5bb018a..8d17f5957 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/NotificationTray.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/NotificationTray.kt
@@ -24,6 +24,7 @@ import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.commands.CreateRepetitionCommand
 import org.isoron.uhabits.core.commands.DeleteHabitsCommand
 import org.isoron.uhabits.core.models.Habit
+import org.isoron.uhabits.core.models.NumericalHabitType
 import org.isoron.uhabits.core.models.Timestamp
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.core.tasks.Task
@@ -120,7 +121,7 @@ class NotificationTray @Inject constructor(
 
         override fun onPostExecute() {
             systemTray.log("Showing notification for habit=" + habit.id)
-            if (isCompleted) {
+            if (isCompleted && habit.targetType != NumericalHabitType.AT_MOST) {
                 systemTray.log(
                     String.format(
                         Locale.US,

From 303020a8c00a0ef81595a16a4e05a210689616f2 Mon Sep 17 00:00:00 2001
From: Jakub Kalinowski <kalj@netcompany.com>
Date: Mon, 16 Dec 2024 18:38:56 +0100
Subject: [PATCH 08/12] Never mark AT_MOST habits as completed for today

---
 .../src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt
index a06d01ec9..02b7c33e9 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt
+++ b/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 != Entry.UNKNOWN && value / 1000.0 <= targetValue
+                NumericalHabitType.AT_MOST -> false
             }
         } else {
             value != Entry.NO && value != Entry.UNKNOWN

From 2296a4999905955afe20423655fa3747eb607be2 Mon Sep 17 00:00:00 2001
From: Jakub Kalinowski <kalj@netcompany.com>
Date: Mon, 16 Dec 2024 19:23:40 +0100
Subject: [PATCH 09/12] Corrected HabitTest

---
 .../jvmTest/java/org/isoron/uhabits/core/models/HabitTest.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitTest.kt b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitTest.kt
index 64b498ed3..832be20fb 100644
--- a/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitTest.kt
+++ b/uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/models/HabitTest.kt
@@ -110,10 +110,10 @@ class HabitTest : BaseUnitTest() {
         assertFalse(h.isCompletedToday())
         h.originalEntries.add(Entry(getToday(), 100000))
         h.recompute()
-        assertTrue(h.isCompletedToday())
+        assertFalse(h.isCompletedToday())
         h.originalEntries.add(Entry(getToday(), 50000))
         h.recompute()
-        assertTrue(h.isCompletedToday())
+        assertFalse(h.isCompletedToday())
     }
 
     @Test

From 13ecc2a3864d0c070b7e9f2b5fc4e272c889615d Mon Sep 17 00:00:00 2001
From: Abdul Majeed <abdulmajeed@Abduls-MacBook-Pro.local>
Date: Thu, 24 Oct 2024 00:16:04 +0530
Subject: [PATCH 10/12] Added Streaks info for numeric habits

---
 .../activities/habits/show/ShowHabitView.kt     |  5 +----
 .../org/isoron/uhabits/core/models/Habit.kt     |  5 ++++-
 .../isoron/uhabits/core/models/StreakList.kt    | 17 +++++++++++++++--
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt
index aec96aed3..23aacd03d 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt
@@ -52,10 +52,7 @@ class ShowHabitView(context: Context) : FrameLayout(context) {
         binding.frequencyCard.setState(data.frequency)
         binding.historyCard.setState(data.history)
         binding.barCard.setState(data.bar)
-        if (data.isNumerical) {
-            binding.overviewCard.visibility = GONE
-            binding.streakCard.visibility = GONE
-        } else {
+        if (!data.isNumerical) {
             binding.targetCard.visibility = GONE
         }
     }
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt
index 02b7c33e9..4b31d2a2e 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt
@@ -100,7 +100,10 @@ data class Habit(
         streaks.recompute(
             computedEntries,
             from,
-            to
+            to,
+            isNumerical,
+            targetValue,
+            targetType
         )
     }
 
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/StreakList.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/StreakList.kt
index d3bed0af7..ab9dfb041 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/StreakList.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/StreakList.kt
@@ -37,12 +37,25 @@ class StreakList {
     fun recompute(
         computedEntries: EntryList,
         from: Timestamp,
-        to: Timestamp
+        to: Timestamp,
+        isNumerical: Boolean,
+        targetValue: Double,
+        targetType: NumericalHabitType
     ) {
         list.clear()
         val timestamps = computedEntries
             .getByInterval(from, to)
-            .filter { it.value > 0 }
+            .filter {
+                val value = it.value
+                if (isNumerical) {
+                    when (targetType) {
+                        NumericalHabitType.AT_LEAST -> value / 1000.0 >= targetValue
+                        NumericalHabitType.AT_MOST -> value != Entry.UNKNOWN && value / 1000.0 <= targetValue
+                    }
+                } else {
+                    value > 0
+                }
+            }
             .map { it.timestamp }
             .toTypedArray()
 

From 4a7d7ef49050c7518a9afeef1b51d398f8db2a7b Mon Sep 17 00:00:00 2001
From: Abdul Majeed <abdmajd2@gmail.com>
Date: Thu, 24 Oct 2024 00:27:03 +0530
Subject: [PATCH 11/12] Added Streaks info for numeric habits

---
 .../isoron/uhabits/activities/habits/show/ShowHabitView.kt    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt
index 23aacd03d..fb484745d 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitView.kt
@@ -52,7 +52,9 @@ class ShowHabitView(context: Context) : FrameLayout(context) {
         binding.frequencyCard.setState(data.frequency)
         binding.historyCard.setState(data.history)
         binding.barCard.setState(data.bar)
-        if (!data.isNumerical) {
+        if (data.isNumerical) {
+            binding.overviewCard.visibility = GONE
+        } else {
             binding.targetCard.visibility = GONE
         }
     }

From 107c898f5102226a2ff7387bded8b84a9e76c43f Mon Sep 17 00:00:00 2001
From: Chris Smowton <smowton@github.com>
Date: Wed, 17 Jul 2024 15:40:36 +0100
Subject: [PATCH 12/12] Add repository now required for old kotlin-css-jvm
 versions

Gradle Plugin Portal was previously making kotlin-css-jvm 1.0.0-pre.148-kotlin-1.4.30 available by virtue of mirroring JCenter. Now that Gradle have stopped doing that in preparation for JCenter to go away, we need to retrieve the old version from a different repository.

If this is bumped forwards to Kotlin 1.5.0+ it will become possible to get the package from Central instead.
---
 build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6ead66e55..0df91dee2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,5 +18,6 @@ allprojects {
         maven(url = "https://plugins.gradle.org/m2/")
         maven(url = "https://oss.sonatype.org/content/repositories/snapshots/")
         maven(url = "https://jitpack.io")
+        maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers/") // Repository for kotlin-css-jvm old versions, now that the Gradle Plugin Portal no longer brings these in by mirroring JCenter
     }
 }