From 49dfe6a52e09bdb218e2b1ceb5a8df9ed46873f1 Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Tue, 22 Jun 2021 18:37:12 -0400 Subject: Squashed commit of the following: commit b1c2002caa349dc96f81d3cc3e00ea545f4e654e Author: Ivan Chen Date: Tue Jun 22 15:28:18 2021 -0400 Add video for camerea --- src/components/profile/ProfileBody.tsx | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/components/profile/ProfileBody.tsx') diff --git a/src/components/profile/ProfileBody.tsx b/src/components/profile/ProfileBody.tsx index c0ee508a..34cf1870 100644 --- a/src/components/profile/ProfileBody.tsx +++ b/src/components/profile/ProfileBody.tsx @@ -1,5 +1,7 @@ import React from 'react'; import {LayoutChangeEvent, Linking, StyleSheet, Text, View} from 'react-native'; +import {TouchableOpacity} from 'react-native-gesture-handler'; +import {launchCamera} from 'react-native-image-picker'; import {useDispatch, useSelector, useStore} from 'react-redux'; import {TAGG_DARK_BLUE, TOGGLE_BUTTON_TYPE} from '../../constants'; import { @@ -80,6 +82,23 @@ const ProfileBody: React.FC = ({ ); }}>{`${website}`} )} + { + launchCamera( + { + mediaType: 'video', + durationLimit: 60, + videoQuality: 'medium', + }, + (response) => { + console.log(response); + const file = response.assets[0].uri; + console.log(file); + }, + ); + }}> + foooo + {userXId && isBlocked && ( -- cgit v1.2.3-70-g09d2 From c3066187b9d253767e32880cc35ddd1abc6db6b3 Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Tue, 22 Jun 2021 19:16:04 -0400 Subject: Remove test code --- src/components/profile/ProfileBody.tsx | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'src/components/profile/ProfileBody.tsx') diff --git a/src/components/profile/ProfileBody.tsx b/src/components/profile/ProfileBody.tsx index 34cf1870..048de696 100644 --- a/src/components/profile/ProfileBody.tsx +++ b/src/components/profile/ProfileBody.tsx @@ -82,24 +82,6 @@ const ProfileBody: React.FC = ({ ); }}>{`${website}`} )} - { - launchCamera( - { - mediaType: 'video', - durationLimit: 60, - videoQuality: 'medium', - }, - (response) => { - console.log(response); - const file = response.assets[0].uri; - console.log(file); - }, - ); - }}> - foooo - - {userXId && isBlocked && ( Date: Tue, 22 Jun 2021 19:21:26 -0400 Subject: Lint --- src/components/profile/ProfileBody.tsx | 2 -- src/constants/regex.ts | 2 +- src/screens/profile/IndividualMoment.tsx | 1 - src/services/MomentService.ts | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src/components/profile/ProfileBody.tsx') diff --git a/src/components/profile/ProfileBody.tsx b/src/components/profile/ProfileBody.tsx index 048de696..cc001516 100644 --- a/src/components/profile/ProfileBody.tsx +++ b/src/components/profile/ProfileBody.tsx @@ -1,7 +1,5 @@ import React from 'react'; import {LayoutChangeEvent, Linking, StyleSheet, Text, View} from 'react-native'; -import {TouchableOpacity} from 'react-native-gesture-handler'; -import {launchCamera} from 'react-native-image-picker'; import {useDispatch, useSelector, useStore} from 'react-redux'; import {TAGG_DARK_BLUE, TOGGLE_BUTTON_TYPE} from '../../constants'; import { diff --git a/src/constants/regex.ts b/src/constants/regex.ts index f934185d..61523203 100644 --- a/src/constants/regex.ts +++ b/src/constants/regex.ts @@ -36,7 +36,7 @@ export const nameRegex: RegExp = /^[A-Za-z'\-,. ]{2,20}$/; * - match alphanumerics, and special characters used in URLs */ export const websiteRegex: RegExp = - /^$|^(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,50}\.[a-zA-Z0-9()]{2,6}\b([-a-zA-Z0-9()@:%_+.~#?&\/=]{0,35})$/; + /^$|^(https?:\/\/)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,50}\.[a-zA-Z0-9()]{2,6}\b([-a-zA-Z0-9()@:%_+.~#?&/=]{0,35})$/; /** * The website regex has the following constraints diff --git a/src/screens/profile/IndividualMoment.tsx b/src/screens/profile/IndividualMoment.tsx index cc176cd3..f8113aba 100644 --- a/src/screens/profile/IndividualMoment.tsx +++ b/src/screens/profile/IndividualMoment.tsx @@ -9,7 +9,6 @@ import {AVATAR_DIM} from '../../constants'; import {MainStackParams} from '../../routes'; import {RootState} from '../../store/rootreducer'; import {MomentPostType} from '../../types'; -import Video from 'react-native-video'; import { isIPhoneX, normalize, diff --git a/src/services/MomentService.ts b/src/services/MomentService.ts index da6f9690..da1bfb97 100644 --- a/src/services/MomentService.ts +++ b/src/services/MomentService.ts @@ -1,5 +1,4 @@ import AsyncStorage from '@react-native-community/async-storage'; -import {Image, Video} from 'react-native-image-crop-picker'; import RNFetchBlob from 'rn-fetch-blob'; import { MOMENTS_ENDPOINT, -- cgit v1.2.3-70-g09d2