Merge pull request #50 from t-regbs/snackbar-dismiss

Fix Nearest Alarm Message
t-regbs · May 25, 2024 · 7819602 · 7819602
2 parents 1cc000f + 4b93df0
commit 7819602
Show file tree

Hide file tree

Showing 8 changed files with 244 additions and 21 deletions.
diff --git a/.idea/CamelCaseConfigNew.xml b/.idea/CamelCaseConfigNew.xml
diff --git a/.idea/cody_history.xml b/.idea/cody_history.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/studiobot.xml b/.idea/studiobot.xml
diff --git a/...va/com/timilehinaregbesola/mathalarm/presentation/alarmlist/components/AlarmListHeader.kt b/...va/com/timilehinaregbesola/mathalarm/presentation/alarmlist/components/AlarmListHeader.kt
@@ -19,6 +19,7 @@ import com.timilehinaregbesola.mathalarm.domain.model.Alarm
 import com.timilehinaregbesola.mathalarm.presentation.alarmlist.components.AlarmListHeader.LIST_HEADER_ALPHA
 import com.timilehinaregbesola.mathalarm.presentation.alarmlist.components.AlarmListHeader.LIST_HEADER_ELEVATION
 import com.timilehinaregbesola.mathalarm.presentation.alarmlist.components.AlarmListHeader.LIST_HEADER_FONT_SIZE
+import com.timilehinaregbesola.mathalarm.presentation.alarmlist.components.AlarmListHeader.ONE_WEEK_IN_MILLISECONDS
 import com.timilehinaregbesola.mathalarm.presentation.ui.darkPrimaryLight
 import com.timilehinaregbesola.mathalarm.presentation.ui.spacing
 import com.timilehinaregbesola.mathalarm.utils.getCalendarFromAlarm
@@ -57,7 +58,11 @@ fun ListHeader(
     ) {
         with(MaterialTheme.spacing) {
             Text(
-                text = if (enabled) "Next alarm in $nearestAlarmMessage" else "No upcoming alarms",
+                text = if (enabled && nearestAlarmMessage != null) {
+                    "Next alarm in $nearestAlarmMessage"
+                } else {
+                    "No upcoming alarms"
+                },
                 modifier = Modifier
                     .padding(
                         start = extraMedium,
@@ -77,24 +82,23 @@ private fun buildNearestTime(
     var nearestTime: Long? = null
     var nearestIndex = -1
     if (alarmList.isNotEmpty()) {
-        nearestTime = alarmList.firstOrNull { it.isOn }?.let { it1 ->
-            getCalendarFromAlarm(it1, calendar).timeInMillis
-        }
-        nearestIndex = alarmList.indexOfFirst { it.isOn }
-        val now = System.currentTimeMillis()
-        val onAlarms = alarmList.filter { it.isOn }
-        onAlarms.forEachIndexed { index, alarm ->
-            val cal = getCalendarFromAlarm(alarm, calendar)
-            val time = cal.timeInMillis
-            Timber.d("time = $time")
-            val currentEval = time - now
-            val nearestEval = nearestTime!! - now
-            Timber.d("index = $index, currentEval = $currentEval, nearestEval = $nearestEval")
-            if (currentEval < nearestEval) {
-                nearestTime = time
-                nearestIndex = index
+        alarmList
+            .filter { it.isOn }
+            .forEachIndexed { index, alarm ->
+                val cal = getCalendarFromAlarm(alarm, calendar)
+                var alarmTime = cal.timeInMillis
+
+                val now = System.currentTimeMillis()
+                Timber.d("time = $alarmTime")
+                if (alarmTime < now) {
+                    alarmTime += ONE_WEEK_IN_MILLISECONDS
+                }
+                val timeToAlarm = alarmTime - now
+                if (nearestTime == null || timeToAlarm < nearestTime!!) {
+                    nearestTime = timeToAlarm
+                    nearestIndex = index
+                }
             }
-        }
     }
     return Pair(nearestTime, nearestIndex)
 }
@@ -114,6 +118,7 @@ private fun ListHeaderPreview() {
 
 private object AlarmListHeader {
     const val LIST_HEADER_ALPHA = 0.1f
+    const val ONE_WEEK_IN_MILLISECONDS = 7 * 24 * 60 * 60 * 1000
     val LIST_HEADER_ELEVATION = 4.dp
     val LIST_HEADER_FONT_SIZE = 16.sp
 }
diff --git a/...va/com/timilehinaregbesola/mathalarm/presentation/alarmlist/components/AlarmListScreen.kt b/...va/com/timilehinaregbesola/mathalarm/presentation/alarmlist/components/AlarmListScreen.kt
@@ -99,6 +99,7 @@ fun ListDisplayScreen(
                     val result = snackbarHoststate.showSnackbar(
                         message = event.message,
                         actionLabel = event.action,
+                        withDismissAction = true,
                         duration = SnackbarDuration.Short
                     )
                     if (result == ActionPerformed) {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 accompanist = "0.35.0-alpha"
 # @keep
 android_compile_sdk = "34"
-android_gradle_plugin = "8.4.0-alpha03"
+android_gradle_plugin = "8.4.1"
 # @keep
 android_min_sdk = "21"
 # @keep

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Mar 11 00:07:56 GMT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists