remove the word ‘new’ from a bunch of places
- ID
d680737- date
2023-06-10 21:40:41+00:00- author
Alex Chan <alex@alexwlchan.net>- parent
57b7720- message
remove the word 'new' from a bunch of places- changed files
5 files, 33 additions, 77 deletions
Changed files
BlinkReviewer/BlinkReviewer.xcodeproj/project.pbxproj (32538) → BlinkReviewer/BlinkReviewer.xcodeproj/project.pbxproj (32078)
diff --git a/BlinkReviewer/BlinkReviewer.xcodeproj/project.pbxproj b/BlinkReviewer/BlinkReviewer.xcodeproj/project.pbxproj
index 4dedd7d..095368c 100644
--- a/BlinkReviewer/BlinkReviewer.xcodeproj/project.pbxproj
+++ b/BlinkReviewer/BlinkReviewer.xcodeproj/project.pbxproj
@@ -8,7 +8,7 @@
/* Begin PBXBuildFile section */
940331732A336B5100200C5D /* DeferredRendering.swift in Sources */ = {isa = PBXBuildFile; fileRef = 940331722A336B5100200C5D /* DeferredRendering.swift */; };
- 945F17B02A33D167004FC479 /* NewThumbnailImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 945F17AF2A33D167004FC479 /* NewThumbnailImage.swift */; };
+ 945F17B02A33D167004FC479 /* ThumbnailImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 945F17AF2A33D167004FC479 /* ThumbnailImage.swift */; };
945F17B22A33D69B004FC479 /* FavoriteOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 945F17B12A33D69B004FC479 /* FavoriteOverlay.swift */; };
945F17B42A33D726004FC479 /* ReviewStateIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 945F17B32A33D726004FC479 /* ReviewStateIcon.swift */; };
945F17B62A33D7AA004FC479 /* ReviewStateBorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 945F17B52A33D7AA004FC479 /* ReviewStateBorder.swift */; };
@@ -17,7 +17,7 @@
94A083612A33E98000238964 /* AlbumInfoOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94A083602A33E98000238964 /* AlbumInfoOverlay.swift */; };
94A083632A33F30300238964 /* LoadingIndicatorOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94A083622A33F30300238964 /* LoadingIndicatorOverlay.swift */; };
94A083662A33F50900238964 /* Debug.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94A083652A33F50900238964 /* Debug.swift */; };
- 94A083682A33F6E900238964 /* NewThumbnailList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94A083672A33F6E900238964 /* NewThumbnailList.swift */; };
+ 94A083682A33F6E900238964 /* ThumbnailList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94A083672A33F6E900238964 /* ThumbnailList.swift */; };
94C5FFF22A33ADD4004ADDF5 /* PHFetchResultCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94C5FFF12A33ADD4004ADDF5 /* PHFetchResultCollection.swift */; };
94C5FFF62A33B698004ADDF5 /* PHAssetHStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94C5FFF52A33B698004ADDF5 /* PHAssetHStack.swift */; };
94D2C8B92A320E6F00BEE15B /* ReviewState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94D2C8B82A320E6F00BEE15B /* ReviewState.swift */; };
@@ -30,7 +30,6 @@
94D751022A31A798005859E7 /* BlinkReviewerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94D751012A31A798005859E7 /* BlinkReviewerTests.swift */; };
94D7510C2A31A798005859E7 /* BlinkReviewerUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94D7510B2A31A798005859E7 /* BlinkReviewerUITests.swift */; };
94D7510E2A31A798005859E7 /* BlinkReviewerUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94D7510D2A31A798005859E7 /* BlinkReviewerUITestsLaunchTests.swift */; };
- 94D751202A31B53E005859E7 /* AlbumInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94D7511F2A31B53E005859E7 /* AlbumInfo.swift */; };
94D751222A31BD8E005859E7 /* PhotoReviewer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94D751212A31BD8E005859E7 /* PhotoReviewer.swift */; };
94D7512B2A31D6AC005859E7 /* AssetHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94D7512A2A31D6AC005859E7 /* AssetHelpers.swift */; };
94F7E39E2A331A9E00763DB9 /* Statistics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94F7E39D2A331A9E00763DB9 /* Statistics.swift */; };
@@ -55,7 +54,7 @@
/* Begin PBXFileReference section */
940331722A336B5100200C5D /* DeferredRendering.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeferredRendering.swift; sourceTree = "<group>"; };
- 945F17AF2A33D167004FC479 /* NewThumbnailImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewThumbnailImage.swift; sourceTree = "<group>"; };
+ 945F17AF2A33D167004FC479 /* ThumbnailImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThumbnailImage.swift; sourceTree = "<group>"; };
945F17B12A33D69B004FC479 /* FavoriteOverlay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FavoriteOverlay.swift; sourceTree = "<group>"; };
945F17B32A33D726004FC479 /* ReviewStateIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewStateIcon.swift; sourceTree = "<group>"; };
945F17B52A33D7AA004FC479 /* ReviewStateBorder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewStateBorder.swift; sourceTree = "<group>"; };
@@ -64,7 +63,7 @@
94A083602A33E98000238964 /* AlbumInfoOverlay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlbumInfoOverlay.swift; sourceTree = "<group>"; };
94A083622A33F30300238964 /* LoadingIndicatorOverlay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingIndicatorOverlay.swift; sourceTree = "<group>"; };
94A083652A33F50900238964 /* Debug.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Debug.swift; sourceTree = "<group>"; };
- 94A083672A33F6E900238964 /* NewThumbnailList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewThumbnailList.swift; sourceTree = "<group>"; };
+ 94A083672A33F6E900238964 /* ThumbnailList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThumbnailList.swift; sourceTree = "<group>"; };
94C5FFF12A33ADD4004ADDF5 /* PHFetchResultCollection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PHFetchResultCollection.swift; sourceTree = "<group>"; };
94C5FFF52A33B698004ADDF5 /* PHAssetHStack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PHAssetHStack.swift; sourceTree = "<group>"; };
94D2C8B82A320E6F00BEE15B /* ReviewState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReviewState.swift; sourceTree = "<group>"; };
@@ -81,7 +80,6 @@
94D751072A31A798005859E7 /* BlinkReviewerUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BlinkReviewerUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
94D7510B2A31A798005859E7 /* BlinkReviewerUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlinkReviewerUITests.swift; sourceTree = "<group>"; };
94D7510D2A31A798005859E7 /* BlinkReviewerUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlinkReviewerUITestsLaunchTests.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>"; };
94D7512A2A31D6AC005859E7 /* AssetHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetHelpers.swift; sourceTree = "<group>"; };
94F7E39D2A331A9E00763DB9 /* Statistics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Statistics.swift; sourceTree = "<group>"; };
@@ -125,12 +123,12 @@
945F17AE2A33D15D004FC479 /* Thumbnails */ = {
isa = PBXGroup;
children = (
- 945F17AF2A33D167004FC479 /* NewThumbnailImage.swift */,
+ 945F17AF2A33D167004FC479 /* ThumbnailImage.swift */,
945F17B12A33D69B004FC479 /* FavoriteOverlay.swift */,
945F17B32A33D726004FC479 /* ReviewStateIcon.swift */,
945F17B52A33D7AA004FC479 /* ReviewStateBorder.swift */,
945F17B72A33DAC7004FC479 /* ReviewStateSaturation.swift */,
- 94A083672A33F6E900238964 /* NewThumbnailList.swift */,
+ 94A083672A33F6E900238964 /* ThumbnailList.swift */,
);
path = Thumbnails;
sourceTree = "<group>";
@@ -228,7 +226,6 @@
94A0835F2A33E7E900238964 /* FocusedImage */,
945F17AE2A33D15D004FC479 /* Thumbnails */,
940331742A336BEB00200C5D /* Helpers */,
- 94D7511F2A31B53E005859E7 /* AlbumInfo.swift */,
94D751212A31BD8E005859E7 /* PhotoReviewer.swift */,
94D2C8C02A32FCE300BEE15B /* PHAssetImage.swift */,
);
@@ -377,7 +374,7 @@
files = (
94D7512B2A31D6AC005859E7 /* AssetHelpers.swift in Sources */,
94D2C8BD2A32796500BEE15B /* AlbumHelpers.swift in Sources */,
- 945F17B02A33D167004FC479 /* NewThumbnailImage.swift in Sources */,
+ 945F17B02A33D167004FC479 /* ThumbnailImage.swift in Sources */,
94D2C8BF2A3299BD00BEE15B /* PhotosLibrary.swift in Sources */,
94C5FFF62A33B698004ADDF5 /* PHAssetHStack.swift in Sources */,
945F17B22A33D69B004FC479 /* FavoriteOverlay.swift in Sources */,
@@ -387,10 +384,9 @@
94A083612A33E98000238964 /* AlbumInfoOverlay.swift in Sources */,
94C5FFF22A33ADD4004ADDF5 /* PHFetchResultCollection.swift in Sources */,
94A083662A33F50900238964 /* Debug.swift in Sources */,
- 94A083682A33F6E900238964 /* NewThumbnailList.swift in Sources */,
+ 94A083682A33F6E900238964 /* ThumbnailList.swift in Sources */,
94D750F02A31A796005859E7 /* BlinkReviewerApp.swift in Sources */,
940331732A336B5100200C5D /* DeferredRendering.swift in Sources */,
- 94D751202A31B53E005859E7 /* AlbumInfo.swift in Sources */,
94A0835E2A33E49E00238964 /* FocusedImage.swift in Sources */,
945F17B82A33DAC7004FC479 /* ReviewStateSaturation.swift in Sources */,
94D751222A31BD8E005859E7 /* PhotoReviewer.swift in Sources */,
BlinkReviewer/BlinkReviewer/Views/AlbumInfo.swift (1363) → BlinkReviewer/BlinkReviewer/Views/AlbumInfo.swift (0)
diff --git a/BlinkReviewer/BlinkReviewer/Views/AlbumInfo.swift b/BlinkReviewer/BlinkReviewer/Views/AlbumInfo.swift
deleted file mode 100644
index 86f5961..0000000
--- a/BlinkReviewer/BlinkReviewer/Views/AlbumInfo.swift
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// AlbumInfo.swift
-// BlinkReviewer
-//
-// Created by Alex Chan on 08/06/2023.
-//
-
-import SwiftUI
-import Photos
-
-/// This view shows the names of the albums that a given asset is in.
-///
-/// Each album is shown as a separate "pill" in the list, for example:
-///
-/// [Cats] [Cross-stitch] [Stuff I did in 2023]
-///
-struct AlbumInfo: View {
- var asset: PHAsset
-
- var body: some View {
- HStack {
- ForEach(asset.albums(), id: \.localIdentifier) { album in
- if let title = album.localizedTitle {
- // 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()
- }
-}
BlinkReviewer/BlinkReviewer/Views/PhotoReviewer.swift (10664) → BlinkReviewer/BlinkReviewer/Views/PhotoReviewer.swift (10661)
diff --git a/BlinkReviewer/BlinkReviewer/Views/PhotoReviewer.swift b/BlinkReviewer/BlinkReviewer/Views/PhotoReviewer.swift
index bd7222a..c5084cf 100644
--- a/BlinkReviewer/BlinkReviewer/Views/PhotoReviewer.swift
+++ b/BlinkReviewer/BlinkReviewer/Views/PhotoReviewer.swift
@@ -40,7 +40,7 @@ struct PhotoReviewer: View {
} else {
ZStack {
VStack {
- NewThumbnailList(focusedAssetIndex: $focusedAssetIndex)
+ ThumbnailList(focusedAssetIndex: $focusedAssetIndex)
.environmentObject(photosLibrary)
.frame(height: 90)
BlinkReviewer/BlinkReviewer/Views/Thumbnails/NewThumbnailImage.swift (1978) → BlinkReviewer/BlinkReviewer/Views/Thumbnails/ThumbnailImage.swift (1979)
diff --git a/BlinkReviewer/BlinkReviewer/Views/Thumbnails/NewThumbnailImage.swift b/BlinkReviewer/BlinkReviewer/Views/Thumbnails/ThumbnailImage.swift
similarity index 63%
rename from BlinkReviewer/BlinkReviewer/Views/Thumbnails/NewThumbnailImage.swift
rename to BlinkReviewer/BlinkReviewer/Views/Thumbnails/ThumbnailImage.swift
index fd03ccc..ce45de1 100644
--- a/BlinkReviewer/BlinkReviewer/Views/Thumbnails/NewThumbnailImage.swift
+++ b/BlinkReviewer/BlinkReviewer/Views/Thumbnails/ThumbnailImage.swift
@@ -6,14 +6,19 @@ import Photos
/// Thumbnails are square, and they expand to fill the square. This may
/// mean some information gets cropped out -- that's okay, these are only
/// small previews, not complete images.
-struct NewThumbnailImage: View {
+struct ThumbnailImage: View {
@ObservedObject var assetImage: PHAssetImage
var state: ReviewState?
var isFocused: Bool
var isFavorite: Bool
- private var size: CGFloat
- private var cornerRadius: CGFloat
+ private func size() -> CGFloat {
+ isFocused ? 70 : 50
+ }
+
+ private func cornerRadius() -> CGFloat {
+ isFocused ? 7 : 5
+ }
// Implementation note: the reason we pass in a bunch of individual
// properties rather than the whole asset is because we need an
@@ -23,27 +28,24 @@ struct NewThumbnailImage: View {
// But EnvironmentObject values aren't passed down until you call the
// `body` method, which is too late! So instead we have the parent
// view call into PhotosLibrary and pass in the relevant values here.
- init(_ assetImage: PHAssetImage, state: ReviewState?, isFavorite: Bool, isFocused: Bool) {
- print("Redrawing thumbnail image! \(assetImage.asset?.localIdentifier ?? "(unknown)") @ \(DispatchTime.now())")
-
- self.assetImage = assetImage
- self.state = state
- self.isFavorite = isFavorite
- self.isFocused = isFocused
-
- self.size = isFocused ? 70 : 50
- self.cornerRadius = isFocused ? 7 : 5
- }
+// init(_ assetImage: PHAssetImage, state: ReviewState?, isFavorite: Bool, isFocused: Bool) {
+// print("Redrawing thumbnail image! \(assetImage.asset?.localIdentifier ?? "(unknown)") @ \(DispatchTime.now())")
+//
+// self.assetImage = assetImage
+// self.state = state
+// self.isFavorite = isFavorite
+// self.isFocused = isFocused
+// }
var body: some View {
Image(nsImage: assetImage.image)
.resizable()
.scaledToFill()
.clipped()
- .frame(width: self.size, height: self.size, alignment: .center)
- .cornerRadius(cornerRadius)
+ .frame(width: size(), height: size(), alignment: .center)
+ .cornerRadius(cornerRadius())
.reviewStateColor(isRejected: state == .Rejected)
- .reviewStateBorder(for: state, with: cornerRadius)
+ .reviewStateBorder(for: state, with: cornerRadius())
.reviewStateIcon(for: state, isFocused)
.favoriteHeartIcon(isFavorite, isFocused)
}
BlinkReviewer/BlinkReviewer/Views/Thumbnails/NewThumbnailList.swift (1000) → BlinkReviewer/BlinkReviewer/Views/Thumbnails/ThumbnailList.swift (1006)
diff --git a/BlinkReviewer/BlinkReviewer/Views/Thumbnails/NewThumbnailList.swift b/BlinkReviewer/BlinkReviewer/Views/Thumbnails/ThumbnailList.swift
similarity index 83%
rename from BlinkReviewer/BlinkReviewer/Views/Thumbnails/NewThumbnailList.swift
rename to BlinkReviewer/BlinkReviewer/Views/Thumbnails/ThumbnailList.swift
index d22a2e4..6f6a27e 100644
--- a/BlinkReviewer/BlinkReviewer/Views/Thumbnails/NewThumbnailList.swift
+++ b/BlinkReviewer/BlinkReviewer/Views/Thumbnails/ThumbnailList.swift
@@ -7,18 +7,18 @@
import SwiftUI
-struct NewThumbnailList: View {
+struct ThumbnailList: View {
@EnvironmentObject var photosLibrary: PhotosLibrary
@Binding var focusedAssetIndex: Int
var body: some View {
ScrollViewReader { proxy in
PHAssetHStack(photosLibrary.assets2) { asset, index in
- NewThumbnailImage(
- photosLibrary.getThumbnail(for: asset),
+ ThumbnailImage(
+ assetImage: photosLibrary.getThumbnail(for: asset),
state: photosLibrary.state(of: asset),
- isFavorite: asset.isFavorite,
- isFocused: index == focusedAssetIndex
+ isFocused: index == focusedAssetIndex,
+ isFavorite: asset.isFavorite
)
}
.onChange(of: focusedAssetIndex, perform: { newIndex in