From b7cba594635f4a6de3582ba4845bfc9757632ba1 Mon Sep 17 00:00:00 2001 From: Brian Kim Date: Tue, 13 Jul 2021 16:01:11 -0400 Subject: Extremely rough working --- src/utils/camera.ts | 39 ++++++++++++++++++++++++++++++++++++++- src/utils/index.ts | 1 + 2 files changed, 39 insertions(+), 1 deletion(-) (limited to 'src/utils') diff --git a/src/utils/camera.ts b/src/utils/camera.ts index ccdd42b0..2f189a1d 100644 --- a/src/utils/camera.ts +++ b/src/utils/camera.ts @@ -109,7 +109,7 @@ const options = { width: 1080, height: 1920, bitrateMultiplier: 3, - saveToCameraRoll: true, // default is false, iOS only + // saveToCameraRoll: true, // default is false, iOS only saveWithCurrentDate: true, // default is false, iOS only minimumBitrate: 300000, // removeAudio: true, // default is false @@ -140,3 +140,40 @@ export const showGIFFailureAlert = (onSuccess: () => void) => ), }, ); + +export const cropVideo = ( + sourceUri: string, + handleData: (data: any) => any, + videoCropValues?: { + cropWidth?: number; + cropHeight?: number; + cropOffsetX?: number; + cropOffsetY?: number; + }, +) => { + ProcessingManager.crop(sourceUri, { + cropWidth: videoCropValues + ? videoCropValues.cropWidth + ? Math.round(videoCropValues.cropWidth) + : 100 + : 100, + cropHeight: videoCropValues + ? videoCropValues.cropHeight + ? Math.round(videoCropValues.cropHeight) + : 100 + : 100, + cropOffsetX: videoCropValues + ? videoCropValues.cropOffsetX + ? Math.round(videoCropValues.cropOffsetX) + : 0 + : 0, + cropOffsetY: videoCropValues + ? videoCropValues.cropOffsetY + ? Math.round(videoCropValues.cropOffsetY) + : 0 + : 0, + quality: 'highest', + }).then((data: any) => { + handleData(data); + }); +}; diff --git a/src/utils/index.ts b/src/utils/index.ts index 4ff9afac..dc00c049 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -5,3 +5,4 @@ export * from './users'; export * from './friends'; export * from './search'; export * from './messages'; +export * from './camera'; -- cgit v1.2.3-70-g09d2 From e890381389d07ef2a194536268508c9dde5a2828 Mon Sep 17 00:00:00 2001 From: Brian Kim Date: Tue, 13 Jul 2021 18:03:22 -0400 Subject: Fix lint --- src/components/comments/ZoomInCropper.tsx | 2 -- src/screens/profile/CaptionScreen.tsx | 1 - src/utils/camera.ts | 1 - 3 files changed, 4 deletions(-) (limited to 'src/utils') diff --git a/src/components/comments/ZoomInCropper.tsx b/src/components/comments/ZoomInCropper.tsx index f4c06311..c20bab67 100644 --- a/src/components/comments/ZoomInCropper.tsx +++ b/src/components/comments/ZoomInCropper.tsx @@ -108,7 +108,6 @@ export const ZoomInCropper: React.FC = ({ .then((croppedURL) => { navigation.navigate('CaptionScreen', { screenType, - title: title, media: { uri: croppedURL, isVideo: false, @@ -124,7 +123,6 @@ export const ZoomInCropper: React.FC = ({ ) { navigation.navigate('CaptionScreen', { screenType, - title: title, media, }); } diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx index 38c6d8f0..99ff8819 100644 --- a/src/screens/profile/CaptionScreen.tsx +++ b/src/screens/profile/CaptionScreen.tsx @@ -49,7 +49,6 @@ import {RootState} from '../../store/rootReducer'; import {MomentTagType} from '../../types'; import {isIPhoneX, normalize, SCREEN_WIDTH, StatusBarHeight} from '../../utils'; import {mentionPartTypes} from '../../utils/comments'; -import {Trimmer, VideoPlayer} from 'react-native-video-processing'; /** * Upload Screen to allow users to upload posts to Tagg diff --git a/src/utils/camera.ts b/src/utils/camera.ts index 2f189a1d..8c05355f 100644 --- a/src/utils/camera.ts +++ b/src/utils/camera.ts @@ -11,7 +11,6 @@ import { import {ProcessingManager} from 'react-native-video-processing'; import ImagePicker, {ImageOrVideo, Video} from 'react-native-image-crop-picker'; import {ERROR_UPLOAD} from '../constants/strings'; -import RNFetchBlob from 'rn-fetch-blob'; /* * Captures a photo and pauses to show the preview of the picture taken -- cgit v1.2.3-70-g09d2 From 7b79ab3e33a6df14394537b1050019db46f670e0 Mon Sep 17 00:00:00 2001 From: Brian Kim Date: Wed, 14 Jul 2021 10:33:45 -0400 Subject: Working on code cleanup --- ios/Frontend.xcodeproj/project.pbxproj | 27 +++++++++++---------------- ios/Frontend/Info.plist | 8 -------- src/components/comments/ZoomInCropper.tsx | 4 ---- src/utils/camera.ts | 2 -- 4 files changed, 11 insertions(+), 30 deletions(-) (limited to 'src/utils') diff --git a/ios/Frontend.xcodeproj/project.pbxproj b/ios/Frontend.xcodeproj/project.pbxproj index ce1492da..af943815 100644 --- a/ios/Frontend.xcodeproj/project.pbxproj +++ b/ios/Frontend.xcodeproj/project.pbxproj @@ -475,22 +475,20 @@ TargetAttributes = { 00E356ED1AD99517003FC87E = { CreatedOnToolsVersion = 6.2; - DevelopmentTeam = VQ6D29Y5N7; - ProvisioningStyle = Automatic; + DevelopmentTeam = CA2JXDK7RB; TestTargetID = 13B07F861A680F5B00A75B9A; }; 13B07F861A680F5B00A75B9A = { DevelopmentTeam = VQ6D29Y5N7; - LastSwiftMigration = 1250; + LastSwiftMigration = 1250; ProvisioningStyle = Automatic; }; 2D02E47A1E0B4A5D006451C7 = { CreatedOnToolsVersion = 8.2.1; - ProvisioningStyle = Manual; + ProvisioningStyle = Automatic; }; 2D02E48F1E0B4A5D006451C7 = { CreatedOnToolsVersion = 8.2.1; - DevelopmentTeam = VQ6D29Y5N7; ProvisioningStyle = Automatic; TestTargetID = 2D02E47A1E0B4A5D006451C7; }; @@ -971,10 +969,7 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = VQ6D29Y5N7; + DEVELOPMENT_TEAM = CA2JXDK7RB; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", @@ -1005,7 +1000,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - DEVELOPMENT_TEAM = VQ6D29Y5N7; + DEVELOPMENT_TEAM = CA2JXDK7RB; INFOPLIST_FILE = FrontendTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1032,7 +1027,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = VQ6D29Y5N7; + DEVELOPMENT_TEAM = FZ5J543S6Y; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -1046,7 +1041,7 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = FZ5J543S6Y; + PRODUCT_BUNDLE_IDENTIFIER = com.taggid.taggid; PRODUCT_NAME = Frontend; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "RNVideoProcessing/Frontend-Bridging-Header.h"; @@ -1065,7 +1060,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = VQ6D29Y5N7; + DEVELOPMENT_TEAM = FZ5J543S6Y; INFOPLIST_FILE = Frontend/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -1074,7 +1069,7 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = FZ5J543S6Y; + PRODUCT_BUNDLE_IDENTIFIER = com.taggid.taggid; PRODUCT_NAME = Frontend; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "RNVideoProcessing/Frontend-Bridging-Header.h"; @@ -1105,7 +1100,7 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = FZ5J543S6Y; + PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.Frontend-tvOS"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; @@ -1136,7 +1131,7 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = FZ5J543S6Y; + PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.Frontend-tvOS"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; diff --git a/ios/Frontend/Info.plist b/ios/Frontend/Info.plist index bf077fca..8e1ae927 100644 --- a/ios/Frontend/Info.plist +++ b/ios/Frontend/Info.plist @@ -48,20 +48,12 @@ - NSCameraUsageDescription - Enable camera access to capture and share moment with your friends NSContactsUsageDescription This helps you quickly get in touch with friends on the app and more NSLocationWhenInUseUsageDescription NSMainNibFile LaunchScreen - NSMicrophoneUsageDescription - Enable microphone access to record and listen to videos - NSPhotoLibraryAddUsageDescription - This lets you save photos captured on Tagg, to your library - NSPhotoLibraryUsageDescription - This lets you share photos from your library and select profile displays UIAppFonts Feather.ttf diff --git a/src/components/comments/ZoomInCropper.tsx b/src/components/comments/ZoomInCropper.tsx index c20bab67..5f14522e 100644 --- a/src/components/comments/ZoomInCropper.tsx +++ b/src/components/comments/ZoomInCropper.tsx @@ -339,8 +339,6 @@ const styles = StyleSheet.create({ backgroundColor: 'black', height: SCREEN_HEIGHT, width: SCREEN_WIDTH, - // flexDirection: 'column', - // justifyContent: 'center', }, closeButton: { position: 'absolute', @@ -375,7 +373,5 @@ const styles = StyleSheet.create({ zoomView: { backgroundColor: 'black', flex: 1, - // borderColor: 'pink', - // borderWidth: 2, }, }); diff --git a/src/utils/camera.ts b/src/utils/camera.ts index 8c05355f..15758112 100644 --- a/src/utils/camera.ts +++ b/src/utils/camera.ts @@ -91,8 +91,6 @@ export const navigateToVideoPicker = (callback: (vid: Video) => void) => { }) .then(async (vid) => { if (vid.path) { - ProcessingManager.compress(vid.path, options.compress) // like VideoPlayer compress options - .then((data: any) => console.log(data)); callback(vid); } }) -- cgit v1.2.3-70-g09d2 From 2a7b22cda940c8550dbe140540cc08c69d289278 Mon Sep 17 00:00:00 2001 From: Brian Kim Date: Wed, 14 Jul 2021 10:46:48 -0400 Subject: Clean up camera.ts --- src/utils/camera.ts | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'src/utils') diff --git a/src/utils/camera.ts b/src/utils/camera.ts index 15758112..9e37d62e 100644 --- a/src/utils/camera.ts +++ b/src/utils/camera.ts @@ -68,9 +68,6 @@ export const navigateToImagePicker = ( mediaType: 'any', }) .then((media) => { - const path: String = getVideoPath(media); - ProcessingManager.compress(path, options.compress) // like VideoPlayer compress options - .then((data: any) => console.log(data)); callback(media); }) .catch((err) => { @@ -80,11 +77,6 @@ export const navigateToImagePicker = ( }); }; -const getVideoPath = (uri) => { - console.log(uri); - return uri.path; -}; - export const navigateToVideoPicker = (callback: (vid: Video) => void) => { ImagePicker.openPicker({ mediaType: 'video', @@ -101,18 +93,6 @@ export const navigateToVideoPicker = (callback: (vid: Video) => void) => { }); }; -const options = { - compress: { - width: 1080, - height: 1920, - bitrateMultiplier: 3, - // saveToCameraRoll: true, // default is false, iOS only - saveWithCurrentDate: true, // default is false, iOS only - minimumBitrate: 300000, - // removeAudio: true, // default is false - }, -}; - export const showGIFFailureAlert = (onSuccess: () => void) => Alert.alert( 'Warning', -- cgit v1.2.3-70-g09d2