From 5ea750599d08229d4b5b10d0e724ca14c73735f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreiro?= Date: Mon, 28 Nov 2022 16:46:58 +0000 Subject: [PATCH 01/15] upload images in composer v1 --- android/settings.gradle | 4 + ios/Podfile | 2 + ios/Podfile.lock | 24 +++- ios/app.xcodeproj/project.pbxproj | 56 ++++---- ios/app/Info.plist | 2 + package.json | 6 +- src/state/models/user-local-photos.ts | 25 ++++ src/view/com/composer/ComposePost.tsx | 181 +++++++++++++++++++++++++- src/view/index.ts | 6 + yarn.lock | 10 ++ 10 files changed, 283 insertions(+), 33 deletions(-) create mode 100644 src/state/models/user-local-photos.ts diff --git a/android/settings.gradle b/android/settings.gradle index 3c22b7a2c7..e6c53dc6bd 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,4 +1,8 @@ rootProject.name = 'app' +include ':@react-native-camera-roll_camera-roll' +project(':@react-native-camera-roll_camera-roll').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-camera-roll/camera-roll/android') +include ':@react-native-camera-roll_camera-roll' +project(':@react-native-camera-roll_camera-roll').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-camera-roll/camera-roll/android') apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) include ':app' includeBuild('../node_modules/react-native-gradle-plugin') diff --git a/ios/Podfile b/ios/Podfile index f9a45704c4..b4fa1f55f2 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -20,6 +20,8 @@ target 'app' do :app_path => "#{Pod::Config.instance.installation_root}/.." ) + pod 'react-native-cameraroll', :path => '../node_modules/@react-native-camera-roll/camera-roll' + target 'appTests' do inherit! :complete # Pods for testing diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 39b5a5ad00..37e55dacd8 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -220,6 +220,8 @@ PODS: - React-jsinspector (0.68.2) - React-logger (0.68.2): - glog + - react-native-cameraroll (5.1.0): + - React-Core - react-native-pager-view (6.0.2): - React-Core - react-native-safe-area-context (4.4.1): @@ -301,6 +303,15 @@ PODS: - React-Core - RNGestureHandler (2.6.1): - React-Core + - RNImageCropPicker (0.38.1): + - React-Core + - React-RCTImage + - RNImageCropPicker/QBImagePickerController (= 0.38.1) + - TOCropViewController + - RNImageCropPicker/QBImagePickerController (0.38.1): + - React-Core + - React-RCTImage + - TOCropViewController - RNInAppBrowser (3.7.0): - React-Core - RNReanimated (2.10.0): @@ -335,6 +346,7 @@ PODS: - React-RCTImage - RNSVG (12.4.4): - React-Core + - TOCropViewController (2.6.1) - Yoga (1.14.0) DEPENDENCIES: @@ -359,6 +371,7 @@ DEPENDENCIES: - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) - React-logger (from `../node_modules/react-native/ReactCommon/logger`) + - "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)" - react-native-pager-view (from `../node_modules/react-native-pager-view`) - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) - react-native-splash-screen (from `../node_modules/react-native-splash-screen`) @@ -377,6 +390,7 @@ DEPENDENCIES: - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)" - "RNCClipboard (from `../node_modules/@react-native-clipboard/clipboard`)" - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) + - RNImageCropPicker (from `../node_modules/react-native-image-crop-picker`) - RNInAppBrowser (from `../node_modules/react-native-inappbrowser-reborn`) - RNReanimated (from `../node_modules/react-native-reanimated`) - RNScreens (from `../node_modules/react-native-screens`) @@ -386,6 +400,7 @@ DEPENDENCIES: SPEC REPOS: trunk: - fmt + - TOCropViewController EXTERNAL SOURCES: boost: @@ -426,6 +441,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/jsinspector" React-logger: :path: "../node_modules/react-native/ReactCommon/logger" + react-native-cameraroll: + :path: "../node_modules/@react-native-camera-roll/camera-roll" react-native-pager-view: :path: "../node_modules/react-native-pager-view" react-native-safe-area-context: @@ -462,6 +479,8 @@ EXTERNAL SOURCES: :path: "../node_modules/@react-native-clipboard/clipboard" RNGestureHandler: :path: "../node_modules/react-native-gesture-handler" + RNImageCropPicker: + :path: "../node_modules/react-native-image-crop-picker" RNInAppBrowser: :path: "../node_modules/react-native-inappbrowser-reborn" RNReanimated: @@ -494,6 +513,7 @@ SPEC CHECKSUMS: React-jsiexecutor: b7b553412f2ec768fe6c8f27cd6bafdb9d8719e6 React-jsinspector: c5989c77cb89ae6a69561095a61cce56a44ae8e8 React-logger: a0833912d93b36b791b7a521672d8ee89107aff1 + react-native-cameraroll: a40b082318eb1ecd0336a2f29d9f74b7f2c8cae8 react-native-pager-view: 592421df0259bf7a7a4fe85b74c24f3f39905605 react-native-safe-area-context: 99b24a0c5acd0d5dcac2b1a7f18c49ea317be99a react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457 @@ -512,12 +532,14 @@ SPEC CHECKSUMS: RNCAsyncStorage: 0c357f3156fcb16c8589ede67cc036330b6698ca RNCClipboard: 2834e1c4af68697089cdd455ee4a4cdd198fa7dd RNGestureHandler: 28ad20bf02257791f7f137b31beef34b9549f54b + RNImageCropPicker: 648356d68fbf9911a1016b3e3723885d28373eda RNInAppBrowser: e36d6935517101ccba0e875bac8ad7b0cb655364 RNReanimated: 5bdcbcc3a72aedeee7bb099604262403aa75a1e5 RNScreens: 0df01424e9e0ed7827200d6ed1087ddd06c493f9 RNSVG: ecd661f380a07ba690c9c5929c475a44f432d674 + TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863 Yoga: 99652481fcd320aefa4a7ef90095b95acd181952 -PODFILE CHECKSUM: cf94853ebcb0d8e0d027dca9ab7a4ede886a8f20 +PODFILE CHECKSUM: 1c470a84819c5f003f8861cf58774e2fedb862b3 COCOAPODS: 1.11.3 diff --git a/ios/app.xcodeproj/project.pbxproj b/ios/app.xcodeproj/project.pbxproj index 914a272df6..323cf87b0b 100644 --- a/ios/app.xcodeproj/project.pbxproj +++ b/ios/app.xcodeproj/project.pbxproj @@ -8,13 +8,13 @@ /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* appTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* appTests.m */; }; + 03CEA62EF4246066A4356DBF /* libPods-app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C05267EED8EC1DA4212FD4 /* libPods-app.a */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 5CEAE7B7A55582F96F1D5952 /* libPods-app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FCB672808307A6013805A3FE /* libPods-app.a */; }; + 64B2214C33449E5F5EB4EA8C /* libPods-app-appTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D5A91013937D8724CBF0A625 /* libPods-app-appTests.a */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; E4BBD590292C1F5200296224 /* app.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = E4437C9E28581FA7006DA9E7 /* app.entitlements */; }; - FEB90D21557517F9279AECA4 /* libPods-app-appTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BAD3BC60FA05CF2D4F6F9BA2 /* libPods-app-appTests.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -31,21 +31,21 @@ 00E356EE1AD99517003FC87E /* appTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = appTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 00E356F21AD99517003FC87E /* appTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = appTests.m; sourceTree = ""; }; - 03F7088487057F17D25D2F4B /* Pods-app-appTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.release.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.release.xcconfig"; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = app.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = app/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = app/AppDelegate.mm; sourceTree = ""; }; 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = app/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = app/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = app/main.m; sourceTree = ""; }; - 19C43486502F2DE23E091FE3 /* Pods-app-appTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.debug.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.debug.xcconfig"; sourceTree = ""; }; + 1F5A3A10A9E763C1649E35A2 /* Pods-app-appTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.release.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.release.xcconfig"; sourceTree = ""; }; + 40C05267EED8EC1DA4212FD4 /* libPods-app.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = app/LaunchScreen.storyboard; sourceTree = ""; }; - 970005155A83960D1D13380F /* Pods-app.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.release.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.release.xcconfig"; sourceTree = ""; }; - BAD3BC60FA05CF2D4F6F9BA2 /* libPods-app-appTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app-appTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 9778B24B11B793045DA74F2B /* Pods-app.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.debug.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.debug.xcconfig"; sourceTree = ""; }; + AA52915648F9E2111DA9ADD8 /* Pods-app.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.release.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.release.xcconfig"; sourceTree = ""; }; + CC31CE4B797ED8DCD20C1535 /* Pods-app-appTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.debug.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.debug.xcconfig"; sourceTree = ""; }; + D5A91013937D8724CBF0A625 /* libPods-app-appTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app-appTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; E4437C9E28581FA7006DA9E7 /* app.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = app.entitlements; path = app/app.entitlements; sourceTree = ""; }; - ED22CAA45207BC18E75DB44B /* Pods-app.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.debug.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.debug.xcconfig"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; - FCB672808307A6013805A3FE /* libPods-app.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -53,7 +53,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FEB90D21557517F9279AECA4 /* libPods-app-appTests.a in Frameworks */, + 64B2214C33449E5F5EB4EA8C /* libPods-app-appTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -61,7 +61,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 5CEAE7B7A55582F96F1D5952 /* libPods-app.a in Frameworks */, + 03CEA62EF4246066A4356DBF /* libPods-app.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,8 +103,8 @@ isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, - FCB672808307A6013805A3FE /* libPods-app.a */, - BAD3BC60FA05CF2D4F6F9BA2 /* libPods-app-appTests.a */, + 40C05267EED8EC1DA4212FD4 /* libPods-app.a */, + D5A91013937D8724CBF0A625 /* libPods-app-appTests.a */, ); name = Frameworks; sourceTree = ""; @@ -143,10 +143,10 @@ BBD78D7AC51CEA395F1C20DB /* Pods */ = { isa = PBXGroup; children = ( - ED22CAA45207BC18E75DB44B /* Pods-app.debug.xcconfig */, - 970005155A83960D1D13380F /* Pods-app.release.xcconfig */, - 19C43486502F2DE23E091FE3 /* Pods-app-appTests.debug.xcconfig */, - 03F7088487057F17D25D2F4B /* Pods-app-appTests.release.xcconfig */, + 9778B24B11B793045DA74F2B /* Pods-app.debug.xcconfig */, + AA52915648F9E2111DA9ADD8 /* Pods-app.release.xcconfig */, + CC31CE4B797ED8DCD20C1535 /* Pods-app-appTests.debug.xcconfig */, + 1F5A3A10A9E763C1649E35A2 /* Pods-app-appTests.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -158,11 +158,11 @@ isa = PBXNativeTarget; buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "appTests" */; buildPhases = ( - F309585457BFF312EF73FD95 /* [CP] Check Pods Manifest.lock */, + 5D162178C88ED1C10D55B6A4 /* [CP] Check Pods Manifest.lock */, 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, - 2772CBCCE24036517E86445D /* [CP] Copy Pods Resources */, + 431D96626A2B8B60C16D4F56 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -178,13 +178,13 @@ isa = PBXNativeTarget; buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "app" */; buildPhases = ( - 4D45C29570A58E7A8A8D177D /* [CP] Check Pods Manifest.lock */, + 467B75E7982670E38F3A3036 /* [CP] Check Pods Manifest.lock */, FD10A7F022414F080027D42C /* Start Packager */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, - 9CEFF2A5EA3D60C120442CA6 /* [CP] Copy Pods Resources */, + 55D43DDC59A5C9BA3D615BAB /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -266,7 +266,7 @@ shellPath = /bin/sh; shellScript = "set -e\n\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n"; }; - 2772CBCCE24036517E86445D /* [CP] Copy Pods Resources */ = { + 431D96626A2B8B60C16D4F56 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -283,7 +283,7 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 4D45C29570A58E7A8A8D177D /* [CP] Check Pods Manifest.lock */ = { + 467B75E7982670E38F3A3036 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -305,7 +305,7 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 9CEFF2A5EA3D60C120442CA6 /* [CP] Copy Pods Resources */ = { + 55D43DDC59A5C9BA3D615BAB /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -322,7 +322,7 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-resources.sh\"\n"; showEnvVarsInLog = 0; }; - F309585457BFF312EF73FD95 /* [CP] Check Pods Manifest.lock */ = { + 5D162178C88ED1C10D55B6A4 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -396,7 +396,7 @@ /* Begin XCBuildConfiguration section */ 00E356F61AD99517003FC87E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 19C43486502F2DE23E091FE3 /* Pods-app-appTests.debug.xcconfig */; + baseConfigurationReference = CC31CE4B797ED8DCD20C1535 /* Pods-app-appTests.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -424,7 +424,7 @@ }; 00E356F71AD99517003FC87E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 03F7088487057F17D25D2F4B /* Pods-app-appTests.release.xcconfig */; + baseConfigurationReference = 1F5A3A10A9E763C1649E35A2 /* Pods-app-appTests.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -449,7 +449,7 @@ }; 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = ED22CAA45207BC18E75DB44B /* Pods-app.debug.xcconfig */; + baseConfigurationReference = 9778B24B11B793045DA74F2B /* Pods-app.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -478,7 +478,7 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 970005155A83960D1D13380F /* Pods-app.release.xcconfig */; + baseConfigurationReference = AA52915648F9E2111DA9ADD8 /* Pods-app.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; diff --git a/ios/app/Info.plist b/ios/app/Info.plist index 416d557597..5a9e7e53ab 100644 --- a/ios/app/Info.plist +++ b/ios/app/Info.plist @@ -48,6 +48,8 @@ + NSPhotoLibraryUsageDescription + NSLocationWhenInUseUsageDescription UILaunchStoryboardName diff --git a/package.json b/package.json index f500c0e87c..35e4615a9f 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "@fortawesome/react-native-fontawesome": "^0.3.0", "@gorhom/bottom-sheet": "^4", "@react-native-async-storage/async-storage": "^1.17.6", + "@react-native-camera-roll/camera-roll": "^5.1.0", "@react-native-clipboard/clipboard": "^1.10.0", "@zxing/text-encoding": "^0.9.0", "base64-js": "^1.5.1", @@ -33,6 +34,7 @@ "react-native": "0.68.2", "react-native-appstate-hook": "^1.0.6", "react-native-gesture-handler": "^2.5.0", + "react-native-image-crop-picker": "^0.38.1", "react-native-inappbrowser-reborn": "^3.6.3", "react-native-linear-gradient": "^2.6.2", "react-native-pager-view": "^6.0.2", @@ -74,7 +76,9 @@ }, "jest": { "preset": "react-native", - "setupFiles": ["./jest.js"], + "setupFiles": [ + "./jest.js" + ], "moduleFileExtensions": [ "ts", "tsx", diff --git a/src/state/models/user-local-photos.ts b/src/state/models/user-local-photos.ts new file mode 100644 index 0000000000..4e01f1d94f --- /dev/null +++ b/src/state/models/user-local-photos.ts @@ -0,0 +1,25 @@ +import {PhotoIdentifier} from './../../../node_modules/@react-native-camera-roll/camera-roll/src/CameraRoll' +import {makeAutoObservable} from 'mobx' +import {CameraRoll} from '@react-native-camera-roll/camera-roll' +import {RootStoreModel} from './root-store' + +export class UserLocalPhotosModel { + // state + photos: PhotoIdentifier[] = [] + + constructor(public rootStore: RootStoreModel) { + makeAutoObservable(this, { + rootStore: false, + }) + } + + async setup() { + await this._getPhotos() + } + + private async _getPhotos() { + CameraRoll.getPhotos({first: 20}).then(r => { + this.photos = r.edges + }) + } +} diff --git a/src/view/com/composer/ComposePost.tsx b/src/view/com/composer/ComposePost.tsx index bb175f166c..10305adb67 100644 --- a/src/view/com/composer/ComposePost.tsx +++ b/src/view/com/composer/ComposePost.tsx @@ -9,10 +9,13 @@ import { TextInput, TouchableOpacity, View, + ScrollView, + Image, } from 'react-native' import LinearGradient from 'react-native-linear-gradient' import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' import {UserAutocompleteViewModel} from '../../../state/models/user-autocomplete-view' +import {UserLocalPhotosModel} from '../../../state/models/user-local-photos' import {Autocomplete} from './Autocomplete' import Toast from '../util/Toast' import ProgressCircle from '../util/ProgressCircle' @@ -22,6 +25,7 @@ import * as apilib from '../../../state/lib/api' import {ComposerOpts} from '../../../state/models/shell-ui' import {s, colors, gradients} from '../../lib/styles' import {detectLinkables} from '../../../lib/strings' +import {openPicker, openCamera} from 'react-native-image-crop-picker' const MAX_TEXT_LENGTH = 256 const WARNING_TEXT_LENGTH = 200 @@ -40,15 +44,24 @@ export const ComposePost = observer(function ComposePost({ const [isProcessing, setIsProcessing] = useState(false) const [error, setError] = useState('') const [text, setText] = useState('') + const [photoUris, setPhotoUris] = useState([]) const autocompleteView = useMemo( () => new UserAutocompleteViewModel(store), [], ) + const localPhotos = useMemo( + () => new UserLocalPhotosModel(store), + [], + ) useEffect(() => { autocompleteView.setup() }) + useEffect(() => { + localPhotos.setup() + }, []) + const onChangeText = (newText: string) => { setText(newText) @@ -183,12 +196,109 @@ export const ComposePost = observer(function ComposePost({ multiline scrollEnabled onChangeText={(text: string) => onChangeText(text)} - placeholder={replyTo ? 'Write your reply' : "What's up?"} + placeholder={ + replyTo + ? 'Write your reply' + : photoUris.length === 0 + ? "What's up?" + : 'Add a comment...' + } style={styles.textInput}> {textDecorated} - + {photoUris.length !== 0 && ( + + {photoUris.length !== 0 && + photoUris.map(item => ( + + { + setPhotoUris( + photoUris.filter(filterItem => filterItem !== item), + ) + }} + style={styles.removePhotoButton}> + + + + + + ))} + + )} + {localPhotos.photos != null && text === '' && photoUris.length === 0 && ( + + { + openCamera({multiple: true, maxFiles: 4}).then() + }}> + + + {localPhotos.photos.map(item => ( + { + setPhotoUris([item.node.image.uri, ...photoUris]) + }}> + + + ))} + { + openPicker({multiple: true, maxFiles: 4}).then(items => { + setPhotoUris([ + ...items.reduce( + (accum, cur) => accum.concat(cur.sourceURL!), + [] as string[], + ), + ...photoUris, + ]) + }) + }}> + + + + )} + + {MAX_TEXT_LENGTH - text.length} @@ -275,4 +385,69 @@ const styles = StyleSheet.create({ marginTop: 5, marginBottom: 10, }, + contentCenter: {alignItems: 'center'}, + selectedImageContainer: { + flex: 10, + flexDirection: 'row', + }, + selectedImage: { + borderRadius: 8, + margin: 2, + }, + selectedImage250: { + width: 250, + height: 250, + }, + selectedImage175: { + width: 175, + height: 175, + }, + selectedImage85: { + width: 85, + height: 85, + }, + photosContainer: { + width: '100%', + maxHeight: 96, + padding: 8, + overflow: 'hidden', + }, + removePhotoButton: { + position: 'absolute', + top: 8, + right: 8, + width: 24, + height: 24, + borderRadius: 12, + alignItems: 'center', + justifyContent: 'center', + backgroundColor: colors.black, + zIndex: 1, + }, + galleryButton: { + borderWidth: 1, + borderColor: colors.gray3, + alignItems: 'center', + justifyContent: 'center', + }, + photoButton: { + width: 75, + height: 75, + marginRight: 8, + borderWidth: 1, + borderRadius: 16, + borderColor: colors.gray3, + }, + photo: { + width: 75, + height: 75, + marginRight: 8, + borderRadius: 16, + }, + separator: { + borderBottomColor: 'black', + borderBottomWidth: StyleSheet.hairlineWidth, + width: '110%', + marginLeft: -16, + }, }) diff --git a/src/view/index.ts b/src/view/index.ts index e38e1debf1..bd0e33cbe7 100644 --- a/src/view/index.ts +++ b/src/view/index.ts @@ -56,6 +56,9 @@ import {faUserXmark} from '@fortawesome/free-solid-svg-icons/faUserXmark' import {faTicket} from '@fortawesome/free-solid-svg-icons/faTicket' import {faTrashCan} from '@fortawesome/free-regular-svg-icons/faTrashCan' import {faX} from '@fortawesome/free-solid-svg-icons/faX' +import {faCamera} from '@fortawesome/free-solid-svg-icons/faCamera' +import {faImage} from '@fortawesome/free-solid-svg-icons/faImage' +import {faXmark} from '@fortawesome/free-solid-svg-icons/faXmark' export function setup() { library.add( @@ -115,5 +118,8 @@ export function setup() { faTicket, faTrashCan, faX, + faCamera, + faImage, + faXmark, ) } diff --git a/yarn.lock b/yarn.lock index ce2d532d25..76c7f64f5a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1897,6 +1897,11 @@ dependencies: merge-options "^3.0.4" +"@react-native-camera-roll/camera-roll@^5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@react-native-camera-roll/camera-roll/-/camera-roll-5.1.0.tgz#5cfb3cf02d72ab03b3d6a0bdda392e2896c8d55f" + integrity sha512-74pavpt2T2U3V0r5d+pn4NChJbRNcydqakp3NVmosod35Lzxrt9My7kCLDdHXW2S6J6DhgXb/n36/heZQB4AUA== + "@react-native-clipboard/clipboard@^1.10.0": version "1.11.1" resolved "https://registry.yarnpkg.com/@react-native-clipboard/clipboard/-/clipboard-1.11.1.tgz#d3a9e685ce2383b1e92b89a334896c5575cc103d" @@ -10186,6 +10191,11 @@ react-native-gradle-plugin@^0.0.6: resolved "https://registry.yarnpkg.com/react-native-gradle-plugin/-/react-native-gradle-plugin-0.0.6.tgz#b61a9234ad2f61430937911003cddd7e15c72b45" integrity sha512-eIlgtsmDp1jLC24dRn43hB3kEcZVqx6DUQbR0N1ABXGnMEafm9I3V3dUUeD1vh+Dy5WqijSoEwLNUPLgu5zDMg== +react-native-image-crop-picker@^0.38.1: + version "0.38.1" + resolved "https://registry.yarnpkg.com/react-native-image-crop-picker/-/react-native-image-crop-picker-0.38.1.tgz#5973b4a8b55835b987e6be2064de411e849ac005" + integrity sha512-cF5UQnWplzHCeiCO+aiGS/0VomWaLmFf3nSsgTMPfY+8+99h8N/eHQvVdSF7RsGw50B8394wGeGyqHjjp8YRWw== + react-native-inappbrowser-reborn@^3.6.3: version "3.7.0" resolved "https://registry.yarnpkg.com/react-native-inappbrowser-reborn/-/react-native-inappbrowser-reborn-3.7.0.tgz#849a43c3c7da22b65147649fe596836bcb494083" From 3ce113f1076bbeeffc20888b3a28b2680ada8ab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreiro?= Date: Mon, 28 Nov 2022 16:56:23 +0000 Subject: [PATCH 02/15] fix android compile --- android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index e997cb0e66..16e3e93d08 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,10 +4,10 @@ import org.apache.tools.ant.taskdefs.condition.Os buildscript { ext { - buildToolsVersion = "31.0.0" + buildToolsVersion = "33.0.0" minSdkVersion = 21 - compileSdkVersion = 31 - targetSdkVersion = 31 + compileSdkVersion = 33 + targetSdkVersion = 33 if (System.properties['os.arch'] == "aarch64") { // For M1 Users we need to use the NDK 24 which added support for aarch64 From acfdea2518ad047896079b2ab7b716fa9544baee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreiro?= Date: Tue, 29 Nov 2022 10:59:32 +0000 Subject: [PATCH 03/15] reafctor image carousel into new component; fix photo overlapping text in composer --- ios/app.xcodeproj/project.pbxproj | 130 ++++++------ src/view/com/composer/ComposePost.tsx | 197 +++--------------- src/view/com/composer/PhotoCarouselPicker.tsx | 192 +++++++++++++++++ 3 files changed, 285 insertions(+), 234 deletions(-) create mode 100644 src/view/com/composer/PhotoCarouselPicker.tsx diff --git a/ios/app.xcodeproj/project.pbxproj b/ios/app.xcodeproj/project.pbxproj index 323cf87b0b..f964b12323 100644 --- a/ios/app.xcodeproj/project.pbxproj +++ b/ios/app.xcodeproj/project.pbxproj @@ -8,13 +8,13 @@ /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* appTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* appTests.m */; }; - 03CEA62EF4246066A4356DBF /* libPods-app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 40C05267EED8EC1DA4212FD4 /* libPods-app.a */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 64B2214C33449E5F5EB4EA8C /* libPods-app-appTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D5A91013937D8724CBF0A625 /* libPods-app-appTests.a */; }; + 6D37A166CEFC7E8937DE72CB /* libPods-app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 596ED3134AA9EF6DBAB6EB96 /* libPods-app.a */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; E4BBD590292C1F5200296224 /* app.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = E4437C9E28581FA7006DA9E7 /* app.entitlements */; }; + F19C1FC2EC3C7162CB25E815 /* libPods-app-appTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16A4C892E71787BF5849EC83 /* libPods-app-appTests.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -31,19 +31,19 @@ 00E356EE1AD99517003FC87E /* appTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = appTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 00E356F21AD99517003FC87E /* appTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = appTests.m; sourceTree = ""; }; + 0C0949EE4E80361188F0C002 /* Pods-app.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.debug.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.debug.xcconfig"; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = app.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = app/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = app/AppDelegate.mm; sourceTree = ""; }; 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = app/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = app/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = app/main.m; sourceTree = ""; }; - 1F5A3A10A9E763C1649E35A2 /* Pods-app-appTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.release.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.release.xcconfig"; sourceTree = ""; }; - 40C05267EED8EC1DA4212FD4 /* libPods-app.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 16A4C892E71787BF5849EC83 /* libPods-app-appTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app-appTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 30A0A65C98339E6009F0927D /* Pods-app.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.release.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.release.xcconfig"; sourceTree = ""; }; + 4DFF35494A5D1C813CE7EF11 /* Pods-app-appTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.debug.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.debug.xcconfig"; sourceTree = ""; }; + 596ED3134AA9EF6DBAB6EB96 /* libPods-app.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 685FA16DF9AC2B99AE3B5DBD /* Pods-app-appTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.release.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.release.xcconfig"; sourceTree = ""; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = app/LaunchScreen.storyboard; sourceTree = ""; }; - 9778B24B11B793045DA74F2B /* Pods-app.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.debug.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.debug.xcconfig"; sourceTree = ""; }; - AA52915648F9E2111DA9ADD8 /* Pods-app.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.release.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.release.xcconfig"; sourceTree = ""; }; - CC31CE4B797ED8DCD20C1535 /* Pods-app-appTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.debug.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.debug.xcconfig"; sourceTree = ""; }; - D5A91013937D8724CBF0A625 /* libPods-app-appTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app-appTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; E4437C9E28581FA7006DA9E7 /* app.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = app.entitlements; path = app/app.entitlements; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -53,7 +53,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 64B2214C33449E5F5EB4EA8C /* libPods-app-appTests.a in Frameworks */, + F19C1FC2EC3C7162CB25E815 /* libPods-app-appTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -61,7 +61,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 03CEA62EF4246066A4356DBF /* libPods-app.a in Frameworks */, + 6D37A166CEFC7E8937DE72CB /* libPods-app.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,8 +103,8 @@ isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, - 40C05267EED8EC1DA4212FD4 /* libPods-app.a */, - D5A91013937D8724CBF0A625 /* libPods-app-appTests.a */, + 596ED3134AA9EF6DBAB6EB96 /* libPods-app.a */, + 16A4C892E71787BF5849EC83 /* libPods-app-appTests.a */, ); name = Frameworks; sourceTree = ""; @@ -143,10 +143,10 @@ BBD78D7AC51CEA395F1C20DB /* Pods */ = { isa = PBXGroup; children = ( - 9778B24B11B793045DA74F2B /* Pods-app.debug.xcconfig */, - AA52915648F9E2111DA9ADD8 /* Pods-app.release.xcconfig */, - CC31CE4B797ED8DCD20C1535 /* Pods-app-appTests.debug.xcconfig */, - 1F5A3A10A9E763C1649E35A2 /* Pods-app-appTests.release.xcconfig */, + 0C0949EE4E80361188F0C002 /* Pods-app.debug.xcconfig */, + 30A0A65C98339E6009F0927D /* Pods-app.release.xcconfig */, + 4DFF35494A5D1C813CE7EF11 /* Pods-app-appTests.debug.xcconfig */, + 685FA16DF9AC2B99AE3B5DBD /* Pods-app-appTests.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -158,11 +158,11 @@ isa = PBXNativeTarget; buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "appTests" */; buildPhases = ( - 5D162178C88ED1C10D55B6A4 /* [CP] Check Pods Manifest.lock */, + D25A2C8B8B280E54CDBF5192 /* [CP] Check Pods Manifest.lock */, 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, - 431D96626A2B8B60C16D4F56 /* [CP] Copy Pods Resources */, + 93C4A008E3B1F5BDF90AA282 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -178,13 +178,13 @@ isa = PBXNativeTarget; buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "app" */; buildPhases = ( - 467B75E7982670E38F3A3036 /* [CP] Check Pods Manifest.lock */, + E5C10128C4EC047B9CD6EEFB /* [CP] Check Pods Manifest.lock */, FD10A7F022414F080027D42C /* Start Packager */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, - 55D43DDC59A5C9BA3D615BAB /* [CP] Copy Pods Resources */, + 29E5C2625DDCB23B01CF3257 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -266,46 +266,7 @@ shellPath = /bin/sh; shellScript = "set -e\n\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n"; }; - 431D96626A2B8B60C16D4F56 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 467B75E7982670E38F3A3036 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-app-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; - 55D43DDC59A5C9BA3D615BAB /* [CP] Copy Pods Resources */ = { + 29E5C2625DDCB23B01CF3257 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -322,7 +283,24 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 5D162178C88ED1C10D55B6A4 /* [CP] Check Pods Manifest.lock */ = { + 93C4A008E3B1F5BDF90AA282 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + D25A2C8B8B280E54CDBF5192 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -344,6 +322,28 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + E5C10128C4EC047B9CD6EEFB /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-app-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; FD10A7F022414F080027D42C /* Start Packager */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -396,7 +396,7 @@ /* Begin XCBuildConfiguration section */ 00E356F61AD99517003FC87E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CC31CE4B797ED8DCD20C1535 /* Pods-app-appTests.debug.xcconfig */; + baseConfigurationReference = 4DFF35494A5D1C813CE7EF11 /* Pods-app-appTests.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -424,7 +424,7 @@ }; 00E356F71AD99517003FC87E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1F5A3A10A9E763C1649E35A2 /* Pods-app-appTests.release.xcconfig */; + baseConfigurationReference = 685FA16DF9AC2B99AE3B5DBD /* Pods-app-appTests.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -449,7 +449,7 @@ }; 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9778B24B11B793045DA74F2B /* Pods-app.debug.xcconfig */; + baseConfigurationReference = 0C0949EE4E80361188F0C002 /* Pods-app.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -478,7 +478,7 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AA52915648F9E2111DA9ADD8 /* Pods-app.release.xcconfig */; + baseConfigurationReference = 30A0A65C98339E6009F0927D /* Pods-app.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; diff --git a/src/view/com/composer/ComposePost.tsx b/src/view/com/composer/ComposePost.tsx index ce42ee17ec..2f8c29e7c9 100644 --- a/src/view/com/composer/ComposePost.tsx +++ b/src/view/com/composer/ComposePost.tsx @@ -9,13 +9,10 @@ import { TextInput, TouchableOpacity, View, - ScrollView, - Image, } from 'react-native' import LinearGradient from 'react-native-linear-gradient' import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' import {UserAutocompleteViewModel} from '../../../state/models/user-autocomplete-view' -import {UserLocalPhotosModel} from '../../../state/models/user-local-photos' import {Autocomplete} from './Autocomplete' import * as Toast from '../util/Toast' import ProgressCircle from '../util/ProgressCircle' @@ -26,7 +23,8 @@ import * as apilib from '../../../state/lib/api' import {ComposerOpts} from '../../../state/models/shell-ui' import {s, colors, gradients} from '../../lib/styles' import {detectLinkables} from '../../../lib/strings' -import {openPicker, openCamera} from 'react-native-image-crop-picker' +import {PhotoCarouselPicker} from './PhotoCarouselPicker' +import {UserLocalPhotosModel} from '../../../state/models/user-local-photos' const MAX_TEXT_LENGTH = 256 const DANGER_TEXT_LENGTH = MAX_TEXT_LENGTH @@ -45,7 +43,8 @@ export const ComposePost = observer(function ComposePost({ const [isProcessing, setIsProcessing] = useState(false) const [error, setError] = useState('') const [text, setText] = useState('') - const [photoUris, setPhotoUris] = useState([]) + const [selectedPhotos, setSelectedPhotos] = useState([]) + const autocompleteView = useMemo( () => new UserAutocompleteViewModel(store), [], @@ -58,6 +57,11 @@ export const ComposePost = observer(function ComposePost({ useEffect(() => { autocompleteView.setup() }) + + useEffect(() => { + localPhotos.setup() + }, []) + useEffect(() => { // HACK // wait a moment before focusing the input to resolve some layout bugs with the keyboard-avoiding-view @@ -75,10 +79,6 @@ export const ComposePost = observer(function ComposePost({ } }, [textInput.current]) - useEffect(() => { - localPhotos.setup() - }, []) - const onChangeText = (newText: string) => { setText(newText) @@ -207,7 +207,13 @@ export const ComposePost = observer(function ComposePost({ ) : undefined} - + - {photoUris.length !== 0 && ( - - {photoUris.length !== 0 && - photoUris.map((item, index) => ( - - { - setPhotoUris( - photoUris.filter(filterItem => filterItem !== item), - ) - }} - style={styles.removePhotoButton}> - - - - - - ))} - - )} - {localPhotos.photos != null && text === '' && photoUris.length === 0 && ( - - { - openCamera({multiple: true, maxFiles: 4}).then() - }}> - - - {localPhotos.photos.map((item, index) => ( - { - setPhotoUris([item.node.image.uri, ...photoUris]) - }}> - - - ))} - { - openPicker({multiple: true, maxFiles: 4}).then(items => { - setPhotoUris([ - ...items.reduce( - (accum, cur) => accum.concat(cur.sourceURL!), - [] as string[], - ), - ...photoUris, - ]) - }) - }}> - - - - )} - + @@ -390,9 +308,14 @@ const styles = StyleSheet.create({ justifyContent: 'center', marginRight: 5, }, + textInputLayoutWithPhoto: { + flexWrap: 'wrap', + }, + textInputLayoutWithoutPhoto: { + flex: 1, + }, textInputLayout: { flexDirection: 'row', - flex: 1, borderTopWidth: 1, borderTopColor: colors.gray2, paddingTop: 16, @@ -416,68 +339,4 @@ const styles = StyleSheet.create({ paddingRight: 8, }, contentCenter: {alignItems: 'center'}, - selectedImageContainer: { - flex: 10, - flexDirection: 'row', - }, - selectedImage: { - borderRadius: 8, - margin: 2, - }, - selectedImage250: { - width: 250, - height: 250, - }, - selectedImage175: { - width: 175, - height: 175, - }, - selectedImage85: { - width: 85, - height: 85, - }, - photosContainer: { - width: '100%', - maxHeight: 96, - padding: 8, - overflow: 'hidden', - }, - removePhotoButton: { - position: 'absolute', - top: 8, - right: 8, - width: 24, - height: 24, - borderRadius: 12, - alignItems: 'center', - justifyContent: 'center', - backgroundColor: colors.black, - zIndex: 1, - }, - galleryButton: { - borderWidth: 1, - borderColor: colors.gray3, - alignItems: 'center', - justifyContent: 'center', - }, - photoButton: { - width: 75, - height: 75, - marginRight: 8, - borderWidth: 1, - borderRadius: 16, - borderColor: colors.gray3, - }, - photo: { - width: 75, - height: 75, - marginRight: 8, - borderRadius: 16, - }, - separator: { - borderBottomColor: 'black', - borderBottomWidth: StyleSheet.hairlineWidth, - width: '110%', - marginLeft: -16, - }, }) diff --git a/src/view/com/composer/PhotoCarouselPicker.tsx b/src/view/com/composer/PhotoCarouselPicker.tsx new file mode 100644 index 0000000000..f3c3b89c06 --- /dev/null +++ b/src/view/com/composer/PhotoCarouselPicker.tsx @@ -0,0 +1,192 @@ +import React from 'react' +import { + Image, + StyleSheet, + TouchableOpacity, + View, + ScrollView, +} from 'react-native' +import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' +import {colors} from '../../lib/styles' +import {openPicker, openCamera} from 'react-native-image-crop-picker' +import {observer} from 'mobx-react-lite' + +export const PhotoCarouselPicker = observer(function PhotoCarouselPicker({ + selectedPhotos, + setSelectedPhotos, + inputText, + localPhotos, +}: { + selectedPhotos: string[] + setSelectedPhotos: React.Dispatch> + inputText: string + localPhotos: any +}) { + return ( + <> + {selectedPhotos.length !== 0 && ( + + {selectedPhotos.length !== 0 && + selectedPhotos.map((item, index) => ( + + { + setSelectedPhotos( + selectedPhotos.filter(filterItem => filterItem !== item), + ) + }} + style={styles.removePhotoButton}> + + + + + + ))} + + )} + {localPhotos.photos != null && + inputText === '' && + selectedPhotos.length === 0 && ( + + { + openCamera({multiple: true, maxFiles: 4}).then() + }}> + + + {localPhotos.photos.map((item: any, index: number) => ( + { + setSelectedPhotos([item.node.image.uri, ...selectedPhotos]) + }}> + + + ))} + { + openPicker({multiple: true, maxFiles: 4}).then(items => { + setSelectedPhotos([ + ...items.reduce( + (accum, cur) => accum.concat(cur.sourceURL!), + [] as string[], + ), + ...selectedPhotos, + ]) + }) + }}> + + + + )} + + + ) +}) + +const styles = StyleSheet.create({ + selectedImageContainer: { + flex: 1, + flexDirection: 'row', + marginTop: 16, + }, + selectedImage: { + borderRadius: 8, + margin: 2, + }, + selectedImage250: { + width: 250, + height: 250, + }, + selectedImage175: { + width: 175, + height: 175, + }, + selectedImage85: { + width: 85, + height: 85, + }, + photosContainer: { + width: '100%', + maxHeight: 96, + padding: 8, + overflow: 'hidden', + }, + removePhotoButton: { + position: 'absolute', + top: 8, + right: 8, + width: 24, + height: 24, + borderRadius: 12, + alignItems: 'center', + justifyContent: 'center', + backgroundColor: colors.black, + zIndex: 1, + }, + galleryButton: { + borderWidth: 1, + borderColor: colors.gray3, + alignItems: 'center', + justifyContent: 'center', + }, + photoButton: { + width: 75, + height: 75, + marginRight: 8, + borderWidth: 1, + borderRadius: 16, + borderColor: colors.gray3, + }, + photo: { + width: 75, + height: 75, + marginRight: 8, + borderRadius: 16, + }, + separator: { + borderBottomColor: 'black', + borderBottomWidth: StyleSheet.hairlineWidth, + width: '100%', + }, +}) From 0102e91f3a5f2c6458aa7e2884d4862742f54a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreiro?= Date: Tue, 29 Nov 2022 15:25:32 +0000 Subject: [PATCH 04/15] revert android changes --- android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 16e3e93d08..e997cb0e66 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,10 +4,10 @@ import org.apache.tools.ant.taskdefs.condition.Os buildscript { ext { - buildToolsVersion = "33.0.0" + buildToolsVersion = "31.0.0" minSdkVersion = 21 - compileSdkVersion = 33 - targetSdkVersion = 33 + compileSdkVersion = 31 + targetSdkVersion = 31 if (System.properties['os.arch'] == "aarch64") { // For M1 Users we need to use the NDK 24 which added support for aarch64 From 31be6fbbac5091ebdf1734fecf4eae50d2ad3159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreiro?= Date: Tue, 29 Nov 2022 15:35:49 +0000 Subject: [PATCH 05/15] further refactoring code into different components --- src/view/com/composer/ComposePost.tsx | 27 ++- src/view/com/composer/PhotoCarouselPicker.tsx | 191 +++++------------- src/view/com/composer/SelectedPhoto.tsx | 83 ++++++++ 3 files changed, 147 insertions(+), 154 deletions(-) create mode 100644 src/view/com/composer/SelectedPhoto.tsx diff --git a/src/view/com/composer/ComposePost.tsx b/src/view/com/composer/ComposePost.tsx index 2f8c29e7c9..114586f478 100644 --- a/src/view/com/composer/ComposePost.tsx +++ b/src/view/com/composer/ComposePost.tsx @@ -23,8 +23,9 @@ import * as apilib from '../../../state/lib/api' import {ComposerOpts} from '../../../state/models/shell-ui' import {s, colors, gradients} from '../../lib/styles' import {detectLinkables} from '../../../lib/strings' -import {PhotoCarouselPicker} from './PhotoCarouselPicker' import {UserLocalPhotosModel} from '../../../state/models/user-local-photos' +import {PhotoCarouselPicker} from './PhotoCarouselPicker' +import {SelectedPhoto} from './SelectedPhoto' const MAX_TEXT_LENGTH = 256 const DANGER_TEXT_LENGTH = MAX_TEXT_LENGTH @@ -60,7 +61,7 @@ export const ComposePost = observer(function ComposePost({ useEffect(() => { localPhotos.setup() - }, []) + }, [localPhotos]) useEffect(() => { // HACK @@ -130,6 +131,10 @@ export const ComposePost = observer(function ComposePost({ const canPost = text.length <= MAX_TEXT_LENGTH const progressColor = text.length > DANGER_TEXT_LENGTH ? '#e60000' : undefined + const selectTextInputLayout = + selectedPhotos.length !== 0 + ? styles.textInputLayoutWithPhoto + : styles.textInputLayoutWithoutPhoto const textDecorated = useMemo(() => { let i = 0 @@ -207,13 +212,7 @@ export const ComposePost = observer(function ComposePost({ ) : undefined} - + + + @@ -339,4 +343,9 @@ const styles = StyleSheet.create({ paddingRight: 8, }, contentCenter: {alignItems: 'center'}, + separator: { + borderBottomColor: 'black', + borderBottomWidth: StyleSheet.hairlineWidth, + width: '100%', + }, }) diff --git a/src/view/com/composer/PhotoCarouselPicker.tsx b/src/view/com/composer/PhotoCarouselPicker.tsx index f3c3b89c06..17be8a5f5e 100644 --- a/src/view/com/composer/PhotoCarouselPicker.tsx +++ b/src/view/com/composer/PhotoCarouselPicker.tsx @@ -1,11 +1,5 @@ import React from 'react' -import { - Image, - StyleSheet, - TouchableOpacity, - View, - ScrollView, -} from 'react-native' +import {Image, StyleSheet, TouchableOpacity, ScrollView} from 'react-native' import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' import {colors} from '../../lib/styles' import {openPicker, openCamera} from 'react-native-image-crop-picker' @@ -22,148 +16,60 @@ export const PhotoCarouselPicker = observer(function PhotoCarouselPicker({ inputText: string localPhotos: any }) { - return ( - <> - {selectedPhotos.length !== 0 && ( - - {selectedPhotos.length !== 0 && - selectedPhotos.map((item, index) => ( - - { - setSelectedPhotos( - selectedPhotos.filter(filterItem => filterItem !== item), - ) - }} - style={styles.removePhotoButton}> - - - - - - ))} - - )} - {localPhotos.photos != null && - inputText === '' && - selectedPhotos.length === 0 && ( - - { - openCamera({multiple: true, maxFiles: 4}).then() - }}> - - - {localPhotos.photos.map((item: any, index: number) => ( - { - setSelectedPhotos([item.node.image.uri, ...selectedPhotos]) - }}> - - - ))} - { - openPicker({multiple: true, maxFiles: 4}).then(items => { - setSelectedPhotos([ - ...items.reduce( - (accum, cur) => accum.concat(cur.sourceURL!), - [] as string[], - ), - ...selectedPhotos, - ]) - }) - }}> - - - - )} - - - ) + return localPhotos.photos != null && + inputText === '' && + selectedPhotos.length === 0 ? ( + + { + openCamera({multiple: true, maxFiles: 4}).then() + }}> + + + {localPhotos.photos.map((item: any, index: number) => ( + { + setSelectedPhotos([item.node.image.uri, ...selectedPhotos]) + }}> + + + ))} + { + openPicker({multiple: true, maxFiles: 4}).then(items => { + setSelectedPhotos([ + ...items.reduce( + (accum, cur) => accum.concat(cur.sourceURL!), + [] as string[], + ), + ...selectedPhotos, + ]) + }) + }}> + + + + ) : null }) const styles = StyleSheet.create({ - selectedImageContainer: { - flex: 1, - flexDirection: 'row', - marginTop: 16, - }, - selectedImage: { - borderRadius: 8, - margin: 2, - }, - selectedImage250: { - width: 250, - height: 250, - }, - selectedImage175: { - width: 175, - height: 175, - }, - selectedImage85: { - width: 85, - height: 85, - }, photosContainer: { width: '100%', maxHeight: 96, padding: 8, overflow: 'hidden', }, - removePhotoButton: { - position: 'absolute', - top: 8, - right: 8, - width: 24, - height: 24, - borderRadius: 12, - alignItems: 'center', - justifyContent: 'center', - backgroundColor: colors.black, - zIndex: 1, - }, galleryButton: { borderWidth: 1, borderColor: colors.gray3, @@ -184,9 +90,4 @@ const styles = StyleSheet.create({ marginRight: 8, borderRadius: 16, }, - separator: { - borderBottomColor: 'black', - borderBottomWidth: StyleSheet.hairlineWidth, - width: '100%', - }, }) diff --git a/src/view/com/composer/SelectedPhoto.tsx b/src/view/com/composer/SelectedPhoto.tsx new file mode 100644 index 0000000000..1fe1474833 --- /dev/null +++ b/src/view/com/composer/SelectedPhoto.tsx @@ -0,0 +1,83 @@ +import React from 'react' +import {Image, StyleSheet, TouchableOpacity, View} from 'react-native' +import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' +import {colors} from '../../lib/styles' +import {observer} from 'mobx-react-lite' + +export const SelectedPhoto = ({ + selectedPhotos, + setSelectedPhotos, +}: { + selectedPhotos: string[] + setSelectedPhotos: React.Dispatch> +}) => { + const imageStyle = + selectedPhotos.length === 1 + ? styles.image250 + : selectedPhotos.length === 2 + ? styles.image175 + : styles.image85 + + return selectedPhotos.length !== 0 ? ( + + {selectedPhotos.length !== 0 && + selectedPhotos.map((item, index) => ( + + { + setSelectedPhotos( + selectedPhotos.filter(filterItem => filterItem !== item), + ) + }} + style={styles.removePhotoButton}> + + + + + + ))} + + ) : null +} + +const styles = StyleSheet.create({ + imageContainer: { + flex: 1, + flexDirection: 'row', + marginTop: 16, + }, + image: { + borderRadius: 8, + margin: 2, + }, + image250: { + width: 250, + height: 250, + }, + image175: { + width: 175, + height: 175, + }, + image85: { + width: 85, + height: 85, + }, + removePhotoButton: { + position: 'absolute', + top: 8, + right: 8, + width: 24, + height: 24, + borderRadius: 12, + alignItems: 'center', + justifyContent: 'center', + backgroundColor: colors.black, + zIndex: 1, + }, +}) From 23ea5929870c180a688433faabcbeafd2353db11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreiro?= Date: Tue, 29 Nov 2022 16:00:21 +0000 Subject: [PATCH 06/15] move show carousel out of the component --- ios/Podfile | 1 - ios/Podfile.lock | 2 +- ios/app.xcodeproj/project.pbxproj | 88 +++++++++---------- src/view/com/composer/ComposePost.tsx | 15 ++-- src/view/com/composer/PhotoCarouselPicker.tsx | 8 +- src/view/com/composer/SelectedPhoto.tsx | 1 - 6 files changed, 56 insertions(+), 59 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index b4fa1f55f2..abdbbf1d85 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -20,7 +20,6 @@ target 'app' do :app_path => "#{Pod::Config.instance.installation_root}/.." ) - pod 'react-native-cameraroll', :path => '../node_modules/@react-native-camera-roll/camera-roll' target 'appTests' do inherit! :complete diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 37e55dacd8..39f1ead9ed 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -540,6 +540,6 @@ SPEC CHECKSUMS: TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863 Yoga: 99652481fcd320aefa4a7ef90095b95acd181952 -PODFILE CHECKSUM: 1c470a84819c5f003f8861cf58774e2fedb862b3 +PODFILE CHECKSUM: 95dad1cd550c9983fb5c851af858b806e8250502 COCOAPODS: 1.11.3 diff --git a/ios/app.xcodeproj/project.pbxproj b/ios/app.xcodeproj/project.pbxproj index f964b12323..50db4563af 100644 --- a/ios/app.xcodeproj/project.pbxproj +++ b/ios/app.xcodeproj/project.pbxproj @@ -11,10 +11,10 @@ 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 6D37A166CEFC7E8937DE72CB /* libPods-app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 596ED3134AA9EF6DBAB6EB96 /* libPods-app.a */; }; + 56F0250941FE75DA8CF8094A /* libPods-app-appTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5D2424078D205E2F98F0707 /* libPods-app-appTests.a */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; + BFADB63545C91424F7C8293A /* libPods-app.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C668306DD1C0A63684EDCB0 /* libPods-app.a */; }; E4BBD590292C1F5200296224 /* app.entitlements in Resources */ = {isa = PBXBuildFile; fileRef = E4437C9E28581FA7006DA9E7 /* app.entitlements */; }; - F19C1FC2EC3C7162CB25E815 /* libPods-app-appTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 16A4C892E71787BF5849EC83 /* libPods-app-appTests.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -31,21 +31,21 @@ 00E356EE1AD99517003FC87E /* appTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = appTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 00E356F21AD99517003FC87E /* appTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = appTests.m; sourceTree = ""; }; - 0C0949EE4E80361188F0C002 /* Pods-app.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.debug.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.debug.xcconfig"; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = app.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = app/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = app/AppDelegate.mm; sourceTree = ""; }; 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = app/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = app/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = app/main.m; sourceTree = ""; }; - 16A4C892E71787BF5849EC83 /* libPods-app-appTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app-appTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 30A0A65C98339E6009F0927D /* Pods-app.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.release.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.release.xcconfig"; sourceTree = ""; }; - 4DFF35494A5D1C813CE7EF11 /* Pods-app-appTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.debug.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.debug.xcconfig"; sourceTree = ""; }; - 596ED3134AA9EF6DBAB6EB96 /* libPods-app.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 685FA16DF9AC2B99AE3B5DBD /* Pods-app-appTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.release.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.release.xcconfig"; sourceTree = ""; }; + 3D3D4D80CD734363E3EADE03 /* Pods-app.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.release.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.release.xcconfig"; sourceTree = ""; }; + 65D2EDDD9D88DA37994C7743 /* Pods-app-appTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.debug.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.debug.xcconfig"; sourceTree = ""; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = app/LaunchScreen.storyboard; sourceTree = ""; }; + 9C668306DD1C0A63684EDCB0 /* libPods-app.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + A79BD0E1A3F5B868AD4F5D68 /* Pods-app.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app.debug.xcconfig"; path = "Target Support Files/Pods-app/Pods-app.debug.xcconfig"; sourceTree = ""; }; + AA0AD1B60CF7C90FFDB948B9 /* Pods-app-appTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-app-appTests.release.xcconfig"; path = "Target Support Files/Pods-app-appTests/Pods-app-appTests.release.xcconfig"; sourceTree = ""; }; E4437C9E28581FA7006DA9E7 /* app.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = app.entitlements; path = app/app.entitlements; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; + F5D2424078D205E2F98F0707 /* libPods-app-appTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-app-appTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -53,7 +53,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F19C1FC2EC3C7162CB25E815 /* libPods-app-appTests.a in Frameworks */, + 56F0250941FE75DA8CF8094A /* libPods-app-appTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -61,7 +61,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6D37A166CEFC7E8937DE72CB /* libPods-app.a in Frameworks */, + BFADB63545C91424F7C8293A /* libPods-app.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -103,8 +103,8 @@ isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, - 596ED3134AA9EF6DBAB6EB96 /* libPods-app.a */, - 16A4C892E71787BF5849EC83 /* libPods-app-appTests.a */, + 9C668306DD1C0A63684EDCB0 /* libPods-app.a */, + F5D2424078D205E2F98F0707 /* libPods-app-appTests.a */, ); name = Frameworks; sourceTree = ""; @@ -143,10 +143,10 @@ BBD78D7AC51CEA395F1C20DB /* Pods */ = { isa = PBXGroup; children = ( - 0C0949EE4E80361188F0C002 /* Pods-app.debug.xcconfig */, - 30A0A65C98339E6009F0927D /* Pods-app.release.xcconfig */, - 4DFF35494A5D1C813CE7EF11 /* Pods-app-appTests.debug.xcconfig */, - 685FA16DF9AC2B99AE3B5DBD /* Pods-app-appTests.release.xcconfig */, + A79BD0E1A3F5B868AD4F5D68 /* Pods-app.debug.xcconfig */, + 3D3D4D80CD734363E3EADE03 /* Pods-app.release.xcconfig */, + 65D2EDDD9D88DA37994C7743 /* Pods-app-appTests.debug.xcconfig */, + AA0AD1B60CF7C90FFDB948B9 /* Pods-app-appTests.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -158,11 +158,11 @@ isa = PBXNativeTarget; buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "appTests" */; buildPhases = ( - D25A2C8B8B280E54CDBF5192 /* [CP] Check Pods Manifest.lock */, + A8646FFAA087C80271BB2CC6 /* [CP] Check Pods Manifest.lock */, 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, 00E356EC1AD99517003FC87E /* Resources */, - 93C4A008E3B1F5BDF90AA282 /* [CP] Copy Pods Resources */, + 8DC349844744C81F79F94A1E /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -178,13 +178,13 @@ isa = PBXNativeTarget; buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "app" */; buildPhases = ( - E5C10128C4EC047B9CD6EEFB /* [CP] Check Pods Manifest.lock */, + AFA1F7779F8B1AF36C3A7914 /* [CP] Check Pods Manifest.lock */, FD10A7F022414F080027D42C /* Start Packager */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, - 29E5C2625DDCB23B01CF3257 /* [CP] Copy Pods Resources */, + EEF3465D9B31EDDCEB2438EA /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -266,24 +266,7 @@ shellPath = /bin/sh; shellScript = "set -e\n\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n"; }; - 29E5C2625DDCB23B01CF3257 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-resources-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-resources-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 93C4A008E3B1F5BDF90AA282 /* [CP] Copy Pods Resources */ = { + 8DC349844744C81F79F94A1E /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -300,7 +283,7 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app-appTests/Pods-app-appTests-resources.sh\"\n"; showEnvVarsInLog = 0; }; - D25A2C8B8B280E54CDBF5192 /* [CP] Check Pods Manifest.lock */ = { + A8646FFAA087C80271BB2CC6 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -322,7 +305,7 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - E5C10128C4EC047B9CD6EEFB /* [CP] Check Pods Manifest.lock */ = { + AFA1F7779F8B1AF36C3A7914 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -344,6 +327,23 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + EEF3465D9B31EDDCEB2438EA /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-app/Pods-app-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; FD10A7F022414F080027D42C /* Start Packager */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -396,7 +396,7 @@ /* Begin XCBuildConfiguration section */ 00E356F61AD99517003FC87E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4DFF35494A5D1C813CE7EF11 /* Pods-app-appTests.debug.xcconfig */; + baseConfigurationReference = 65D2EDDD9D88DA37994C7743 /* Pods-app-appTests.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -424,7 +424,7 @@ }; 00E356F71AD99517003FC87E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 685FA16DF9AC2B99AE3B5DBD /* Pods-app-appTests.release.xcconfig */; + baseConfigurationReference = AA0AD1B60CF7C90FFDB948B9 /* Pods-app-appTests.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -449,7 +449,7 @@ }; 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 0C0949EE4E80361188F0C002 /* Pods-app.debug.xcconfig */; + baseConfigurationReference = A79BD0E1A3F5B868AD4F5D68 /* Pods-app.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; @@ -478,7 +478,7 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 30A0A65C98339E6009F0927D /* Pods-app.release.xcconfig */; + baseConfigurationReference = 3D3D4D80CD734363E3EADE03 /* Pods-app.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; diff --git a/src/view/com/composer/ComposePost.tsx b/src/view/com/composer/ComposePost.tsx index 114586f478..9fe6b78b37 100644 --- a/src/view/com/composer/ComposePost.tsx +++ b/src/view/com/composer/ComposePost.tsx @@ -232,12 +232,15 @@ export const ComposePost = observer(function ComposePost({ selectedPhotos={selectedPhotos} setSelectedPhotos={setSelectedPhotos} /> - + {localPhotos.photos != null && + text === '' && + selectedPhotos.length === 0 && ( + + )} diff --git a/src/view/com/composer/PhotoCarouselPicker.tsx b/src/view/com/composer/PhotoCarouselPicker.tsx index 17be8a5f5e..9671dd29f7 100644 --- a/src/view/com/composer/PhotoCarouselPicker.tsx +++ b/src/view/com/composer/PhotoCarouselPicker.tsx @@ -8,17 +8,13 @@ import {observer} from 'mobx-react-lite' export const PhotoCarouselPicker = observer(function PhotoCarouselPicker({ selectedPhotos, setSelectedPhotos, - inputText, localPhotos, }: { selectedPhotos: string[] setSelectedPhotos: React.Dispatch> - inputText: string localPhotos: any }) { - return localPhotos.photos != null && - inputText === '' && - selectedPhotos.length === 0 ? ( + return ( - ) : null + ) }) const styles = StyleSheet.create({ diff --git a/src/view/com/composer/SelectedPhoto.tsx b/src/view/com/composer/SelectedPhoto.tsx index 1fe1474833..87f7fbb8c8 100644 --- a/src/view/com/composer/SelectedPhoto.tsx +++ b/src/view/com/composer/SelectedPhoto.tsx @@ -2,7 +2,6 @@ import React from 'react' import {Image, StyleSheet, TouchableOpacity, View} from 'react-native' import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' import {colors} from '../../lib/styles' -import {observer} from 'mobx-react-lite' export const SelectedPhoto = ({ selectedPhotos, From 87d37f9df9842267cc8e9f0d4d85c7ac6d901151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreiro?= Date: Tue, 29 Nov 2022 16:11:17 +0000 Subject: [PATCH 07/15] fixing add photo using camera --- ios/app.xcodeproj/project.pbxproj | 8 ++++---- ios/app/Info.plist | 4 +++- src/view/com/composer/PhotoCarouselPicker.tsx | 5 ++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ios/app.xcodeproj/project.pbxproj b/ios/app.xcodeproj/project.pbxproj index 50db4563af..485aa8e04c 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 = B3LX46C5HS; + DEVELOPMENT_TEAM = 28H695D9YK; 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 = B3LX46C5HS; + DEVELOPMENT_TEAM = 28H695D9YK; "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 5a9e7e53ab..3450031861 100644 --- a/ios/app/Info.plist +++ b/ios/app/Info.plist @@ -48,9 +48,11 @@ + NSLocationWhenInUseUsageDescription + NSPhotoLibraryUsageDescription - NSLocationWhenInUseUsageDescription + NSCameraUsageDescription UILaunchStoryboardName LaunchScreen diff --git a/src/view/com/composer/PhotoCarouselPicker.tsx b/src/view/com/composer/PhotoCarouselPicker.tsx index 9671dd29f7..598ff188f5 100644 --- a/src/view/com/composer/PhotoCarouselPicker.tsx +++ b/src/view/com/composer/PhotoCarouselPicker.tsx @@ -22,7 +22,10 @@ export const PhotoCarouselPicker = observer(function PhotoCarouselPicker({ { - openCamera({multiple: true, maxFiles: 4}).then() + openCamera({multiple: true, maxFiles: 4}).then(item => { + console.log(item) + setSelectedPhotos([item.path, ...selectedPhotos]) + }) }}> Date: Tue, 29 Nov 2022 16:19:15 +0000 Subject: [PATCH 08/15] fix typescript issue; force mediatype photo --- src/view/com/composer/PhotoCarouselPicker.tsx | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/src/view/com/composer/PhotoCarouselPicker.tsx b/src/view/com/composer/PhotoCarouselPicker.tsx index 598ff188f5..6a2b9712ec 100644 --- a/src/view/com/composer/PhotoCarouselPicker.tsx +++ b/src/view/com/composer/PhotoCarouselPicker.tsx @@ -2,7 +2,11 @@ import React from 'react' import {Image, StyleSheet, TouchableOpacity, ScrollView} from 'react-native' import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' import {colors} from '../../lib/styles' -import {openPicker, openCamera} from 'react-native-image-crop-picker' +import { + openPicker, + openCamera, + ImageOrVideo, +} from 'react-native-image-crop-picker' import {observer} from 'mobx-react-lite' export const PhotoCarouselPicker = observer(function PhotoCarouselPicker({ @@ -22,8 +26,7 @@ export const PhotoCarouselPicker = observer(function PhotoCarouselPicker({ { - openCamera({multiple: true, maxFiles: 4}).then(item => { - console.log(item) + openCamera({mediaType: 'photo'}).then(item => { setSelectedPhotos([item.path, ...selectedPhotos]) }) }}> @@ -46,15 +49,17 @@ export const PhotoCarouselPicker = observer(function PhotoCarouselPicker({ { - openPicker({multiple: true, maxFiles: 4}).then(items => { - setSelectedPhotos([ - ...items.reduce( - (accum, cur) => accum.concat(cur.sourceURL!), - [] as string[], - ), - ...selectedPhotos, - ]) - }) + openPicker({multiple: true, maxFiles: 4, mediaType: 'photo'}).then( + items => { + setSelectedPhotos([ + ...items.reduce( + (accum, cur) => accum.concat(cur.sourceURL!), + [] as string[], + ), + ...selectedPhotos, + ]) + }, + ) }}> From 3b899bfc66deff242567bdafd9ecce90f5216965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreiro?= Date: Tue, 29 Nov 2022 16:45:44 +0000 Subject: [PATCH 09/15] change post test with photo attached; remove auto linking settings --- android/settings.gradle | 4 ---- ios/Podfile | 1 - src/view/com/composer/ComposePost.tsx | 8 +++++++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/android/settings.gradle b/android/settings.gradle index e6c53dc6bd..3c22b7a2c7 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,8 +1,4 @@ rootProject.name = 'app' -include ':@react-native-camera-roll_camera-roll' -project(':@react-native-camera-roll_camera-roll').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-camera-roll/camera-roll/android') -include ':@react-native-camera-roll_camera-roll' -project(':@react-native-camera-roll_camera-roll').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-camera-roll/camera-roll/android') apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) include ':app' includeBuild('../node_modules/react-native-gradle-plugin') diff --git a/ios/Podfile b/ios/Podfile index abdbbf1d85..f9a45704c4 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -20,7 +20,6 @@ target 'app' do :app_path => "#{Pod::Config.instance.installation_root}/.." ) - target 'appTests' do inherit! :complete # Pods for testing diff --git a/src/view/com/composer/ComposePost.tsx b/src/view/com/composer/ComposePost.tsx index 9fe6b78b37..ec0b0bf8d8 100644 --- a/src/view/com/composer/ComposePost.tsx +++ b/src/view/com/composer/ComposePost.tsx @@ -223,7 +223,13 @@ export const ComposePost = observer(function ComposePost({ multiline scrollEnabled onChangeText={(text: string) => onChangeText(text)} - placeholder={replyTo ? 'Write your reply' : "What's up?"} + placeholder={ + replyTo + ? 'Write your reply' + : selectedPhotos.length !== 0 + ? 'Write a comment' + : "What's up?" + } style={styles.textInput}> {textDecorated} From 1f16c75121ee324595ca20620b5ec124e43c1b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreiro?= Date: Tue, 29 Nov 2022 17:46:55 +0000 Subject: [PATCH 10/15] use runInAction in getPhotos model --- src/state/models/user-local-photos.ts | 8 +++++--- src/view/com/composer/PhotoCarouselPicker.tsx | 13 ++++--------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/state/models/user-local-photos.ts b/src/state/models/user-local-photos.ts index 4e01f1d94f..12b95e376f 100644 --- a/src/state/models/user-local-photos.ts +++ b/src/state/models/user-local-photos.ts @@ -1,5 +1,5 @@ import {PhotoIdentifier} from './../../../node_modules/@react-native-camera-roll/camera-roll/src/CameraRoll' -import {makeAutoObservable} from 'mobx' +import {makeAutoObservable, runInAction} from 'mobx' import {CameraRoll} from '@react-native-camera-roll/camera-roll' import {RootStoreModel} from './root-store' @@ -18,8 +18,10 @@ export class UserLocalPhotosModel { } private async _getPhotos() { - CameraRoll.getPhotos({first: 20}).then(r => { - this.photos = r.edges + runInAction(() => { + CameraRoll.getPhotos({first: 20}).then(r => { + this.photos = r.edges + }) }) } } diff --git a/src/view/com/composer/PhotoCarouselPicker.tsx b/src/view/com/composer/PhotoCarouselPicker.tsx index 6a2b9712ec..e6b308dcb4 100644 --- a/src/view/com/composer/PhotoCarouselPicker.tsx +++ b/src/view/com/composer/PhotoCarouselPicker.tsx @@ -2,14 +2,9 @@ import React from 'react' import {Image, StyleSheet, TouchableOpacity, ScrollView} from 'react-native' import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' import {colors} from '../../lib/styles' -import { - openPicker, - openCamera, - ImageOrVideo, -} from 'react-native-image-crop-picker' -import {observer} from 'mobx-react-lite' +import {openPicker, openCamera} from 'react-native-image-crop-picker' -export const PhotoCarouselPicker = observer(function PhotoCarouselPicker({ +export const PhotoCarouselPicker = ({ selectedPhotos, setSelectedPhotos, localPhotos, @@ -17,7 +12,7 @@ export const PhotoCarouselPicker = observer(function PhotoCarouselPicker({ selectedPhotos: string[] setSelectedPhotos: React.Dispatch> localPhotos: any -}) { +}) => { return ( ) -}) +} const styles = StyleSheet.create({ photosContainer: { From 68e1abf4a9d082e019e5f78732ded12f0d5d8bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreiro?= Date: Tue, 29 Nov 2022 17:51:06 +0000 Subject: [PATCH 11/15] react-hooks/exhaustive-deps fixes --- src/view/com/composer/ComposePost.tsx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/view/com/composer/ComposePost.tsx b/src/view/com/composer/ComposePost.tsx index ec0b0bf8d8..7b41f95fca 100644 --- a/src/view/com/composer/ComposePost.tsx +++ b/src/view/com/composer/ComposePost.tsx @@ -48,20 +48,17 @@ export const ComposePost = observer(function ComposePost({ const autocompleteView = useMemo( () => new UserAutocompleteViewModel(store), - [], + [store], ) const localPhotos = useMemo( () => new UserLocalPhotosModel(store), - [], + [store], ) useEffect(() => { autocompleteView.setup() - }) - - useEffect(() => { localPhotos.setup() - }, [localPhotos]) + }, [autocompleteView, localPhotos]) useEffect(() => { // HACK @@ -78,7 +75,7 @@ export const ComposePost = observer(function ComposePost({ clearTimeout(to) } } - }, [textInput.current]) + }, []) const onChangeText = (newText: string) => { setText(newText) From 6ba5d15cb68b4edd657667a9d487eeceb05891e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreiro?= Date: Tue, 29 Nov 2022 18:26:16 +0000 Subject: [PATCH 12/15] crop every photo; make use of useCallback --- src/view/com/composer/PhotoCarouselPicker.tsx | 84 ++++++++++++++----- src/view/com/composer/SelectedPhoto.tsx | 17 ++-- 2 files changed, 72 insertions(+), 29 deletions(-) diff --git a/src/view/com/composer/PhotoCarouselPicker.tsx b/src/view/com/composer/PhotoCarouselPicker.tsx index e6b308dcb4..208e8070b7 100644 --- a/src/view/com/composer/PhotoCarouselPicker.tsx +++ b/src/view/com/composer/PhotoCarouselPicker.tsx @@ -1,8 +1,12 @@ -import React from 'react' +import React, {useCallback} from 'react' import {Image, StyleSheet, TouchableOpacity, ScrollView} from 'react-native' import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' import {colors} from '../../lib/styles' -import {openPicker, openCamera} from 'react-native-image-crop-picker' +import { + openPicker, + openCamera, + openCropper, +} from 'react-native-image-crop-picker' export const PhotoCarouselPicker = ({ selectedPhotos, @@ -13,6 +17,58 @@ export const PhotoCarouselPicker = ({ setSelectedPhotos: React.Dispatch> localPhotos: any }) => { + const handleOpenCamera = useCallback(() => { + openCamera({ + mediaType: 'photo', + cropping: true, + width: 1000, + height: 1000, + }).then(item => { + setSelectedPhotos([item.path, ...selectedPhotos]) + }) + }, [selectedPhotos, setSelectedPhotos]) + + const handleSelectPhoto = useCallback( + async (uri: string) => { + const img = await openCropper({ + mediaType: 'photo', + path: uri, + width: 1000, + height: 1000, + }) + setSelectedPhotos([img.path, ...selectedPhotos]) + }, + [selectedPhotos, setSelectedPhotos], + ) + + const handleOpenGallery = useCallback(() => { + openPicker({ + multiple: true, + maxFiles: 4, + mediaType: 'photo', + }).then(async items => { + const result = [] + + for await (const image of items) { + const img = await openCropper({ + mediaType: 'photo', + path: image.path, + width: 1000, + height: 1000, + }) + result.push(img.path) + } + setSelectedPhotos([ + // ...items.reduce( + // (accum, cur) => accum.concat(cur.sourceURL!), + // [] as string[], + // ), + ...result, + ...selectedPhotos, + ]) + }) + }, [selectedPhotos, setSelectedPhotos]) + return ( { - openCamera({mediaType: 'photo'}).then(item => { - setSelectedPhotos([item.path, ...selectedPhotos]) - }) - }}> + onPress={handleOpenCamera}> { - setSelectedPhotos([item.node.image.uri, ...selectedPhotos]) - }}> + onPress={() => handleSelectPhoto(item.node.image.uri)}> ))} { - openPicker({multiple: true, maxFiles: 4, mediaType: 'photo'}).then( - items => { - setSelectedPhotos([ - ...items.reduce( - (accum, cur) => accum.concat(cur.sourceURL!), - [] as string[], - ), - ...selectedPhotos, - ]) - }, - ) - }}> + onPress={handleOpenGallery}> diff --git a/src/view/com/composer/SelectedPhoto.tsx b/src/view/com/composer/SelectedPhoto.tsx index 87f7fbb8c8..88209b3df6 100644 --- a/src/view/com/composer/SelectedPhoto.tsx +++ b/src/view/com/composer/SelectedPhoto.tsx @@ -1,4 +1,4 @@ -import React from 'react' +import React, {useCallback} from 'react' import {Image, StyleSheet, TouchableOpacity, View} from 'react-native' import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome' import {colors} from '../../lib/styles' @@ -17,6 +17,15 @@ export const SelectedPhoto = ({ ? styles.image175 : styles.image85 + const handleRemovePhoto = useCallback( + item => { + setSelectedPhotos( + selectedPhotos.filter(filterItem => filterItem !== item), + ) + }, + [selectedPhotos, setSelectedPhotos], + ) + return selectedPhotos.length !== 0 ? ( {selectedPhotos.length !== 0 && @@ -25,11 +34,7 @@ export const SelectedPhoto = ({ key={`selected-image-${index}`} style={[styles.image, imageStyle]}> { - setSelectedPhotos( - selectedPhotos.filter(filterItem => filterItem !== item), - ) - }} + onPress={() => handleRemovePhoto(item)} style={styles.removePhotoButton}> Date: Tue, 29 Nov 2022 18:32:07 +0000 Subject: [PATCH 13/15] moving placeholder condition --- src/view/com/composer/ComposePost.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/view/com/composer/ComposePost.tsx b/src/view/com/composer/ComposePost.tsx index 7b41f95fca..b43f4ab9e7 100644 --- a/src/view/com/composer/ComposePost.tsx +++ b/src/view/com/composer/ComposePost.tsx @@ -128,10 +128,16 @@ export const ComposePost = observer(function ComposePost({ const canPost = text.length <= MAX_TEXT_LENGTH const progressColor = text.length > DANGER_TEXT_LENGTH ? '#e60000' : undefined + const selectTextInputLayout = selectedPhotos.length !== 0 ? styles.textInputLayoutWithPhoto : styles.textInputLayoutWithoutPhoto + const selectTextInputPlaceholder = replyTo + ? 'Write your reply' + : selectedPhotos.length !== 0 + ? 'Write a comment' + : "What's up?" const textDecorated = useMemo(() => { let i = 0 @@ -220,13 +226,7 @@ export const ComposePost = observer(function ComposePost({ multiline scrollEnabled onChangeText={(text: string) => onChangeText(text)} - placeholder={ - replyTo - ? 'Write your reply' - : selectedPhotos.length !== 0 - ? 'Write a comment' - : "What's up?" - } + placeholder={selectTextInputPlaceholder} style={styles.textInput}> {textDecorated} From ea27b9ed085beec246262c9b6ed25d16e855d939 Mon Sep 17 00:00:00 2001 From: Paul Frazee Date: Fri, 2 Dec 2022 10:40:22 -0600 Subject: [PATCH 14/15] 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 39f1ead9ed..182ceab758 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 485aa8e04c..50db4563af 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 3450031861..5b5202592c 100644 --- a/ios/app/Info.plist +++ b/ios/app/Info.plist @@ -48,12 +48,12 @@ + NSCameraUsageDescription + NSLocationWhenInUseUsageDescription NSPhotoLibraryUsageDescription - NSCameraUsageDescription - UILaunchStoryboardName LaunchScreen UIRequiredDeviceCapabilities diff --git a/src/state/models/user-local-photos.ts b/src/state/models/user-local-photos.ts index 12b95e376f..9a14550391 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 208e8070b7..f4af4c61e3 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]) From 8a43040ec6e1f2970b16610dc497d20e0dea5664 Mon Sep 17 00:00:00 2001 From: Paul Frazee Date: Fri, 2 Dec 2022 10:48:57 -0600 Subject: [PATCH 15/15] Hide images behind a build flag until ready --- src/build-flags.ts | 1 + src/view/com/composer/ComposePost.tsx | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/build-flags.ts b/src/build-flags.ts index 155230e5d7..f57e158407 100644 --- a/src/build-flags.ts +++ b/src/build-flags.ts @@ -1,2 +1,3 @@ export const LOGIN_INCLUDE_DEV_SERVERS = true export const TABS_ENABLED = false +export const IMAGES_ENABLED = false diff --git a/src/view/com/composer/ComposePost.tsx b/src/view/com/composer/ComposePost.tsx index b43f4ab9e7..10d9f4b1ca 100644 --- a/src/view/com/composer/ComposePost.tsx +++ b/src/view/com/composer/ComposePost.tsx @@ -26,6 +26,7 @@ import {detectLinkables} from '../../../lib/strings' import {UserLocalPhotosModel} from '../../../state/models/user-local-photos' import {PhotoCarouselPicker} from './PhotoCarouselPicker' import {SelectedPhoto} from './SelectedPhoto' +import {IMAGES_ENABLED} from '../../../build-flags' const MAX_TEXT_LENGTH = 256 const DANGER_TEXT_LENGTH = MAX_TEXT_LENGTH @@ -235,7 +236,8 @@ export const ComposePost = observer(function ComposePost({ selectedPhotos={selectedPhotos} setSelectedPhotos={setSelectedPhotos} /> - {localPhotos.photos != null && + {IMAGES_ENABLED && + localPhotos.photos != null && text === '' && selectedPhotos.length === 0 && ( )} - - + {MAX_TEXT_LENGTH - text.length} @@ -348,10 +349,12 @@ const styles = StyleSheet.create({ paddingLeft: 13, paddingRight: 8, }, - contentCenter: {alignItems: 'center'}, - separator: { - borderBottomColor: 'black', - borderBottomWidth: StyleSheet.hairlineWidth, - width: '100%', + bottomBar: { + flexDirection: 'row', + paddingVertical: 10, + paddingRight: 5, + alignItems: 'center', + borderTopWidth: 1, + borderTopColor: colors.gray2, }, })