From 11286fa274d0f8c721b7d507fc64660eed4807fe Mon Sep 17 00:00:00 2001
From: Michael <michael.foiani@gmail.com>
Date: Fri, 9 Jul 2021 15:36:12 -0400
Subject: Add states and components for video trimming.

---
 src/screens/profile/CaptionScreen.tsx | 44 +++--------------------------------
 1 file changed, 3 insertions(+), 41 deletions(-)

(limited to 'src/screens')

diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx
index c6cf767f..4b5ac0c5 100644
--- a/src/screens/profile/CaptionScreen.tsx
+++ b/src/screens/profile/CaptionScreen.tsx
@@ -15,7 +15,6 @@ import {
 } from 'react-native';
 import {MentionInputControlled} from '../../components';
 import {Button, normalize} from 'react-native-elements';
-import Video from 'react-native-video';
 import {useDispatch, useSelector} from 'react-redux';
 import FrontArrow from '../../assets/icons/front-arrow.svg';
 import {SearchBackground} from '../../components';
@@ -43,8 +42,7 @@ import {RootState} from '../../store/rootReducer';
 import {MomentTagType} from '../../types';
 import {SCREEN_WIDTH, StatusBarHeight} from '../../utils';
 import {mentionPartTypes} from '../../utils/comments';
-import {Trimmer, VideoPlayer} from 'react-native-video-processing';
-
+import {TrimmerPlayer} from '../../utils/trimmer';
 /**
  * Upload Screen to allow users to upload posts to Tagg
  */
@@ -198,11 +196,6 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => {
     }
   };
 
-  const [currentTime, setCurrentTime] = useState(0);
-  const [startTime, setStartTime] = useState(0);
-  // todo: update with vid times
-  const [endTime, setEndTime] = useState(60);
-
   return (
     <SearchBackground>
       {loading ? <TaggLoadingIndicator fullscreen /> : <Fragment />}
@@ -229,39 +222,7 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => {
               {...{title: moment ? moment.moment_category : title ?? ''}}
             />
             {isMediaAVideo ? (
-              <>
-                <VideoPlayer
-                  //style={styles.media}
-                  ref={(ref) => (this.videoPlayerRef = ref)}
-                  startTime={startTime} // seconds
-                  endTime={endTime} // seconds
-                  play={true} // default false
-                  replay={true} // should player play video again if it's ended
-                  //rotate={true} // use this prop to rotate video if it captured in landscape mode iOS only
-                  source={mediaUri}
-                  playerWidth={360} // iOS only
-                  playerHeight={680} // iOS only
-                  //resizeMode={VideoPlayer.Constants.resizeMode.CONTAIN}
-                  onChange={({nativeEvent}) =>
-                    setCurrentTime(nativeEvent.currentTime)
-                  } // get Current time on every second
-                />
-                <Trimmer
-                  source={mediaUri}
-                  height={50}
-                  width={350}
-                  onTrackerMove={(e) => setCurrentTime(e.currentTime)} // iOS only
-                  currentTime={currentTime} // use this prop to set tracker position iOS only
-                  themeColor={'white'} // iOS only
-                  showTrackerHandle={true}
-                  thumbWidth={10} // iOS only
-                  trackerColor={'green'} // iOS only
-                  onChange={(e) => {
-                    setStartTime(e.startTime);
-                    setEndTime(e.endTime);
-                  }}
-                />
-              </>
+              <TrimmerPlayer source={mediaUri} styles={styles.media} />
             ) : (
               <Image
                 style={styles.media}
@@ -305,6 +266,7 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => {
     </SearchBackground>
   );
 };
+
 const styles = StyleSheet.create({
   contentContainer: {
     paddingTop: StatusBarHeight,
-- 
cgit v1.2.3-70-g09d2


From e9678b4dc94f04c192ad5573bb2debc6e28f21b6 Mon Sep 17 00:00:00 2001
From: Michael <michael.foiani@gmail.com>
Date: Fri, 9 Jul 2021 16:22:26 -0400
Subject: Fix cropping bug. Updated the source to be the correct higher res
 video.

---
 src/components/moments/trimmer.tsx    | 129 ++++++++++++++++++++++++++++++++++
 src/screens/moments/CameraScreen.tsx  |   4 +-
 src/screens/profile/CaptionScreen.tsx |   2 +-
 src/utils/trimmer.tsx                 | 106 ----------------------------
 4 files changed, 132 insertions(+), 109 deletions(-)
 create mode 100644 src/components/moments/trimmer.tsx
 delete mode 100644 src/utils/trimmer.tsx

(limited to 'src/screens')

diff --git a/src/components/moments/trimmer.tsx b/src/components/moments/trimmer.tsx
new file mode 100644
index 00000000..ebf0d59e
--- /dev/null
+++ b/src/components/moments/trimmer.tsx
@@ -0,0 +1,129 @@
+import React, {useEffect, useState} from 'react';
+import Video from 'react-native-video';
+import {Trimmer, ProcessingManager} from 'react-native-video-processing';
+import {useRef} from 'react';
+
+export const TrimmerPlayer: React.FC<{source: string; styles: Object}> = ({
+  source,
+  styles,
+}) => {
+  const playerRef = useRef<Video>();
+
+  const [seekTime, setSeekTime] = useState<number>(0);
+  const [paused, setPaused] = useState<boolean>(false);
+  useEffect(() => {
+    playerRef.current?.seek(seekTime);
+  }, [seekTime]);
+
+  const [trackerTime, setTrackerTime] = useState<number>(0);
+  useEffect(() => {
+    if (!paused && (trackerTime >= end || trackerTime < start)) {
+      //console.log('trackerTime reset start', start);
+      setTrackerTime(start);
+      playerRef.current?.seek(start);
+    }
+  }, [trackerTime]);
+
+  const [end, setEnd] = useState<number>(60);
+  const [start, setStart] = useState<number>(0);
+  useEffect(() => {
+    setSeekTime(start);
+    setTrackerTime(start);
+  }, [start]);
+  useEffect(() => {
+    setSeekTime(end);
+    setTrackerTime(end - 0.1);
+  }, [end]);
+
+  const trim = () => {
+    ProcessingManager.trim(source, {
+      startTime: start / 2, //need to divide by two for bug in module
+      endTime: end,
+      saveToCameraRoll: true, // default is false // iOS only
+      saveWithCurrentDate: true, // default is false // iOS only
+      quality: 'highest',
+    }) // like VideoPlayer compress options
+      .then((data: any) => console.log(data));
+  };
+
+  /*
+  const [tempSource, setSource] = useState<string>(source);
+  const getCompressedVideo = () => {
+    console.log(source);
+    //ProcessingManager.getVideoInfo(source, (info) => console.log('info', info));
+
+    ProcessingManager.compress(source, {
+      width: 720,
+      height: 1280,
+      bitrateMultiplier: 3,
+      saveToCameraRoll: true, // default is false, iOS only
+      saveWithCurrentDate: true, // default is false, iOS only
+      minimumBitrate: 300000,
+      removeAudio: true, // default is false
+    }).then((data: string) => {
+      //console.log('compressed', data);
+      setSource(data);
+    });
+  };
+  useEffect(() => {
+    getCompressedVideo();
+  }, []); */
+
+  return (
+    <>
+      <Video
+        ref={(ref) => {
+          playerRef.current = ref || undefined;
+        }}
+        source={{uri: source}} // Looks for .mp4 file (background.mp4) in the given expansion version.
+        rate={1.0} // 0 is paused, 1 is normal.
+        volume={1.0} // 0 is muted, 1 is normal.
+        muted={false} // Mutes the audio entirely.
+        paused={paused} // Pauses playback entirely.
+        //resizeMode="cover" // Fill the whole screen at aspect ratio.
+        repeat={true} // Repeat forever.
+        //onLoadStart={this.loadStart} // Callback when video starts to load
+        onLoad={(payload) => {
+          console.log(payload, source);
+          setEnd(payload.duration);
+        }} // Callback when video loads
+        onProgress={(e) => {
+          //console.log('progress', e.currentTime);
+          if (!paused) {
+            // make sure within bounds
+            setTrackerTime(e.currentTime);
+          }
+        }} // Callback every ~250ms with currentTime
+        //onEnd={() => console.log('end')} // Callback when playback finishes
+        //onError={this.videoError} // Callback when video cannot be loaded
+        style={styles}
+        onTouchEnd={() => {
+          //setPaused((state) => !state);
+          trim();
+        }}
+      />
+      <Trimmer
+        source={source}
+        height={100}
+        width={350}
+        onTrackerMove={(e) => {
+          //console.log('trackerMove', e);
+          setPaused(true);
+          setSeekTime(e.currentTime);
+        }} // iOS only
+        // added .25 bc tracker is inaccurate
+        currentTime={trackerTime + 0.25} // use this prop to set tracker position iOS only
+        themeColor={'white'} // iOS only
+        showTrackerHandle={true}
+        thumbWidth={10} // iOS only
+        trackerColor={'white'} // iOS only
+        onChange={(e) => {
+          //console.log('endsChange', e);
+          setPaused(true);
+          setEnd(e.endTime);
+          setStart(e.startTime);
+        }}
+      />
+    </>
+  );
+};
diff --git a/src/screens/moments/CameraScreen.tsx b/src/screens/moments/CameraScreen.tsx
index 75638c40..7643f6ab 100644
--- a/src/screens/moments/CameraScreen.tsx
+++ b/src/screens/moments/CameraScreen.tsx
@@ -186,9 +186,9 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => {
                 } else {
                   // is this a video?
                   if (media.duration !== null) {
-                    navigateToCaptionScreen(true, media.path);
+                    navigateToCaptionScreen(true, media.sourceURL);
                   } else {
-                    navigateToCropper(media.path);
+                    navigateToCropper(media.sourceURL);
                   }
                 }
               }}
diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx
index 4b5ac0c5..9816f1a3 100644
--- a/src/screens/profile/CaptionScreen.tsx
+++ b/src/screens/profile/CaptionScreen.tsx
@@ -42,7 +42,7 @@ import {RootState} from '../../store/rootReducer';
 import {MomentTagType} from '../../types';
 import {SCREEN_WIDTH, StatusBarHeight} from '../../utils';
 import {mentionPartTypes} from '../../utils/comments';
-import {TrimmerPlayer} from '../../utils/trimmer';
+import {TrimmerPlayer} from '../../components/moments/trimmer';
 /**
  * Upload Screen to allow users to upload posts to Tagg
  */
diff --git a/src/utils/trimmer.tsx b/src/utils/trimmer.tsx
deleted file mode 100644
index 11d93ea8..00000000
--- a/src/utils/trimmer.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import React, {useEffect, useState} from 'react';
-import Video from 'react-native-video';
-import {Trimmer, ProcessingManager} from 'react-native-video-processing';
-import {useRef} from 'react';
-
-export const TrimmerPlayer: React.FC<{source: string; styles: Object}> = ({
-  source,
-  styles,
-}) => {
-  const playerRef = useRef<Video>();
-
-  const [seekTime, setSeekTime] = useState<number>(0);
-  const [paused, setPaused] = useState<boolean>(false);
-  useEffect(() => {
-    playerRef.current?.seek(seekTime);
-  }, [seekTime]);
-
-  const [trackerTime, setTrackerTime] = useState<number>(0);
-  useEffect(() => {
-    if (!paused && (trackerTime >= end || trackerTime < start)) {
-      console.log('trackerTime reset start', start);
-      setTrackerTime(start);
-      playerRef.current?.seek(start);
-    }
-  }, [trackerTime]);
-
-  const [end, setEnd] = useState<number>(60);
-  const [start, setStart] = useState<number>(0);
-  useEffect(() => {
-    setSeekTime(start);
-    setTrackerTime(start);
-  }, [start]);
-  useEffect(() => {
-    setSeekTime(end);
-    setTrackerTime(end - 0.1);
-  }, [end]);
-
-  const trim = () => {
-    ProcessingManager.trim(source, {
-      startTime: start,
-      endTime: end,
-      saveToCameraRoll: true, // default is false // iOS only
-      saveWithCurrentDate: true, // default is false // iOS only
-      quality: 'highest',
-    }) // like VideoPlayer compress options
-      .then((data: any) => console.log(data));
-  };
-
-  return (
-    <>
-      <Video
-        ref={(ref) => {
-          playerRef.current = ref || undefined;
-        }}
-        source={{uri: source}} // Looks for .mp4 file (background.mp4) in the given expansion version.
-        rate={1.0} // 0 is paused, 1 is normal.
-        volume={1.0} // 0 is muted, 1 is normal.
-        muted={false} // Mutes the audio entirely.
-        paused={paused} // Pauses playback entirely.
-        //resizeMode="cover" // Fill the whole screen at aspect ratio.
-        repeat={true} // Repeat forever.
-        //onLoadStart={this.loadStart} // Callback when video starts to load
-        onLoad={(payload) => {
-          console.log(payload);
-          setEnd(payload.duration);
-        }} // Callback when video loads
-        onProgress={(e) => {
-          //console.log('progress', e.currentTime);
-          if (!paused) {
-            // make sure within bounds
-            setTrackerTime(e.currentTime);
-          }
-        }} // Callback every ~250ms with currentTime
-        //onEnd={() => console.log('end')} // Callback when playback finishes
-        //onError={this.videoError} // Callback when video cannot be loaded
-        style={styles}
-        onTouchEnd={() => {
-          //setPaused((state) => !state);
-          trim();
-        }}
-      />
-      <Trimmer
-        source={source}
-        height={100}
-        width={350}
-        onTrackerMove={(e) => {
-          //console.log('trackerMove', e);
-          setPaused(true);
-          setSeekTime(e.currentTime);
-        }} // iOS only
-        // added .25 bc tracker is inaccurate
-        currentTime={trackerTime + 0.25} // use this prop to set tracker position iOS only
-        themeColor={'white'} // iOS only
-        showTrackerHandle={true}
-        thumbWidth={10} // iOS only
-        trackerColor={'green'} // iOS only
-        onChange={(e) => {
-          //console.log('endsChange', e);
-          setPaused(true);
-          setEnd(e.endTime);
-          setStart(e.startTime);
-        }}
-      />
-    </>
-  );
-};
-- 
cgit v1.2.3-70-g09d2


From c51abe84b279402c3b3ad541e2af80754d0c67e7 Mon Sep 17 00:00:00 2001
From: Michael <michael.foiani@gmail.com>
Date: Tue, 13 Jul 2021 15:53:08 -0400
Subject: Cleaned up comments and added hideTrimmer functionality

---
 src/components/moments/trimmer.tsx    | 91 ++++++++++++-----------------------
 src/screens/profile/CaptionScreen.tsx |  6 ++-
 2 files changed, 37 insertions(+), 60 deletions(-)

(limited to 'src/screens')

diff --git a/src/components/moments/trimmer.tsx b/src/components/moments/trimmer.tsx
index ebf0d59e..f011d222 100644
--- a/src/components/moments/trimmer.tsx
+++ b/src/components/moments/trimmer.tsx
@@ -3,10 +3,11 @@ import Video from 'react-native-video';
 import {Trimmer, ProcessingManager} from 'react-native-video-processing';
 import {useRef} from 'react';
 
-export const TrimmerPlayer: React.FC<{source: string; styles: Object}> = ({
-  source,
-  styles,
-}) => {
+export const TrimmerPlayer: React.FC<{
+  source: string;
+  styles: Object;
+  hideTrimmer: boolean;
+}> = ({source, styles, hideTrimmer}) => {
   const playerRef = useRef<Video>();
 
   const [seekTime, setSeekTime] = useState<number>(0);
@@ -18,7 +19,6 @@ export const TrimmerPlayer: React.FC<{source: string; styles: Object}> = ({
   const [trackerTime, setTrackerTime] = useState<number>(0);
   useEffect(() => {
     if (!paused && (trackerTime >= end || trackerTime < start)) {
-      //console.log('trackerTime reset start', start);
       setTrackerTime(start);
       playerRef.current?.seek(start);
     }
@@ -39,36 +39,12 @@ export const TrimmerPlayer: React.FC<{source: string; styles: Object}> = ({
     ProcessingManager.trim(source, {
       startTime: start / 2, //need to divide by two for bug in module
       endTime: end,
-      saveToCameraRoll: true, // default is false // iOS only
+      // saveToCameraRoll: true, // default is false // iOS only
       saveWithCurrentDate: true, // default is false // iOS only
       quality: 'highest',
-    }) // like VideoPlayer compress options
-      .then((data: any) => console.log(data));
+    }).then((data: any) => console.log('trim', data));
   };
 
-  /*
-  const [tempSource, setSource] = useState<string>(source);
-  const getCompressedVideo = () => {
-    console.log(source);
-    //ProcessingManager.getVideoInfo(source, (info) => console.log('info', info));
-
-    ProcessingManager.compress(source, {
-      width: 720,
-      height: 1280,
-      bitrateMultiplier: 3,
-      saveToCameraRoll: true, // default is false, iOS only
-      saveWithCurrentDate: true, // default is false, iOS only
-      minimumBitrate: 300000,
-      removeAudio: true, // default is false
-    }).then((data: string) => {
-      //console.log('compressed', data);
-      setSource(data);
-    });
-  };
-  useEffect(() => {
-    getCompressedVideo();
-  }, []); */
-
   return (
     <>
       <Video
@@ -82,15 +58,12 @@ export const TrimmerPlayer: React.FC<{source: string; styles: Object}> = ({
         paused={paused} // Pauses playback entirely.
         //resizeMode="cover" // Fill the whole screen at aspect ratio.
         repeat={true} // Repeat forever.
-        //onLoadStart={this.loadStart} // Callback when video starts to load
         onLoad={(payload) => {
           console.log(payload, source);
           setEnd(payload.duration);
-        }} // Callback when video loads
+        }}
         onProgress={(e) => {
-          //console.log('progress', e.currentTime);
           if (!paused) {
-            // make sure within bounds
             setTrackerTime(e.currentTime);
           }
         }} // Callback every ~250ms with currentTime
@@ -98,32 +71,32 @@ export const TrimmerPlayer: React.FC<{source: string; styles: Object}> = ({
         //onError={this.videoError} // Callback when video cannot be loaded
         style={styles}
         onTouchEnd={() => {
-          //setPaused((state) => !state);
-          trim();
-        }}
-      />
-      <Trimmer
-        source={source}
-        height={100}
-        width={350}
-        onTrackerMove={(e) => {
-          //console.log('trackerMove', e);
-          setPaused(true);
-          setSeekTime(e.currentTime);
-        }} // iOS only
-        // added .25 bc tracker is inaccurate
-        currentTime={trackerTime + 0.25} // use this prop to set tracker position iOS only
-        themeColor={'white'} // iOS only
-        showTrackerHandle={true}
-        thumbWidth={10} // iOS only
-        trackerColor={'white'} // iOS only
-        onChange={(e) => {
-          //console.log('endsChange', e);
-          setPaused(true);
-          setEnd(e.endTime);
-          setStart(e.startTime);
+          setPaused((state) => !state);
         }}
       />
+      {hideTrimmer ? (
+        <> </>
+      ) : (
+        <Trimmer
+          source={source}
+          height={100}
+          width={350}
+          onTrackerMove={(e) => {
+            setPaused(true);
+            setSeekTime(e.currentTime);
+          }} // iOS only
+          currentTime={trackerTime + 0.25} // added .25 bc tracker is inaccurate
+          themeColor={'white'} // iOS only
+          showTrackerHandle={true}
+          thumbWidth={10} // iOS only
+          trackerColor={'white'} // iOS only
+          onChange={(e) => {
+            setPaused(true);
+            setEnd(e.endTime);
+            setStart(e.startTime);
+          }}
+        />
+      )}
     </>
   );
 };
diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx
index 9816f1a3..e77f40c2 100644
--- a/src/screens/profile/CaptionScreen.tsx
+++ b/src/screens/profile/CaptionScreen.tsx
@@ -222,7 +222,11 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => {
               {...{title: moment ? moment.moment_category : title ?? ''}}
             />
             {isMediaAVideo ? (
-              <TrimmerPlayer source={mediaUri} styles={styles.media} />
+              <TrimmerPlayer
+                source={mediaUri}
+                styles={styles.media}
+                hideTrimmer={true}
+              />
             ) : (
               <Image
                 style={styles.media}
-- 
cgit v1.2.3-70-g09d2


From 45e9f5568e24becad0b1aefece41606a554c5d4d Mon Sep 17 00:00:00 2001
From: Michael <michael.foiani@gmail.com>
Date: Tue, 13 Jul 2021 16:12:32 -0400
Subject: Commented out trimmer player input.

---
 src/screens/profile/CaptionScreen.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/screens')

diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx
index 383737e7..d472bc7c 100644
--- a/src/screens/profile/CaptionScreen.tsx
+++ b/src/screens/profile/CaptionScreen.tsx
@@ -49,7 +49,7 @@ import {RootState} from '../../store/rootReducer';
 import {MomentTagType} from '../../types';
 import {isIPhoneX, normalize, SCREEN_WIDTH, StatusBarHeight} from '../../utils';
 import {mentionPartTypes} from '../../utils/comments';
-import {TrimmerPlayer} from '../../components/moments/trimmer';
+// import {TrimmerPlayer} from '../../components/moments/trimmer';
 /**
  * Upload Screen to allow users to upload posts to Tagg
  */
-- 
cgit v1.2.3-70-g09d2


From 648193580fb2648906864f439befff5dad480671 Mon Sep 17 00:00:00 2001
From: Michael <michael.foiani@gmail.com>
Date: Tue, 13 Jul 2021 16:13:06 -0400
Subject: Commented out trimmer player input.

---
 src/screens/profile/CaptionScreen.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/screens')

diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx
index d472bc7c..954f8b24 100644
--- a/src/screens/profile/CaptionScreen.tsx
+++ b/src/screens/profile/CaptionScreen.tsx
@@ -49,7 +49,7 @@ import {RootState} from '../../store/rootReducer';
 import {MomentTagType} from '../../types';
 import {isIPhoneX, normalize, SCREEN_WIDTH, StatusBarHeight} from '../../utils';
 import {mentionPartTypes} from '../../utils/comments';
-// import {TrimmerPlayer} from '../../components/moments/trimmer';
+//import {TrimmerPlayer} from '../../components/moments/trimmer';
 /**
  * Upload Screen to allow users to upload posts to Tagg
  */
-- 
cgit v1.2.3-70-g09d2


From f1873c074f3e9d8807b5e812f7ee37ba495a6c0a Mon Sep 17 00:00:00 2001
From: Michael <michael.foiani@gmail.com>
Date: Wed, 14 Jul 2021 17:48:55 -0400
Subject: Incorportated the trimmer component on the zoom inn croppper page.
 Trimmer is hidden. Will incorporate trimmer soon.

---
 src/components/comments/ZoomInCropper.tsx | 17 +++++++++--------
 src/components/moments/trimmer.tsx        | 22 +++++++---------------
 src/screens/moments/CameraScreen.tsx      |  9 ---------
 src/utils/camera.ts                       |  1 +
 4 files changed, 17 insertions(+), 32 deletions(-)

(limited to 'src/screens')

diff --git a/src/components/comments/ZoomInCropper.tsx b/src/components/comments/ZoomInCropper.tsx
index 6f8ff97c..5fad89e6 100644
--- a/src/components/comments/ZoomInCropper.tsx
+++ b/src/components/comments/ZoomInCropper.tsx
@@ -10,12 +10,14 @@ import {MainStackParams} from '../../routes';
 import {
   cropVideo,
   HeaderHeight,
+  numberWithCommas,
   SCREEN_HEIGHT,
   SCREEN_WIDTH,
 } from '../../utils';
 import {TaggSquareButton} from '../common';
 import ReactNativeZoomableView from '@dudigital/react-native-zoomable-view/src/ReactNativeZoomableView';
 import Video from 'react-native-video';
+import {TrimmerPlayer} from '../moments/trimmer';
 
 type ZoomInCropperRouteProps = RouteProp<MainStackParams, 'ZoomInCropper'>;
 type ZoomInCropperNavigationProps = StackNavigationProp<
@@ -304,19 +306,18 @@ export const ZoomInCropper: React.FC<ZoomInCropperProps> = ({
           }}
           style={styles.zoomView}>
           <View style={styles.videoParent} ref={vidRef}>
-            <Video
-              source={{uri: media.uri}}
-              volume={1}
-              style={[
+            <TrimmerPlayer
+              hideTrimmer={false}
+              source={media.uri}
+              videoStyles={[
                 styles.media,
                 {
                   height: SCREEN_WIDTH / aspectRatio,
                 },
               ]}
-              repeat={true}
-              resizeMode={'contain'}
-              onLoad={(response) => {
-                const {width, height} = response.naturalSize;
+              handleLoad={(response: Object) => {
+                console.log(response);
+                const {width, height} = response;
                 setOrigDimensions([width, height]);
                 setAspectRatio(width / height);
               }}
diff --git a/src/components/moments/trimmer.tsx b/src/components/moments/trimmer.tsx
index f011d222..2bd3eb41 100644
--- a/src/components/moments/trimmer.tsx
+++ b/src/components/moments/trimmer.tsx
@@ -1,13 +1,14 @@
 import React, {useEffect, useState} from 'react';
 import Video from 'react-native-video';
-import {Trimmer, ProcessingManager} from 'react-native-video-processing';
+import {Trimmer} from 'react-native-video-processing';
 import {useRef} from 'react';
 
 export const TrimmerPlayer: React.FC<{
   source: string;
-  styles: Object;
+  videoStyles: Object;
   hideTrimmer: boolean;
-}> = ({source, styles, hideTrimmer}) => {
+  handleLoad: Function;
+}> = ({source, videoStyles, hideTrimmer, handleLoad}) => {
   const playerRef = useRef<Video>();
 
   const [seekTime, setSeekTime] = useState<number>(0);
@@ -35,16 +36,6 @@ export const TrimmerPlayer: React.FC<{
     setTrackerTime(end - 0.1);
   }, [end]);
 
-  const trim = () => {
-    ProcessingManager.trim(source, {
-      startTime: start / 2, //need to divide by two for bug in module
-      endTime: end,
-      // saveToCameraRoll: true, // default is false // iOS only
-      saveWithCurrentDate: true, // default is false // iOS only
-      quality: 'highest',
-    }).then((data: any) => console.log('trim', data));
-  };
-
   return (
     <>
       <Video
@@ -56,11 +47,12 @@ export const TrimmerPlayer: React.FC<{
         volume={1.0} // 0 is muted, 1 is normal.
         muted={false} // Mutes the audio entirely.
         paused={paused} // Pauses playback entirely.
-        //resizeMode="cover" // Fill the whole screen at aspect ratio.
+        resizeMode={'contain'}
         repeat={true} // Repeat forever.
         onLoad={(payload) => {
           console.log(payload, source);
           setEnd(payload.duration);
+          handleLoad(payload.naturalSize);
         }}
         onProgress={(e) => {
           if (!paused) {
@@ -69,7 +61,7 @@ export const TrimmerPlayer: React.FC<{
         }} // Callback every ~250ms with currentTime
         //onEnd={() => console.log('end')} // Callback when playback finishes
         //onError={this.videoError} // Callback when video cannot be loaded
-        style={styles}
+        style={videoStyles}
         onTouchEnd={() => {
           setPaused((state) => !state);
         }}
diff --git a/src/screens/moments/CameraScreen.tsx b/src/screens/moments/CameraScreen.tsx
index ef52a56f..ee5834cb 100644
--- a/src/screens/moments/CameraScreen.tsx
+++ b/src/screens/moments/CameraScreen.tsx
@@ -184,16 +184,7 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => {
                 ) {
                   showGIFFailureAlert(() => navigateToCropper(media.path));
                 } else {
-<<<<<<< HEAD
-                  // is this a video?
-                  if (media.duration !== null) {
-                    navigateToCaptionScreen(true, media.sourceURL);
-                  } else {
-                    navigateToCropper(media.sourceURL);
-                  }
-=======
                   navigateToCropper(media.path);
->>>>>>> master
                 }
               }}
             />
diff --git a/src/utils/camera.ts b/src/utils/camera.ts
index 4a72f5f4..9e37d62e 100644
--- a/src/utils/camera.ts
+++ b/src/utils/camera.ts
@@ -8,6 +8,7 @@ import {
   TakePictureOptions,
   TakePictureResponse,
 } from 'react-native-camera';
+import {ProcessingManager} from 'react-native-video-processing';
 import ImagePicker, {ImageOrVideo, Video} from 'react-native-image-crop-picker';
 import {ERROR_UPLOAD} from '../constants/strings';
 
-- 
cgit v1.2.3-70-g09d2