Added swipe to delete alarm item

MubarakNative · MubarakNative · commit 915f47d05f82 · 2024-04-28T21:38:57.000+05:30
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -85,6 +85,7 @@ dependencies {
     implementation(libs.androidx.activity)
     implementation(libs.androidx.constraintlayout)
     testImplementation(libs.junit)
+    implementation(libs.androidx.recyclerview)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
 }
diff --git a/app/src/main/java/com/mbexample/alarmmanager/alarmmanager/AlarmScheduler.kt b/app/src/main/java/com/mbexample/alarmmanager/alarmmanager/AlarmScheduler.kt
@@ -1,4 +1,4 @@
-package com.mbexample.alarmmanager.alarmmanager
+package com.mbexample.alarmmanager.alarm
 
 import com.mbexample.alarmmanager.data.sources.local.Alarm
 
diff --git a/app/src/main/java/com/mbexample/alarmmanager/alarmmanager/AlarmSchedulerImpl.kt b/app/src/main/java/com/mbexample/alarmmanager/alarmmanager/AlarmSchedulerImpl.kt
@@ -1,4 +1,4 @@
-package com.mbexample.alarmmanager.alarmmanager
+package com.mbexample.alarmmanager.alarm
 
 import android.app.AlarmManager
 import android.app.PendingIntent
diff --git a/app/src/main/java/com/mbexample/alarmmanager/data/repository/AlarmRepository.kt b/app/src/main/java/com/mbexample/alarmmanager/data/repository/AlarmRepository.kt
@@ -15,6 +15,6 @@ interface AlarmRepository {
 
     suspend fun deleteAlarm(alarm: Alarm)
 
-    suspend fun deleteAlarmById(alarmId: Int)
+    suspend fun deleteAlarmById(alarmId: Long)
 
 }
diff --git a/app/src/main/java/com/mbexample/alarmmanager/data/repository/AlarmRepositoryImpl.kt b/app/src/main/java/com/mbexample/alarmmanager/data/repository/AlarmRepositoryImpl.kt
@@ -31,7 +31,7 @@ class AlarmRepositoryImpl @Inject constructor(
         alarmDatabase.getAlarmDao.deleteAlarm(alarm)
     }
 
-    override suspend fun deleteAlarmById(alarmId:Int) {
+    override suspend fun deleteAlarmById(alarmId:Long) {
         alarmDatabase.getAlarmDao.deleteAlarmById(alarmId)
     }
 
diff --git a/app/src/main/java/com/mbexample/alarmmanager/data/sources/local/AlarmDao.kt b/app/src/main/java/com/mbexample/alarmmanager/data/sources/local/AlarmDao.kt
@@ -27,6 +27,6 @@ interface AlarmDao {
     fun getAllAlarms(): Flow<List<Alarm>>
 
     @Query("DELETE FROM Alarm WHERE id = :alarmId")
-    suspend fun deleteAlarmById(alarmId: Int)
+    suspend fun deleteAlarmById(alarmId: Long)
 
 }
diff --git a/app/src/main/java/com/mbexample/alarmmanager/ui/AlarmItemAdapter.kt b/app/src/main/java/com/mbexample/alarmmanager/ui/AlarmItemAdapter.kt
@@ -4,11 +4,13 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.mbexample.alarmmanager.R
 import com.mbexample.alarmmanager.data.sources.local.Alarm
 import com.mbexample.alarmmanager.databinding.AlarmListItemBinding
+import com.mbexample.alarmmanager.ui.main.SwipeItemHelper
 import com.mbexample.alarmmanager.utils.Event
 import java.text.DateFormat
 
@@ -57,9 +59,12 @@ class AlarmItemAdapter (
         holder.bind(currentItem)
     }
 
+    val touchHelper = ItemTouchHelper(SwipeItemHelper(this.alarmItemDismissClickListener, this))
+
+
     interface AlarmItemDismissClickListener {
         fun onAlarmItemDismissClick(alarm: Event<Unit>)
-
+        fun onAlarmItemSwipe(alarm: Alarm)
     }
 
 }
diff --git a/app/src/main/java/com/mbexample/alarmmanager/ui/main/AlarmActivity.kt b/app/src/main/java/com/mbexample/alarmmanager/ui/main/AlarmActivity.kt
@@ -7,7 +7,6 @@ import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
 import android.text.format.DateFormat
-import android.util.Log
 import android.widget.EditText
 import android.widget.Toast
 import androidx.activity.enableEdgeToEdge
@@ -25,7 +24,7 @@ import com.google.android.material.timepicker.MaterialTimePicker
 import com.google.android.material.timepicker.MaterialTimePicker.INPUT_MODE_CLOCK
 import com.google.android.material.timepicker.TimeFormat
 import com.mbexample.alarmmanager.R
-import com.mbexample.alarmmanager.alarmmanager.AlarmSchedulerImpl
+import com.mbexample.alarmmanager.alarm.AlarmSchedulerImpl
 import com.mbexample.alarmmanager.data.sources.local.Alarm
 import com.mbexample.alarmmanager.databinding.ActivityAlarmBinding
 import com.mbexample.alarmmanager.ui.AlarmItemAdapter
@@ -50,6 +49,7 @@ class AlarmActivity : AppCompatActivity() {
         setContentView(binding.root)
 
         adapter = AlarmItemAdapter(viewModel)
+        adapter.touchHelper.attachToRecyclerView(binding.alarmList)
         alarmSchedulerImpl = AlarmSchedulerImpl(this)
 
         ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets ->
@@ -64,6 +64,13 @@ class AlarmActivity : AppCompatActivity() {
             adapter.submitList(it)
         }
 
+        viewModel.onAlarmItemSwipe.observe(this){
+            it.getContentIfNotHandled()?.let {alarmItem ->
+                alarm?.let(alarmSchedulerImpl::cancel)
+                viewModel.deleteAlarmItemById(alarmItem.id)
+            }
+        }
+
         viewModel.onAlarmDismissItemClick.observe(this) { onDismissClick ->
             onDismissClick.getContentIfNotHandled()?.let {
                 alarm?.let(alarmSchedulerImpl::cancel)
diff --git a/app/src/main/java/com/mbexample/alarmmanager/ui/main/AlarmActivityViewModel.kt b/app/src/main/java/com/mbexample/alarmmanager/ui/main/AlarmActivityViewModel.kt
@@ -18,16 +18,27 @@ class AlarmActivityViewModel @Inject constructor(
     private val alarmRepository: AlarmRepository
 ):ViewModel(),AlarmItemAdapter.AlarmItemDismissClickListener {
 
+    private val _onAlarmItemSwipe = MutableLiveData<Event<Alarm>>()
+    val onAlarmItemSwipe: LiveData<Event<Alarm>> = _onAlarmItemSwipe
+
     private val _onAlarmDismissItemClick = MutableLiveData<Event<Unit>>()
     val onAlarmDismissItemClick: LiveData<Event<Unit>> = _onAlarmDismissItemClick
 
     fun insertAlarm(alarm: Alarm)= viewModelScope.launch{
         alarmRepository.insertAlarm(alarm)
     }
 
+    fun deleteAlarmItemById(alarmId: Long)= viewModelScope.launch{
+        alarmRepository.deleteAlarmById(alarmId)
+    }
+
     val getAllAlarm = alarmRepository.getAllAlarm().asLiveData()
 
     override fun onAlarmItemDismissClick(alarm: Event<Unit>) {
         _onAlarmDismissItemClick.value = Event(Unit)
     }
+
+    override fun onAlarmItemSwipe(alarm: Alarm) {
+        _onAlarmItemSwipe.value = Event(alarm)
+    }
 }
diff --git a/app/src/main/java/com/mbexample/alarmmanager/ui/main/SwipeItemHelper.kt b/app/src/main/java/com/mbexample/alarmmanager/ui/main/SwipeItemHelper.kt
@@ -0,0 +1,20 @@
+package com.mbexample.alarmmanager.ui.main
+
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.RecyclerView
+import com.mbexample.alarmmanager.ui.AlarmItemAdapter
+
+class SwipeItemHelper(
+    private val listener: AlarmItemAdapter.AlarmItemDismissClickListener? = null,
+    private val adapter: AlarmItemAdapter
+) : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) {
+    override fun onMove(
+        recyclerView: RecyclerView,
+        viewHolder: RecyclerView.ViewHolder,
+        target: RecyclerView.ViewHolder
+    ) = false
+
+    override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+        listener?.onAlarmItemSwipe(adapter.currentList[viewHolder.bindingAdapterPosition])
+    }
+}
diff --git a/app/src/main/res/layout/dialog_create_alarm.xml b/app/src/main/res/layout/dialog_create_alarm.xml
@@ -16,9 +16,7 @@
         android:maxLines="3"
         android:textAppearance="@style/TextAppearance.AppCompat.Title"
         app:layout_constraintStart_toStartOf="@+id/guideline"
-        app:layout_constraintTop_toTopOf="parent"
-        android:autofillHints="name"
-        android:inputType="text" />
+        app:layout_constraintTop_toTopOf="parent" />
 
 
         <EditText
@@ -34,9 +32,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="@+id/etTitle"
             app:layout_constraintTop_toBottomOf="@+id/etTitle"
-            app:layout_constraintVertical_bias="0.0"
-            android:autofillHints="name"
-            android:inputType="text" />
+            app:layout_constraintVertical_bias="0.0"/>
 
 
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -15,6 +15,7 @@ activity = "1.8.0"
 constraintlayout = "2.1.4"
 navVersion = "2.7.7"
 preferenceKtx = "1.2.1"
+recyclerview = "1.3.2"
 roomVersion = "2.6.1"
 viewModelVersion = "2.7.0"
 
@@ -28,6 +29,7 @@ androidx-navigation-fragment-ktx = { module = "androidx.navigation:navigation-fr
 androidx-navigation-safe-args-gradle-plugin = { module = "androidx.navigation:navigation-safe-args-gradle-plugin", version.ref = "navVersion" }
 androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navVersion" }
 androidx-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preferenceKtx" }
+androidx-recyclerview = { module = "androidx.recyclerview:recyclerview", version.ref = "recyclerview" }
 androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "roomVersion" }
 androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "roomVersion" }
 androidx-room-paging = { module = "androidx.room:room-paging", version.ref = "roomVersion" }

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ dependencies {`
`85`	`85`	`implementation(libs.androidx.activity)`
`86`	`86`	`implementation(libs.androidx.constraintlayout)`
`87`	`87`	`testImplementation(libs.junit)`
	`88`	`+ implementation(libs.androidx.recyclerview)`
`88`	`89`	`androidTestImplementation(libs.androidx.junit)`
`89`	`90`	`androidTestImplementation(libs.androidx.espresso.core)`
`90`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.mbexample.alarmmanager.alarmmanager`
	`1`	`+package com.mbexample.alarmmanager.alarm`
`2`	`2`
`3`	`3`	`import com.mbexample.alarmmanager.data.sources.local.Alarm`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@ interface AlarmRepository {`
`15`	`15`
`16`	`16`	`suspend fun deleteAlarm(alarm: Alarm)`
`17`	`17`
`18`		`- suspend fun deleteAlarmById(alarmId: Int)`
	`18`	`+ suspend fun deleteAlarmById(alarmId: Long)`
`19`	`19`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class AlarmRepositoryImpl @Inject constructor(`
`31`	`31`	`alarmDatabase.getAlarmDao.deleteAlarm(alarm)`
`32`	`32`	`}`
`33`	`33`
`34`		`- override suspend fun deleteAlarmById(alarmId:Int) {`
	`34`	`+ override suspend fun deleteAlarmById(alarmId:Long) {`
`35`	`35`	`alarmDatabase.getAlarmDao.deleteAlarmById(alarmId)`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@ interface AlarmDao {`
`27`	`27`	`fun getAllAlarms(): Flow<List<Alarm>>`
`28`	`28`
`29`	`29`	`@Query("DELETE FROM Alarm WHERE id = :alarmId")`
`30`		`- suspend fun deleteAlarmById(alarmId: Int)`
	`30`	`+ suspend fun deleteAlarmById(alarmId: Long)`
`31`	`31`
`32`	`32`	`}`