Solve Feedback points

1.) Terms and Condition and Privacy policy should be clickable. 2.) I agree with the Terms & Conditions and Privacy Policy 3.) Email or WhatsApp message not received on registration 4.) Remove the user Doctor option. We will build the doctors app post MVP 5.) Error Message should be corrected to- Click the checkbox to proceed 6.) Name must be between 2 to 100 characters 7.) Remove male pic and use nuetral gender default pic 8.) Remove marked statement 9.) link all the social icons : Share popup added 10.) Also change the text below the pic to “Refer a friend” 11.) Also change website to new website URL 12.) Currency should be specified 13.) Pic of the expert should be in circle with same background 14.) Pic and text should be centrally aligned 15.) Specify “No bookmarks added” 16.) Correct the icon of the installed app and the name should start with capital “G” 17.) Parenting TV - video does not stop if the user goes to some other link on the app The audio is on in the background 18.) We need a “Next” button on the bottom right side along with Skip options. Do the user to go to the next page. This page doesn’t go to the next page until you click on skip
parasme123 · Mar 14, 2023 · a7623f5 · a7623f5
1 parent 33b29cf
commit a7623f5
Show file tree

Hide file tree

Showing 19 changed files with 268 additions and 85 deletions.
diff --git a/gravid/android/app/src/main/res/values/strings.xml b/gravid/android/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">gravid</string>
+    <string name="app_name">Gravid</string>
 </resources>
diff --git a/gravid/package-lock.json b/gravid/package-lock.json
diff --git a/gravid/package.json b/gravid/package.json
@@ -34,6 +34,7 @@
     "react-native-responsive-screen": "^1.4.2",
     "react-native-safe-area-context": "^4.4.1",
     "react-native-screens": "^3.18.2",
+    "react-native-share": "^8.2.1",
     "react-native-simple-toast": "^2.0.0",
     "react-native-svg": "^13.6.0",
     "react-native-swiper": "^1.6.0",

diff --git a/gravid/src/common/svgs.js b/gravid/src/common/svgs.js
@@ -1,8 +1,8 @@
 import Svg, { Circle, Ellipse, G, Text, TSpan, TextPath, Path, Polygon, Polyline, Line, Rect, Use, Image, Symbol, Defs, LinearGradient, RadialGradient, Stop, ClipPath, Pattern, Mask } from 'react-native-svg';
 
-export const userIcon = (color, size) => {
+export const userIcon = (color, width="19.546", height="18.615") => {
   return (
-    <Svg xmlns="http://www.w3.org/2000/svg" width="19.546" height="18.615" viewBox="0 0 19.546 18.615">
+    <Svg xmlns="http://www.w3.org/2000/svg" width={width} height={height} viewBox="0 0 19.546 18.615">
       <G id="webpagehome_85808" transform="translate(0)">
         <G id="Group_117" data-name="Group 117" transform="translate(0 0)">
           <G id="Group_152" data-name="Group 152" transform="translate(0 0)">

diff --git a/gravid/src/screens/Blogs/index.js b/gravid/src/screens/Blogs/index.js
@@ -7,7 +7,7 @@
  */
 
 import React, { useEffect, useState } from 'react';
-import { Image, ScrollView, Text, View, TouchableOpacity, FlatList, ActivityIndicator } from 'react-native';
+import { Image, ScrollView, Text, View, TouchableOpacity, FlatList, ActivityIndicator, Linking } from 'react-native';
 import { svgs } from '@common';
 import styles from './styles';
 import Swiper from 'react-native-swiper';
@@ -61,6 +61,10 @@ const Blogs = (props) => {
     );
   };
 
+  const handleOtherSlider = (url) => {
+    Linking.openURL(url);
+  }
+
   return (
     <View style={styles.container}>
 
@@ -94,7 +98,9 @@ const Blogs = (props) => {
                       {
                         btmSlider?.map((item) => {
                           return (
-                            <Image key={item.id} style={styles.endImg} source={{ uri: imageurl + item.image }} />
+                            <TouchableOpacity key={item.id} onPress={item.slider_url ? () => handleOtherSlider(item.slider_url) : null}>
+                              <Image key={item.id} style={styles.endImg} source={{ uri: imageurl + item.image }} />
+                            </TouchableOpacity>
                           )
                         })
                       }

diff --git a/gravid/src/screens/ExpertList/styles.js b/gravid/src/screens/ExpertList/styles.js
@@ -49,11 +49,13 @@ const styles = StyleSheet.create({
     color: colors.black,
     fontSize: 18,
     lineHeight: 18,
-    marginTop: 10
+    marginTop: 10,
+    textAlign: "center"
   },
   newsleftView: {
     flexDirection: "row",
-    marginTop: 16
+    marginTop: 16,
+    justifyContent:"center"
   },
   issueDes: {
     // flex: 3,
@@ -75,11 +77,12 @@ const styles = StyleSheet.create({
   },
   newsImg: {
     // flex: 2,
-    width: "100%",
+    width: 200,
     height: 200,
     marginTop: 5,
-    resizeMode:"contain",    // width: "100%",
-    alignSelf:"center"
+    resizeMode: "contain",    // width: "100%",
+    alignSelf: "center",
+    borderRadius: 100
   },
   endView: {
     marginHorizontal: 24,

diff --git a/gravid/src/screens/ExpertListDetail/style.js b/gravid/src/screens/ExpertListDetail/style.js
@@ -29,11 +29,12 @@ const styles = StyleSheet.create({
         marginTop: -30,
     },
     ScreenshotImage: {
-        width: "100%",
-        height: 230,
+        width: 200,
+        height: 200,
         borderRadius: 20,
         resizeMode: "contain",
-        alignSelf:'center'
+        alignSelf: 'center',
+        borderRadius: 100,
     },
     CONTRIBUTORSTEXT: {
         marginTop: 25,

diff --git a/gravid/src/screens/Home/index.js b/gravid/src/screens/Home/index.js
@@ -7,7 +7,7 @@
  */
 
 import React, { useState, useEffect } from 'react';
-import { Image, ScrollView, Text, View, TouchableOpacity, TextInput, FlatList, ActivityIndicator, Dimensions } from 'react-native';
+import { Image, ScrollView, Text, View, TouchableOpacity, TextInput, FlatList, ActivityIndicator, Dimensions, Linking } from 'react-native';
 import { svgs, colors } from '@common';
 import Modal from "react-native-modal";
 import styles from './styles';
@@ -207,6 +207,10 @@ const Home = (props, { route }) => {
     );
   };
 
+  const handleOtherSlider = (url) => {
+    Linking.openURL(url);
+  }
+
   if (isLoader) {
     return (
       <View style={{ flex: 1, alignItems: "center", justifyContent: "center" }}>
@@ -340,7 +344,9 @@ const Home = (props, { route }) => {
             {
               btmSlider?.map((item) => {
                 return (
-                  <Image key={item.id} style={styles.endImg} source={{ uri: imageurl + item.image }} />
+                  <TouchableOpacity key={item.id} onPress={item.slider_url ? () => handleOtherSlider(item.slider_url) : null}>
+                    <Image key={item.id} style={styles.endImg} source={{ uri: imageurl + item.image }} />
+                  </TouchableOpacity>
                 )
               })
             }

diff --git a/gravid/src/screens/Introduction/index.js b/gravid/src/screens/Introduction/index.js
@@ -65,14 +65,46 @@ const Introduction = (props) => {
             data={introductionlist}
             renderItem={renderslider}
             activeDotStyle={styles.activedot}
-            onDone={() => { props.navigation.navigate("welcome") }}
+            onDone={() => props.navigation.navigate("welcome")}
+            onSkip={() => props.navigation.navigate("welcome")}
+            showSkipButton
+            showPrevButton
+            renderNextButton={() => {
+              return (
+                <View>
+                  <Text style={styles.nextBtnTxt}>Next</Text>
+                </View>
+              )
+            }
+            }
+            renderSkipButton={() => {
+              return (
+                <View>
+                  <Text style={styles.skipBtnTxt}>Skip</Text>
+                </View>
+              )
+            }
+            }
+            renderDoneButton={() => {
+              return (
+                <View>
+                  <Text style={styles.skipBtnTxt}>Finish</Text>
+                </View>
+              )
+            }
+            }
+            renderPrevButton={() => {
+              return (
+                <View>
+                  <Text style={styles.skipBtnTxt}>Previous</Text>
+                </View>
+              )
+            }
+            }
           />
           : null
         }
-        <TouchableOpacity style={styles.skipBtn}
-          onPress={() => props.navigation.navigate("welcome")}>
-          <Text style={styles.skipBtnTxt}>Skip</Text>
-        </TouchableOpacity>
+
       </View>
       {/* <View style={styles.btnMainView}>
           <TouchableOpacity style={styles.skipBtn}

diff --git a/gravid/src/screens/Library/index.js b/gravid/src/screens/Library/index.js
@@ -104,7 +104,7 @@ const Library = (props) => {
             }
             <Text style={type == "bookmark" ? styles.WebinarActiveBtnTxt : styles.WebinarInactiveBtnTxt}>Bookmarks</Text>
           </TouchableOpacity>
-          <TouchableOpacity style={type == "download" ? styles.WebinarActiveBtn : styles.WebinarInactiveBtn} onPress={() => handleWebinarType("download")}>
+          {/* <TouchableOpacity style={type == "download" ? styles.WebinarActiveBtn : styles.WebinarInactiveBtn} onPress={() => handleWebinarType("download")}>
             {
               type == "download" ? (
                 <>
@@ -114,7 +114,7 @@ const Library = (props) => {
               ) : null
             }
             <Text style={type == "download" ? styles.WebinarActiveBtnTxt : styles.WebinarInactiveBtnTxt}>Download</Text>
-          </TouchableOpacity>
+          </TouchableOpacity> */}
           <TouchableOpacity style={type == "video" ? styles.WebinarActiveBtn : styles.WebinarInactiveBtn} onPress={() => handleWebinarType("video")}>
             {
               type == "video" ? (
@@ -133,13 +133,17 @@ const Library = (props) => {
               <ActivityIndicator size="large" />
             </View>
           ) : type == "bookmark" ? (
-            <FlatList
-              data={bookmarkDataList}
-              numColumns={2}
-              style={{ paddingLeft: 16, marginTop: 40, flexDirection: "row" }}
-              renderItem={renderItemNewsLetter}
-              keyExtractor={(item) => item.id}
-            />
+            bookmarkDataList?.length > 0 ? (
+              <FlatList
+                data={bookmarkDataList}
+                numColumns={2}
+                style={{ paddingLeft: 16, marginTop: 40, flexDirection: "row" }}
+                renderItem={renderItemNewsLetter}
+                keyExtractor={(item) => item.id}
+              />
+            ) : (
+              <Text style={styles.noBookMarkTxt}>No bookmarks added</Text>
+            )
           ) : null
         }
 

diff --git a/gravid/src/screens/Library/styles.js b/gravid/src/screens/Library/styles.js
@@ -64,13 +64,13 @@ const styles = StyleSheet.create({
   WebinarActiveBtnTxt: {
     fontFamily: fonts.OptimaMedium,
     color: colors.white,
-    fontSize: 12,
+    fontSize: 14,
     lineHeight: 24
   },
   WebinarInactiveBtnTxt: {
     fontFamily: fonts.OptimaMedium,
     color: colors.themeColor,
-    fontSize: 12,
+    fontSize: 14,
     lineHeight: 24
   },
   signupImg: {
@@ -424,9 +424,16 @@ const styles = StyleSheet.create({
     color: colors.white,
     fontSize: 14,
   },
+  noBookMarkTxt: {
+    fontFamily: fonts.OptimaBold,
+    color: colors.black,
+    fontSize: 18,
+    textAlign: "center",
+    marginTop: 200
+  },
   talkBubbleTriangleRight: {
     position: "absolute",
-    left: 55,
+    left: 75,
     bottom: -15,
     width: 0,
     height: 0,
@@ -438,7 +445,7 @@ const styles = StyleSheet.create({
   },
   talkBubbleTriangleLeft: {
     position: "absolute",
-    left: 45,
+    left: 65,
     bottom: -15,
     width: 0,
     height: 0,

diff --git a/gravid/src/screens/ParentingTV/index.js b/gravid/src/screens/ParentingTV/index.js
@@ -1,4 +1,4 @@
-import react, { useRef } from "react";
+import react, { useEffect, useRef, useState } from "react";
 import { View, Text, TouchableOpacity, Dimensions } from "react-native";
 import { ScrollView } from "react-native-gesture-handler";
 import styles from "./styles";
@@ -7,10 +7,17 @@ import VideoPlayer from 'react-native-video-controls';
 import { imageurl } from '../../Services/constants';
 import Video from 'react-native-video';
 const { width } = Dimensions.get('window');
+import { useIsFocused } from '@react-navigation/native';
 
 const ParentingTV = (props) => {
+    const isFocused = useIsFocused();
+    const [isPaused, setIsPaused] = useState(false);
     const playerRef = useRef(null)
     const videoUrl = 'https://www.sample-videos.com/video123/mp4/720/big_buck_bunny_720p_1mb.mp4';
+
+    useEffect(() => {
+        setIsPaused(!isFocused)
+    }, [isFocused])
     return (
         <View style={styles.container}>
             <View style={styles.haddingView}>
@@ -28,6 +35,7 @@ const ParentingTV = (props) => {
                 controls
             /> */}
             <VideoPlayer
+                paused={isPaused}
                 source={{ uri: 'https://rasatva.apponedemo.top/gravid/public/vedio/Tusshar_Kapoor_7th.mp4', initOptions: ['--codec=avcodec'] }}
                 // source={{ uri: imageurl + 'public\vedio\Tusshar Kapoor 7th Cut.mov' }}
                 onPause={() => console.log("pause")}

diff --git a/gravid/src/screens/Profile/index.js b/gravid/src/screens/Profile/index.js
@@ -106,8 +106,16 @@ const Profile = ({ navigation }) => {
             <Text style={styles.edittext}>Edit</Text>
           </TouchableOpacity>
           <View style={styles.profileHeader}>
-            <Image source={userData?.profile ? { uri: imageurl + userData?.profile } : require('../../assets/images/profile.png')}
-              style={styles.profileimg} />
+            {
+              userData?.profile ? (
+                <Image source={{ uri: imageurl + userData?.profile }}
+                  style={styles.profileimg} />
+              ) : (
+                <View style={{ borderWidth: 1, borderColor:colors.lightblack, borderRadius: 70, padding: 20 }}>
+                  {svgs.userIcon(colors.gray, 90, 90)}
+                </View>
+              )
+            }
             <Text style={styles.userName}>{userData?.name ? userData?.name : userData?.fname} {userData?.lname}</Text>
           </View>
           <View style={styles.activerow}>