redstrate/gallery
Archived
1
Fork 0
Code Activity

Improve swift safety

Browse source
This commit is contained in:
redstrate 2020-03-16 12:10:53 -04:00
parent 52e6ffc8d0
commit 1b7c66e206
5 changed files with 68 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Gallery/PostCollectionView.swift
View file

@ -69,6 +69,8 @@ class PostCollectionView: UICollectionView, UICollectionViewDataSource, UICollec
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "postCell", for: indexPath as IndexPath) as! PostViewCell
cell.name = post.value(forKey: "name") as? String
let imagePath = documentsPath.appendingPathComponent(post.value(forKey: "name") as! String).path
if(FileManager.default.fileExists(atPath: imagePath)) {
@ -279,8 +281,10 @@ class PostCollectionView: UICollectionView, UICollectionViewDataSource, UICollec
let model = posts[indexPath.item]
let itemProvider = NSItemProvider(object: (cellForItem(at: indexPath) as! PostViewCell).imageView.image!)
itemProvider.suggestedName = model.value(forKey: "name") as? String
let dragItem = UIDragItem(itemProvider: itemProvider)
dragItem.localObject = model //We can set the localObject property for convenience
return [dragItem]
let dragItem = UIDragItem(itemProvider: itemProvider)
dragItem.localObject = model //We can set the localObject property for convenience
return [dragItem]
}
}

1
Gallery/PostViewCell.swift
View file

@ -1,6 +1,7 @@
import UIKit
class PostViewCell: UICollectionViewCell {
var name: String?
@IBOutlet weak var imageView: UIImageView!
}

36
Gallery/PostViewController.swift
View file

@ -4,32 +4,34 @@ import AVFoundation
import AVKit
class PostViewController: UIViewController {
@IBOutlet weak var imageView: UIImageView!
@IBOutlet weak var imageView: UIImageView?
@IBOutlet weak var shareButton: UIBarButtonItem?
var post: NSManagedObject?
var image: UIImage?
var isPopup: Bool = false
@IBOutlet weak var shareButton: UIBarButtonItem!
let documentsPath : URL = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0].absoluteURL
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
if(image == nil) {
let imagePath = documentsPath.appendingPathComponent(post!.value(forKey: "name") as! String).path
if post != nil {
if image == nil {
let imagePath = documentsPath.appendingPathComponent(post!.value(forKey: "name") as! String).path
if((post?.value(forKey: "type") as? String) == "public.mpeg-4") {
self.image = generateThumbnail(path: URL(fileURLWithPath: imagePath))
} else {
self.image = UIImage(contentsOfFile: imagePath)
if((post?.value(forKey: "type") as? String) == "public.mpeg-4") {
self.image = generateThumbnail(path: URL(fileURLWithPath: imagePath))
} else {
self.image = UIImage(contentsOfFile: imagePath)
}
}
}
imageView.image = self.image
imageView?.image = self.image
if(isPopup) {
navigationItem.leftBarButtonItem = UIBarButtonItem(title: "Done", style: .plain, target: self, action: #selector(closePopup))
if(isPopup) {
navigationItem.leftBarButtonItem = UIBarButtonItem(title: "Done", style: .plain, target: self, action: #selector(closePopup))
}
}
}
@ -50,11 +52,15 @@ class PostViewController: UIViewController {
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
if segue.identifier == "showTags" {
let newViewController = segue.destination as! EditTagsViewController
guard let newViewController = segue.destination as? EditTagsViewController else {
return
}
newViewController.post = self.post as? Post
} else if segue.identifier == "showInfo" {
let newViewController = segue.destination as! InfoViewController
guard let newViewController = segue.destination as? InfoViewController else {
return
}
newViewController.post = self.post as? Post
newViewController.image = self.image
@ -87,6 +93,7 @@ extension PostViewController {
#if targetEnvironment(macCatalyst)
private let EditButtonToolbarIdentifier = NSToolbarItem.Identifier(rawValue: "OurButton")
private let ShareButtonToolbarIdentifier = NSToolbarItem.Identifier(rawValue: "OurButton2")
private let InfoButtonToolbarIdentifier = NSToolbarItem.Identifier(rawValue: "OurButton3")
@ -144,4 +151,5 @@ extension PostViewController: NSToolbarDelegate {
return nil
}
}
#endif

43
Gallery/SceneDelegate.swift
View file

@ -12,34 +12,21 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
}
#if targetEnvironment(macCatalyst)
guard let windowScene = (scene as? UIWindowScene) else { return }
let toolbar = NSToolbar(identifier: "MyToolbar")
toolbar.delegate = (window?.rootViewController as! UINavigationController).topViewController as? NSToolbarDelegate
windowScene.titlebar!.toolbar = toolbar
windowScene.titlebar!.titleVisibility = .hidden
toolbar.allowsUserCustomization = true
guard let windowScene = (scene as? UIWindowScene) else {
return
}
(window?.rootViewController as! UINavigationController).navigationBar.isHidden = true
let toolbar = NSToolbar(identifier: "Toolbar")
toolbar.delegate = (window?.rootViewController as! UINavigationController).topViewController as? NSToolbarDelegate
toolbar.allowsUserCustomization = true
windowScene.titlebar!.toolbar = toolbar
windowScene.titlebar!.titleVisibility = .hidden
(window?.rootViewController as! UINavigationController).navigationBar.isHidden = true
#endif
}
func sceneDidDisconnect(_ scene: UIScene) {
}
func sceneDidBecomeActive(_ scene: UIScene) {
}
func sceneWillResignActive(_ scene: UIScene) {
}
func sceneWillEnterForeground(_ scene: UIScene) {
}
func sceneDidEnterBackground(_ scene: UIScene) {
(UIApplication.shared.delegate as? AppDelegate)?.saveContext()
}
@ -48,14 +35,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
if activity.activityType == "post" {
if let photoID = activity.userInfo?["name"] as? String {
if let photoDetailViewController = PostViewController.loadFromStoryboard() {
guard let appDelegate =
UIApplication.shared.delegate as? AppDelegate else {
return false
}
let managedContext =
appDelegate.persistentContainer.viewContext
let managedContext = appDelegate.persistentContainer.viewContext
let request = NSFetchRequest<NSFetchRequestResult>(entityName: "Post")
@ -65,7 +50,11 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
do {
let result = try managedContext.fetch(request)
photoDetailViewController.post = result[0] as? NSManagedObject
guard let object = result[0] as? NSManagedObject else {
return false
}
photoDetailViewController.post = object
photoDetailViewController.isPopup = true
if let navigationController = window?.rootViewController as? UINavigationController {

20
Gallery/ViewController.swift
View file

@ -83,19 +83,23 @@ class ViewController: UIViewController, UIDocumentPickerDelegate {
override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool {
if identifier == "showPost" {
#if targetEnvironment(macCatalyst)
let index = self.collectionView.indexPathsForSelectedItems?.first
guard let cell = sender as? PostViewCell else {
return false
}
let post = self.collectionView.posts[index!.row]
guard let name = cell.name else {
return false
}
let activity = NSUserActivity(activityType: "post")
activity.userInfo = ["name": post.value(forKey: "name") as! String]
activity.isEligibleForHandoff = true
let activity = NSUserActivity(activityType: "post")
activity.userInfo = ["name": name]
activity.isEligibleForHandoff = true
UIApplication.shared.requestSceneSessionActivation(nil, userActivity: activity, options: nil, errorHandler: nil)
UIApplication.shared.requestSceneSessionActivation(nil, userActivity: activity, options: nil, errorHandler: nil)
return false
return false
#else
return true
return true
#endif
}