From 3f244122f9dfd703804321627c3d8c68111193c9 Mon Sep 17 00:00:00 2001
From: George Rusu <george@tagg.id>
Date: Mon, 24 May 2021 15:24:27 -0700
Subject: Fade tags in/out on image click

---
 src/components/moments/MomentPostContent.tsx | 51 +++++++++++++++++++++++-----
 1 file changed, 43 insertions(+), 8 deletions(-)

(limited to 'src/components/moments')

diff --git a/src/components/moments/MomentPostContent.tsx b/src/components/moments/MomentPostContent.tsx
index e702cb68..a20249e6 100644
--- a/src/components/moments/MomentPostContent.tsx
+++ b/src/components/moments/MomentPostContent.tsx
@@ -1,6 +1,14 @@
 import {useNavigation} from '@react-navigation/native';
 import React, {useEffect, useRef, useState} from 'react';
-import {Image, StyleSheet, Text, View, ViewProps} from 'react-native';
+import {
+  Image,
+  StyleSheet,
+  Text,
+  TouchableOpacity,
+  View,
+  ViewProps,
+} from 'react-native';
+import Animated, {Easing} from 'react-native-reanimated';
 import {useDispatch, useStore} from 'react-redux';
 import {getCommentsCount, loadMomentTags} from '../../services';
 import {RootState} from '../../store/rootReducer';
@@ -34,11 +42,16 @@ const MomentPostContent: React.FC<MomentPostContentProps> = ({
   const [elapsedTime, setElapsedTime] = useState('');
   const [comments_count, setCommentsCount] = useState('');
   const [tags, setTags] = useState<MomentTagType[]>([]);
+  const [visible, setVisible] = useState(false);
   const state: RootState = useStore().getState();
   const navigation = useNavigation();
   const dispatch = useDispatch();
   const imageRef = useRef(null);
 
+  const [fadeValue, setFadeValue] = useState<Animated.Value<number>>(
+    new Animated.Value(0),
+  );
+
   useEffect(() => {
     const loadTags = async () => {
       const response = await loadMomentTags(momentId);
@@ -58,15 +71,37 @@ const MomentPostContent: React.FC<MomentPostContentProps> = ({
     fetchCommentsCount();
   }, [dateTime, momentId]);
 
+  useEffect(() => {
+    const fade = async () => {
+      Animated.timing(fadeValue, {
+        toValue: 1,
+        duration: 1000,
+        easing: Easing.linear,
+      }).start();
+    };
+    fade();
+  }, [fadeValue]);
+
   return (
     <View style={[styles.container, style]}>
-      <Image
-        ref={imageRef}
-        style={styles.image}
-        source={{uri: pathHash}}
-        resizeMode={'cover'}
-      />
-      <MomentTags editing={false} tags={tags} imageRef={imageRef} />
+      <TouchableOpacity
+        activeOpacity={1}
+        onPress={() => {
+          setVisible(!visible);
+          setFadeValue(new Animated.Value(0));
+        }}>
+        <Image
+          ref={imageRef}
+          style={styles.image}
+          source={{uri: pathHash}}
+          resizeMode={'cover'}
+        />
+      </TouchableOpacity>
+      {visible && (
+        <Animated.View style={{opacity: fadeValue}}>
+          <MomentTags editing={false} tags={tags} imageRef={imageRef} />
+        </Animated.View>
+      )}
       <View style={styles.footerContainer}>
         <CommentsCount
           commentsCount={comments_count}
-- 
cgit v1.2.3-70-g09d2


From 4723abb677dca97a9f0ac1c50084ba8902a31e36 Mon Sep 17 00:00:00 2001
From: George Rusu <george@tagg.id>
Date: Tue, 25 May 2021 11:38:26 -0700
Subject: Fix positioning

---
 src/components/common/MomentTags.tsx         |  1 -
 src/components/moments/MomentPostContent.tsx | 22 +++++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'src/components/moments')

diff --git a/src/components/common/MomentTags.tsx b/src/components/common/MomentTags.tsx
index 9fe451a1..defd4b4b 100644
--- a/src/components/common/MomentTags.tsx
+++ b/src/components/common/MomentTags.tsx
@@ -8,7 +8,6 @@ interface MomentTagsProps {
   tags: MomentTagType[];
   imageRef: MutableRefObject<null>;
   deleteFromList?: (user: ProfilePreviewType) => void;
-  onPress?: () => void;
 }
 
 const MomentTags: React.FC<MomentTagsProps> = ({
diff --git a/src/components/moments/MomentPostContent.tsx b/src/components/moments/MomentPostContent.tsx
index a20249e6..6953dca4 100644
--- a/src/components/moments/MomentPostContent.tsx
+++ b/src/components/moments/MomentPostContent.tsx
@@ -1,13 +1,7 @@
 import {useNavigation} from '@react-navigation/native';
 import React, {useEffect, useRef, useState} from 'react';
-import {
-  Image,
-  StyleSheet,
-  Text,
-  TouchableOpacity,
-  View,
-  ViewProps,
-} from 'react-native';
+import {Image, StyleSheet, Text, View, ViewProps} from 'react-native';
+import {TouchableWithoutFeedback} from 'react-native-gesture-handler';
 import Animated, {Easing} from 'react-native-reanimated';
 import {useDispatch, useStore} from 'react-redux';
 import {getCommentsCount, loadMomentTags} from '../../services';
@@ -75,7 +69,7 @@ const MomentPostContent: React.FC<MomentPostContentProps> = ({
     const fade = async () => {
       Animated.timing(fadeValue, {
         toValue: 1,
-        duration: 1000,
+        duration: 250,
         easing: Easing.linear,
       }).start();
     };
@@ -84,8 +78,7 @@ const MomentPostContent: React.FC<MomentPostContentProps> = ({
 
   return (
     <View style={[styles.container, style]}>
-      <TouchableOpacity
-        activeOpacity={1}
+      <TouchableWithoutFeedback
         onPress={() => {
           setVisible(!visible);
           setFadeValue(new Animated.Value(0));
@@ -96,9 +89,9 @@ const MomentPostContent: React.FC<MomentPostContentProps> = ({
           source={{uri: pathHash}}
           resizeMode={'cover'}
         />
-      </TouchableOpacity>
+      </TouchableWithoutFeedback>
       {visible && (
-        <Animated.View style={{opacity: fadeValue}}>
+        <Animated.View style={[styles.tapTag, {opacity: fadeValue}]}>
           <MomentTags editing={false} tags={tags} imageRef={imageRef} />
         </Animated.View>
       )}
@@ -130,6 +123,9 @@ const styles = StyleSheet.create({
     aspectRatio: 1,
     marginBottom: '3%',
   },
+  tapTag: {
+    position: 'absolute',
+  },
   footerContainer: {
     flexDirection: 'row',
     justifyContent: 'space-between',
-- 
cgit v1.2.3-70-g09d2