change font

package.json

@@ -9,6 +9,7 @@
     "eject": "expo eject"
   },
   "dependencies": {
+    "@expo-google-fonts/lobster-two": "^0.2.0",
     "@react-native-async-storage/async-storage": "^1.13.0",
     "@react-native-community/masked-view": "0.1.10",
     "@react-navigation/drawer": "^5.12.5",
@@ -35,4 +36,4 @@
     "@babel/core": "^7.9.0"
   },
   "private": true
-}
+}

src/components/layouts/form/MButton.js

@@ -28,7 +28,7 @@ const styles = StyleSheet.create({
         borderRadius: 5,
         paddingHorizontal: 10,
         marginVertical: 15,
-        height: 45,
+        height: 48,
         elevation: 4,
         zIndex: 2
     },

src/components/layouts/modal/PasswordModal.js

@@ -47,11 +47,15 @@ export default function PasswordModal({ open, setOpen, item }) {
     }
     return (
         <MModal title="Password Details" open={open || false} setOpen={setOpen} onSubmit={onSubmit} submitText="Delete Password" cancelText="Edit" onCancel={onEdit}>
-            <Text style={styles.text}>Site: {item?.title} </Text>
-            <Text selectable={true} style={styles.text}>URL: {item?.url} </Text>
-            <Text selectable={true} style={styles.text}>Username: {item?.username} </Text>
-            <Text selectable={true} style={styles.text}>Email: {item?.email}</Text>
+            <Text style={styles.text}>Title: {item?.title} </Text>
+
+            {item?.url.length > 0 ? <Text selectable={true} style={styles.text}>URL: {item?.url} </Text> : null}
+
+            {item?.username.length > 0 ? <Text selectable={true} style={styles.text}>Username: {item?.username} </Text> : null}
+
+            {item?.email.length > 0 ? <Text selectable={true} style={styles.text}>Email: {item?.email}</Text> : null}
             <Text selectable={true} style={styles.text}>Password: {pass}</Text>
+
             {item?.other.length > 0 ? <Text selectable={true} style={styles.text}>Other Info: {item?.other}</Text> : null}
 
         </MModal>

src/components/navigation/DashStackNav.js

@@ -14,13 +14,21 @@ import CreateCategory from './../screens/dashboard/CreateCategory';
 import Fav from './../screens/favourite/Fav';
 import AllCat from './../screens/category/AllCat';
 import ChangePassword from './../screens/password/ChangePassword';
+import { useFonts, LobsterTwo_400Regular } from '@expo-google-fonts/lobster-two';
+import { Text } from 'react-native';
 
 const dashStack = createStackNavigator()
 /**
  * @description we will use it to navigate to different screen when the user is logged in.
  */
 export default function DashStackNav() {
     const nav = useNavigation()
+
+    let [fontsLoaded] = useFonts({
+        LobsterTwo_400Regular
+    });
+
+
     return (
         <dashStack.Navigator initialRouteName={URL.HOME_SCREEN}
 
@@ -44,7 +52,10 @@ export default function DashStackNav() {
             <dashStack.Screen name={URL.HOME_SCREEN} component={HomeScreen}
                 options={
                     {
-                        title: "PASSWORDZ",
+                        title: "Passwordz",
+                        headerTitleStyle: {
+                            fontFamily: !fontsLoaded ? "" : 'LobsterTwo_400Regular', fontSize: 28
+                        },
                         // align-left
                         headerLeft: () => (<Icon size={28} type={DefineIcon.Feather} style={{ paddingHorizontal: 25 }} name="settings" onPress={() => { nav.toggleDrawer() }} />),
                         headerRight: () => {

src/components/navigation/DrawerContent.js

@@ -36,7 +36,7 @@ export default function DrawerContent({ navigation: nav }) {
                 <Image
                     height={50}
                     width={50}
-                    source={require('../../assets/img/logo.png')}
+                    source={require('../../../assets/icon.png')}
                     style={styles.logo}
                 />
             </View>

src/components/screens/auth/SignIn.js

@@ -16,9 +16,11 @@ import DefineIcon from '../../layouts/icon/DefineIcon';
 import Icon from './../../layouts/icon/Icon';
 import { StatusBar } from 'expo-status-bar';
 import axios from 'axios';
-import LOGO from '../../../assets/img/logo.png'
+import LOGO from '../../../../assets/icon.png'
+import { useIsFocused } from '@react-navigation/native';
 
 export default function SignIn() {
+    const isFocused = useIsFocused()
     //global state
     const { app } = useContext(StateContext)
     const { authDispatch, appDispatch } = useContext(DispatchContext)
@@ -49,8 +51,11 @@ export default function SignIn() {
             const ue = await Helper.getUserEmail()
             setInput({ ...input, [N_EMAIL]: ue })
         }
-        setUserLoggedInEmail()
-    }, [])
+        if (isFocused) {
+            setUserLoggedInEmail()
+        }
+
+    }, [isFocused])
     //local method
 
     const onSubmit = async () => {

src/components/screens/auth/SignUp.js

@@ -16,7 +16,7 @@ import AppAction from './../../../utils/context/actions/AppAction';
 import DefineIcon from '../../layouts/icon/DefineIcon';
 import Icon from './../../layouts/icon/Icon';
 import { StatusBar } from 'expo-status-bar';
-import LOGO from '../../../assets/img/logo.png'
+import LOGO from '../../../../assets/icon.png'
 
 
 export default function SignUp() {
@@ -153,7 +153,7 @@ const styles = StyleSheet.create({
         fontWeight: "bold",
         color: Theme.COLOR_PRIMARY,
         fontSize: 25,
-        marginVertical: 15,
+        marginBottom: 15,
         padding: 7
     },
     logo: {

src/components/screens/dashboard/CreateCategory.js

@@ -25,9 +25,9 @@ export default function CreateCategory() {
         console.log("CreateCategory", val)
         if (val.success) {
             setTitle("")
-            Helper.Toast("" + val.title)
+            Helper.Toast("Category Created Succesfully.")
         } else {
-            Helper.Toast("" + val.title)
+            Helper.Toast("" + val.desc)
         }
     }
 

src/components/screens/dashboard/CreatePassword.js

@@ -12,11 +12,16 @@ import DropDownPicker from 'react-native-dropdown-picker'
 import AxiosHelper from './../../../utils/helpers/AxiosHelper';
 import AppAction from './../../../utils/context/actions/AppAction';
 import { StatusBar } from 'expo-status-bar';
+import NavLink from './../../layouts/form/NavLink';
+import URL from './../../../utils/helpers/URL';
+import { useIsFocused } from '@react-navigation/native';
 
 export default function CreatePassword({ route: { params }, navigation }) {
 
     const item = params?.item;
 
+    const isF = useIsFocused()
+
     const { app } = useContext(StateContext)
     const { appDispatch } = useContext(DispatchContext)
 
@@ -103,12 +108,14 @@ export default function CreatePassword({ route: { params }, navigation }) {
                 console.log("error Create Password.js->", e);
             }
         }
-        load()
+        if (isF) {
+            load()
+        }
 
         return () => {
             token.cancel()
         }
-    }, [cat.length])
+    }, [isF, cat.length])
 
     // local method
     const onSubmit = async () => {
@@ -158,17 +165,17 @@ export default function CreatePassword({ route: { params }, navigation }) {
         if (val.success) {
             setInput(clear_init)
             setValue([])
-            Helper.Toast("" + val.title)
+            Helper.Toast("" + val.desc)
         } else {
-            Helper.Toast("" + val.title)
+            Helper.Toast("" + val.desc)
         }
 
     }
 
     return (
         <ScrollView style={{ backgroundColor: Theme.COLOR_BG }}>
 
-            <Container style={{ paddingTop: 30 }}>
+            <Container style={{ paddingVertical: 30 }}>
                 <StatusBar style={Theme.STATUS_BAR} />
 
                 <Input value={input[N_TITLE]} error={error[N_TITLE]}
@@ -268,6 +275,7 @@ export default function CreatePassword({ route: { params }, navigation }) {
 
                 <MButton style={{ elevation: 0 }} title={item ? "Update Now" : "Create New"} loading={app?.loading} color={Theme.COLOR_PRIMARY} onPress={onSubmit} disabled={app?.loading} />
                 {/* while loading.. it should be disabled */}
+                <NavLink title="Don't have Category? Create New Now" url={URL.CREATE_CATEGORY}></NavLink>
             </Container>
         </ScrollView>
     )

src/components/screens/splash/Splash.js

@@ -13,7 +13,7 @@ export default function Splash() {
                 <Image
                     height={75}
                     width={75}
-                    source={require('../../../assets/img/logo.png')}
+                    source={require('../../../../assets/icon.png')}
                     style={styles.logo}
                 />
             </View>
@@ -31,7 +31,7 @@ const styles = StyleSheet.create({
         backgroundColor: Theme.COLOR_WHITE
     },
     text: {
-        color: Theme.COLOR_WHITE,
+        color: Theme.COLOR_PRIMARY,
         fontSize: 35,
         textAlign: "center"
     },

src/utils/helpers/Theme.js

@@ -30,7 +30,7 @@ const Theme1 = {
 
 const Theme = {
     COLOR_PRIMARY: "#6763D5",//
-    COLOR_ACCENT: "#6763D5",//
+    COLOR_ACCENT: "#FBE261",//
     COLOR_BG: "#FDFDFD",//
     COLOR_GRAY: "#909090",//
     COLOR_WHITE: "#fff",