diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-07-15 16:59:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-15 16:59:26 -0400 |
| commit | 1cb63f69e6ce049b18704bdd39d9abda6c351233 (patch) | |
| tree | dea72db914ed01b68f2bebad3bd9242261c67ad8 | |
| parent | 4fe0ec166f355eb4c0b279f8790c7e61ff6c1243 (diff) | |
| parent | 6b65929115e031d0bdbb9d663f6a83e9a46a09e1 (diff) | |
Merge pull request #504 from grusuTagg/tma975-Tag-Position-Migration
[TMA-975] Tag Positions
| -rw-r--r-- | src/components/moments/MomentPost.tsx | 20 | ||||
| -rw-r--r-- | src/screens/profile/CaptionScreen.tsx | 6 |
2 files changed, 12 insertions, 14 deletions
diff --git a/src/components/moments/MomentPost.tsx b/src/components/moments/MomentPost.tsx index 07295369..e789a9bf 100644 --- a/src/components/moments/MomentPost.tsx +++ b/src/components/moments/MomentPost.tsx @@ -83,6 +83,7 @@ const MomentPost: React.FC<MomentPostProps> = ({ moment.moment_url.endsWith('GIF') || moment.moment_url.endsWith('gif') ); + const mediaHeight = SCREEN_WIDTH / aspectRatio; /* * Load tags on initial render to pass tags data to moment header and content @@ -201,14 +202,7 @@ const MomentPost: React.FC<MomentPostProps> = ({ <View style={styles.mainContainer}> <View style={styles.imageContainer}> {isVideo ? ( - <View - ref={imageRef} - style={[ - styles.media, - { - height: SCREEN_WIDTH / aspectRatio, - }, - ]}> + <View ref={imageRef}> <Video ref={videoRef} source={{ @@ -218,7 +212,7 @@ const MomentPost: React.FC<MomentPostProps> = ({ style={[ styles.media, { - height: SCREEN_WIDTH / aspectRatio, + height: mediaHeight, }, ]} repeat={true} @@ -233,7 +227,12 @@ const MomentPost: React.FC<MomentPostProps> = ({ ) : ( <Image source={{uri: moment.moment_url}} - style={styles.media} + style={[ + styles.media, + { + height: mediaHeight, + }, + ]} resizeMode={'contain'} ref={imageRef} /> @@ -337,7 +336,6 @@ const MomentPost: React.FC<MomentPostProps> = ({ const styles = StyleSheet.create({ media: { zIndex: 0, - flex: 1, }, imageContainer: { height: SCREEN_HEIGHT, diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx index 1232eb66..f0d24f96 100644 --- a/src/screens/profile/CaptionScreen.tsx +++ b/src/screens/profile/CaptionScreen.tsx @@ -156,9 +156,9 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => { const formattedTags = () => { return tags.map((tag) => ({ - x: Math.floor(tag.x), - y: Math.floor(tag.y), - z: Math.floor(tag.z), + x: tag.x, + y: tag.y, + z: tag.z, user_id: tag.user.id, })); }; |