From 93db38000e0c284f5dc6d1074a159d3316e7b5c1 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@vmiklos.hu>
Date: Sun, 4 Feb 2024 19:17:47 +0100
Subject: [PATCH] Update dependencies (2024-02)

Which requires initializing the database a bit earlier, so that by the
time the view model is created, the database is already there.
---
 app/build.gradle                                          | 3 +--
 .../main/java/hu/vmiklos/plees_tracker/MainActivity.kt    | 8 ++++----
 build.gradle                                              | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d693447..ff511eb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -73,10 +73,9 @@ dependencies {
     implementation 'javax.annotation:jsr250-api:1.0'
     implementation 'com.google.android.material:material:1.11.0'
     implementation 'androidx.core:core-ktx:1.12.0'
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "com.mikepenz:aboutlibraries:7.1.0"
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation "androidx.activity:activity-ktx:1.8.2"
     implementation "androidx.fragment:fragment-ktx:1.6.2"
diff --git a/app/src/main/java/hu/vmiklos/plees_tracker/MainActivity.kt b/app/src/main/java/hu/vmiklos/plees_tracker/MainActivity.kt
index 871fdb6..f3beaaf 100644
--- a/app/src/main/java/hu/vmiklos/plees_tracker/MainActivity.kt
+++ b/app/src/main/java/hu/vmiklos/plees_tracker/MainActivity.kt
@@ -118,6 +118,10 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
 
         sharedPreferenceListener.applyTheme(PreferenceManager.getDefaultSharedPreferences(this))
 
+        val preferences = PreferenceManager.getDefaultSharedPreferences(applicationContext)
+        preferences.registerOnSharedPreferenceChangeListener(sharedPreferenceListener)
+        DataModel.init(applicationContext, preferences)
+
         viewModel = ViewModelProvider.AndroidViewModelFactory(application)
             .create(MainViewModel::class.java)
 
@@ -125,10 +129,6 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
         val startStop = findViewById<LinearLayout>(R.id.start_stop_layout)
         startStop.setOnClickListener(this)
 
-        val preferences = PreferenceManager.getDefaultSharedPreferences(applicationContext)
-        preferences.registerOnSharedPreferenceChangeListener(sharedPreferenceListener)
-        DataModel.init(applicationContext, preferences)
-
         preferences.liveData("dashboard_duration", "-7").observe(
             this
         ) { setDashboardText(it ?: "0") }
diff --git a/build.gradle b/build.gradle
index 9fce52e..997a28b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath 'com.android.tools.build:gradle:8.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong