reza changed activation and faq color

navigation/index.js

@@ -1,6 +1,6 @@
 import React, { useEffect } from "react";
 import Svg, { G, Path } from "react-native-svg";
-import {Appearance} from 'react-native';
+import { Appearance } from "react-native";
 import { NavigationContainer } from "@react-navigation/native";
 import { createNativeStackNavigator } from "@react-navigation/native-stack";
 import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
@@ -38,7 +38,6 @@ import fontSize from "../src/constants/fontSize";
 import Colors from "../src/constants/Colors";
 import tw from "tailwind-react-native-classnames";
 
-
 const Tab = createBottomTabNavigator();
 const BottomTabNavigator = () => {
   const colorScheme = Appearance.getColorScheme();
@@ -178,11 +177,7 @@ const BottomTabNavigator = () => {
           title: "ویدئوها",
           tabBarIcon: ({ focused, color }) =>
             focused ? (
-              <Svg
+              <Svg xmlns="http://www.w3.org/2000/svg" width={35} height={31.1}>
-                xmlns="http://www.w3.org/2000/svg"
-                width={35}
-                height={31.100}
-              >
                 <G data-name="Group 2000">
                   <Path
                     d="M25.421 29.241H8.974C4.04 29.241.75 26.392.75 19.744V10.25c0-6.651 3.29-9.5 8.224-9.5h16.447c4.935 0 8.229 2.849 8.229 9.5v9.5c0 6.642-3.294 9.491-8.229 9.491Z"
@@ -205,11 +200,7 @@ const BottomTabNavigator = () => {
                 </G>
               </Svg>
             ) : (
-              <Svg
+              <Svg xmlns="http://www.w3.org/2000/svg" width={35} height={32}>
-                xmlns="http://www.w3.org/2000/svg"
-                width={35}
-                height={32}
-              >
                 <G data-name="Group 1999">
                   <Path
                     d="M25.421 29.241H8.974C4.04 29.241.75 26.392.75 19.744V10.25c0-6.651 3.29-9.5 8.224-9.5h16.447c4.935 0 8.229 2.849 8.229 9.5v9.5c0 6.642-3.294 9.491-8.229 9.491Z"
@@ -359,7 +350,13 @@ const HomeStackScreen = () => {
 const ProductsStack = createNativeStackNavigator();
 const ProductsStackScreen = () => {
   return (
-    <ProductsStack.Navigator screenOptions={{ headerShown: false }} initialRouteName="Products">
+    <ProductsStack.Navigator
+      screenOptions={{
+        headerShown: false,
+        contentStyle: { backgroundColor: "white" },
+      }}
+      initialRouteName="Products"
+    >
       <ProductsStack.Screen name="Products" component={Products} />
       <ProductsStack.Screen name="Product" component={Product} />
     </ProductsStack.Navigator>
@@ -385,7 +382,7 @@ const CARTStackScreen = () => {
       <CARTStack.Screen name="DeliveryForm" component={DeliveryForm} />
     </CARTStack.Navigator>
   );
-}
+};
 
 const PROFILEStack = createNativeStackNavigator();
 const PROFILEStackScreen = () => {
@@ -408,7 +405,10 @@ const Navigation = ({ getStatus, isLogin }) => {
     <NavigationContainer>
       <Stack.Navigator
         // initialRouteName="Root"
-        screenOptions={{ headerShown: false, contentStyle : {backgroundColor : 'white'} }}
+        screenOptions={{
+          headerShown: false,
+          contentStyle: { backgroundColor: "white" },
+        }}
       >
         <Stack.Screen name="Splash" component={Splash} />
         <Stack.Screen name="QR" component={QR} />

src/redux/actions/activation.js

@@ -0,0 +1,27 @@
+import proxy from "../proxy";
+
+const activation = {
+  list:
+    (data = {}) =>
+    async (dispatch) =>
+      await proxy.get("activation/list", data, { dispatch }),
+  update:
+    (data = {}, data2 = {}) =>
+    async (dispatch) => {
+      await proxy.put("activation/update", data);
+      await proxy.get("activation/list", data2, { dispatch });
+    },
+  add:
+    (data = {}) =>
+    async (dispatch) => {
+      await proxy.post("activation/add", data);
+    },
+  del:
+    (data = {}, data2 = {}) =>
+    async (dispatch) => {
+      await proxy.delete("activation/delete", data);
+      await proxy.get("activation/list", data2, { dispatch });
+    },
+};
+
+export default activation;

src/redux/actions/index.js

@@ -11,4 +11,5 @@ export { default as faq } from "./faq";
 export { default as file } from "./file";
 export { default as qr } from "./qr";
 export {default as userAddress} from "./userAddress";
-export { default as transport } from "./transport";
+export { default as transport } from "./transport";
+export { default as activation } from "./activation";

src/redux/reducers/activation.js

@@ -0,0 +1,40 @@
+import { asyncAwesomeAlert } from "../../utils/AsyncWrappers";
+
+const initialState = {
+  loading: false,
+  error: null,
+  list: [],
+  message: null,
+};
+export default function activation(state = initialState, action) {
+  let { type, data } = action;
+  switch (type) {
+    case "activation/list":
+      return { ...state, loading: false, list: data, error: null };
+    case "activation/update":
+      return { ...state, loading: false, error: null, message: data.message };
+    case "activation/add":
+      asyncAwesomeAlert("نتیجه", data.message, {
+        showCancelButton: false,
+      });
+      console.log(data.message);
+      return { ...state, loading: false, error: null };
+    case "activation/delete":
+      return { ...state, loading: false, error: null };
+    case "loading":
+      return { ...state, loading: true };
+    case "error":
+      console.log(data.message);
+      asyncAwesomeAlert("خطا", data.message, {
+        showCancelButton: false,
+      });
+      return {
+        ...state,
+        loading: false,
+        error: data.message,
+        message: data.message,
+      };
+    default:
+      return state;
+  }
+}

src/redux/reducers/index.js

@@ -10,4 +10,5 @@ export { default as userFactor } from "./userFactor";
 export { default as userProduct } from "./userProduct";
 import { default as qr } from "./qr";
 export { default as userAddress } from "./userAddress";
-export { default as transport } from "./transport";
+export { default as transport } from "./transport";
+export { default as activation } from "./activation";

src/screens/Faq/components/Instance.js

@@ -1,20 +1,34 @@
-import { View, Text, Dimensions, TouchableOpacity } from "react-native";
+import {
+  View,
+  Text,
+  Dimensions,
+  TouchableOpacity,
+  Appearance,
+} from "react-native";
 import { Entypo } from "@expo/vector-icons";
+
+//style
 import tw from "tailwind-rn";
-import fontSize from '../../../constants/fontSize';
+import fontSize from "../../../constants/fontSize";
+import Colors from "../../../constants/Colors";
 
 const { width } = Dimensions.get("window");
 
 function Instance({ question, selectFaq }) {
+  const colorScheme = Appearance.getColorScheme();
   return (
     <TouchableOpacity
       onPress={() => selectFaq(question.id)}
       style={[
         tw("w-full flex flex-col my-1.5 rounded-md px-4 py-2"),
         {
-          backgroundColor: !question.active ? "#F9F9F9" : "#F6F9FD",
+          backgroundColor: !question.active
-          borderColor: !question.active ? "#DBDBDB" : "#196EC0",
+            ? "#F9F9F9"
-          borderWidth: 1,
+            : Colors.theme1[colorScheme].greenCF + "0a",
+          borderColor: !question.active
+            ? "#DBDBDB"
+            : Colors.theme1[colorScheme].greenCF,
+          borderWidth: 1.5,
         },
       ]}
     >
@@ -24,8 +38,8 @@ function Instance({ question, selectFaq }) {
             {
               width: "90%",
               textAlign: "right",
-              color: "#196EC0",
+              color: Colors.theme1[colorScheme].green79,
-              fontSize: fontSize.sm,
+              fontSize: fontSize.tiny,
               fontFamily: "bold",
             },
           ]}
@@ -33,16 +47,20 @@ function Instance({ question, selectFaq }) {
           {question.title}
         </Text>
         {question.active ? (
-          <Entypo name="minus" size={18} color="#196EC0" />
+          <Entypo name="minus" size={18} color={Colors.theme1[colorScheme].green79} />
         ) : (
-          <Entypo name="plus" size={18} color="#196EC0" />
+          <Entypo name="plus" size={18} color={Colors.theme1[colorScheme].green79} />
         )}
       </View>
       {question.active && (
         <View style={tw("w-full flex flex-row-reverse pt-2")}>
           <Text
             style={[
-              { color: "#196EC0", fontSize: fontSize.sm, fontFamily: "light" },
+              {
+                color: Colors.theme1[colorScheme].green79,
+                fontSize: fontSize.tiny,
+                fontFamily: "light",
+              },
               tw("text-right flex-1"),
             ]}
           >