Merge pull request #4 from easydev991/develop

Доработки бэкапа

Author: easydev991

SwiftUI-Days/Extensions/Binding+mappedToBool.swift

@@ -0,0 +1,28 @@
+//
+//  Binding+mappedToBool.swift
+//  SwiftUI-Days
+//
+//  Created by Oleg991 on 06.04.2025.
+//
+
+import SwiftUI
+
+extension Binding<Bool> {
+    init(bindingOptional: Binding<(some Sendable)?>) {
+        self.init(
+            get: { bindingOptional.wrappedValue != nil },
+            set: { newValue in
+                guard newValue == false else { return }
+                /// Обрабатываем только значение `false`, чтобы обнулить опционал,
+                /// потому что не можем восстановить предыдущее состояние опционала для значения `true`
+                bindingOptional.wrappedValue = nil
+            }
+        )
+    }
+}
+
+extension Binding {
+    func mappedToBool<Wrapped: Sendable>() -> Binding<Bool> where Value == Wrapped? {
+        Binding<Bool>(bindingOptional: self)
+    }
+}

SwiftUI-Days/Models/BackupFileDocument.swift

@@ -11,7 +11,7 @@ import UniformTypeIdentifiers
 struct BackupFileDocument: FileDocument {
     static var readableContentTypes: [UTType] { [.json] }
     static var writableContentTypes: [UTType] { [.json] }
-    static func makeBackupItem(with item: Item) -> BackupItem {
+    static func toBackupItem(item: Item) -> BackupItem {
         .init(title: item.title, details: item.details, timestamp: item.timestamp)
     }
 
@@ -35,7 +35,7 @@ struct BackupFileDocument: FileDocument {
 }
 
 extension BackupFileDocument {
-    struct BackupItem: Codable {
+    struct BackupItem: Codable, Hashable {
         let title: String
         let details: String
         let timestamp: Date

SwiftUI-Days/Models/Item.swift

@@ -28,6 +28,10 @@ final class Item {
             to: .now
         ).day ?? 0
     }
+    
+    var backupItem: BackupFileDocument.BackupItem {
+        .init(title: title, details: details, timestamp: timestamp)
+    }
 }
 
 extension Item {

SwiftUI-Days/Screens/Main/MainScreen.swift

@@ -14,9 +14,10 @@ struct MainScreen: View {
     @AppStorage("listSortOrder") private var sortOrder = SortOrder.forward.rawValue
     @State private var searchQuery = ""
     @State private var editItem: Item?
+    @State private var path = NavigationPath()
 
     var body: some View {
-        NavigationStack {
+        NavigationStack(path: $path) {
             ZStack {
                 if items.isEmpty {
                     emptyView.transition(.scale.combined(with: .opacity))
@@ -25,6 +26,7 @@ struct MainScreen: View {
                 }
             }
             .animation(.bouncy, value: items.isEmpty)
+            .toolbar(path.isEmpty ? .automatic : .hidden, for: .tabBar)
             .navigationTitle("Events")
         }
         .sheet(isPresented: $showAddItemSheet) {

SwiftUI-Days/Screens/More/AppDataScreen.swift

@@ -14,13 +14,14 @@ struct AppDataScreen: View {
     @State private var showDeleteDataConfirmation = false
     @State private var isCreatingBackup = false
     @State private var isRestoringFromBackup = false
-    @State private var showResult = false
     @State private var operationResult: OperationResult?
 
     var body: some View {
         VStack(spacing: 16) {
             Group {
-                backupDataButton
+                if !items.isEmpty {
+                    backupDataButton
+                }
                 restoreDataButton
                 if !items.isEmpty {
                     removeAllDataButton
@@ -32,7 +33,7 @@ struct AppDataScreen: View {
         .animation(.default, value: items.isEmpty)
         .alert(
             operationResult?.title ?? "",
-            isPresented: $showResult,
+            isPresented: $operationResult.mappedToBool(),
             presenting: operationResult,
             actions: { _ in
                 Button("Ok") {}
@@ -51,7 +52,7 @@ struct AppDataScreen: View {
         .accessibilityIdentifier("backupDataButton")
         .fileExporter(
             isPresented: $isCreatingBackup,
-            document: BackupFileDocument(items: items.map(BackupFileDocument.makeBackupItem)),
+            document: BackupFileDocument(items: items.map(BackupFileDocument.toBackupItem)),
             contentType: .json,
             defaultFilename: "Days backup"
         ) { result in
@@ -61,7 +62,6 @@ struct AppDataScreen: View {
             case let .failure(error):
                 operationResult = .error(error.localizedDescription)
             }
-            showResult = true
         }
     }
 
@@ -77,21 +77,25 @@ struct AppDataScreen: View {
         ) { result in
             switch result {
             case let .success(urls):
-                if let url = urls.first,
-                   url.startAccessingSecurityScopedResource(),
-                   let data = try? Data(contentsOf: url),
-                   let importedItems = try? JSONDecoder().decode([BackupFileDocument.BackupItem].self, from: data) {
+                guard let url = urls.first, url.startAccessingSecurityScopedResource() else {
+                    operationResult = .failedToRestore
+                    return
+                }
+                do {
                     defer { url.stopAccessingSecurityScopedResource() }
-                    let mappedRealItems = importedItems.map(\.realItem)
-                    mappedRealItems.forEach { modelContext.insert($0) }
+                    let data = try Data(contentsOf: url)
+                    let importedItems = try JSONDecoder().decode([BackupFileDocument.BackupItem].self, from: data)
+                    let currentItems = items.map(\.backupItem)
+                    let newItemsFromBackup = importedItems.filter { !currentItems.contains($0) }
+                    newItemsFromBackup.forEach { modelContext.insert($0.realItem) }
+                    try modelContext.save()
                     operationResult = .restoreSuccess
-                } else {
+                } catch {
                     operationResult = .failedToRestore
                 }
             case let .failure(error):
                 operationResult = .error(error.localizedDescription)
             }
-            showResult = true
         }
     }
 
@@ -109,10 +113,11 @@ struct AppDataScreen: View {
             Button("Delete", role: .destructive) {
                 do {
                     try modelContext.delete(model: Item.self)
+                    try modelContext.save()
+                    operationResult = .deletionSuccess
                 } catch {
                     assertionFailure(error.localizedDescription)
                     operationResult = .error(error.localizedDescription)
-                    showResult = true
                 }
             }
             .accessibilityIdentifier("confirmRemoveAllDataButton")
@@ -124,12 +129,13 @@ extension AppDataScreen {
     private enum OperationResult: Equatable {
         case backupSuccess
         case restoreSuccess
+        case deletionSuccess
         case failedToRestore
         case error(String)
 
         var title: LocalizedStringKey {
             switch self {
-            case .backupSuccess, .restoreSuccess: "Done"
+            case .backupSuccess, .restoreSuccess, .deletionSuccess: "Done"
             case .failedToRestore, .error: "Error"
             }
         }
@@ -138,6 +144,7 @@ extension AppDataScreen {
             switch self {
             case .backupSuccess: "Backup data saved"
             case .restoreSuccess: "Data restored from backup"
+            case .deletionSuccess: "All data deleted"
             case .failedToRestore: "Unable to recover data from the selected file"
             case let .error(message): .init(message)
             }

SwiftUI-Days/SupportingFiles/Localizable.xcstrings

@@ -103,6 +103,16 @@
         }
       }
     },
+    "All data deleted" : {
+      "localizations" : {
+        "ru" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Все данные удалены"
+          }
+        }
+      }
+    },
     "App data" : {
       "localizations" : {
         "ru" : {