Merge remote-tracking branch 'origin/main' into main

Author: t-regbs

app/src/main/java/com/timilehinaregbesola/mathalarm/notification/MathAlarmNotification.kt

@@ -52,7 +52,7 @@ class MathAlarmNotification(
         Timber.d("Showing notification for '${alarm.title}'")
         val builder = buildNotification(alarm)
 //        builder.addAction(getCompleteAction(alarm))
-        var uriExists = false
+        var uriExists: Boolean
         var toneUri = alarm.alarmTone.toUri()
         player.apply {
             init()
@@ -62,6 +62,7 @@ class MathAlarmNotification(
                 inputStream?.close()
                 uriExists = true
             } catch (e: Exception) {
+                uriExists = false
                 Timber.w("File corresponding to the uri does not exist $toneUri")
             }
             toneUri = if (uriExists) toneUri else RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM)

app/src/main/java/com/timilehinaregbesola/mathalarm/presentation/MainActivity.kt

@@ -33,8 +33,18 @@ class MainActivity : AppCompatActivity() {
     lateinit var preferences: AlarmPreferencesImpl
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        installSplashScreen()
+        val splashscreen = installSplashScreen()
         super.onCreate(savedInstanceState)
+
+        // Keep the splash screen on-screen until the UI state is loaded. This condition is
+        // evaluated each time the app needs to be redrawn so it should be fast to avoid blocking
+        // the UI.
+//        splashScreen.setKeepOnScreenCondition {
+//            when (uiState) {
+//                Loading -> true
+//                is Success -> false
+//            }
+//        }
         setContent {
             val isDarkTheme = preferences.shouldUseDarkColors()
             updateTheme(isDarkTheme)

app/src/main/java/com/timilehinaregbesola/mathalarm/presentation/alarmlist/components/AlarmListScreen.kt

@@ -205,7 +205,10 @@ fun ListDisplayScreen(
                                 stickyHeader {
                                     ListHeader(enabled, nearestAlarmMessage.value ?: "", darkTheme)
                                 }
-                                items(alarmList) { alarm ->
+                                items(
+                                    items = alarmList,
+                                    key = { alarm -> alarm.alarmId }
+                                ) { alarm ->
                                     AlarmItem(
                                         alarm = alarm,
                                         onEditAlarm = {

core/src/main/java/com/timilehinaregbesola/mathalarm/usecases/ShowAlarm.kt

@@ -22,7 +22,6 @@ class ShowAlarm(
 
         if (alarm.repeat && alarm.isOn) {
             scheduleNextAlarm(alarm)
-        } else {
         }
 
         if (alarm.isOn.not()) {