Move out some of the helper functions
- ID
5361a64- date
2023-06-08 09:27:00+00:00- author
Alex Chan <alex@alexwlchan.net>- parent
e6274b4- message
Move out some of the helper functions- changed files
Changed files
BlinkReviewer/BlinkReviewer.xcodeproj/project.pbxproj (24062) → BlinkReviewer/BlinkReviewer.xcodeproj/project.pbxproj (24646)
diff --git a/BlinkReviewer/BlinkReviewer.xcodeproj/project.pbxproj b/BlinkReviewer/BlinkReviewer.xcodeproj/project.pbxproj
index 2f0f404..d50c739 100644
--- a/BlinkReviewer/BlinkReviewer.xcodeproj/project.pbxproj
+++ b/BlinkReviewer/BlinkReviewer.xcodeproj/project.pbxproj
@@ -18,6 +18,7 @@
94D7511E2A31B243005859E7 /* PreviewImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94D7511D2A31B243005859E7 /* PreviewImage.swift */; };
94D751202A31B53E005859E7 /* AlbumInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94D7511F2A31B53E005859E7 /* AlbumInfo.swift */; };
94D751222A31BD8E005859E7 /* PhotoReviewer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94D751212A31BD8E005859E7 /* PhotoReviewer.swift */; };
+ 94D751292A31D629005859E7 /* Assets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94D751282A31D629005859E7 /* Assets.swift */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -53,6 +54,7 @@
94D7511D2A31B243005859E7 /* PreviewImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreviewImage.swift; sourceTree = "<group>"; };
94D7511F2A31B53E005859E7 /* AlbumInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlbumInfo.swift; sourceTree = "<group>"; };
94D751212A31BD8E005859E7 /* PhotoReviewer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoReviewer.swift; sourceTree = "<group>"; };
+ 94D751282A31D629005859E7 /* Assets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Assets.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -103,6 +105,7 @@
94D750EE2A31A796005859E7 /* BlinkReviewer */ = {
isa = PBXGroup;
children = (
+ 94D751272A31D61D005859E7 /* Photos */,
94D7511A2A31A7A6005859E7 /* Views */,
94D750EF2A31A796005859E7 /* BlinkReviewerApp.swift */,
94D750F12A31A796005859E7 /* ContentView.swift */,
@@ -149,6 +152,14 @@
path = Views;
sourceTree = "<group>";
};
+ 94D751272A31D61D005859E7 /* Photos */ = {
+ isa = PBXGroup;
+ children = (
+ 94D751282A31D629005859E7 /* Assets.swift */,
+ );
+ path = Photos;
+ sourceTree = "<group>";
+ };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -280,6 +291,7 @@
buildActionMask = 2147483647;
files = (
94D7511C2A31A7B1005859E7 /* ThumbnailItem.swift in Sources */,
+ 94D751292A31D629005859E7 /* Assets.swift in Sources */,
94D750F22A31A796005859E7 /* ContentView.swift in Sources */,
94D7511E2A31B243005859E7 /* PreviewImage.swift in Sources */,
94D750F02A31A796005859E7 /* BlinkReviewerApp.swift in Sources */,
BlinkReviewer/BlinkReviewer/ContentView.swift (512) → BlinkReviewer/BlinkReviewer/ContentView.swift (213)
diff --git a/BlinkReviewer/BlinkReviewer/ContentView.swift b/BlinkReviewer/BlinkReviewer/ContentView.swift
index e8955b6..905ad9c 100644
--- a/BlinkReviewer/BlinkReviewer/ContentView.swift
+++ b/BlinkReviewer/BlinkReviewer/ContentView.swift
@@ -6,21 +6,9 @@
//
import SwiftUI
-import Photos
struct ContentView: View {
- var allPhotos: [PHAsset] {
- var photos: [PHAsset] = []
-
- PHAsset.fetchAssets(with: PHAssetMediaType.image, options: nil)
- .enumerateObjects({ (asset, _, _) in
- photos.append(asset)
- })
-
- return photos
- }
-
var body: some View {
- PhotoReviewer(assets: allPhotos)
+ PhotoReviewer(assets: getAllPhotos())
}
}
BlinkReviewer/BlinkReviewer/Photos/Assets.swift (0) → BlinkReviewer/BlinkReviewer/Photos/Assets.swift (431)
diff --git a/BlinkReviewer/BlinkReviewer/Photos/Assets.swift b/BlinkReviewer/BlinkReviewer/Photos/Assets.swift
new file mode 100644
index 0000000..32fb9f1
--- /dev/null
+++ b/BlinkReviewer/BlinkReviewer/Photos/Assets.swift
@@ -0,0 +1,21 @@
+//
+// Assets.swift
+// BlinkReviewer
+//
+// Created by Alex Chan on 08/06/2023.
+//
+
+import Foundation
+import Photos
+
+/// Returns a list of all the images in the Photos Library.
+func getAllPhotos() -> [PHAsset] {
+ var photos: [PHAsset] = []
+
+ PHAsset.fetchAssets(with: PHAssetMediaType.image, options: nil)
+ .enumerateObjects({ (asset, _, _) in
+ photos.append(asset)
+ })
+
+ return photos
+}