add store images service

bzec · bzec · commit 403c7678c50d · 2022-04-05T21:30:37.000+02:00
diff --git a/ImagesDefault.swift b/ImagesDefault.swift
@@ -0,0 +1,43 @@
+//
+//  ImagesDefault.swift
+//  PicturesViewer
+//
+//  Created by Bryan Zec on 30/03/2022.
+//
+
+import Foundation
+import SwiftUI
+
+class ImagesDefault {
+    private static var defaults = UserDefaults.standard
+
+    static func load() -> Array<UIImage> {
+        var list : Array<UIImage> = []
+        if let savedImg = defaults.object(forKey: "SavedImage") as? Data {
+            let decoder = JSONDecoder()
+            if let loadedImgs = try? decoder.decode([Data].self, from: savedImg) {
+                var listImages : Array<UIImage> = []
+                loadedImgs.forEach { im in
+                    listImages.append(UIImage(data: im)!)
+                }
+                list = listImages
+            }
+        }
+        return list
+
+    }
+    
+    static func save(images: Array<UIImage>) {
+       
+        var imagesEncode: [Data] = []
+        images.forEach { image in
+            let imageData: Data = image.pngData()!
+            // let strBase64 = imageData.base64EncodedString(options: .lineLength64Characters)
+            imagesEncode.append(imageData)
+        }
+        let encoder = JSONEncoder()
+        if let encoded = try? encoder.encode(imagesEncode) {
+            defaults.set(encoded, forKey: "SavedImage")
+        }
+    }
+}
diff --git a/ImagesStore.swift b/ImagesStore.swift
@@ -0,0 +1,80 @@
+//
+//  ImagesStore.swift
+//  PicturesViewer
+//
+//  Created by Bryan Zec on 30/03/2022.
+//
+
+import Foundation
+import SwiftUI
+
+class ImageStore: ObservableObject {
+    @Published var images: Array<UIImage> = []
+    
+    private static func fileURL() throws -> URL {
+        try FileManager.default.url(for: .documentDirectory,
+                                       in: .userDomainMask,
+                                       appropriateFor: nil,
+                                       create: false)
+            .appendingPathComponent("images.data")
+    }
+    
+    static func load(completion: @escaping (Result<Array<UIImage>, Error>)->Void) {
+        DispatchQueue.global(qos: .background).async {
+            do {
+                let fileURL = try fileURL()
+                guard let file = try? FileHandle(forReadingFrom: fileURL) else {
+                    DispatchQueue.main.async {
+                        completion(.success([]))
+                    }
+                    return
+                }
+                
+                let listImagesData = try JSONDecoder().decode(Array<Data>.self, from: file.availableData)
+
+                DispatchQueue.main.async {
+                    
+                    var listImages : Array<UIImage> = []
+                    listImagesData.forEach { im in
+                        listImages.append(UIImage(data: im)!)
+                    }
+                    completion(.success(listImages))
+                }
+            } catch {
+                DispatchQueue.main.async {
+                    completion(.failure(error))
+                }
+            }
+        }
+    }
+    
+    static func save(images: Array<UIImage>, completion: @escaping (Result<Int, Error>)->Void) {
+        DispatchQueue.global(qos: .background).async {
+            do {
+                print("on encode les images")
+
+                var imagesEncode: [Data] = []
+                images.forEach { image in
+                    let imageData: Data = image.pngData()!
+                    imagesEncode.append(imageData)
+                }
+                let data = try JSONEncoder().encode(imagesEncode)
+                print("on get le outfile")
+                let outfile = try fileURL()
+                try data.write(to: outfile)
+                print("write")
+                DispatchQueue.main.async {
+                    print("finish")
+
+                    completion(.success(imagesEncode.count))
+                }
+            } catch {
+                print("ERROR")
+
+                DispatchQueue.main.async {
+                    completion(.failure(error))
+                }
+            }
+        }
+    }
+}
diff --git a/PicturesViewer.xcodeproj/project.pbxproj b/PicturesViewer.xcodeproj/project.pbxproj
@@ -8,6 +8,8 @@
 
 /* Begin PBXBuildFile section */
 		3306F89927ED1A5000EF602D /* ModalImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3306F89827ED1A5000EF602D /* ModalImageView.swift */; };
+		33B29C8127F4F25200910A69 /* ImagesDefault.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33B29C8027F4F25200910A69 /* ImagesDefault.swift */; };
+		33B29C8327F4F64E00910A69 /* ImagesStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33B29C8227F4F64E00910A69 /* ImagesStore.swift */; };
 		33B2B20227E9112E00F8D6BB /* PicturesViewerApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33B2B20127E9112E00F8D6BB /* PicturesViewerApp.swift */; };
 		33B2B20427E9112E00F8D6BB /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33B2B20327E9112E00F8D6BB /* ContentView.swift */; };
 		33B2B20627E9113200F8D6BB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33B2B20527E9113200F8D6BB /* Assets.xcassets */; };
@@ -20,6 +22,8 @@
 
 /* Begin PBXFileReference section */
 		3306F89827ED1A5000EF602D /* ModalImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModalImageView.swift; sourceTree = "<group>"; };
+		33B29C8027F4F25200910A69 /* ImagesDefault.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagesDefault.swift; sourceTree = "<group>"; };
+		33B29C8227F4F64E00910A69 /* ImagesStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagesStore.swift; sourceTree = "<group>"; };
 		33B2B1FE27E9112E00F8D6BB /* PicturesViewer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PicturesViewer.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		33B2B20127E9112E00F8D6BB /* PicturesViewerApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PicturesViewerApp.swift; sourceTree = "<group>"; };
 		33B2B20327E9112E00F8D6BB /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -45,6 +49,8 @@
 		33B2B1F527E9112E00F8D6BB = {
 			isa = PBXGroup;
 			children = (
+				33B29C8227F4F64E00910A69 /* ImagesStore.swift */,
+				33B29C8027F4F25200910A69 /* ImagesDefault.swift */,
 				3306F89827ED1A5000EF602D /* ModalImageView.swift */,
 				33D0C90827EA5ADB00A45147 /* ItemPictureView.swift */,
 				33B2B20027E9112E00F8D6BB /* PicturesViewer */,
@@ -153,9 +159,11 @@
 			buildActionMask = 2147483647;
 			files = (
 				3306F89927ED1A5000EF602D /* ModalImageView.swift in Sources */,
+				33B29C8127F4F25200910A69 /* ImagesDefault.swift in Sources */,
 				33B2B21027E9120000F8D6BB /* ListPicturesView.swift in Sources */,
 				33B2B21827E91E3F00F8D6BB /* PhotoPicker.swift in Sources */,
 				33B2B21427E914F800F8D6BB /* ButtonView.swift in Sources */,
+				33B29C8327F4F64E00910A69 /* ImagesStore.swift in Sources */,
 				33B2B20427E9112E00F8D6BB /* ContentView.swift in Sources */,
 				33D0C90927EA5ADB00A45147 /* ItemPictureView.swift in Sources */,
 				33B2B20227E9112E00F8D6BB /* PicturesViewerApp.swift in Sources */,
diff --git a/PicturesViewer.xcodeproj/xcuserdata/bzec.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/PicturesViewer.xcodeproj/xcuserdata/bzec.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -16,8 +16,8 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "14"
             endingLineNumber = "14"
-            landmarkName = "lastScale"
-            landmarkType = "24">
+            landmarkName = "ModalImageView"
+            landmarkType = "14">
          </BreakpointContent>
       </BreakpointProxy>
    </Breakpoints>
diff --git a/PicturesViewer/ButtonView.swift b/PicturesViewer/ButtonView.swift
@@ -9,9 +9,11 @@ import SwiftUI
 
 struct ButtonView: View {
     @State private var showPhotoSheet = false
-    @Binding var images:  Array<UIImage>?
+    @Binding var images:  Array<UIImage>
     @Binding var imageIndex : Int
 
+    let saveAction: ()->Void
+
     var body: some View {
         VStack {
           Button(action: { showPhotoSheet = true }) {
@@ -24,8 +26,9 @@ struct ButtonView: View {
                   print(error)
                 }
                   if imagesOrNil != nil {
-                      images = imagesOrNil
+                      images = imagesOrNil!
                       imageIndex = 0
+                      saveAction()
                   }
               }
             }
@@ -36,11 +39,11 @@ struct ButtonView: View {
 }
 
 struct ButtonView_Previews: PreviewProvider {
-    @State static var prev: Array<UIImage>? = []
+    @State static var prev: Array<UIImage> = []
     @State static var index = 0
 
     static var previews: some View {
-        ButtonView(images : $prev, imageIndex: $index)
+        ButtonView(images : $prev, imageIndex: $index, saveAction: {})
     }
 }
 
diff --git a/PicturesViewer/ContentView.swift b/PicturesViewer/ContentView.swift
@@ -8,21 +8,32 @@
 import SwiftUI
 
 struct ContentView: View {
-    @State private var images:  Array<UIImage>? = []
+    @Binding var images:  Array<UIImage>
     @State var imageIndex : Int = 0
+    @Environment(\.scenePhase) private var scenePhase
+    let saveAction: ()->Void
 
     var body: some View {
         HStack{
             VStack{
                 ListPicturesView(images: $images, imageIndex: $imageIndex)
-                ButtonView(images: $images, imageIndex: $imageIndex)
+                ButtonView(images: $images, imageIndex: $imageIndex) {
+                    saveAction()
+                }
             }
         }
+        /*
+        .onChange(of: scenePhase) { phase in
+            if phase == .inactive { saveAction() }
+        }
+         */
     }
 }
 
 struct ContentView_Previews: PreviewProvider {
+    @State static var prev: Array<UIImage> = []
+
     static var previews: some View {
-        ContentView()
+        ContentView(images: $prev, saveAction: {})
     }
 }
diff --git a/PicturesViewer/ListPicturesView.swift b/PicturesViewer/ListPicturesView.swift
@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct ListPicturesView: View {
-    @Binding var images : Array<UIImage>!
+    @Binding var images : Array<UIImage>
     @Binding var imageIndex : Int
 
     @State var isFullScreen : Bool = false;
@@ -58,7 +58,7 @@ struct ListPicturesView: View {
 }
 
 struct ListPicturesView_Previews: PreviewProvider {
-    @State static var prev: Array<UIImage>? = []
+    @State static var prev: Array<UIImage> = []
     @State static var index = 0
     
     static var previews: some View {
diff --git a/PicturesViewer/PicturesViewerApp.swift b/PicturesViewer/PicturesViewerApp.swift
@@ -9,9 +9,28 @@ import SwiftUI
 
 @main
 struct PicturesViewerApp: App {
+    @StateObject private var store = ImageStore()
+
     var body: some Scene {
         WindowGroup {
-            ContentView()
+            ContentView(images: $store.images){
+                ImageStore.save(images: store.images) { result in
+                    if case .failure(let error) = result {
+                        fatalError(error.localizedDescription)
+                    }
+                }
+                
+            }
+            .onAppear {
+                    ImageStore.load { result in
+                        switch result {
+                        case .failure(let error):
+                            fatalError(error.localizedDescription)
+                        case .success(let imgs):
+                            store.images = imgs
+                        }
+                    }
+                }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,11 @@ import SwiftUI`
`9`	`9`
`10`	`10`	`struct ButtonView: View {`
`11`	`11`	`@State private var showPhotoSheet = false`
`12`		`- @Binding var images: Array<UIImage>?`
	`12`	`+ @Binding var images: Array<UIImage>`
`13`	`13`	`@Binding var imageIndex : Int`
`14`	`14`
	`15`	`+ let saveAction: ()->Void`
	`16`	`+`
`15`	`17`	`var body: some View {`
`16`	`18`	`VStack {`
`17`	`19`	`Button(action: { showPhotoSheet = true }) {`
`@@ -24,8 +26,9 @@ struct ButtonView: View {`
`24`	`26`	`print(error)`
`25`	`27`	`}`
`26`	`28`	`if imagesOrNil != nil {`
`27`		`- images = imagesOrNil`
	`29`	`+ images = imagesOrNil!`
`28`	`30`	`imageIndex = 0`
	`31`	`+ saveAction()`
`29`	`32`	`}`
`30`	`33`	`}`
`31`	`34`	`}`
`@@ -36,11 +39,11 @@ struct ButtonView: View {`
`36`	`39`	`}`
`37`	`40`
`38`	`41`	`struct ButtonView_Previews: PreviewProvider {`
`39`		`- @State static var prev: Array<UIImage>? = []`
	`42`	`+ @State static var prev: Array<UIImage> = []`
`40`	`43`	`@State static var index = 0`
`41`	`44`
`42`	`45`	`static var previews: some View {`
`43`		`- ButtonView(images : $prev, imageIndex: $index)`
	`46`	`+ ButtonView(images : $prev, imageIndex: $index, saveAction: {})`
`44`	`47`	`}`
`45`	`48`	`}`
`46`	`49`
Original file line number	Diff line number	Diff line change
`@@ -8,21 +8,32 @@`
`8`	`8`	`import SwiftUI`
`9`	`9`
`10`	`10`	`struct ContentView: View {`
`11`		`- @State private var images: Array<UIImage>? = []`
	`11`	`+ @Binding var images: Array<UIImage>`
`12`	`12`	`@State var imageIndex : Int = 0`
	`13`	`+ @Environment(\.scenePhase) private var scenePhase`
	`14`	`+ let saveAction: ()->Void`
`13`	`15`
`14`	`16`	`var body: some View {`
`15`	`17`	`HStack{`
`16`	`18`	`VStack{`
`17`	`19`	`ListPicturesView(images: $images, imageIndex: $imageIndex)`
`18`		`- ButtonView(images: $images, imageIndex: $imageIndex)`
	`20`	`+ ButtonView(images: $images, imageIndex: $imageIndex) {`
	`21`	`+ saveAction()`
	`22`	`+ }`
`19`	`23`	`}`
`20`	`24`	`}`
	`25`	`+ /*`
	`26`	`+ .onChange(of: scenePhase) { phase in`
	`27`	`+ if phase == .inactive { saveAction() }`
	`28`	`+ }`
	`29`	`+ */`
`21`	`30`	`}`
`22`	`31`	`}`
`23`	`32`
`24`	`33`	`struct ContentView_Previews: PreviewProvider {`
	`34`	`+ @State static var prev: Array<UIImage> = []`
	`35`	`+`
`25`	`36`	`static var previews: some View {`
`26`		`- ContentView()`
	`37`	`+ ContentView(images: $prev, saveAction: {})`
`27`	`38`	`}`
`28`	`39`	`}`