Recorder: Move from tasks to coroutines and flows

Query code stolen from Glimpse Co-authored-by: Luca Stefani <[email protected]> Change-Id: Ibed443b7e0b0860a1a4511987c9a8b5cde14096a
LineageOS · Sep 9, 2024 · c587995 · c587995
1 parent 73e00e2
commit c587995
Show file tree

Hide file tree

Showing 36 changed files with 971 additions and 865 deletions.
diff --git a/app/Android.bp b/app/Android.bp
@@ -19,10 +19,16 @@ android_app {
 
     static_libs: [
         // DO NOT EDIT THIS SECTION MANUALLY
+        "androidx.activity_activity-ktx",
         "androidx.appcompat_appcompat",
         "androidx.core_core-ktx",
         "Recorder_com.google.android.material_material",
         "androidx-constraintlayout_constraintlayout",
+        "androidx.lifecycle_lifecycle-livedata-ktx",
+        "androidx.lifecycle_lifecycle-service",
+        "androidx.lifecycle_lifecycle-viewmodel-ktx",
+        "androidx.recyclerview_recyclerview",
+        "androidx.recyclerview_recyclerview-selection",
     ],
 
     sdk_version: "34",

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -71,10 +71,20 @@ dependencies {
     // Align versions of all Kotlin components
     implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
 
+    implementation("androidx.activity:activity-ktx:1.7.2")
     implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.core:core-ktx:1.10.1")
+    implementation("androidx.core:core-ktx:1.12.0")
     implementation("com.google.android.material:material:1.9.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+
+    // Lifecycle
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.7.0")
+    implementation("androidx.lifecycle:lifecycle-service:2.7.0")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0")
+
+    // Recyclerview
+    implementation("androidx.recyclerview:recyclerview:1.3.2")
+    implementation("androidx.recyclerview:recyclerview-selection:1.1.0")
 }
 
 configure<GenerateBpPluginExtension> {

diff --git a/app/src/main/java/org/lineageos/recorder/DeleteLastActivity.kt b/app/src/main/java/org/lineageos/recorder/DeleteLastActivity.kt
@@ -8,22 +8,22 @@ package org.lineageos.recorder
 import android.content.DialogInterface
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.activity.viewModels
+import androidx.lifecycle.lifecycleScope
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.lineageos.recorder.task.DeleteRecordingTask
-import org.lineageos.recorder.task.TaskExecutor
+import kotlinx.coroutines.launch
 import org.lineageos.recorder.utils.PreferencesManager
-import org.lineageos.recorder.utils.Utils
+import org.lineageos.recorder.viewmodels.RecordingsViewModel
 
 class DeleteLastActivity : ComponentActivity() {
-    private val taskExecutor = TaskExecutor()
+    // View models
+    private val model: RecordingsViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setFinishOnTouchOutside(true)
 
-        lifecycle.addObserver(taskExecutor)
-
         val preferences = PreferencesManager(this)
         val uri = preferences.lastItemUri ?: run {
             finish()
@@ -34,12 +34,10 @@ class DeleteLastActivity : ComponentActivity() {
             .setTitle(R.string.delete_title)
             .setMessage(getString(R.string.delete_recording_message))
             .setPositiveButton(R.string.delete) { d: DialogInterface, _: Int ->
-                taskExecutor.runTask(
-                    DeleteRecordingTask(contentResolver, uri)
-                ) {
-                    d.dismiss()
-                    Utils.cancelShareNotification(this)
+                lifecycleScope.launch {
+                    model.deleteRecordings(uri)
                     preferences.lastItemUri = null
+                    d.dismiss()
                 }
             }
             .setNegativeButton(R.string.cancel, null)