Bump org.jlleitschuh.gradle.ktlint from 11.6.0 to 11.6.1

Bumps org.jlleitschuh.gradle.ktlint from 11.6.0 to 11.6.1.

---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle.ktlint
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/main.yml

@@ -18,7 +18,7 @@ jobs:
       run: ./build.sh build
 
     - name: Run Android tests
-      run: ./build.sh android-tests-parallel 28 29 30 32 33 34
+      run: ./build.sh android-tests-parallel 28 29 30 31 32 33
 
     - name: Upload artifacts
       if: always()

CHANGELOG.md

@@ -1,22 +1,5 @@
 # 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)

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    val kotlinVersion = "1.9.21"
+    val kotlinVersion = "1.8.20"
     id("com.android.application") version "8.1.4" apply (false)
     id("org.jetbrains.kotlin.android") version kotlinVersion apply (false)
     id("org.jetbrains.kotlin.kapt") version kotlinVersion apply (false)

build.sh

@@ -181,7 +181,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..10}; do
+        for i in {1..5}; do
             log_info "Running $size instrumented tests (attempt $i)..."
             $ADB shell am instrument \
                 -r -e coverage true -e size "$size" $FAILED_TESTS \

uhabits-android/build.gradle.kts

@@ -18,7 +18,7 @@
  */
 
 plugins {
-    id("com.github.triplet.play") version "3.8.6"
+    id("com.github.triplet.play") version "3.8.4"
     id("com.android.application") version "8.1.4"
     id("org.jetbrains.kotlin.android")
     id("org.jetbrains.kotlin.kapt")
@@ -43,13 +43,13 @@ kotlin {
 android {
 
     namespace = "org.isoron.uhabits"
-    compileSdk = 34
+    compileSdk = 33
 
     defaultConfig {
         versionCode = 20200
         versionName = "2.2.0"
         minSdk = 28
-        targetSdk = 34
+        targetSdk = 33
         applicationId = "org.isoron.uhabits"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -95,7 +95,7 @@ android {
 
 dependencies {
     val daggerVersion = "2.48.1"
-    val kotlinVersion = "1.9.21"
+    val kotlinVersion = "1.8.20"
     val kxCoroutinesVersion = "1.7.3"
     val ktorVersion = "1.6.8"
     val espressoVersion = "3.5.1"
@@ -112,11 +112,11 @@ dependencies {
     androidTestImplementation("androidx.test:rules:1.5.0")
     androidTestImplementation("org.mockito.kotlin:mockito-kotlin:5.1.0")
     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")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
+    implementation("com.github.AppIntro:AppIntro:6.2.0")
     implementation("com.google.code.findbugs:jsr305:3.0.2")
     implementation("com.google.dagger:dagger:$daggerVersion")
-    implementation("com.google.guava:guava:32.1.3-android")
+    implementation("com.google.guava:guava:32.1.2-android")
     implementation("io.ktor:ktor-client-android:$ktorVersion")
     implementation("io.ktor:ktor-client-core:$ktorVersion")
     implementation("io.ktor:ktor-client-jackson:$ktorVersion")
@@ -124,11 +124,11 @@ 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.5.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.opencsv:opencsv:5.9")
+    implementation("com.google.android.material:material:1.9.0")
+    implementation("com.opencsv:opencsv:5.8")
     implementation(project(":uhabits-core"))
     kapt("com.google.dagger:dagger-compiler:$daggerVersion")
     kaptAndroidTest("com.google.dagger:dagger-compiler:$daggerVersion")

uhabits-android/src/main/AndroidManifest.xml

@@ -30,7 +30,6 @@
         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/org/isoron/platform/gui/AndroidDataView.kt

@@ -57,7 +57,7 @@ class AndroidDataView(
     }
 
     override fun onScroll(
-        e1: MotionEvent?,
+        e1: MotionEvent,
         e2: MotionEvent,
         dx: Float,
         dy: Float
@@ -79,7 +79,7 @@ class AndroidDataView(
     }
 
     override fun onFling(
-        e1: MotionEvent?,
+        e1: MotionEvent,
         e2: MotionEvent,
         velocityX: Float,
         velocityY: Float

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

@@ -2,13 +2,11 @@ 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
@@ -67,7 +65,7 @@ class NumberDialog : AppCompatDialogFragment() {
             save()
         }
         view.skipBtnNumber.setOnClickListener {
-            view.value.setText(DecimalFormat("#.###").format((Entry.SKIP.toDouble() / 1000)))
+            view.value.setText((Entry.SKIP.toDouble() / 1000).toString())
             save()
         }
         view.notes.setOnEditorActionListener { v, actionId, event ->
@@ -88,15 +86,6 @@ class NumberDialog : AppCompatDialogFragment() {
         // 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() {

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/intents/IntentScheduler.kt

@@ -25,7 +25,6 @@ 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
@@ -57,10 +56,6 @@ 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/res/layout/checkmark_popup.xml

@@ -36,7 +36,7 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:gravity="center"
-        android:inputType="textCapSentences|textMultiLine"
+        android:inputType="textCapSentences"
         android:textSize="@dimen/smallTextSize"
         android:padding="4dp"
         android:background="@color/transparent"

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

@@ -44,7 +44,6 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:textSize="@dimen/smallTextSize"
-            android:maxLines="2"
             android:textColor="@color/white"/>
 
     </LinearLayout>

uhabits-android/src/main/res/values-night/colors.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ 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/>.
-  -->
-
-<resources>
-    <color name="color_background">@color/grey_900</color>
-</resources>

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

@@ -89,5 +89,4 @@
     </array>
 
     <color name="ic_launcher_background">#1976D2</color>
-    <color name="color_background">@color/grey_200</color>
 </resources>

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

@@ -61,7 +61,6 @@
         <item name="widgetShadowAlpha">0.25</item>
         <item name="windowActionModeOverlay">true</item>
         <item name="windowBackgroundColor">@color/grey_200</item>
-        <item name="android:colorBackground">@color/color_background</item>
         <item name="android:textColorAlertDialogListItem">@color/grey_800</item>
         <item name="singleLineTitle">false</item>
         <item name="dialogFormLabelColor">@color/white</item>

uhabits-android/src/main/res/xml/locales_config.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
-    <locale android:name="en" /> <!-- English -->
-    <locale android:name="af-ZA" /> <!-- Afrikaans -->
-    <locale android:name="ar-SA" /> <!-- Arabic -->
-    <locale android:name="bg-BG" /> <!-- Bulgarian -->
-    <locale android:name="ca-ES" /> <!-- Catalan -->
-    <locale android:name="cs-CZ" /> <!-- Czech -->
-    <locale android:name="da-DK" /> <!-- Danish -->
-    <locale android:name="de-DE" /> <!-- German -->
-    <locale android:name="el-GR" /> <!-- Greek -->
-    <locale android:name="eo-UY" /> <!-- Esperanto -->
-    <locale android:name="es-ES" /> <!-- Spanish -->
-    <locale android:name="eu-ES" /> <!-- Basque -->
-    <locale android:name="fa-IR" /> <!-- Farsi -->
-    <locale android:name="fi-FI" /> <!-- Finnish -->
-    <locale android:name="fr-FR" /> <!-- French -->
-    <locale android:name="hi-IN" /> <!-- Hindi -->
-    <locale android:name="hr-HR" /> <!-- Croatian -->
-    <locale android:name="hu-HU" /> <!-- Hungarian -->
-    <locale android:name="hy-AM" /> <!-- Armenian -->
-    <locale android:name="in-ID" /> <!-- Indonesian -->
-    <locale android:name="it-IT" /> <!-- Italian -->
-    <locale android:name="iw-IL" /> <!-- Hebrew -->
-    <locale android:name="ja-JP" /> <!-- Japanese -->
-    <locale android:name="ko-KR" /> <!-- Korean -->
-    <locale android:name="nl-NL" /> <!-- Dutch -->
-    <locale android:name="no-NO" /> <!-- Norwegian -->
-    <locale android:name="pl-PL" /> <!-- Polish -->
-    <locale android:name="pt-BR" /> <!-- Portuguese (Brazil) -->
-    <locale android:name="pt-PT" /> <!-- Portuguese (Portugal) -->
-    <locale android:name="ro-RO" /> <!-- Romanian -->
-    <locale android:name="ru-RU" /> <!-- Russian -->
-    <locale android:name="sk-SK" /> <!-- Slovak -->
-    <locale android:name="sl-SL" /> <!-- Slovenian -->
-    <locale android:name="sr-CS" /> <!-- Serbian (Latin) -->
-    <locale android:name="sr-SP" /> <!-- Serbian (Cyrillic) -->
-    <locale android:name="sv-SE" /> <!-- Swedish -->
-    <locale android:name="ta-IN" /> <!-- Tamil -->
-    <locale android:name="te-IN" /> <!-- Telugu -->
-    <locale android:name="tr-TR" /> <!-- Turkish -->
-    <locale android:name="ug-CN" /> <!-- Uyghur -->
-    <locale android:name="uk-UA" /> <!-- Ukrainian -->
-    <locale android:name="vi-VN" /> <!-- Vietnamese -->
-    <locale android:name="zh-CN" /> <!-- Chinese (Simplified) -->
-    <locale android:name="zh-TW" /> <!-- Chinese (Traditional) -->
-</locale-config>

uhabits-core/build.gradle.kts

@@ -45,13 +45,13 @@ kotlin {
             dependencies {
                 implementation(kotlin("stdlib-jdk8"))
                 compileOnly("com.google.dagger:dagger:2.48.1")
-                implementation("com.google.guava:guava:32.1.3-android")
+                implementation("com.google.guava:guava:32.1.2-android")
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3")
                 implementation("androidx.annotation:annotation:1.7.0")
                 implementation("com.google.code.findbugs:jsr305:3.0.2")
-                implementation("com.opencsv:opencsv:5.9")
+                implementation("com.opencsv:opencsv:5.8")
                 implementation("commons-codec:commons-codec:1.16.0")
-                implementation("org.apache.commons:commons-lang3:3.14.0")
+                implementation("org.apache.commons:commons-lang3:3.13.0")
             }
         }
 
@@ -63,7 +63,7 @@ kotlin {
                 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.junit.jupiter:junit-jupiter:5.10.1")
+                implementation("org.junit.jupiter:junit-jupiter:5.10.0")
             }
         }
     }

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/views/Themes.kt

@@ -125,30 +125,4 @@ class WidgetTheme : LightTheme() {
     override val highContrastTextColor = Color.WHITE
     override val mediumContrastTextColor = Color.WHITE.withAlpha(0.50)
     override val lowContrastTextColor = Color.WHITE.withAlpha(0.10)
-
-    override fun color(paletteIndex: Int): Color {
-        return when (paletteIndex) {
-            0 -> Color(0xD32F2F)
-            1 -> Color(0xE64A19)
-            2 -> Color(0xF57C00)
-            3 -> Color(0xFF8F00)
-            4 -> Color(0xF9A825)
-            5 -> Color(0xAFB42B)
-            6 -> Color(0x7CB342)
-            7 -> Color(0x388E3C)
-            8 -> Color(0x00897B)
-            9 -> Color(0x00ACC1)
-            10 -> Color(0x039BE5)
-            11 -> Color(0x1976D2)
-            12 -> Color(0x6275f0)
-            13 -> Color(0x5E35B1)
-            14 -> Color(0x8E24AA)
-            15 -> Color(0xD81B60)
-            16 -> Color(0x5D4037)
-            17 -> Color(0x757575)
-            18 -> Color(0x757575)
-            19 -> Color(0x9E9E9E)
-            else -> Color(0x000000)
-        }
-    }
 }

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/DateUtils.kt

@@ -227,7 +227,7 @@ abstract class DateUtils {
         fun getStartOfTodayWithOffset(): Long = getStartOfDayWithOffset(getLocalTime())
 
         @JvmStatic
-        fun millisecondsUntilTomorrowWithOffset(): Long = getStartOfTomorrowWithOffset() - applyTimezone(getLocalTime())
+        fun millisecondsUntilTomorrowWithOffset(): Long = getStartOfTomorrowWithOffset() - getLocalTime()
 
         @JvmStatic
         fun getStartOfTodayCalendar(): GregorianCalendar = getCalendar(getStartOfToday())

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/utils/MidnightTimer.kt

@@ -19,7 +19,6 @@
 package org.isoron.uhabits.core.utils
 
 import org.isoron.uhabits.core.AppScope
-import org.isoron.uhabits.core.io.Logging
 import java.util.LinkedList
 import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
@@ -30,10 +29,9 @@ import javax.inject.Inject
  * A class that emits events when a new day starts.
  */
 @AppScope
-open class MidnightTimer @Inject constructor(logging: Logging) {
+open class MidnightTimer @Inject constructor() {
     private val listeners: MutableList<MidnightListener> = LinkedList()
     private lateinit var executor: ScheduledExecutorService
-    private val logger = logging.getLogger("MidnightTimer")
 
     @Synchronized
     fun addListener(listener: MidnightListener) {
@@ -41,10 +39,7 @@ open class MidnightTimer @Inject constructor(logging: Logging) {
     }
 
     @Synchronized
-    fun onPause(): MutableList<Runnable>? {
-        logger.info("Pausing timer")
-        return executor.shutdownNow()
-    }
+    fun onPause(): MutableList<Runnable>? = executor.shutdownNow()
 
     @Synchronized
     fun onResume(
@@ -52,11 +47,9 @@ open class MidnightTimer @Inject constructor(logging: Logging) {
         testExecutor: ScheduledExecutorService? = null
     ) {
         executor = testExecutor ?: Executors.newSingleThreadScheduledExecutor()
-        val initialDelay = DateUtils.millisecondsUntilTomorrowWithOffset() + delayOffsetInMillis
-        logger.info("Scheduling refresh for $initialDelay ms from now")
         executor.scheduleAtFixedRate(
             { notifyListeners() },
-            initialDelay,
+            DateUtils.millisecondsUntilTomorrowWithOffset() + delayOffsetInMillis,
             DateUtils.DAY_LENGTH,
             TimeUnit.MILLISECONDS
         )
@@ -67,7 +60,6 @@ open class MidnightTimer @Inject constructor(logging: Logging) {
 
     @Synchronized
     private fun notifyListeners() {
-        logger.info("Midnight refresh")
         for (l in listeners) {
             l.atMidnight()
         }

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

@@ -4,7 +4,6 @@ import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import org.isoron.uhabits.core.BaseUnitTest
-import org.isoron.uhabits.core.io.StandardLogging
 import org.junit.Test
 import java.util.Calendar
 import java.util.TimeZone
@@ -35,7 +34,7 @@ class MidnightTimerTest : BaseUnitTest() {
             )
 
             val suspendedListener = suspendCoroutine<Boolean> { continuation ->
-                MidnightTimer(StandardLogging()).apply {
+                MidnightTimer().apply {
                     addListener { continuation.resume(true) }
                     // When
                     onResume(1, executor)

uhabits-server/build.gradle.kts

@@ -22,7 +22,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 plugins {
     application
     id("kotlin")
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    id("com.github.johnrengelman.shadow") version "7.1.2"
 }
 
 kotlin {
@@ -38,9 +38,11 @@ application {
 
 dependencies {
     val ktorVersion = "1.6.8"
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.21")
+    val kotlinVersion = "1.8.20"
+    val logbackVersion = "1.4.9"
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
     implementation("io.ktor:ktor-server-netty:$ktorVersion")
-    implementation("ch.qos.logback:logback-classic:1.4.13")
+    implementation("ch.qos.logback:logback-classic:$logbackVersion")
     implementation("io.ktor:ktor-server-core:$ktorVersion")
     implementation("io.ktor:ktor-html-builder:$ktorVersion")
     implementation("io.ktor:ktor-jackson:$ktorVersion")