Merge pull request #2 from marty-suzuki/refactor

Refactor

ArtShredder/AR/ARViewController.swift

@@ -39,7 +39,7 @@ final class ARViewController: UIViewController {
     }
     @IBOutlet private(set) weak var selectImageButton: UIButton! {
         didSet {
-            let title = NSLocalizedString("select_to_add_art_title", comment: "")
+            let title = LocalizedString.selectToAddArtTitle
             selectImageButton.setTitle(title, for: .normal)
             selectImageButton.layer.borderWidth = 2
             selectImageButton.layer.borderColor = UIColor.white.cgColor
@@ -55,8 +55,7 @@ final class ARViewController: UIViewController {
     }
     @IBOutlet private(set) weak var noRecognitionLabel: UILabel! {
         didSet {
-            let title = NSLocalizedString("ar_no_recognition_text", comment: "")
-            noRecognitionLabel.text = title
+            noRecognitionLabel.text = LocalizedString.arNoRecognitionText
         }
     }
 
@@ -70,8 +69,8 @@ final class ARViewController: UIViewController {
     }()
 
     private lazy var presenter = ARPresenter(view: self)
-    private lazy var delegateProxy = ARViewDelegateProxy(presenter: presenter,
-                                                         pointOfView: { [weak self] in self?.sceneView.pointOfView })
+    private lazy var delegateHandler = ARViewDelegateHandler(presenter: presenter,
+                                                             pointOfView: { [weak self] in self?.sceneView.pointOfView })
 
     override var prefersStatusBarHidden: Bool {
         return true
@@ -90,8 +89,8 @@ final class ARViewController: UIViewController {
 
         presenter.reflect()
 
-        bannerView.delegate = delegateProxy
-        sceneView.delegate = delegateProxy
+        bannerView.delegate = delegateHandler
+        sceneView.delegate = delegateHandler
         sceneView.scene = SCNScene()
         sceneView.debugOptions = .showFeaturePoints
 
@@ -120,7 +119,7 @@ final class ARViewController: UIViewController {
         if UIImagePickerController.isSourceTypeAvailable(.photoLibrary) {
             let picker = UIImagePickerController()
             picker.sourceType = .photoLibrary
-            picker.delegate = delegateProxy
+            picker.delegate = delegateHandler
             picker.modalPresentationStyle = .overFullScreen
             present(picker, animated: true, completion: nil)
         }

ArtShredder/AR/ARViewDelegateProxy.swift → ArtShredder/AR/ARViewDelegateHandler.swift

@@ -1,5 +1,5 @@
 //
-//  ARViewDelegateProxy.swift
+//  ARViewDelegateHandler.swift
 //  ArtShredder
 //
 //  Created by marty-suzuki on 2018/10/19.
@@ -11,7 +11,7 @@ import GoogleMobileAds
 import SceneKit
 import UIKit
 
-final class ARViewDelegateProxy: NSObject {
+final class ARViewDelegateHandler: NSObject {
     private let presenter: ARPresenter
     private let pointOfView: () -> SCNNode?
 
@@ -21,7 +21,7 @@ final class ARViewDelegateProxy: NSObject {
     }
 }
 
-extension ARViewDelegateProxy: UIImagePickerControllerDelegate, UINavigationControllerDelegate {
+extension ARViewDelegateHandler: UIImagePickerControllerDelegate, UINavigationControllerDelegate {
     func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) {
         presenter.setImage(info[.originalImage] as? UIImage)
 
@@ -31,7 +31,7 @@ extension ARViewDelegateProxy: UIImagePickerControllerDelegate, UINavigationCont
     }
 }
 
-extension ARViewDelegateProxy: ARSCNViewDelegate {
+extension ARViewDelegateHandler: ARSCNViewDelegate {
     func renderer(_ renderer: SCNSceneRenderer, didAdd node: SCNNode, for anchor: ARAnchor) {
         let semaphore = DispatchSemaphore(value: 1)
         DispatchQueue.main.async {
@@ -49,7 +49,7 @@ extension ARViewDelegateProxy: ARSCNViewDelegate {
     }
 }
 
-extension ARViewDelegateProxy: GADBannerViewDelegate {
+extension ARViewDelegateHandler: GADBannerViewDelegate {
     /// Tells the delegate an ad request loaded an ad.
     func adViewDidReceiveAd(_ bannerView: GADBannerView) {
         print("adViewDidReceiveAd")

ArtShredder/AppDelegate.swift

@@ -18,6 +18,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         GADMobileAds.configure(withApplicationID: AdMobConfig.make().appID)
+
+        self.window = {
+            let window = UIWindow(frame: UIScreen.main.bounds)
+            window.rootViewController = ShredderViewController()
+            window.makeKeyAndVisible()
+            return window
+        }()
         return true
     }
 

ArtShredder/Common/Extension/DispatchQueue.extension.swift

@@ -0,0 +1,28 @@
+//
+//  DispatchQueue.extension.swift
+//  ArtShredder
+//
+//  Created by marty-suzuki on 2018/12/03.
+//  Copyright © 2018年 marty-suzuki. All rights reserved.
+//
+
+import Foundation
+
+extension DispatchQueue: AdditionalCompatible {}
+
+extension Additional where Base: DispatchQueue {
+    func throttle(delay: DispatchTimeInterval) -> (_ action: @escaping () -> ()) -> () {
+        var lastFireTime: DispatchTime = .now()
+
+        return { [weak base, delay] action in
+            let deadline: DispatchTime = .now() + delay
+            base?.asyncAfter(deadline: deadline) { [delay] in
+                let now: DispatchTime = .now()
+                let when: DispatchTime = lastFireTime + delay
+                if now < when { return }
+                lastFireTime = .now()
+                action()
+            }
+        }
+    }
+}

ArtShredder/Extension/UIImage.extension.swift → ArtShredder/Common/Extension/UIImage.extension.swift

@@ -8,11 +8,8 @@
 
 import UIKit
 
-
-
 extension UIImage: AdditionalCompatible {}
 
-
 extension Additional where Base: UIImage {
     func fixedOrientation() -> UIImage {
         let imageOrientation = base.imageOrientation

ArtShredder/Common/GIFMaker.swift

@@ -0,0 +1,68 @@
+//
+//  GIFMaker.swift
+//  ArtShredder
+//
+//  Created by marty-suzuki on 2018/12/04.
+//  Copyright © 2018年 marty-suzuki. All rights reserved.
+//
+
+import CoreImage
+import Foundation
+import MobileCoreServices
+import UIKit
+
+protocol GIFMakerType: AnyObject {
+    var didCreateGIFWithURL: ((URL?) -> ())? { get set }
+    func create(with imageHolder: ImageHolder)
+}
+
+final class GIFMaker: GIFMakerType {
+
+    var didCreateGIFWithURL: ((URL?) -> ())?
+
+    private let queue: DispatchQueue
+
+    init(queue: DispatchQueue = .global()) {
+        self.queue = queue
+    }
+
+    func create(with imageHolder: ImageHolder) {
+        queue.async { [weak self] in
+            let images = imageHolder.images
+            let filename = imageHolder.filename
+
+            guard
+                let url = NSURL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent(filename),
+                let destination = CGImageDestinationCreateWithURL(url as CFURL, kUTTypeGIF, images.count, nil)
+            else {
+                self?.didCreateGIFWithURL?(nil)
+                return
+            }
+
+            let delay = imageHolder.delay
+
+            let properties = [kCGImagePropertyGIFDictionary as String: [kCGImagePropertyGIFLoopCount as String: 0]]
+            CGImageDestinationSetProperties(destination, properties as CFDictionary)
+
+            let frameProperties = [kCGImagePropertyGIFDictionary as String: [kCGImagePropertyGIFDelayTime as String: delay]]
+            for image in images {
+                if let cgImage = image.cgImage {
+                    CGImageDestinationAddImage(destination, cgImage, frameProperties as CFDictionary)
+                }
+            }
+
+            guard CGImageDestinationFinalize(destination) else {
+                self?.didCreateGIFWithURL?(nil)
+                return
+            }
+
+            self?.didCreateGIFWithURL?(url)
+        }
+    }
+}
+
+struct ImageHolder {
+    let images: [UIImage]
+    let delay: TimeInterval
+    let filename: String
+}

ArtShredder/Common/LocalizedString.swift

@@ -0,0 +1,29 @@
+//
+//  LocalizedString.swift
+//  ArtShredder
+//
+//  Created by marty-suzuki on 2018/10/27.
+//  Copyright © 2018年 marty-suzuki. All rights reserved.
+//
+
+import Foundation
+
+enum LocalizedString {
+    static let frameDescription = NSLocalizedString("frame_description", comment: "")
+    static let selectImageName = NSLocalizedString("select_image_name", comment: "")
+    static let saveGIFButton = NSLocalizedString("save_gif_button", comment: "")
+    static let saveImageButton = NSLocalizedString("save_image_button", comment: "")
+    static let didSaveToCameraRollTitle = NSLocalizedString("did_save_to_camera_roll_title", comment: "")
+    static let didSaveToCameraRollMessage = NSLocalizedString("did_save_to_camera_roll_message", comment: "")
+    static let closeAction = NSLocalizedString("close_action", comment: "")
+    static let imageSourceSelectTitle = NSLocalizedString("image_source_select_title", comment: "")
+    static let imageSourceSelectMessage = NSLocalizedString("image_source_select_message", comment: "")
+    static let imageSourceSelectCamera = NSLocalizedString("image_source_select_camera", comment: "")
+    static let imageSourceSelectCameraRoll = NSLocalizedString("image_source_select_camera_roll", comment: "")
+    static let cancelAction = NSLocalizedString("cancel_action", comment: "")
+    static let supportURL = NSLocalizedString("support_url", comment: "")
+    static let supprotTitle = NSLocalizedString("supprot_title", comment: "")
+    static let selectToAddArtTitle = NSLocalizedString("select_to_add_art_title", comment: "")
+    static let arModeTitle = NSLocalizedString("ar_mode_title", comment: "")
+    static let arNoRecognitionText = NSLocalizedString("ar_no_recognition_text", comment: "")
+}