updating commons, kotlin, gradle

.editorconfig

@@ -17,7 +17,7 @@ insert_final_newline = true
 charset = utf-8
 indent_style = space
 indent_size = 4
-continuation_indent_size = 8
+continuation_indent_size = 4
 
 [*.xml]
 continuation_indent_size = 4

app/build.gradle

@@ -66,14 +66,14 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.32.15'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:99a97f2e16'
     implementation 'com.facebook.stetho:stetho:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'com.shawnlin:number-picker:2.4.6'
     implementation "androidx.preference:preference-ktx:1.1.1"
-    implementation "androidx.work:work-runtime-ktx:2.4.0"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0'
+    implementation "androidx.work:work-runtime-ktx:2.5.0"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
     implementation 'org.greenrobot:eventbus:3.2.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 }

app/src/main/kotlin/com/simplemobiletools/clock/dialogs/EditAlarmDialog.kt

@@ -3,6 +3,7 @@ package com.simplemobiletools.clock.dialogs
 import android.app.TimePickerDialog
 import android.graphics.drawable.Drawable
 import android.media.AudioManager
+import android.media.RingtoneManager
 import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.clock.R
@@ -15,7 +16,6 @@ import com.simplemobiletools.clock.helpers.getCurrentDayMinutes
 import com.simplemobiletools.clock.models.Alarm
 import com.simplemobiletools.commons.dialogs.SelectAlarmSoundDialog
 import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.ALARM_SOUND_TYPE_ALARM
 import com.simplemobiletools.commons.models.AlarmSound
 import kotlinx.android.synthetic.main.dialog_edit_alarm.view.*
 import java.util.*
@@ -36,14 +36,14 @@ class EditAlarmDialog(val activity: SimpleActivity, val alarm: Alarm, val callba
             edit_alarm_sound.colorLeftDrawable(textColor)
             edit_alarm_sound.text = alarm.soundTitle
             edit_alarm_sound.setOnClickListener {
-                SelectAlarmSoundDialog(activity, alarm.soundUri, AudioManager.STREAM_ALARM, PICK_AUDIO_FILE_INTENT_ID, ALARM_SOUND_TYPE_ALARM, true,
+                SelectAlarmSoundDialog(activity, alarm.soundUri, AudioManager.STREAM_ALARM, PICK_AUDIO_FILE_INTENT_ID, RingtoneManager.TYPE_ALARM, true,
                     onAlarmPicked = {
                         if (it != null) {
                             updateSelectedAlarmSound(it)
                         }
                     }, onAlarmSoundDeleted = {
                         if (alarm.soundUri == it.uri) {
-                            val defaultAlarm = context.getDefaultAlarmSound(ALARM_SOUND_TYPE_ALARM)
+                            val defaultAlarm = context.getDefaultAlarmSound(RingtoneManager.TYPE_ALARM)
                             updateSelectedAlarmSound(defaultAlarm)
                         }
                         activity.checkAlarmsWithDeletedSoundUri(it.uri)

app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt

@@ -8,6 +8,7 @@ import android.content.Context
 import android.content.Intent
 import android.media.AudioAttributes
 import android.media.AudioManager.STREAM_ALARM
+import android.media.RingtoneManager
 import android.net.Uri
 import android.os.PowerManager
 import android.text.SpannableString
@@ -72,7 +73,7 @@ fun Context.getAllTimeZonesModified(): ArrayList<MyTimeZone> {
 fun Context.getModifiedTimeZoneTitle(id: Int) = getAllTimeZonesModified().firstOrNull { it.id == id }?.title ?: getDefaultTimeZoneTitle(id)
 
 fun Context.createNewAlarm(timeInMinutes: Int, weekDays: Int): Alarm {
-    val defaultAlarmSound = getDefaultAlarmSound(ALARM_SOUND_TYPE_ALARM)
+    val defaultAlarmSound = getDefaultAlarmSound(RingtoneManager.TYPE_ALARM)
     return Alarm(0, timeInMinutes, weekDays, false, false, defaultAlarmSound.title, defaultAlarmSound.uri, "")
 }
 
@@ -406,7 +407,7 @@ fun Context.getReminderActivityIntent(): PendingIntent {
 }
 
 fun Context.checkAlarmsWithDeletedSoundUri(uri: String) {
-    val defaultAlarmSound = getDefaultAlarmSound(ALARM_SOUND_TYPE_ALARM)
+    val defaultAlarmSound = getDefaultAlarmSound(RingtoneManager.TYPE_ALARM)
     dbHelper.getAlarmsWithUri(uri).forEach {
         it.soundTitle = defaultAlarmSound.title
         it.soundUri = defaultAlarmSound.uri

app/src/main/kotlin/com/simplemobiletools/clock/fragments/TimerFragment.kt

@@ -2,6 +2,7 @@ package com.simplemobiletools.clock.fragments
 
 import android.graphics.Color
 import android.media.AudioManager
+import android.media.RingtoneManager
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,7 +16,6 @@ import com.simplemobiletools.clock.helpers.PICK_AUDIO_FILE_INTENT_ID
 import com.simplemobiletools.clock.models.TimerState
 import com.simplemobiletools.commons.dialogs.SelectAlarmSoundDialog
 import com.simplemobiletools.commons.extensions.*
-import com.simplemobiletools.commons.helpers.ALARM_SOUND_TYPE_ALARM
 import com.simplemobiletools.commons.models.AlarmSound
 import kotlinx.android.synthetic.main.fragment_timer.view.*
 import org.greenrobot.eventbus.EventBus
@@ -96,7 +96,7 @@ class TimerFragment : Fragment() {
 
             timer_sound.setOnClickListener {
                 SelectAlarmSoundDialog(activity as SimpleActivity, config.timerSoundUri, AudioManager.STREAM_ALARM, PICK_AUDIO_FILE_INTENT_ID,
-                    ALARM_SOUND_TYPE_ALARM, true,
+                    RingtoneManager.TYPE_ALARM, true,
                     onAlarmPicked = { sound ->
                         if (sound != null) {
                             updateAlarmSound(sound)
@@ -104,7 +104,7 @@ class TimerFragment : Fragment() {
                     },
                     onAlarmSoundDeleted = { sound ->
                         if (config.timerSoundUri == sound.uri) {
-                            val defaultAlarm = context.getDefaultAlarmSound(ALARM_SOUND_TYPE_ALARM)
+                            val defaultAlarm = context.getDefaultAlarmSound(RingtoneManager.TYPE_ALARM)
                             updateAlarmSound(defaultAlarm)
                         }
 
@@ -127,7 +127,7 @@ class TimerFragment : Fragment() {
     }
 
     private fun changeDuration() {
-        MyTimePickerDialogDialog(activity as SimpleActivity, context!!.config.timerSeconds) { seconds ->
+        MyTimePickerDialogDialog(activity as SimpleActivity, requireContext().config.timerSeconds) { seconds ->
             val timerSeconds = if (seconds <= 0) 10 else seconds
             activity?.config?.timerSeconds = timerSeconds
             val duration = timerSeconds.getFormattedDuration()

app/src/main/kotlin/com/simplemobiletools/clock/helpers/Config.kt

@@ -1,13 +1,13 @@
 package com.simplemobiletools.clock.helpers
 
 import android.content.Context
+import android.media.RingtoneManager
 import com.simplemobiletools.clock.extensions.gson.gson
 import com.simplemobiletools.clock.models.Alarm
 import com.simplemobiletools.clock.models.StateWrapper
 import com.simplemobiletools.clock.models.TimerState
+import com.simplemobiletools.commons.extensions.getDefaultAlarmSound
 import com.simplemobiletools.commons.extensions.getDefaultAlarmTitle
-import com.simplemobiletools.commons.extensions.getDefaultAlarmUri
-import com.simplemobiletools.commons.helpers.ALARM_SOUND_TYPE_ALARM
 import com.simplemobiletools.commons.helpers.BaseConfig
 
 class Config(context: Context) : BaseConfig(context) {
@@ -42,11 +42,11 @@ class Config(context: Context) : BaseConfig(context) {
         set(timerVibrate) = prefs.edit().putBoolean(TIMER_VIBRATE, timerVibrate).apply()
 
     var timerSoundUri: String
-        get() = prefs.getString(TIMER_SOUND_URI, context.getDefaultAlarmUri(ALARM_SOUND_TYPE_ALARM).toString())!!
+        get() = prefs.getString(TIMER_SOUND_URI, context.getDefaultAlarmSound(RingtoneManager.TYPE_ALARM).uri)!!
         set(timerSoundUri) = prefs.edit().putString(TIMER_SOUND_URI, timerSoundUri).apply()
 
     var timerSoundTitle: String
-        get() = prefs.getString(TIMER_SOUND_TITLE, context.getDefaultAlarmTitle(ALARM_SOUND_TYPE_ALARM))!!
+        get() = prefs.getString(TIMER_SOUND_TITLE, context.getDefaultAlarmTitle(RingtoneManager.TYPE_ALARM))!!
         set(timerSoundTitle) = prefs.edit().putString(TIMER_SOUND_TITLE, timerSoundTitle).apply()
 
     var timerMaxReminderSecs: Int

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.21'
+    ext.kotlin_version = '1.4.32'
 
     repositories {
         google()
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong