Merge pull request #14 from shadow578/fix/quality-of-life

Quality-of-Life fixes for 1.3
shadow578 · Oct 3, 2022 · c27c2b1 · c27c2b1
2 parents b2b60bb + 7b1d0b5
commit c27c2b1
Show file tree

Hide file tree

Showing 19 changed files with 248 additions and 189 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -57,6 +57,9 @@ android {
                 signingConfig = signingConfigs.getByName("from_props")
             }
         }
+        getByName("debug") {
+            applicationIdSuffix = ".dev"
+        }
     }
     compileOptions {
         isCoreLibraryDesugaringEnabled = true

diff --git a/app/src/debug/res/values/colors.xml b/app/src/debug/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FF69B4</color>
+</resources>
diff --git a/app/src/main/kotlin/io/github/shadow578/yodel/backup/BackupHelper.kt b/app/src/main/kotlin/io/github/shadow578/yodel/backup/BackupHelper.kt
@@ -4,9 +4,11 @@ import android.content.Context
 import androidx.documentfile.provider.DocumentFile
 import com.google.gson.*
 import io.github.shadow578.yodel.db.TracksDB
+import io.github.shadow578.yodel.db.model.TrackInfo
 import timber.log.Timber
 import java.io.*
-import java.time.*
+import java.time.LocalDate
+import java.time.LocalDateTime
 
 /**
  * tracks db backup helper class.
@@ -87,15 +89,19 @@ class BackupHelper(
      *
      * @param data            the data to restore
      * @param replaceExisting if true, existing entries are overwritten. if false, existing entries are not added
+     * @param transform transformation function, applied to all restored tracks
      */
-    fun restoreBackup(data: BackupData, replaceExisting: Boolean) {
+    fun restoreBackup(data: BackupData, replaceExisting: Boolean, transform: TrackInfo.() -> Unit = {}) {
         // check there are tracks to import
         if (data.tracks.isEmpty()) return
 
+        // apply transform to all tracks
+        val tracks = data.tracks.map { it.transform(); it }
+
         // insert the tracks
         if (replaceExisting)
-            db.tracks().insertAll(data.tracks)
+            db.tracks().insertAll(tracks)
         else
-            db.tracks().insertAllNew(data.tracks)
+            db.tracks().insertAllNew(tracks)
     }
 }
diff --git a/app/src/main/kotlin/io/github/shadow578/yodel/db/TracksDao.kt b/app/src/main/kotlin/io/github/shadow578/yodel/db/TracksDao.kt
@@ -17,14 +17,6 @@ interface TracksDao {
     @Query("SELECT * FROM tracks ORDER BY first_added_at ASC")
     fun observe(): LiveData<List<TrackInfo>>
 
-    /**
-     * observe all tracks that have to be downloaded
-     *
-     * @return the tracks that can be observed
-     */
-    @Query("SELECT * FROM tracks WHERE status = 'pending'")
-    fun observePending(): LiveData<List<TrackInfo>>
-
     /**
      * get a list of all tracks
      *
@@ -33,6 +25,14 @@ interface TracksDao {
     @get:Query("SELECT * FROM tracks")
     val all: List<TrackInfo>
 
+    /**
+     * get a list of all tracks that are marked as pending download
+     *
+     * @return a list of all downloaded tracks
+     */
+    @get:Query("SELECT * FROM tracks WHERE status = 'pending'")
+    val pending: List<TrackInfo>
+
     /**
      * get a list of all tracks that are marked as downloaded
      *