Update dependencies

.github/workflows/main.yml

@@ -9,7 +9,6 @@ on:
 jobs:
   Test:
     runs-on: self-hosted
-    timeout-minutes: 30
     steps:
     - name: Check out source code
       uses: actions/checkout@v1

README.md

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

uhabits-android/build.gradle.kts

@@ -80,11 +80,11 @@ android {
 }
 
 dependencies {
-    val daggerVersion = "2.46"
+    val daggerVersion = "2.43.2"
     val kotlinVersion = "1.7.21"
     val kxCoroutinesVersion = "1.6.4"
     val ktorVersion = "1.6.8"
-    val espressoVersion = "3.5.1"
+    val espressoVersion = "3.4.0"
 
     androidTestImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion")
     androidTestImplementation("androidx.test.espresso:espresso-core:$espressoVersion")
@@ -93,7 +93,7 @@ dependencies {
     androidTestImplementation("io.ktor:ktor-client-mock:$ktorVersion")
     androidTestImplementation("io.ktor:ktor-jackson:$ktorVersion")
     androidTestImplementation("androidx.annotation:annotation:1.5.0")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.ext:junit:1.1.4")
     androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0")
     androidTestImplementation("androidx.test:rules:1.5.0")
     androidTestImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
@@ -113,7 +113,7 @@ dependencies {
     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.8.0")
+    implementation("com.google.android.material:material:1.7.0")
     implementation("com.opencsv:opencsv:5.7.1")
     implementation(project(":uhabits-core"))
     kapt("com.google.dagger:dagger-compiler:$daggerVersion")

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

@@ -33,8 +33,7 @@ import org.isoron.uhabits.HabitsApplication
 import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.AndroidThemeSwitcher
 import org.isoron.uhabits.core.models.Habit
-import org.isoron.uhabits.core.ui.views.DarkTheme
-import org.isoron.uhabits.core.ui.views.LightTheme
+import org.isoron.uhabits.core.ui.ThemeSwitcher.Companion.THEME_LIGHT
 import org.isoron.uhabits.receivers.ReminderController
 import org.isoron.uhabits.utils.SystemUtils
 import java.util.Calendar
@@ -52,8 +51,11 @@ class SnoozeDelayPickerActivity : FragmentActivity(), OnItemClickListener {
         val app = applicationContext as HabitsApplication
         val appComponent = app.component
         val themeSwitcher = AndroidThemeSwitcher(this, appComponent.preferences)
-        themeSwitcher.setTheme()
-
+        if (themeSwitcher.getSystemTheme() == THEME_LIGHT) {
+            setTheme(R.style.BaseDialog)
+        } else {
+            setTheme(R.style.BaseDialogDark)
+        }
         val data = intent.data
         if (data == null) {
             finish()
@@ -73,16 +75,6 @@ class SnoozeDelayPickerActivity : FragmentActivity(), OnItemClickListener {
         SystemUtils.unlockScreen(this)
     }
 
-    private fun AndroidThemeSwitcher.setTheme() {
-        if (this.isNightMode) {
-            setTheme(R.style.BaseDialogDark)
-            this.currentTheme = DarkTheme()
-        } else {
-            setTheme(R.style.BaseDialog)
-            this.currentTheme = LightTheme()
-        }
-    }
-
     private fun showTimePicker() {
         val calendar = Calendar.getInstance()
         val dialog = TimePickerDialog.newInstance(

uhabits-core/assets/test/habitbull4.csv

@@ -1,3 +0,0 @@
-HabitName,HabitDescription,HabitCategory,CalendarDate,Value,CommentText
-Caffeine,,Coffee Consumption,2022-11-21,80,
-Caffeine,,Coffee Consumption,2022-11-22,80,

uhabits-core/build.gradle.kts

@@ -43,8 +43,9 @@ kotlin {
         val jvmMain by getting {
             dependencies {
                 implementation(kotlin("stdlib-jdk8"))
-                compileOnly("com.google.dagger:dagger:2.46")
+                compileOnly("com.google.dagger:dagger:2.43.2")
                 implementation("com.google.guava:guava:31.1-android")
+                implementation("org.jetbrains.kotlin:kotlin-stdlib:1.7.21")
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4")
                 implementation("androidx.annotation:annotation:1.5.0")
                 implementation("com.google.code.findbugs:jsr305:3.0.2")

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/io/HabitBullCSVImporter.kt

@@ -86,12 +86,10 @@ class HabitBullCSVImporter
                         logger.info("Found a value of $value, considering this habit as numerical.")
                         h.type = HabitType.NUMERICAL
                     }
-                    h.originalEntries.add(Entry(timestamp, value * 1000, notes))
+                    h.originalEntries.add(Entry(timestamp, value, notes))
                 }
             }
         }
-
-        map.forEach { (_, habit) -> habit.recompute() }
     }
 
     private fun parseTimestamp(rawValue: String): Timestamp {

uhabits-core/src/jvmTest/java/org/isoron/uhabits/core/io/ImportTest.kt

@@ -85,8 +85,8 @@ class ImportTest : BaseUnitTest() {
         assertThat(habit.type, equalTo(HabitType.NUMERICAL))
         assertThat(habit.description, equalTo(""))
         assertThat(habit.frequency, equalTo(Frequency.DAILY))
-        assertThat(getValue(habit, 2021, 9, 1), equalTo(30000))
-        assertThat(getValue(habit, 2022, 1, 8), equalTo(100000))
+        assertThat(getValue(habit, 2021, 9, 1), equalTo(30))
+        assertThat(getValue(habit, 2022, 1, 8), equalTo(100))
 
         val habit2 = habitList.getByPosition(1)
         assertThat(habit2.name, equalTo("run"))
@@ -98,21 +98,6 @@ class ImportTest : BaseUnitTest() {
         assertTrue(isChecked(habit2, 2022, 1, 19))
     }
 
-    @Test
-    @Throws(IOException::class)
-    fun testHabitBullCSV4() {
-        importFromFile("habitbull4.csv")
-        assertThat(habitList.size(), equalTo(1))
-
-        val habit = habitList.getByPosition(0)
-        assertThat(habit.name, equalTo("Caffeine"))
-        assertThat(habit.type, equalTo(HabitType.NUMERICAL))
-        assertThat(habit.description, equalTo(""))
-        assertThat(habit.frequency, equalTo(Frequency.DAILY))
-        assertThat(getValue(habit, 2022, 11, 21), equalTo(80000))
-        assertThat(getValue(habit, 2022, 11, 22), equalTo(80000))
-    }
-
     @Test
     @Throws(IOException::class)
     fun testLoopDB() {

uhabits-server/build.gradle.kts

@@ -35,7 +35,7 @@ application {
 dependencies {
     val ktorVersion = "1.6.8"
     val kotlinVersion = "1.7.21"
-    val logbackVersion = "1.4.5"
+    val logbackVersion = "1.4.4"
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
     implementation("io.ktor:ktor-server-netty:$ktorVersion")
     implementation("ch.qos.logback:logback-classic:$logbackVersion")