Merge pull request #158 from hossain-khan/154-make-log-list-better

[UX/UX] Improve the log list

Author: hossain-khan

app/src/main/java/dev/hossain/remotenotify/db/AlertCheckLogDao.kt

@@ -3,6 +3,7 @@ package dev.hossain.remotenotify.db
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.Query
+import androidx.room.Transaction
 import kotlinx.coroutines.flow.Flow
 
 @Dao
@@ -57,4 +58,13 @@ interface AlertCheckLogDao {
     """,
     )
     fun getLatestCheckLog(): Flow<AlertCheckLogEntity?>
+
+    @Transaction
+    @Query(
+        """
+        SELECT * FROM alert_check_log
+        ORDER BY checked_at DESC
+    """,
+    )
+    fun getAllLogsWithConfig(): Flow<List<AlertLogWithConfig>>
 }

app/src/main/java/dev/hossain/remotenotify/db/AlertLogWithConfig.kt

@@ -0,0 +1,13 @@
+package dev.hossain.remotenotify.db
+
+import androidx.room.Embedded
+import androidx.room.Relation
+
+data class AlertLogWithConfig(
+    @Embedded val log: AlertCheckLogEntity,
+    @Relation(
+        parentColumn = "alert_config_id",
+        entityColumn = "id",
+    )
+    val config: AlertConfigEntity,
+)

app/src/main/java/dev/hossain/remotenotify/model/AlertCheckLog.kt

@@ -1,18 +1,43 @@
 package dev.hossain.remotenotify.model
 
 import dev.hossain.remotenotify.db.AlertCheckLogEntity
+import dev.hossain.remotenotify.db.AlertLogWithConfig
+import dev.hossain.remotenotify.notifier.NotifierType
 
 data class AlertCheckLog(
     val checkedOn: Long,
     val alertType: AlertType,
     val isAlertSent: Boolean,
+    val notifierType: NotifierType?,
     val stateValue: Int,
+    val configId: Long,
+    val configBatteryPercentage: Int,
+    val configStorageMinSpaceGb: Int,
+    val configCreatedOn: Long,
 )
 
 fun AlertCheckLogEntity.toAlertCheckLog(): AlertCheckLog =
     AlertCheckLog(
         checkedOn = checkedAt,
         alertType = alertType,
         isAlertSent = alertTriggered,
+        notifierType = notifierType,
         stateValue = alertStateValue,
+        configId = 0,
+        configBatteryPercentage = 0,
+        configStorageMinSpaceGb = 0,
+        configCreatedOn = 0,
+    )
+
+fun AlertLogWithConfig.toAlertCheckLog(): AlertCheckLog =
+    AlertCheckLog(
+        checkedOn = log.checkedAt,
+        alertType = log.alertType,
+        isAlertSent = log.alertTriggered,
+        notifierType = log.notifierType,
+        stateValue = log.alertStateValue,
+        configId = config.id,
+        configBatteryPercentage = config.batteryPercentage,
+        configStorageMinSpaceGb = config.storageMinSpaceGb,
+        configCreatedOn = config.createdOn,
     )

app/src/main/java/dev/hossain/remotenotify/ui/addalert/AddNewRemoteAlert.kt

@@ -9,6 +9,8 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.Button
@@ -186,6 +188,7 @@ fun AddNewRemoteAlertUi(
                 Modifier
                     .padding(innerPadding)
                     .padding(16.dp)
+                    .verticalScroll(rememberScrollState())
                     .fillMaxWidth(),
             verticalArrangement = Arrangement.spacedBy(24.dp),
         ) {