reza fixed something

src/components/Navbar.js

@@ -477,7 +477,11 @@ const Navbar = ({
           )
         ) : null}
         {headerOptions?.menu ? (
-          <Entypo name="dots-three-vertical" size={24} color="#52796F" />
+          <Entypo
+            name="dots-three-vertical"
+            size={24}
+            color={theme === "light" ? "#52796F" : Colors.theme1.white}
+          />
         ) : null}
       </View>
     </View>

src/redux/reducers/public.js

@@ -18,7 +18,7 @@ const initialState = {
   provinces: [],
   cities: [],
   province: ["استان"],
-  city: ["شهر"],
+  city: ["شهرستان"],
   departmans: [
     {
       id: 0,

src/screens/Activation/index.js

@@ -36,7 +36,7 @@ const ios = Platform.OS === "ios";
 const { height } = Dimensions.get("window");
 
 function Activation({ add, mobile, theme, route }) {
-  const [value, setValue] = useState(null);
+  const [value, setValue] = useState(route?.params?.data || "");
   const navigation = useNavigation();
   const insets = useSafeAreaInsets();
 
@@ -113,7 +113,7 @@ function Activation({ add, mobile, theme, route }) {
                           : Colors.theme1.white,
                     },
                   ]}
-                  value={value || route?.params?.data}
+                  value={value}
                   onChangeText={(value) =>
                     setValue(
                       (value = onInput.englishAndNumberWithoutSpace(value))

src/screens/Address/index.js

@@ -410,7 +410,7 @@ const Address = ({
                       : city[0]
                   }
                   onChange={(name, value) =>
-                    value === "شهر" ? {} : onChange(name, value)
+                    value === "شهرستان" ? {} : onChange(name, value)
                   }
                   options={city}
                   width={"100%"}

src/screens/Profile/components/MyCourses/index.js

@@ -63,7 +63,7 @@ const ProfileBookmark = ({ myCourses = [], mobile, theme }) => {
         <Empty
           text="هیچ دوره ویدئویی وجود ندارد."
           buttonText={"رفتن به فروشگاه"}
-          buttonAction={() => navigation.push("Products")}
+          buttonAction={() => navigation.navigate("VOD")}
         />
       )}
     </SafeAreaView>

src/screens/Profile/components/Trophy.js

@@ -2,6 +2,7 @@ import { View, Text, Platform, Pressable } from "react-native";
 import React from "react";
 import { connect } from "react-redux";
 import Svg, { G, Path } from "react-native-svg";
+import {asyncAwesomeAlert} from "../../../utils/AsyncWrappers";
 
 //style
 import tw from "tailwind-rn";
@@ -61,10 +62,17 @@ const Trophy = ({ theme }) => {
               theme === "light" ? Colors.theme1.green79 : Colors.theme1.yellow2,
           }}
         >
-          {"امتیاز شما" + " " + 14560}
+          {"امتیاز شما" + " " + 0}
         </Text>
       </View>
-      <Pressable>
+      <Pressable
+        onPress={() =>
+          asyncAwesomeAlert("نتیجه", "این قابلیت در حال توسعه است.", {
+            confirmText : 'باشه',
+            showCancelButton: false,
+          })
+        }
+      >
         <Text
           style={{
             fontFamily: "light",

src/screens/Profile/components/User.js

@@ -85,7 +85,8 @@ const User = ({ user, mobile, theme }) => {
           <Pressable
             style={tw(`flex  w-full ${mobile ? "mt-0" : "mt-4"}`)}
             onPress={() =>
-              asyncAwesomeAlert("نتیجه", "این قابلیت در حال توسعه است.", {
+              asyncAwesomeAlert("", "این قابلیت در حال توسعه است.", {
+                confirmText : 'باشه',
                 showCancelButton: false,
               })
             }

src/screens/Profile/index.js

@@ -65,7 +65,7 @@ function Profile({ mobile, theme, logout, loading }) {
         style={styles.container}
       >
         <User />
-        {/* <Trophy /> */}
+        <Trophy />
         <List />
         <Pressable
           style={tw(`flex  w-full ${mobile ? "mt-0" : "mt-4"}`)}

src/screens/VideoDisplay/components/Season/index.js

@@ -23,7 +23,14 @@ const duration = (value) => {
   );
 };
 
-const Season = ({ season, activeUnit, name, setVideoActive, mobile, theme }) => {
+const Season = ({
+  season,
+  activeUnit,
+  name,
+  setVideoActive,
+  mobile,
+  theme,
+}) => {
   const navigation = useNavigation();
 
   const Unit = ({ unit }) => {
@@ -38,13 +45,17 @@ const Season = ({ season, activeUnit, name, setVideoActive, mobile, theme }) =>
     return (
       <View
         style={[
-          tw(`w-full flex  rounded-md overflow-hidden ${mobile ? "mb-3" : "mb-5"}`),
+          tw(
+            `w-full flex  rounded-md overflow-hidden ${
+              mobile ? "mb-5" : "mb-5"
+            }`
+          ),
           {
             borderWidth: 1,
             borderColor: Colors.theme1.greenD9,
             backgroundColor:
               activeUnit === unit
-                ? Colors.theme1.greenCF
+                ? Colors.theme1.greenCF + (theme === "light" ? "" : "aa")
                 : "transparent",
           },
         ]}
@@ -68,7 +79,9 @@ const Season = ({ season, activeUnit, name, setVideoActive, mobile, theme }) =>
                 color:
                   activeUnit === unit
                     ? "white"
-                    : Colors.theme1.green79,
+                    : theme === "light"
+                    ? Colors.theme1.green79
+                    : Colors.theme1.white,
               },
             ]}
           >
@@ -82,12 +95,16 @@ const Season = ({ season, activeUnit, name, setVideoActive, mobile, theme }) =>
                 color:
                   activeUnit === unit
                     ? "white"
-                    : Colors.theme1.green79,
+                    : theme === "light"
+                    ? Colors.theme1.green79
+                    : Colors.theme1.white,
                 borderRightWidth: 1,
                 borderColor:
                   activeUnit === unit
                     ? "white"
-                    : Colors.theme1.green79,
+                    : theme === "light"
+                    ? Colors.theme1.green79
+                    : Colors.theme1.white,
                 paddingRight: 8,
               },
             ]}
@@ -109,7 +126,9 @@ const Season = ({ season, activeUnit, name, setVideoActive, mobile, theme }) =>
                 color:
                   activeUnit === unit
                     ? "white"
-                    : Colors.theme1.green79,
+                    : theme === "light"
+                    ? Colors.theme1.green79
+                    : Colors.theme1.white,
               }}
             >
               نمایش
@@ -134,7 +153,7 @@ const mapStateToProps = (state) => ({
   vods: state.publicApi.bookSection?.vods,
   userid: state.user.status?.id,
   mobile: state.publicApi.mobile,
-  theme: state.publicApi.theme
+  theme: state.publicApi.theme,
 });
 
 const mapDispatchToProps = {

src/screens/VideoDisplay/index.js

@@ -66,7 +66,7 @@ function VideoDisplay({ route, mobile, theme }) {
       <ScrollView
         contentContainerStyle={styles.contentContainerStyle}
         style={styles.container}
-        onLayout={() => video.current.presentFullscreenPlayer()}
+        onLayout={() => setWidth(Dimensions.get("window").width)}
       >
         {!mobile ? <View style={tw("mt-5")}></View> : null}
         <View style={tw("flex ")}>

src/screens/Videos/index.js

@@ -62,11 +62,11 @@ function Videos({ grades, videos, getVideos, mobile }) {
         style={[styles.container]}
       >
         {!mobile ? <View style={tw("mt-5")}></View> : null}
-        <Search
+        {/* <Search
           value={search}
           onChange={setSearch}
           placeholder={"نام کتاب یا دوره را جستجو کنید"}
-        />
+        /> */}
         {/* <Divider type={"vertical"} /> */}
         {videos.length ? (
           <>