😎 New Zodiac Signs and dark theme is darker

app.json

@@ -56,6 +56,5 @@
       "color": "#192f6a",
       "iosDisplayInForeground": true
     }
-  },
-
+  }
 }

package.json

@@ -8,16 +8,17 @@
     "eject": "expo eject"
   },
   "dependencies": {
-    "@expo/vector-icons": "latest",
+    "@expo/vector-icons": "^10.2.0",
     "@react-native-community/datetimepicker": "2.2.2",
     "@react-native-community/masked-view": "^0.1.6",
-    "@react-navigation/drawer": "^5.4.1",
-    "@react-navigation/material-bottom-tabs": "^5.1.8",
-    "@react-navigation/native": "^5.1.5",
-    "@react-navigation/stack": "^5.2.10",
+    "@react-navigation/bottom-tabs": "^5.4.2",
+    "@react-navigation/drawer": "^5.7.2",
+    "@react-navigation/material-bottom-tabs": "^5.2.2",
+    "@react-navigation/native": "^5.2.1",
+    "@react-navigation/stack": "^5.2.16",
     "@use-expo/font": "^2.0.0",
     "clarifai": "^2.9.1",
-    "expo": "~37.0.3",
+    "expo": "^37.0.9",
     "expo-asset": "^8.1.4",
     "expo-camera": "^8.2.0",
     "expo-constants": "^9.0.0",
@@ -35,17 +36,17 @@
     "react-dom": "~16.9.0",
     "react-native": "https://github.com/expo/react-native/archive/sdk-37.0.1.tar.gz",
     "react-native-gesture-handler": "~1.6.0",
-    "react-native-paper": "^3.8.0",
+    "react-native-paper": "^3.10.1",
     "react-native-picker-select": "^7.0.0",
     "react-native-reanimated": "~1.7.0",
     "react-native-safe-area-context": "0.7.3",
     "react-native-screens": "~2.2.0",
     "react-native-svg": "^11.0.1",
     "react-native-web": "~0.11.7",
-    "react-navigation-material-bottom-tabs": "^2.2.11"
+    "react-navigation-material-bottom-tabs": "^2.2.12"
   },
   "devDependencies": {
-    "@babel/core": "^7.8.6",
+    "@babel/core": "^7.9.6",
     "@types/react": "~16.9.23",
     "@types/react-native": "~0.61.17",
     "babel-preset-expo": "~8.1.0",

src/constants/themes.js

@@ -41,10 +41,6 @@ const themes = {
         colors: {
             ...NavigationDarkTheme.colors,
             ...PaperDarkTheme.colors,
-            background: '#192f6a',
-            primary: '#ffb942',
-            accent: '#415bea',
-            surface: '#12265c',
         },
         fonts: configureFonts(fontConfig),
     }

src/constants/zodiac_signs.js

@@ -14,8 +14,6 @@ const HoroscopeSigns = [
 ]
 
 export const HoroscopeDates = {
-
-
     'Capricorn': {
         'es': '22 dic - 20 ene',
         'en': '22 dec - 20 jan',

src/navigation/MainStackNavigation.js

@@ -10,6 +10,8 @@ import PalmistryPreScanScreen from "../screens/initials/PalmistryPreScanScreen";
 import PalmistryScanScreen from "../screens/initials/PalmistryScanScreen";
 import {useGlobals} from "../contexts/Global";
 import i18n from "i18n-js";
+import {Text, useTheme} from "react-native-paper";
+import {createBottomTabNavigator} from "@react-navigation/bottom-tabs";
 
 const PalmistryStack = createStackNavigator();
 
@@ -49,48 +51,27 @@ function DailyStackNavigation() {
     )
 }
 
-const Tab = createMaterialBottomTabNavigator();
+const BarLabel = (props) => {
+    const {colors} = useTheme()
+    console.log(props)
+    return (
+        <Text style={{fontSize: 10, lineHeight: 20, textAlign: 'center', color: "#FFFFFF"}}>
+            {props.children}
+        </Text>
+    )
+}
+
+const Tab = createBottomTabNavigator();
 
 function MainStackNavigation() {
     const [{session}] = useGlobals();
     return (
-        <Tab.Navigator
-            shifting={false}
-        >
+        <Tab.Navigator>
             <Tab.Screen
                 name="symbol"
                 component={DailyStackNavigation}
-                options={{
-                    tabBarIcon: `zodiac-${session.sign.toLowerCase()}`,
-                    title: i18n.t(session.sign)
-                }}
-            />
-            <Tab.Screen
-                name="Palmistry"
-                component={session.palmistry ? PalmistryScreen : PalmistryStackNavigation}
-                options={{
-                    tabBarIcon: 'hand',
-                    title: i18n.t('Palmistry')
-                }}
-            />
-            <Tab.Screen
-                name="Compatibility"
-                component={CompatibilityScreen}
-                options={{
-                    tabBarIcon: 'heart-multiple',
-                    title: i18n.t('Compatibility2'),
-
-                }}
             />
-            <Tab.Screen
-                name="Profile"
-                component={ProfileScreen}
-                options={{
-                    tabBarIcon: 'account-box',
-                    title: i18n.t('Profile'),
 
-                }}
-            />
         </Tab.Navigator>
     );
 }

src/screens/initials/NameScreen.js

@@ -31,7 +31,7 @@ function NameScreen({navigation}) {
             <Aquarius width={80} height={80} style={styles.aquarius}/>
             <Backgrounds.Constellation color={colors.text} dotColor={colors.primary} height={250} width={250}
                                        style={styles.constellation}/>
-            <View style={{flex: 1}}/>
+            <View style={{flex: .5}}/>
             <View style={styles.textContainer}>
                 <Headline style={styles.textHeadline}>{i18n.t('What\'s your name?')}</Headline>
                 <Text
@@ -44,8 +44,7 @@ function NameScreen({navigation}) {
                 <PaperTextInput
                     value={name}
                     onChangeText={(text) => setName(text)}
-                    style={styles.input}
-                    underlineColor='#ffffff00'
+                    style={[styles.input, {backgroundColor: colors.text + '3D'}]}
                     render={props => <TextInput {...props} style={styles.inputCustom}/>}
                 />
             </View>
@@ -80,13 +79,13 @@ const styles = StyleSheet.create({
         flex: 1, paddingHorizontal: 20, opacity: 0.9
     },
     input: {
-        borderRadius: 5, fontSize: 30, textAlign: 'center',
+        borderRadius: 5, fontSize: 30, textAlign: 'center'
     },
     inputCustom: {
         textAlign: 'center',
         marginTop: 10,
         color: 'white',
-        fontSize: 30
+        fontSize: 30,
     },
     buttonContainer: {
         flex: 1, paddingHorizontal: 20, paddingTop: 35, justifyContent: 'flex-end', marginBottom: 20

src/screens/initials/NumberScreen.js

@@ -42,14 +42,13 @@ function NumberScreen({navigation}) {
                     style={styles.textText}>{i18n.t("{name}, to give you accurate and personal information we need to know some info", {name: 'Josep'})}</Text>
             </View>
             <View style={styles.logoContainer}>
-                <Dices height={80}/>
+                <Dices height={75}/>
             </View>
             <View style={styles.inputContainer}>
                 <PaperTextInput
                     value={number}
                     onChangeText={(text) => setNumber(text)}
-                    style={styles.inputStyle}
-                    underlineColor='#ffffff00'
+                    style={[styles.input, {backgroundColor: colors.text + '3D'}]}
                     keyboardType="number-pad"
                     enablesReturnKeyAutomatically={true}
                     render={props => <TextInput {...props} style={styles.inputCustom} maxLength={5}/>}

src/screens/initials/PalmistryScanScreen.js

@@ -101,7 +101,7 @@ function PalmistryScanScreen({navigation, route}) {
     return (
         <DefaultView barStyle={useIsDark() ? 'light-content' : 'dark-content'}>
             <Aquarius color={colors.text} width={80} height={80} style={styles.aquarius}/>
-            <Backgrounds.Constellation height={250} width={250} style={styles.constellation}/>
+            <Backgrounds.Constellation color={colors.text} dotColor={colors.primary} height={250} width={250} style={styles.constellation}/>
             <View style={{flex: .2}}/>
             <View style={styles.textContainer}>
                 <Headline style={styles.textHeadline}>{i18n.t('Palmistry')}</Headline>

src/svgs/zodiac/Aquarius.js

@@ -1,5 +1,5 @@
 import * as React from "react"
-import Svg, {Circle, G, Path} from "react-native-svg"
+import Svg, {Circle, G, Path, Rect} from "react-native-svg"
 import PropTypes from "prop-types";
 
 /**
@@ -13,51 +13,61 @@ import PropTypes from "prop-types";
 function Aquarius({color, height, width, style}) {
     return (
         <Svg height={height} width={width} viewBox="0 0 512 512" style={style}>
-            <Circle cx={256} cy={256} r={256} fill="#ffe047"/>
             <Path
-                d="M510.99 278.667L398.707 166.385c-38.23-41.627-86.944-34.638-104.572-30.297L230.157 72.11c-6.611-6.611-17.43-6.611-24.042 0l-1.466 1.466c-6.612 6.611-6.612 17.43 0 24.042l.878.878a210.984 210.984 0 00-20.637 3.606L159.443 77.04c-5.726-7.236-13.792-12.866-24.979-14.94-15.124-2.804-32.214 5.247-45.718 21.538-17.582 21.212-30.353 58.82-18.689 104.865-17.084 29.563-24.183 61.538-31.602 107.535L254.398 511.98c.535.003 1.066.02 1.602.02 133.744 0 243.514-102.568 254.99-233.333z"
-                fill="#ffcf00"
+                d="M464 75.649l-25.79 22.4a260.261 260.261 0 01-32.25 23.84q-8.325 5.25-17.14 9.97c-3.98 2.13-8.04 4.19-12.15 6.14a306 306 0 01-45.59 17.45c-40.56 11.94-82.94 15.45-122.3 10.14l-34.47-4.66-14.31-44.58 25.79-22.4a268.994 268.994 0 0149.39-33.81 304.7 304.7 0 0157.74-23.59 310.725 310.725 0 0146.62-9.92 297.477 297.477 0 0133.81-2.58 276.132 276.132 0 0141.87 2.36l34.47 4.66z"
+                fill="#c04a42"
             />
             <Path
-                d="M287.386 138.046s137.72-50.623 159.294 161.24c19.689 193.351-106.997 163.841-87.501 33.693 16.21-108.213 16.723-159.981-35.72-159.981l-36.073-34.952z"
-                fill="#00d9e0"
+                d="M344 128l-8 8v16h-24v32h-32v-76a28 28 0 1156 0v4z"
+                fill="#cb84d3"
             />
             <Path
-                d="M364.999 165.662c-23.203-15.619-46.872-14.117-63.208-13.659l21.669 20.996c52.443 0 51.93 51.768 35.72 159.981-8.587 57.32 11.183 95.113 34.314 102.949 36.875-160.953 8.145-245.603-28.495-270.267z"
-                fill="#00b7be"
+                d="M318.48 82.029L296 112l-3.654 40.2A52.563 52.563 0 01240 200l18.86-89.15A36.922 36.922 0 01295.27 80H308a27.867 27.867 0 0110.48 2.029z"
+                fill="#5f4bbc"
             />
             <Path
-                d="M76.222 207.764c-21.234-54.761-7.453-100.025 12.525-124.126 13.504-16.291 30.595-24.343 45.718-21.538 32.605 6.046 38.763 42.273 37.465 60.583l-19.269-1.341c.006-.098.613-9.973-2.306-20.09-3.397-11.775-9.747-18.368-19.412-20.161-7.897-1.464-18.623 4.374-27.325 14.874-16.478 19.878-27.598 57.853-9.388 104.817l-18.008 6.982z"
-                fill="#7985ec"
+                d="M448 128c-8 32-27.479 70.959-32 80-8 16-80 8-80 8l-8 16h-64.25L248 216l-9.257 32.4a32.541 32.541 0 01-31.289 23.6 32.541 32.541 0 01-30.871-22.251L144 152l32-8 32 96 9.652-33.782A30.634 30.634 0 01247.107 184H384l32-48v-12a24 24 0 019.6-19.2L448 88v-6.7a9.3 9.3 0 019.3-9.3 9.3 9.3 0 018.821 6.358l4.34 13.02a9.3 9.3 0 01-1.382 8.519zM344 350.6c0-20.193-24.391-30.333-38.706-16.091l-86.356 85.911A40.071 40.071 0 00208 447.929 40.07 40.07 0 00248.069 488h149.715A10.216 10.216 0 00408 477.783a10.215 10.215 0 00-4.96-8.76L368 448l-16 8-96-8 81.352-81.352A22.7 22.7 0 00344 350.6z"
+                fill="#cb84d3"
             />
             <Path
-                d="M197.251 328.793c54.761 21.234 100.025 7.453 124.126-12.525 16.291-13.504 24.343-30.595 21.539-45.718-6.046-32.605-42.273-38.764-60.583-37.465l1.341 19.269c.098-.006 9.973-.613 20.09 2.306 11.774 3.397 18.368 9.747 20.161 19.412 1.464 7.897-4.374 18.623-14.874 27.326-19.879 16.478-57.854 27.597-104.817 9.387l-6.983 18.008z"
-                fill="#4b5be5"
+                d="M288 304h-86.962A33.038 33.038 0 00168 337.036V352c0 .74 8 104 8 104l-26.534 13.267A9.888 9.888 0 00144 478.11a9.889 9.889 0 009.889 9.89H208V352h80z"
+                fill="#cb84d3"
             />
             <Path
-                d="M307.789 182.752l-85.527-85.527s-70.522 0-116.286 45.764-56.267 83.276-67.521 153.047l70.522 70.522c69.772-11.254 107.283-21.757 153.048-67.521 45.764-45.763 45.764-116.285 45.764-116.285z"
-                fill="#3a4de3"
+                d="M440 440a16 16 0 00-16-16 16 16 0 01-16-16 16 16 0 00-16-16h-4.183a16 16 0 01-15.292-11.3l-21.119-68.635a101.387 101.387 0 00-25.214-41.878 14.17 14.17 0 01-3.423-14.5L328 232a107.334 107.334 0 01-48-48l-18.492 11.557A30.1 30.1 0 00264 248v144a96 96 0 0096 96h96a16 16 0 0016-16 16 16 0 00-16-16 16 16 0 01-16-16z"
+                fill="#5f4bbc"
             />
+            <Circle cx={168} cy={135.999} fill="#c8534b" r={56} />
+            <Rect fill="#4c3aa3" height={16} rx={8} width={40} x={384} y={415.999} />
+            <Rect fill="#4c3aa3" height={16} rx={8} width={40} x={416} y={447.999} />
             <Path
-                d="M262.026 299.044c-45.76 45.76-83.276 56.259-153.044 67.514L73.72 331.296l191.308-191.308 42.765 42.765s0 70.524-45.767 116.291z"
-                fill="#1c2ede"
+                d="M340.6 383.758c-33.829-35.636-50.7-70.036-57.079-85.2a7.993 7.993 0 014.843-10.682l.022-.007a8 8 0 019.9 4.47 230.1 230.1 0 0010.943 22.2 293.706 293.706 0 0043.016 58.25 7.988 7.988 0 01-.165 11.138 8.014 8.014 0 01-11.48-.169zM365.279 460.322c-37.356-17.345-63.646-63.232-72.938-81.507a7.992 7.992 0 013.888-10.92l.031-.014a7.994 7.994 0 0110.367 3.656c8.528 16.635 32.829 59.139 65.267 74.223a8.01 8.01 0 014.254 9.794 7.971 7.971 0 01-10.869 4.768z"
+                fill="#4c3aa3"
             />
             <Path
-                d="M307.397 200.366L204.65 97.618c-6.612-6.612-6.612-17.43 0-24.042l1.466-1.466c6.611-6.611 17.43-6.611 24.042 0l102.748 102.748c6.612 6.611 6.612 17.43 0 24.042l-1.466 1.466c-6.613 6.611-17.431 6.611-24.043 0z"
-                fill="#7985ec"
+                d="M382.929 52.787l-9.579-28.738a297.477 297.477 0 00-33.81 2.58L344.4 41.2l38.271 11.9z"
+                fill="#af3b34"
             />
             <Path
-                d="M332.685 174.637l-51.154-51.153-25.508 25.508 51.154 51.154c6.733 6.733 17.75 6.733 24.482 0l1.025-1.026c6.734-6.733 6.733-17.75.001-24.483z"
-                fill="#4b5be5"
+                d="M358.507 81.951l38.403 13.266.109-.154-13.945-41.839-.406-.126zM397.091 95.28l-.181-.063-23.452 33.148L376.67 138c4.11-1.95 8.17-4.01 12.15-6.14q8.805-4.71 17.14-9.97z"
+                fill="#af3b34"
             />
-            <G fill="#fff">
-                <Path
-                    d="M220.546 248.151c-5.47-5.47-5.638-11.155-5.762-15.306-.104-3.509-.167-5.627-2.659-8.119-2.491-2.491-4.609-2.554-8.118-2.658-4.151-.123-9.837-.292-15.306-5.761s-5.638-11.155-5.761-15.305c-.104-3.509-.167-5.626-2.658-8.117s-4.609-2.554-8.117-2.658c-4.151-.123-9.836-.291-15.305-5.76s-5.638-11.155-5.76-15.305c-.104-3.509-.167-5.626-2.658-8.117l7.502-7.502c5.469 5.469 5.638 11.155 5.76 15.305.104 3.509.167 5.626 2.658 8.117s4.609 2.554 8.117 2.658c4.151.123 9.836.291 15.305 5.761 5.469 5.469 5.638 11.155 5.76 15.305.104 3.509.167 5.626 2.658 8.117s4.609 2.554 8.118 2.658c4.151.123 9.837.292 15.306 5.761 5.47 5.47 5.639 11.155 5.762 15.307.104 3.509.167 5.627 2.659 8.119s4.61 2.555 8.119 2.659c4.151.124 9.837.293 15.307 5.762l-7.502 7.502c-2.492-2.492-4.61-2.555-8.119-2.659-4.15-.125-9.836-.294-15.306-5.764zM196.587 272.111c-5.47-5.47-5.639-11.155-5.762-15.307-.104-3.509-.167-5.627-2.659-8.119-2.491-2.491-4.609-2.554-8.118-2.658-4.151-.123-9.837-.292-15.306-5.761s-5.638-11.155-5.76-15.305c-.104-3.509-.167-5.626-2.658-8.117s-4.609-2.554-8.117-2.658c-4.151-.123-9.836-.291-15.305-5.76-5.469-5.469-5.638-11.155-5.76-15.305-.104-3.509-.167-5.626-2.658-8.117l7.502-7.502c5.469 5.469 5.638 11.155 5.76 15.305.104 3.509.167 5.626 2.658 8.117s4.609 2.554 8.117 2.658c4.151.123 9.836.291 15.305 5.76 5.469 5.469 5.638 11.155 5.76 15.305.104 3.509.167 5.626 2.658 8.117s4.609 2.554 8.118 2.658c4.151.123 9.837.292 15.306 5.761 5.47 5.47 5.639 11.155 5.762 15.306.104 3.509.167 5.627 2.659 8.119s4.61 2.555 8.119 2.659c4.151.124 9.837.293 15.307 5.762l-7.502 7.502c-2.492-2.492-4.61-2.555-8.119-2.659-4.152-.122-9.838-.291-15.307-5.761zM172.626 296.072c-5.47-5.47-5.639-11.155-5.762-15.307-.104-3.509-.167-5.627-2.659-8.119-2.491-2.491-4.609-2.554-8.118-2.658-4.151-.123-9.837-.292-15.306-5.761s-5.638-11.155-5.76-15.306c-.104-3.509-.167-5.626-2.658-8.117s-4.609-2.554-8.117-2.658c-4.151-.123-9.836-.291-15.305-5.76s-5.638-11.155-5.76-15.305c-.104-3.509-.167-5.626-2.658-8.117l7.502-7.502c5.469 5.469 5.638 11.155 5.76 15.305.104 3.509.167 5.626 2.658 8.117s4.609 2.554 8.117 2.658c4.151.123 9.836.291 15.305 5.76s5.638 11.155 5.76 15.305c.104 3.509.167 5.626 2.658 8.117s4.609 2.554 8.118 2.658c4.151.123 9.837.292 15.306 5.761 5.47 5.47 5.638 11.155 5.762 15.306.104 3.509.167 5.627 2.659 8.119s4.61 2.555 8.119 2.659c4.151.124 9.837.293 15.307 5.762l-7.502 7.502c-2.492-2.492-4.61-2.555-8.119-2.659-4.151-.122-9.837-.291-15.307-5.76z"/>
-            </G>
-            <G fill="#d9d9db">
-                <Path
-                    d="M251.469 249.072l-7.496 7.496c-2.492-2.492-4.609-2.549-8.122-2.65-4.148-.13-9.829-.295-15.301-5.768-5.473-5.473-5.638-11.154-5.768-15.301-.101-3.514-.158-5.631-2.65-8.122-2.491-2.491-4.616-2.556-8.13-2.657-4.148-.13-9.829-.295-15.294-5.76l7.503-7.503c2.484 2.484 4.601 2.556 8.115 2.657 4.14.122 9.829.295 15.301 5.768 5.465 5.465 5.638 11.154 5.76 15.294.101 3.514.173 5.631 2.664 8.122s4.601 2.556 8.115 2.657c4.15.128 9.838.301 15.303 5.767zM227.513 273.028l-7.503 7.503c-2.491-2.491-4.608-2.549-8.115-2.657-4.155-.122-9.836-.288-15.309-5.76-5.473-5.473-5.638-11.154-5.761-15.309-.108-3.507-.166-5.624-2.657-8.115-2.491-2.491-4.616-2.556-8.122-2.664-4.155-.122-9.836-.288-15.302-5.753l7.503-7.503c2.484 2.484 4.608 2.549 8.115 2.657 4.148.115 9.836.288 15.309 5.761 5.465 5.465 5.638 11.154 5.753 15.301.108 3.507.173 5.631 2.664 8.122s4.608 2.549 8.115 2.657c4.156.122 9.845.295 15.31 5.76zM203.556 296.985l-7.503 7.503c-2.491-2.491-4.608-2.549-8.122-2.65-4.148-.13-9.829-.295-15.301-5.768-5.473-5.473-5.638-11.154-5.768-15.301-.101-3.514-.158-5.631-2.65-8.123-2.491-2.491-4.616-2.556-8.122-2.664-4.155-.122-9.836-.288-15.301-5.753l7.503-7.503c2.484 2.484 4.601 2.556 8.115 2.657 4.14.122 9.836.288 15.309 5.761 5.465 5.465 5.631 11.161 5.753 15.301.101 3.514.173 5.631 2.664 8.122s4.601 2.556 8.115 2.657c4.147.13 9.843.296 15.308 5.761z"/>
+            <Path
+                d="M358.507 81.951l-.374.447 15.325 45.967 23.452-33.148zM382.668 53.098l-38.271-11.901 13.519 40.55.591.204z"
+                fill="#a3332c"
+            />
+            <Path
+                d="M136 407.547V360c0-147.952 56-192 56-224a24 24 0 00-24-24c-6.627 0-12.271 3.074-16.971 7.029C117 147.665 40 272 40 376v40a16 16 0 0016 16 15.994 15.994 0 0016-16 16 16 0 0016 16 16 16 0 0016-16 16 16 0 0016 16 16 16 0 0016-16z"
+                fill="#d87474"
+            />
+            <G fill="#cc6968">
+                <Path d="M61 392.067c-.309-36.269 8.125-79.462 8.485-81.283l15.7 3.1c-.085.426-8.48 43.436-8.185 78.046zM109.224 384.677l-16-.347c.1-4.551.231-9.122.394-13.588l15.989.582a985.062 985.062 0 00-.383 13.353zM110.556 351.547l-15.972-.95c1.226-20.614 3.183-40.522 5.816-59.171l15.843 2.237c-2.574 18.224-4.487 37.699-5.687 57.884zM118.753 277.483l-15.774-2.675a458.181 458.181 0 0113.084-56.752l15.3 4.673a442.341 442.341 0 00-12.61 54.754zM136.279 208.042l-15.018-5.52A142.8 142.8 0 01129 184.465l14 7.735-7-3.867 7.013 3.85a132.691 132.691 0 00-6.734 15.859z" />
             </G>
+            <Circle cx={80} cy={223.999} fill="#e59090" r={16} />
+            <Path
+                d="M64 159.999h16v16H64zM48 111.999h16v16H48zM48 463.999h16v16H48zM80 479.999h16v16H80z"
+                fill="#e59090"
+            />
         </Svg>
     )
 }