favorites fix

iOS-vk-education · May 21, 2024 · 243a213 · 243a213
1 parent 9e7921d
commit 243a213
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 23 deletions.
diff --git a/LiveRecipes/Localizable.xcstrings b/LiveRecipes/Localizable.xcstrings
@@ -2886,7 +2886,20 @@
 
     },
     "Да" : {
-
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Yes"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Да"
+          }
+        }
+      }
     },
     "Дессерт" : {
       "extractionState" : "manual",
@@ -2960,13 +2973,39 @@
       }
     },
     "Отмена" : {
-
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Cancel"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "needs_review",
+            "value" : "Отмена"
+          }
+        }
+      }
     },
     "Очистить избранное?" : {
 
     },
     "Очистить мои рецепты?" : {
-
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Clear my recipes?"
+          }
+        },
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Очистить мои рецепты?"
+          }
+        }
+      }
     },
     "Первое блюдо" : {
       "extractionState" : "manual",

diff --git a/LiveRecipes/Modules/Cooking/AnimatedElements/BlinkingText + TimerView.swift b/LiveRecipes/Modules/Cooking/AnimatedElements/BlinkingText + TimerView.swift
@@ -46,6 +46,7 @@ struct TimerView: View {
 
     @State var timeForProgress: Int
     @State var activityStarted: Bool = false
+    @State var identifier = ""
 
     var step: String?
     var stepsCount: Int?
@@ -62,8 +63,9 @@ struct TimerView: View {
         return (hours, minutes, seconds)
     }
 
-    func addNotification(time: Double, title: String) {
+    func addNotification(time: Double, title: String) -> String {
         let center = UNUserNotificationCenter.current()
+        let identifier = UUID().uuidString
 
         let addRequest = {
             let content = UNMutableNotificationContent()
@@ -78,24 +80,35 @@ struct TimerView: View {
 
             let trigger = UNTimeIntervalNotificationTrigger(timeInterval: time, repeats: false)
 
-            let request = UNNotificationRequest(identifier: UUID().uuidString, content: content, trigger: trigger)
+            let request = UNNotificationRequest(identifier: identifier, content: content, trigger: trigger)
             center.add(request)
             print("add")
+
         }
+        addRequest()
+        return identifier
+
+
 
-        center.getNotificationSettings { settings in
-            if settings.authorizationStatus == .authorized {
-                addRequest()
-            } else {
-                center.requestAuthorization(options: [.alert, .badge, .sound]) { success, _ in
-                    if success {
-                        addRequest()
-                    } else {
-                        print("Authorization declined")
-                    }
-                }
-            }
-        }
+//        center.getNotificationSettings { settings in
+//            if settings.authorizationStatus == .authorized {
+//                addRequest()
+//            } else {
+//                center.requestAuthorization(options: [.alert, .badge, .sound]) { success, _ in
+//                    if success {
+//                        addRequest()
+//                    } else {
+//                        print("Authorization declined")
+//                    }
+//                }
+//            }
+//        }
+    }
+
+    func removeNotification(identifier: String) {
+        let center = UNUserNotificationCenter.current()
+        center.removePendingNotificationRequests(withIdentifiers: [identifier])
+        print("remove")
     }
 
     func notify() -> Void {
@@ -114,6 +127,7 @@ struct TimerView: View {
     }
 
     func stopActivity() {
+        removeNotification(identifier: identifier)
         Task {
             await currentActivity?.end(nil, dismissalPolicy: .immediate)
             activityStarted = false
@@ -123,9 +137,7 @@ struct TimerView: View {
     func updateActivity() {
         Task {
             let state = TimerAttributes.TimeState(progress: progress, totalTime: totalTime, timeRemaining: timeForProgress, currentStep: step ?? "", stepsCount: stepsCount ?? 0, interval: nil)
-            //await currentActivity?.update(using: state)
             await currentActivity?.update(ActivityContent<TimerAttributes.TimeState>(state: state, staleDate: nil))
-            //await currentActivity?.update(using: state)
         }
     }
 
@@ -204,7 +216,7 @@ struct TimerView: View {
                 Spacer()
 
                 Button(action: {
-                    addNotification(time: Double(totalTime), title: "LiveRecipes")
+                    identifier = addNotification(time: Double(totalTime), title: "LiveRecipes")
                     isTimerRunning.toggle()
                     if activityStarted {
                        // updateActivity()

diff --git a/LiveRecipes/Modules/Recipes/Components/RecipeBigCardView.swift b/LiveRecipes/Modules/Recipes/Components/RecipeBigCardView.swift
@@ -26,6 +26,13 @@ struct RecipeBigCardView: View {
                             .frame(width: UIScreen.main.bounds.width - 24, height: 170)
                             .clipped()
                     }
+                    else {
+                        Image("mockDishImage")
+                            .resizable()
+                            .scaledToFill()
+                            .frame(width: UIScreen.main.bounds.width - 24, height: 170)
+                            .clipped()
+                    }
                     VStack {
                         HStack {
                             Text(recipe.name)

diff --git a/LiveRecipes/Modules/Recipes/Components/RecipeCardView.swift b/LiveRecipes/Modules/Recipes/Components/RecipeCardView.swift
@@ -27,6 +27,13 @@ struct RecipeCardView: View {
                             .frame(width: 180, height: 110)
                             .clipped()
                     }
+                    else {
+                        Image("mockDishImage")
+                            .resizable()
+                            .scaledToFill()
+                            .frame(width: 180, height: 110)
+                            .clipped()
+                    }
                     VStack{
                         HStack {
                             Text(recipe.name)

diff --git a/LiveRecipes/Modules/Recipes/RecipesView.swift b/LiveRecipes/Modules/Recipes/RecipesView.swift
@@ -12,6 +12,7 @@ import UserNotifications
 
 struct RecipesView: View {
     @StateObject var viewModel: RecipesViewModel
+    @Environment(\.presentationMode) var presentationMode
 
     var body: some View {
         NavigationView {

diff --git a/LiveRecipes/Modules/Recipes/RecipesViewModel.swift b/LiveRecipes/Modules/Recipes/RecipesViewModel.swift
@@ -329,8 +329,7 @@ final class RecipesViewModel: ObservableObject, RecipesViewModelProtocol {
         favoritesID = UserDefaults.standard.array(forKey: "favoritesID") as? [Int] ?? []
         coreData.fetch { dishes in
             for dish in dishes {
-                if self.favoritesID.contains(dish.netId) {
-
+                if recipe.id == dish.id {
                     if let index = self.favoritesID.firstIndex(of: dish.netId) {
                         self.favoritesID.remove(at: index)
                         UserDefaults.standard.setValue(self.favoritesID, forKey: "favoritesID")