don’t show the names of meta-albums
- ID
6a0293e- date
2023-06-08 14:33:48+00:00- author
Alex Chan <alex@alexwlchan.net>- parent
32918c6- message
don't show the names of meta-albums- changed files
2 files, 30 additions, 9 deletions
Changed files
BlinkReviewer/BlinkReviewer.xcodeproj/project.pbxproj (25136) → BlinkReviewer/BlinkReviewer.xcodeproj/project.pbxproj (26183)
diff --git a/BlinkReviewer/BlinkReviewer.xcodeproj/project.pbxproj b/BlinkReviewer/BlinkReviewer.xcodeproj/project.pbxproj
index fa11309..3f1c650 100644
--- a/BlinkReviewer/BlinkReviewer.xcodeproj/project.pbxproj
+++ b/BlinkReviewer/BlinkReviewer.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
+ 94D2C8B92A320E6F00BEE15B /* ReviewState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94D2C8B82A320E6F00BEE15B /* ReviewState.swift */; };
+ 94D2C8BB2A320EFD00BEE15B /* SwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94D2C8BA2A320EFD00BEE15B /* SwiftUIView.swift */; };
94D750F02A31A796005859E7 /* BlinkReviewerApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94D750EF2A31A796005859E7 /* BlinkReviewerApp.swift */; };
94D750F22A31A796005859E7 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94D750F12A31A796005859E7 /* ContentView.swift */; };
94D750F42A31A797005859E7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 94D750F32A31A797005859E7 /* Assets.xcassets */; };
@@ -40,6 +42,8 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
+ 94D2C8B82A320E6F00BEE15B /* ReviewState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewState.swift; sourceTree = "<group>"; };
+ 94D2C8BA2A320EFD00BEE15B /* SwiftUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIView.swift; sourceTree = "<group>"; };
94D750EC2A31A796005859E7 /* BlinkReviewer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BlinkReviewer.app; sourceTree = BUILT_PRODUCTS_DIR; };
94D750EF2A31A796005859E7 /* BlinkReviewerApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlinkReviewerApp.swift; sourceTree = "<group>"; };
94D750F12A31A796005859E7 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -84,6 +88,14 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
+ 94D2C8B72A320E6600BEE15B /* Model */ = {
+ isa = PBXGroup;
+ children = (
+ 94D2C8B82A320E6F00BEE15B /* ReviewState.swift */,
+ );
+ path = Model;
+ sourceTree = "<group>";
+ };
94D750E32A31A796005859E7 = {
isa = PBXGroup;
children = (
@@ -107,6 +119,7 @@
94D750EE2A31A796005859E7 /* BlinkReviewer */ = {
isa = PBXGroup;
children = (
+ 94D2C8B72A320E6600BEE15B /* Model */,
94D751272A31D61D005859E7 /* Photos */,
94D7511A2A31A7A6005859E7 /* Views */,
94D750EF2A31A796005859E7 /* BlinkReviewerApp.swift */,
@@ -147,6 +160,7 @@
isa = PBXGroup;
children = (
94D7511B2A31A7B1005859E7 /* ThumbnailImage.swift */,
+ 94D2C8BA2A320EFD00BEE15B /* SwiftUIView.swift */,
94D7511D2A31B243005859E7 /* PreviewImage.swift */,
94D7511F2A31B53E005859E7 /* AlbumInfo.swift */,
94D751212A31BD8E005859E7 /* PhotoReviewer.swift */,
@@ -297,10 +311,12 @@
94D750F22A31A796005859E7 /* ContentView.swift in Sources */,
94D7512B2A31D6AC005859E7 /* AssetHelpers.swift in Sources */,
94D7511E2A31B243005859E7 /* PreviewImage.swift in Sources */,
+ 94D2C8BB2A320EFD00BEE15B /* SwiftUIView.swift in Sources */,
94D750F02A31A796005859E7 /* BlinkReviewerApp.swift in Sources */,
94D751202A31B53E005859E7 /* AlbumInfo.swift in Sources */,
94D751302A31DC4A005859E7 /* ThumbnailList.swift in Sources */,
94D751222A31BD8E005859E7 /* PhotoReviewer.swift in Sources */,
+ 94D2C8B92A320E6F00BEE15B /* ReviewState.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
BlinkReviewer/BlinkReviewer/Views/AlbumInfo.swift (1068) → BlinkReviewer/BlinkReviewer/Views/AlbumInfo.swift (1363)
diff --git a/BlinkReviewer/BlinkReviewer/Views/AlbumInfo.swift b/BlinkReviewer/BlinkReviewer/Views/AlbumInfo.swift
index 1e4a1be..86f5961 100644
--- a/BlinkReviewer/BlinkReviewer/Views/AlbumInfo.swift
+++ b/BlinkReviewer/BlinkReviewer/Views/AlbumInfo.swift
@@ -21,15 +21,20 @@ struct AlbumInfo: View {
HStack {
ForEach(asset.albums(), id: \.localIdentifier) { album in
if let title = album.localizedTitle {
- // The icon was chosen to match the one used for albums
- // in the sidebar in Photos.
- Text("\(Image(systemName: "rectangle.stack")) \(title)")
- .fontWeight(.bold)
- .font(.title2)
- .padding(5)
- .background(.white.opacity(0.9))
- .cornerRadius(7.0)
- .shadow(radius: 2.0)
+ // Don't show the names of the meta-albums used to manage
+ // review state.
+ if (title != "Approved" && title != "Rejected" && title != "Needs Action") {
+
+ // The icon was chosen to match the one used for albums
+ // in the sidebar in Photos.
+ Text("\(Image(systemName: "rectangle.stack")) \(title)")
+ .fontWeight(.bold)
+ .font(.title2)
+ .padding(5)
+ .background(.white.opacity(0.9))
+ .cornerRadius(7.0)
+ .shadow(radius: 2.0)
+ }
}
}
}.padding()