app: v1.3.4

- fix reappearing notification after deleting - fix notification overwrite when adding multiple notes
Yanndroid · Jul 20, 2022 · ca877c8 · ca877c8
1 parent 1071354
commit ca877c8
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 15 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "de.dlyt.yanndroid.notinotes"
         minSdk 26
         targetSdk 31
-        versionCode 7
-        versionName "1.3.3"
+        versionCode 8
+        versionName "1.3.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -32,9 +32,7 @@ android {
 }
 
 dependencies {
-
     implementation 'androidx.core:core-ktx:1.8.0'
-    implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'com.google.code.gson:gson:2.9.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'

diff --git a/app/release/app-release.aab b/app/release/app-release.aab
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 7,
-      "versionName": "1.3.3",
+      "versionCode": 8,
+      "versionName": "1.3.4",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/java/de/dlyt/yanndroid/notinotes/Notes.kt b/app/src/main/java/de/dlyt/yanndroid/notinotes/Notes.kt
@@ -40,7 +40,7 @@ class Notes(val context: Context) {
         )
     }
 
-    class Note(id: Int) :
+    class Note(id: Int = -1) :
         Serializable {
         var title: String? = null
         var content: String? = null
@@ -57,17 +57,25 @@ class Notes(val context: Context) {
     var list: ArrayList<Note> = ArrayList()
 
     init {
+        loadNotesFromSP()
+        for (note in list) showNotification(note)
+    }
+
+    fun loadNotesFromSP() {
         list = Gson().fromJson(
             context.getSharedPreferences("sp", Context.MODE_PRIVATE).getString("notes", "[]"),
             object : TypeToken<ArrayList<Note>>() {}.type
         )
-        for (note in list) showNotification(note)
     }
 
-    fun saveNotesToSP() = context.getSharedPreferences("sp", Context.MODE_PRIVATE).edit()
-        .putString("notes", Gson().toJson(list)).apply()
+    fun saveNotesToSP() {
+        context.getSharedPreferences("sp", Context.MODE_PRIVATE).edit()
+            .putString("notes", Gson().toJson(list)).apply()
+    }
 
     fun saveNote(note: Note) {
+        loadNotesFromSP()
+        if (note.id == -1) note.id = generateNewNoteID()
         for (i in list.indices) {
             if (note.id == list[i].id) {
                 list[i] = note
@@ -82,6 +90,7 @@ class Notes(val context: Context) {
     }
 
     fun deleteNote(note: Note) {
+        loadNotesFromSP()
         for (i in list.indices) {
             if (note.id == list[i].id) {
                 list.removeAt(i)
@@ -92,7 +101,7 @@ class Notes(val context: Context) {
         }
     }
 
-    fun generateNewNoteID(): Int {
+    private fun generateNewNoteID(): Int {
         val takenIDs = list.stream().map { note -> note.id }.collect(Collectors.toList())
         var newID = 0
         while (takenIDs.contains(newID)) newID++

diff --git a/app/src/main/java/de/dlyt/yanndroid/notinotes/QSTile.kt b/app/src/main/java/de/dlyt/yanndroid/notinotes/QSTile.kt
@@ -39,14 +39,14 @@ class QSTile : TileService() {
         }
     }
 
-    override fun onDestroy() {
+    /*override fun onDestroy() {
         super.onDestroy()
         notes.saveNotesToSP()
-    }
+    }*/
 
     override fun onClick() {
         super.onClick()
-        notes.editNotePopup(Notes.Note(notes.generateNewNoteID()))
+        notes.editNotePopup(Notes.Note())
     }
 
     private fun createNotificationChannel() {
@@ -70,6 +70,7 @@ class QSTile : TileService() {
         val remoteViews = RemoteViews(context.packageName, R.layout.qs_detail_view)
         val adapter = LinearLayoutAdapter(remoteViews, R.id.qs_detail_list)
 
+        notes.loadNotesFromSP()
         for (note in notes.list) {
             val noteView = RemoteViews(context.packageName, R.layout.qs_detail_list_item)
             noteView.setTextViewText(R.id.qs_list_item_title, note.title)
@@ -94,7 +95,7 @@ class QSTile : TileService() {
             R.id.qs_detail_add,
             Utils.getPendingIntent(
                 context,
-                Notes.Note(notes.generateNewNoteID()),
+                Notes.Note(),
                 ActionReceiver.ACTION_EDIT
             )
         )