Update dependencies

Domi04151309 · Jun 8, 2023 · 4db4138 · 4db4138
1 parent db5e0bc
commit 4db4138
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 46 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -47,9 +47,9 @@ preBuild.doFirst {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'androidx.preference:preference-ktx:1.1.1'
-    implementation "androidx.recyclerview:recyclerview:1.2.1"
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation "androidx.recyclerview:recyclerview:1.3.0"
     implementation 'com.jaredrummler:colorpicker:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'com.android.volley:volley:1.2.1'

diff --git a/app/src/main/java/io/github/domi04151309/alwayson/actions/alwayson/AlwaysOnCustomView.kt b/app/src/main/java/io/github/domi04151309/alwayson/actions/alwayson/AlwaysOnCustomView.kt
@@ -100,10 +100,10 @@ class AlwaysOnCustomView : View {
     }
 
     constructor(context: Context) : super(context) {
-        init()
+        init(context)
     }
 
-    private fun init(context: Context? = null) {
+    private fun init(context: Context) {
         prefs = P(PreferenceManager.getDefaultSharedPreferences(context))
 
         padding2 = dpToPx(2f).toInt()
@@ -221,7 +221,7 @@ class AlwaysOnCustomView : View {
                     else "h:mm"
                 } else "H:mm", Locale.getDefault()
             )
-            if (Permissions.hasCalendarPermission(context ?: throw IllegalStateException())) {
+            if (Permissions.hasCalendarPermission(context)) {
                 val cursor = context.contentResolver.query(
                     CalendarContract.Events.CONTENT_URI,
                     arrayOf("title", "dtstart", "dtend"),

diff --git a/app/src/main/java/io/github/domi04151309/alwayson/activities/LAFBackgroundActivity.kt b/app/src/main/java/io/github/domi04151309/alwayson/activities/LAFBackgroundActivity.kt
@@ -57,17 +57,19 @@ class LAFBackgroundActivity : AppCompatActivity() {
                 true
             }
             if (Build.VERSION.SDK_INT < 28)
-                preferenceScreen.removePreference(findPreference("hide_display_cutouts"))
+                preferenceScreen.removePreference(
+                    findPreference("hide_display_cutouts") ?: throw IllegalStateException()
+                )
         }
 
         override fun onStart() {
             super.onStart()
-            preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+            preferenceManager.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
         }
 
         override fun onStop() {
             super.onStop()
-            preferenceManager.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
+            preferenceManager.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
         }
 
         override fun onSharedPreferenceChanged(p0: SharedPreferences?, p1: String?) {

diff --git a/app/src/main/java/io/github/domi04151309/alwayson/activities/LAFBehaviorActivity.kt b/app/src/main/java/io/github/domi04151309/alwayson/activities/LAFBehaviorActivity.kt
@@ -32,7 +32,7 @@ class LAFBehaviorActivity : AppCompatActivity() {
                 startActivity(Intent(context, LAFBrightnessActivity::class.java))
                 true
             }
-            if (!preferenceManager.sharedPreferences.getBoolean(P.ROOT_MODE, false)) {
+            if (preferenceManager.sharedPreferences?.getBoolean(P.ROOT_MODE, false) != true) {
                 findPreference<SwitchPreference>(P.POWER_SAVING_MODE)?.isEnabled = false
                 findPreference<SwitchPreference>(P.DISABLE_HEADS_UP_NOTIFICATIONS)
                     ?.isEnabled = false
@@ -41,12 +41,12 @@ class LAFBehaviorActivity : AppCompatActivity() {
 
         override fun onStart() {
             super.onStart()
-            preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+            preferenceManager.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
         }
 
         override fun onStop() {
             super.onStop()
-            preferenceManager.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
+            preferenceManager.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
         }
 
         override fun onSharedPreferenceChanged(p0: SharedPreferences?, p1: String?) {

diff --git a/...rc/main/java/io/github/domi04151309/alwayson/activities/LAFFilterNotificationsActivity.kt b/...rc/main/java/io/github/domi04151309/alwayson/activities/LAFFilterNotificationsActivity.kt
@@ -53,7 +53,7 @@ class LAFFilterNotificationsActivity : AppCompatActivity() {
         override fun onStart() {
             super.onStart()
             blockedArray = JSONArray(
-                preferenceManager.sharedPreferences.getString("blocked_notifications", "[]")
+                preferenceManager.sharedPreferences?.getString("blocked_notifications", "[]")
             )
             if (!JSON.isEmpty(blockedArray)) {
                 blocked.removeAll()
@@ -83,9 +83,9 @@ class LAFFilterNotificationsActivity : AppCompatActivity() {
 
         override fun onStop() {
             super.onStop()
-            preferenceManager.sharedPreferences.edit()
-                .putString("blocked_notifications", blockedArray.toString())
-                .apply()
+            preferenceManager.sharedPreferences?.edit()
+                ?.putString("blocked_notifications", blockedArray.toString())
+                ?.apply()
             AlwaysOn.finish()
         }
 

diff --git a/app/src/main/java/io/github/domi04151309/alwayson/activities/LAFRulesActivity.kt b/app/src/main/java/io/github/domi04151309/alwayson/activities/LAFRulesActivity.kt
@@ -44,7 +44,7 @@ class LAFRulesActivity : AppCompatActivity() {
             rulesBatteryLevel = findPreference(P.RULES_BATTERY) ?: return
             rulesTime = findPreference("rules_time") ?: return
             rulesTimeout = findPreference(P.RULES_TIMEOUT) ?: return
-            val is24Hour = !preferenceManager.sharedPreferences.getBoolean("hour", false)
+            val is24Hour = preferenceManager.sharedPreferences?.getBoolean("hour", false) != true
 
             if (!Permissions.isNotificationServiceEnabled(requireContext())) {
                 var currentPref: Preference?
@@ -99,17 +99,17 @@ class LAFRulesActivity : AppCompatActivity() {
                 TimePickerDialog(
                     context,
                     { _, selectedStartHour, selectedStartMinute ->
-                        preferenceManager.sharedPreferences.edit().putString(
+                        preferenceManager.sharedPreferences?.edit()?.putString(
                             "rules_time_start",
                             formatTime(selectedStartHour, selectedStartMinute)
-                        ).apply()
+                        )?.apply()
                         TimePickerDialog(
                             context,
                             { _, selectedEndHour, selectedEndMinute ->
-                                preferenceManager.sharedPreferences.edit().putString(
+                                preferenceManager.sharedPreferences?.edit()?.putString(
                                     "rules_time_end",
                                     formatTime(selectedEndHour, selectedEndMinute)
-                                ).apply()
+                                )?.apply()
                             },
                             parseInt(rulesTimeEndValue.substringBefore(":")),
                             parseInt(rulesTimeEndValue.substringAfter(":")),
@@ -126,21 +126,27 @@ class LAFRulesActivity : AppCompatActivity() {
 
         private fun updateSummaries() {
             val rulesBatteryLevelValue =
-                preferenceManager.sharedPreferences.getInt(P.RULES_BATTERY, P.RULES_BATTERY_DEFAULT)
-            rulesTimeStartValue = preferenceManager.sharedPreferences.getString(
+                preferenceManager.sharedPreferences?.getInt(
+                    P.RULES_BATTERY,
+                    P.RULES_BATTERY_DEFAULT
+                ) ?: P.RULES_BATTERY_DEFAULT
+            rulesTimeStartValue = preferenceManager.sharedPreferences?.getString(
                 "rules_time_start",
                 DEFAULT_START_TIME
-            )
-                ?: DEFAULT_START_TIME
+            ) ?: DEFAULT_START_TIME
             rulesTimeEndValue =
-                preferenceManager.sharedPreferences.getString("rules_time_end", DEFAULT_END_TIME)
+                preferenceManager.sharedPreferences?.getString("rules_time_end", DEFAULT_END_TIME)
                     ?: DEFAULT_END_TIME
             val rulesTimeoutValue =
-                preferenceManager.sharedPreferences.getInt(P.RULES_TIMEOUT, P.RULES_TIMEOUT_DEFAULT)
+                preferenceManager.sharedPreferences?.getInt(
+                    P.RULES_TIMEOUT,
+                    P.RULES_TIMEOUT_DEFAULT
+                ) ?: P.RULES_TIMEOUT_DEFAULT
 
             if (rulesBatteryLevelValue > 100) {
-                preferenceManager.sharedPreferences.edit().putInt(P.RULES_BATTERY, 100)
-                    .apply()
+                preferenceManager.sharedPreferences?.edit()
+                    ?.putInt(P.RULES_BATTERY, 100)
+                    ?.apply()
                 return
             }
 
@@ -173,12 +179,12 @@ class LAFRulesActivity : AppCompatActivity() {
 
         override fun onStart() {
             super.onStart()
-            preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+            preferenceManager.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
         }
 
         override fun onStop() {
             super.onStop()
-            preferenceManager.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
+            preferenceManager.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
         }
 
         override fun onSharedPreferenceChanged(p0: SharedPreferences?, p1: String?) {

diff --git a/app/src/main/java/io/github/domi04151309/alwayson/activities/LAFWFColorsActivity.kt b/app/src/main/java/io/github/domi04151309/alwayson/activities/LAFWFColorsActivity.kt
@@ -28,12 +28,12 @@ class LAFWFColorsActivity : AppCompatActivity() {
 
         override fun onStart() {
             super.onStart()
-            preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+            preferenceManager.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
         }
 
         override fun onStop() {
             super.onStop()
-            preferenceManager.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
+            preferenceManager.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
         }
 
         override fun onSharedPreferenceChanged(p0: SharedPreferences?, p1: String?) {

diff --git a/app/src/main/java/io/github/domi04151309/alwayson/activities/LAFWatchFaceActivity.kt b/app/src/main/java/io/github/domi04151309/alwayson/activities/LAFWatchFaceActivity.kt
@@ -86,7 +86,7 @@ class LAFWatchFaceActivity : AppCompatActivity() {
                 val dialogView = layoutInflater.inflate(R.layout.dialog_edit_text, null, false)
                 val editText = dialogView.findViewById<EditText>(R.id.editText)
                 editText.setText(
-                    preferenceManager.sharedPreferences.getString(
+                    preferenceManager.sharedPreferences?.getString(
                         P.DATE_FORMAT,
                         P.DATE_FORMAT_DEFAULT
                     )
@@ -101,8 +101,9 @@ class LAFWatchFaceActivity : AppCompatActivity() {
                 dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
                     try {
                         SimpleDateFormat(editText.text.toString(), Locale.getDefault())
-                        preferenceManager.sharedPreferences.edit()
-                            .putString(P.DATE_FORMAT, editText.text.toString()).apply()
+                        preferenceManager.sharedPreferences?.edit()
+                            ?.putString(P.DATE_FORMAT, editText.text.toString())
+                            ?.apply()
                         dialog.dismiss()
                     } catch (e: Exception) {
                         Toast.makeText(
@@ -144,12 +145,12 @@ class LAFWatchFaceActivity : AppCompatActivity() {
 
         override fun onStart() {
             super.onStart()
-            preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+            preferenceManager.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
         }
 
         override fun onStop() {
             super.onStop()
-            preferenceManager.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
+            preferenceManager.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
         }
 
         override fun onSharedPreferenceChanged(p0: SharedPreferences?, p1: String?) {

diff --git a/app/src/main/java/io/github/domi04151309/alwayson/activities/LAFWeatherActivity.kt b/app/src/main/java/io/github/domi04151309/alwayson/activities/LAFWeatherActivity.kt
@@ -35,7 +35,7 @@ class LAFWeatherActivity : AppCompatActivity() {
                 val dialogView = layoutInflater.inflate(R.layout.dialog_edit_text, null, false)
                 val editText = dialogView.findViewById<EditText>(R.id.editText)
                 editText.setText(
-                    preferenceManager.sharedPreferences.getString(
+                    preferenceManager.sharedPreferences?.getString(
                         P.WEATHER_FORMAT,
                         P.WEATHER_FORMAT_DEFAULT
                     )
@@ -44,8 +44,8 @@ class LAFWeatherActivity : AppCompatActivity() {
                     .setTitle(R.string.pref_look_and_feel_weather_format)
                     .setView(dialogView)
                     .setPositiveButton(android.R.string.ok) { _, _ ->
-                        preferenceManager.sharedPreferences.edit()
-                            .putString(P.WEATHER_FORMAT, editText.text.toString()).apply()
+                        preferenceManager.sharedPreferences?.edit()
+                            ?.putString(P.WEATHER_FORMAT, editText.text.toString())?.apply()
                     }
                     .setNegativeButton(android.R.string.cancel) { _, _ -> }
                     .setNeutralButton(R.string.pref_ao_date_format_dialog_neutral) { _, _ ->
@@ -83,12 +83,12 @@ class LAFWeatherActivity : AppCompatActivity() {
 
         override fun onStart() {
             super.onStart()
-            preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+            preferenceManager.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
         }
 
         override fun onStop() {
             super.onStop()
-            preferenceManager.sharedPreferences.unregisterOnSharedPreferenceChangeListener(this)
+            preferenceManager.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
         }
 
         override fun onSharedPreferenceChanged(p0: SharedPreferences?, p1: String?) {

diff --git a/build.gradle b/build.gradle
@@ -6,8 +6,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
+        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.21"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Jul 24 15:44:39 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME