Merge pull request #24 from Ninjas-Code-official/fixing-issues

dark theme issues

CustomerApp/src/Theme/Colors.js

@@ -17,10 +17,12 @@ const COLORS = {
   primaryLightBlue: '#0cc8d5',
   lightBlueShadeGrey: '#f8f9fa',
   mediumBlueShadeGrey: '#f2f4f5',
+  dkmediumBlueShadeGrey: '#202020',
   black06: 'rgba(0,0,0,0.6)',
   white06: 'rgba(255,255,255,0.6)',
   redishOrange: '#FA7751',
   blueColor: '#00b9c6',
-  yellowishOrange: '#fff1d4'
+  yellowishOrange: '#fff1d4',
+  fontMainColor: '#000'
 }
 export { COLORS }

CustomerApp/src/Theme/Theme.js

@@ -62,7 +62,7 @@ const Theme = {
       fontSecondColor: COLORS.whitishGrey,
       placeHolderColor: COLORS.lightGrey,
       buttonBackground: COLORS.primary,
-      buttonBackgroundLight: COLORS.mediumBlueShadeGrey,
+      buttonBackgroundLight: COLORS.dkmediumBlueShadeGrey,
       buttonBackgroundBlue: COLORS.primaryLightBlue,
       active: COLORS.primaryLightBlue,
       buttonText: COLORS.white,

CustomerApp/src/components/CustomizeComponents/TitleComponent/TitleComponent.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import React from 'react'
 import { View } from 'react-native'
 import { alignment } from '../../../utils/alignment'
-import TextDefault from '../../Text/TextDefault/TextDefault'
+import TextDefault from '../../Text'
 import styles from './styles'
 
 function TitleComponent(props) {

CustomerApp/src/components/Menu/StatusCard/styles.js

@@ -18,7 +18,7 @@ const useStyle = () => {
       marginTop: 20,
       width: scale(275),
       padding: moderateScale(15),
-      backgroundColor: '#f7f7fb',
+      backgroundColor: colors.cardContainer,
       borderRadius: 10,
       borderStyle: 'dashed',
       borderColor: '#a5a5a5',
@@ -32,7 +32,8 @@ const useStyle = () => {
       // ...alignment.MTxSmall,
       // ...alignment.MLmedium
     },
-    textContainer: {},
+    textContainer: {
+    },
     statusCircleContainer: {
       flexDirection: 'row',
       justifyContent: 'flex-start',

CustomerApp/src/screens/Cart/styles.js

@@ -43,7 +43,7 @@ const useStyle = () => {
     contactContainer: {
       width: '100%',
       alignSelf: 'center',
-      backgroundColor: colors.lightBackground,
+      backgroundColor: colors.cardContainer,
       borderRadius: 20,
       padding: scale(15)
     },
@@ -56,7 +56,7 @@ const useStyle = () => {
       alignSelf: 'center',
       borderTopLeftRadius: 20,
       borderTopRightRadius: 20,
-      backgroundColor: colors.lightBackground,
+      backgroundColor: colors.cardContainer,
       borderBottomColor: colors.horizontalLine,
       ...alignment.PLmedium,
       ...alignment.PRmedium,

CustomerApp/src/screens/CreateAccount/CreateAccount.js

@@ -164,7 +164,7 @@ const CreateAccount = () => {
           style={styles.marginLeft5}
           name="apple"
           size={scale(19)}
-          color="#000"
+          color={colors.iconColor}
         />
         <TextDefault style={alignment.MLsmall} bold>
           Signup with Apple

CustomerApp/src/screens/CreateAccount/styles.js

@@ -71,7 +71,7 @@ const useStyle = () => {
       width: '100%',
       height: height * 0.07,
       borderRadius: moderateScale(20),
-      backgroundColor: colors.lightBackground,
+      backgroundColor: colors.buttonBackgroundLight,
       flexDirection: 'row',
       alignItems: 'center'
     },

CustomerApp/src/screens/Help/Help.js

@@ -6,6 +6,7 @@ import i18n from '../../../i18n'
 import { TextDefault, WrapperView } from '../../components'
 import { NAVIGATION_SCREEN } from '../../utils/constant'
 import useStyle from './styles'
+import { useTheme } from '@react-navigation/native'
 
 const links = [
   {
@@ -22,6 +23,7 @@ const links = [
 function Help() {
   const styles = useStyle()
   const navigation = useNavigation()
+  const { colors } = useTheme()
 
   useLayoutEffect(() => {
     navigation.setOptions({
@@ -42,7 +44,7 @@ function Help() {
             key={index}>
             <TextDefault H4>{title}</TextDefault>
             <TouchableOpacity>
-              <AntDesign name="arrowright" size={22} color="black" />
+              <AntDesign name="arrowright" size={22} color={colors.fontMainColor} />
             </TouchableOpacity>
           </TouchableOpacity>
         ))}

CustomerApp/src/screens/Help/styles.js

@@ -10,7 +10,7 @@ const useStyle = () => {
       flex: 1
     },
     itemContainer: {
-      backgroundColor: colors.white,
+      backgroundColor: colors.buttonBackgroundLight,
       marginHorizontal: moderateScale(20),
       borderRadius: moderateScale(10),
       elevation: 2,

CustomerApp/src/screens/Profile/Profile.js

@@ -58,9 +58,17 @@ function Profile() {
     onError,
   });
 
+  const [title, setTitle] = useState('titleProfile');
+
   useLayoutEffect(() => {
     navigation.setOptions({
-      title: "Profile",
+      // headerTitle: () => (
+      //   <TextDefault center H4 bold>
+      //     {title || 'Profile'}
+      //   </TextDefault>
+      // ),
+      // title: "Profile",
+      headerTitle: i18n.t(title),
       headerRight: () => (
         <RightButton
           icon={toggleView ? ICONS_NAME.Pencil : ICONS_NAME.Cross}
@@ -71,6 +79,7 @@ function Profile() {
     });
   }, [navigation, toggleView]);
 
+
   useEffect(() => {
     if (backScreen) {
       viewHideAndShow();