From ea27b9ed085beec246262c9b6ed25d16e855d939 Mon Sep 17 00:00:00 2001
From: Paul Frazee <pfrazee@gmail.com>
Date: Fri, 2 Dec 2022 10:40:22 -0600
Subject: [PATCH] Cleanup
---
ios/Podfile.lock | 2 +-
ios/app.xcodeproj/project.pbxproj | 8 ++++----
ios/app/Info.plist | 4 ++--
src/state/models/user-local-photos.ts | 4 ++--
src/view/com/composer/PhotoCarouselPicker.tsx | 20 +++++++++----------
5 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 39f1ead9..182ceab7 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -540,6 +540,6 @@ SPEC CHECKSUMS:
TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
Yoga: 99652481fcd320aefa4a7ef90095b95acd181952
-PODFILE CHECKSUM: 95dad1cd550c9983fb5c851af858b806e8250502
+PODFILE CHECKSUM: cf94853ebcb0d8e0d027dca9ab7a4ede886a8f20
COCOAPODS: 1.11.3
diff --git a/ios/app.xcodeproj/project.pbxproj b/ios/app.xcodeproj/project.pbxproj
index 485aa8e0..50db4563 100644
--- a/ios/app.xcodeproj/project.pbxproj
+++ b/ios/app.xcodeproj/project.pbxproj
@@ -455,7 +455,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = app/app.entitlements;
CURRENT_PROJECT_VERSION = 1;
- DEVELOPMENT_TEAM = 28H695D9YK;
+ DEVELOPMENT_TEAM = B3LX46C5HS;
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
INFOPLIST_FILE = app/Info.plist;
@@ -468,7 +468,7 @@
"-ObjC",
"-lc++",
);
- PRODUCT_BUNDLE_IDENTIFIER = "xyz.blueskyweb.app-";
+ PRODUCT_BUNDLE_IDENTIFIER = xyz.blueskyweb.app;
PRODUCT_NAME = app;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
@@ -484,7 +484,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = app/app.entitlements;
CURRENT_PROJECT_VERSION = 1;
- DEVELOPMENT_TEAM = 28H695D9YK;
+ DEVELOPMENT_TEAM = B3LX46C5HS;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
INFOPLIST_FILE = app/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
@@ -496,7 +496,7 @@
"-ObjC",
"-lc++",
);
- PRODUCT_BUNDLE_IDENTIFIER = "xyz.blueskyweb.app-";
+ PRODUCT_BUNDLE_IDENTIFIER = xyz.blueskyweb.app;
PRODUCT_NAME = app;
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
diff --git a/ios/app/Info.plist b/ios/app/Info.plist
index 34500318..5b520259 100644
--- a/ios/app/Info.plist
+++ b/ios/app/Info.plist
@@ -48,12 +48,12 @@
</dict>
</dict>
</dict>
+ <key>NSCameraUsageDescription</key>
+ <string></string>
<key>NSLocationWhenInUseUsageDescription</key>
<string></string>
<key>NSPhotoLibraryUsageDescription</key>
<string></string>
- <key>NSCameraUsageDescription</key>
- <string></string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIRequiredDeviceCapabilities</key>
diff --git a/src/state/models/user-local-photos.ts b/src/state/models/user-local-photos.ts
index 12b95e37..9a145503 100644
--- a/src/state/models/user-local-photos.ts
+++ b/src/state/models/user-local-photos.ts
@@ -18,8 +18,8 @@ export class UserLocalPhotosModel {
}
private async _getPhotos() {
- runInAction(() => {
- CameraRoll.getPhotos({first: 20}).then(r => {
+ CameraRoll.getPhotos({first: 20}).then(r => {
+ runInAction(() => {
this.photos = r.edges
})
})
diff --git a/src/view/com/composer/PhotoCarouselPicker.tsx b/src/view/com/composer/PhotoCarouselPicker.tsx
index 208e8070..f4af4c61 100644
--- a/src/view/com/composer/PhotoCarouselPicker.tsx
+++ b/src/view/com/composer/PhotoCarouselPicker.tsx
@@ -23,9 +23,14 @@ export const PhotoCarouselPicker = ({
cropping: true,
width: 1000,
height: 1000,
- }).then(item => {
- setSelectedPhotos([item.path, ...selectedPhotos])
- })
+ }).then(
+ item => {
+ setSelectedPhotos([item.path, ...selectedPhotos])
+ },
+ _err => {
+ // ignore
+ },
+ )
}, [selectedPhotos, setSelectedPhotos])
const handleSelectPhoto = useCallback(
@@ -58,14 +63,7 @@ export const PhotoCarouselPicker = ({
})
result.push(img.path)
}
- setSelectedPhotos([
- // ...items.reduce(
- // (accum, cur) => accum.concat(cur.sourceURL!),
- // [] as string[],
- // ),
- ...result,
- ...selectedPhotos,
- ])
+ setSelectedPhotos([...result, ...selectedPhotos])
})
}, [selectedPhotos, setSelectedPhotos])