Fix album info
- ID
96175a1- date
2023-06-15 23:27:00+00:00- author
Alex Chan <alex@alexwlchan.net>- parent
0528e53- message
Fix album info- changed files
Changed files
BlinkReviewer/Blink.xcodeproj/project.pbxproj (34154) → BlinkReviewer/Blink.xcodeproj/project.pbxproj (34154)
diff --git a/BlinkReviewer/Blink.xcodeproj/project.pbxproj b/BlinkReviewer/Blink.xcodeproj/project.pbxproj
index 82cfc5a..e2012de 100644
--- a/BlinkReviewer/Blink.xcodeproj/project.pbxproj
+++ b/BlinkReviewer/Blink.xcodeproj/project.pbxproj
@@ -588,7 +588,7 @@
CODE_SIGN_ENTITLEMENTS = Blink/Blink.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 42;
+ CURRENT_PROJECT_VERSION = 43;
DEVELOPMENT_ASSET_PATHS = "\"Blink/Preview Content\"";
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
@@ -615,7 +615,7 @@
CODE_SIGN_ENTITLEMENTS = Blink/Blink.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 42;
+ CURRENT_PROJECT_VERSION = 43;
DEVELOPMENT_ASSET_PATHS = "\"Blink/Preview Content\"";
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
@@ -640,7 +640,7 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 42;
+ CURRENT_PROJECT_VERSION = 43;
GENERATE_INFOPLIST_FILE = YES;
MACOSX_DEPLOYMENT_TARGET = 13.3;
MARKETING_VERSION = 1.0;
@@ -658,7 +658,7 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 42;
+ CURRENT_PROJECT_VERSION = 43;
GENERATE_INFOPLIST_FILE = YES;
MACOSX_DEPLOYMENT_TARGET = 13.3;
MARKETING_VERSION = 1.0;
@@ -675,7 +675,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 42;
+ CURRENT_PROJECT_VERSION = 43;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = net.alexwlchan.BlinkReviewerUITests;
@@ -691,7 +691,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 42;
+ CURRENT_PROJECT_VERSION = 43;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = net.alexwlchan.BlinkReviewerUITests;
BlinkReviewer/Blink/Views/FocusedImage/FocusedImage.swift (548) → BlinkReviewer/Blink/Views/FocusedImage/FocusedImage.swift (534)
diff --git a/BlinkReviewer/Blink/Views/FocusedImage/FocusedImage.swift b/BlinkReviewer/Blink/Views/FocusedImage/FocusedImage.swift
index 8eb394c..8f877dd 100644
--- a/BlinkReviewer/Blink/Views/FocusedImage/FocusedImage.swift
+++ b/BlinkReviewer/Blink/Views/FocusedImage/FocusedImage.swift
@@ -4,16 +4,17 @@ import Photos
/// Render the big image that gets shown in the main view.
struct FocusedImage: View, Identifiable {
var id: String {
- focusedAssetImage.asset!.localIdentifier
+ asset.localIdentifier
}
+ var asset: PHAsset
@ObservedObject var focusedAssetImage: PHAssetImage
var body: some View {
Image(nsImage: focusedAssetImage.image)
.resizable()
.aspectRatio(contentMode: .fit)
- .albumInfo(for: focusedAssetImage.asset)
+ .albumInfo(for: asset)
.loadingIndicator(isLoading: focusedAssetImage.isDegraded)
}
}
BlinkReviewer/Blink/Views/PhotoReviewer.swift (13085) → BlinkReviewer/Blink/Views/PhotoReviewer.swift (13094)
diff --git a/BlinkReviewer/Blink/Views/PhotoReviewer.swift b/BlinkReviewer/Blink/Views/PhotoReviewer.swift
index 8d972a4..2d35372 100644
--- a/BlinkReviewer/Blink/Views/PhotoReviewer.swift
+++ b/BlinkReviewer/Blink/Views/PhotoReviewer.swift
@@ -45,7 +45,10 @@ struct PhotoReviewer: View {
.frame(height: 90)
.background(.gray.opacity(0.3))
- FocusedImage(focusedAssetImage: photosLibrary.getFullSizedImage(for: focusedAsset))
+ FocusedImage(
+ asset: focusedAsset,
+ focusedAssetImage: photosLibrary.getFullSizedImage(for: focusedAsset)
+ )
Spacer()
}
@@ -224,8 +227,6 @@ struct PhotoReviewer: View {
return nil
case let e where e.characters == "1" || e.characters == "2" || e.characters == "3":
- let oldState = photosLibrary.state(of: focusedAsset)
-
let newState: ReviewState =
e.characters == "1" ? .Approved :
e.characters == "2" ? .Rejected : .NeedsAction