From 7b79ab3e33a6df14394537b1050019db46f670e0 Mon Sep 17 00:00:00 2001
From: Brian Kim <brian@tagg.id>
Date: Wed, 14 Jul 2021 10:33:45 -0400
Subject: Working on code cleanup

---
 ios/Frontend.xcodeproj/project.pbxproj | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

(limited to 'ios/Frontend.xcodeproj')

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;
-- 
cgit v1.2.3-70-g09d2


From 1b9059d49532eacb60bf36b25771df42541670f4 Mon Sep 17 00:00:00 2001
From: Brian Kim <brian@tagg.id>
Date: Wed, 14 Jul 2021 11:28:06 -0400
Subject: Clean up code round 2

---
 ios/Frontend.xcodeproj/project.pbxproj    |  3 ---
 src/components/comments/ZoomInCropper.tsx | 42 +++++++++++++++++--------------
 src/screens/moments/CameraScreen.tsx      |  6 -----
 src/screens/profile/CaptionScreen.tsx     |  1 -
 4 files changed, 23 insertions(+), 29 deletions(-)

(limited to 'ios/Frontend.xcodeproj')

diff --git a/ios/Frontend.xcodeproj/project.pbxproj b/ios/Frontend.xcodeproj/project.pbxproj
index af943815..0cf0957b 100644
--- a/ios/Frontend.xcodeproj/project.pbxproj
+++ b/ios/Frontend.xcodeproj/project.pbxproj
@@ -1090,7 +1090,6 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CODE_SIGN_STYLE = Manual;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = "";
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "Frontend-tvOS/Info.plist";
@@ -1122,7 +1121,6 @@
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DEVELOPMENT_TEAM = "";
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "Frontend-tvOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -1150,7 +1148,6 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = VQ6D29Y5N7;
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = "Frontend-tvOSTests/Info.plist";
diff --git a/src/components/comments/ZoomInCropper.tsx b/src/components/comments/ZoomInCropper.tsx
index 43c4c6ff..6f8ff97c 100644
--- a/src/components/comments/ZoomInCropper.tsx
+++ b/src/components/comments/ZoomInCropper.tsx
@@ -35,7 +35,7 @@ export const ZoomInCropper: React.FC<ZoomInCropperProps> = ({
   const [aspectRatio, setAspectRatio] = useState<number>(1);
   // width and height of video, if video
   const [origDimensions, setOrigDimensions] = useState<number[]>([0, 0]);
-  const vidRef = useRef<Video>(null);
+  const vidRef = useRef<View>(null);
 
   // Stores the coordinates of the cropped image
   const [x0, setX0] = useState<number>();
@@ -73,20 +73,22 @@ export const ZoomInCropper: React.FC<ZoomInCropperProps> = ({
         (err) => console.log(err),
       );
     } else if (media.uri && !checkIfUriImage(media.uri)) {
-      const tempVideoCrop = {...videoCrop};
-      tempVideoCrop.cropWidth = origDimensions[0];
-      tempVideoCrop.cropHeight = origDimensions[1];
-      setVideoCrop(tempVideoCrop);
+      setVideoCrop((prevState) => ({
+        ...prevState,
+        cropWidth: origDimensions[0],
+        cropHeight: origDimensions[1],
+      }));
     }
   }, []);
 
   // Possible need to delay setting aspect ratio of video until loaded
   useEffect(() => {
     if (media.uri && !checkIfUriImage(media.uri)) {
-      const tempVideoCrop = {...videoCrop};
-      tempVideoCrop.cropWidth = origDimensions[0];
-      tempVideoCrop.cropHeight = origDimensions[1];
-      setVideoCrop(tempVideoCrop);
+      setVideoCrop((prevState) => ({
+        ...prevState,
+        cropWidth: origDimensions[0],
+        cropHeight: origDimensions[1],
+      }));
     }
   }, [origDimensions]);
 
@@ -128,10 +130,11 @@ export const ZoomInCropper: React.FC<ZoomInCropperProps> = ({
       }
     } else {
       if (!videoCrop.cropHeight || !videoCrop.cropWidth) {
-        const tempVideoCrop = {...videoCrop};
-        tempVideoCrop.cropWidth = origDimensions[0];
-        tempVideoCrop.cropHeight = origDimensions[1];
-        setVideoCrop(tempVideoCrop);
+        setVideoCrop((prevState) => ({
+          ...prevState,
+          cropWidth: origDimensions[0],
+          cropHeight: origDimensions[1],
+        }));
       }
       cropVideo(
         media.uri,
@@ -200,12 +203,13 @@ export const ZoomInCropper: React.FC<ZoomInCropperProps> = ({
           } else {
             cropHeight = origDimensions[1];
           }
-          const tempVideoCrop = {...videoCrop};
-          tempVideoCrop.cropWidth = cropWidth;
-          tempVideoCrop.cropHeight = cropHeight;
-          tempVideoCrop.cropOffsetX = cropOffsetX;
-          tempVideoCrop.cropOffsetY = cropOffsetY;
-          setVideoCrop(tempVideoCrop);
+          setVideoCrop((prevState) => ({
+            ...prevState,
+            cropWidth: cropWidth,
+            cropHeight: cropHeight,
+            cropOffsetX: cropOffsetX,
+            cropOffsetY: cropOffsetY,
+          }));
         },
       );
     }
diff --git a/src/screens/moments/CameraScreen.tsx b/src/screens/moments/CameraScreen.tsx
index 4ed984e7..ee5834cb 100644
--- a/src/screens/moments/CameraScreen.tsx
+++ b/src/screens/moments/CameraScreen.tsx
@@ -184,12 +184,6 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => {
                 ) {
                   showGIFFailureAlert(() => navigateToCropper(media.path));
                 } else {
-                  // is this a video?
-                  // if (media.duration !== null) {
-                  //   navigateToCaptionScreen(true, media.path);
-                  // } else {
-                  //   navigateToCropper(media.path);
-                  // }
                   navigateToCropper(media.path);
                 }
               }}
diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx
index 99ff8819..1232eb66 100644
--- a/src/screens/profile/CaptionScreen.tsx
+++ b/src/screens/profile/CaptionScreen.tsx
@@ -78,7 +78,6 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => {
   const [taggedUsersText, setTaggedUsersText] = useState('');
   const [momentCategory, setMomentCategory] = useState<string | undefined>();
   const mediaUri = moment ? moment.moment_url : route.params.media!.uri;
-  // console.log('mediaUri', mediaUri);
   // TODO: change this once moment refactor is done
   const isMediaAVideo = moment
     ? !(
-- 
cgit v1.2.3-70-g09d2