fixed deleteitem bug, disabled haptics

drpeterrohde · Dec 29, 2022 · 660eeed · 660eeed
1 parent 41a1982
commit 660eeed
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/MoodSnap/Base/Constants.swift b/MoodSnap/Base/Constants.swift
@@ -4,7 +4,7 @@ import SwiftUI
 let quoteFrequency = 11
 
 /// Haptics
-let hapticsEnabled = true
+let hapticsEnabled = false
 
 /// Time windows
 let influenceWindowShort = 7

diff --git a/MoodSnap/Base/Utilities.swift b/MoodSnap/Base/Utilities.swift
@@ -79,8 +79,8 @@ import SwiftUI
 /**
  Delete a `moodSnap` from an array of `moodSnaps`.
  */
-@inline(__always) func deleteHistoryItem(data: DataStoreClass, moodSnap: MoodSnapStruct) {
-    data.moodSnaps = data.moodSnaps.filter { $0.id != moodSnap.id }
+@inline(__always) func deleteHistoryItem(data: DataStoreClass, moodSnap: MoodSnapStruct) -> [MoodSnapStruct] {
+    return data.moodSnaps.filter { $0.id != moodSnap.id }
 }
 
 /**

diff --git a/MoodSnap/HistoryView/HistoryItemView.swift b/MoodSnap/HistoryView/HistoryItemView.swift
@@ -90,7 +90,7 @@ struct HistoryItemView: View {
                                         DispatchQueue.main.async {
                                             withAnimation {
                                                 data.stopProcessing()
-                                                deleteHistoryItem(data: data, moodSnap: moodSnap)
+                                                data.moodSnaps = deleteHistoryItem(data: data, moodSnap: moodSnap)
                                                 data.startProcessing()
                                             }
                                         }

diff --git a/MoodSnap/MainViews/EventView.swift b/MoodSnap/MainViews/EventView.swift
@@ -39,7 +39,7 @@ struct EventView: View {
                     withAnimation {
                         data.stopProcessing()
                         moodSnap.snapType = .event
-                        deleteHistoryItem(data: data, moodSnap: moodSnap)
+                        data.moodSnaps = deleteHistoryItem(data: data, moodSnap: moodSnap)
                         data.moodSnaps.append(moodSnap)
                         data.moodSnaps = sortByDate(moodSnaps: data.moodSnaps)
                         data.startProcessing()

diff --git a/MoodSnap/MainViews/MediaView.swift b/MoodSnap/MainViews/MediaView.swift
@@ -28,7 +28,7 @@ struct MediaView: View {
                                 if data.settings.saveMediaToCameraRoll {
                                     UIImageWriteToSavedPhotosAlbum(image!, nil, nil, nil)
                                 }
-                                deleteHistoryItem(data: data, moodSnap: moodSnap)
+                                data.moodSnaps = deleteHistoryItem(data: data, moodSnap: moodSnap)
                                 data.moodSnaps.append(moodSnap)
                                 data.moodSnaps = sortByDate(moodSnaps: data.moodSnaps)
                             }

diff --git a/MoodSnap/MainViews/MoodSnapView.swift b/MoodSnap/MainViews/MoodSnapView.swift
@@ -161,7 +161,7 @@ struct MoodSnapView: View {
                         withAnimation {
                             data.stopProcessing()
                             moodSnap.snapType = .mood
-                            deleteHistoryItem(data: data, moodSnap: moodSnap)
+                            data.moodSnaps = deleteHistoryItem(data: data, moodSnap: moodSnap)
                             data.moodSnaps.append(moodSnap)
                             data.moodSnaps = sortByDate(moodSnaps: data.moodSnaps)
                             data.settings.addedSnaps += 1

diff --git a/MoodSnap/MainViews/NoteView.swift b/MoodSnap/MainViews/NoteView.swift
@@ -35,7 +35,7 @@ struct NoteView: View {
                     withAnimation {
                         data.stopProcessing()
                         moodSnap.snapType = .note
-                        deleteHistoryItem(data: data, moodSnap: moodSnap)
+                        data.moodSnaps = deleteHistoryItem(data: data, moodSnap: moodSnap)
                         data.moodSnaps.append(moodSnap)
                         data.moodSnaps = sortByDate(moodSnaps: data.moodSnaps)
                         data.startProcessing()