Merge branch 'exercise-manage' of http://gitlab.sliit.lk/2023-24-005/emidwife-new into final-app

App.js

@@ -7,14 +7,15 @@ LogBox.ignoreAllLogs();
 const App = () => {
   // Your Firebase project config
   const firebaseConfig = {
-    apiKey: "AIzaSyDYUf2gYWwE_qvQk2e-8ErEZ_PYBZ7eX0o",
-    authDomain: "emidwife-382f9.firebaseapp.com",
-    databaseURL: "https://emidwife-382f9-default-rtdb.asia-southeast1.firebasedatabase.app",
-    projectId: "emidwife-382f9",
-    storageBucket: "emidwife-382f9.appspot.com",
-    messagingSenderId: "586342030256",
-    appId: "1:586342030256:web:a88085b0dd2a72a953d475"
+    apiKey: "AIzaSyCeAB4zi1RAoBPPJyE6qii36pz01tfKrYQ",
+    authDomain: "esp32-emidwife.firebaseapp.com",
+    databaseURL: "https://esp32-emidwife-default-rtdb.firebaseio.com",
+    projectId: "esp32-emidwife",
+    storageBucket: "esp32-emidwife.appspot.com",
+    messagingSenderId: "590307045316",
+    appId: "1:590307045316:web:3471bfeaec9f74f6dcbe91"
   };
+  
   // Initialize Firebase
   if (!firebase.apps.length) {
     firebase.initializeApp(firebaseConfig);

src/constants/routes.js

@@ -24,7 +24,10 @@ export default {
   EXERCISE_VIEW: 'Exercise_View',
   EXERCISE_ACTION_VIEW: 'Exercise_ACTION_View',
   EXERCISE_PROGRESS: 'Exercise_PROGRESS',
-
+  EXERCISE_NEW_VIEW: 'Exercise_NEW_View',
+  EXERCISE_NEW_ACTION_VIEW: 'Exercise_NEW_ACTION_View',
+  EXERCISE_NEW_PROGRESS: 'Exercise_NEW_PROGRESS',
+  
   //skin
 
   SKIN_WELCOME: 'Skin_Welcome',
@@ -80,5 +83,6 @@ export default {
   Game02ProgressLevel04: 'Game02ProgressLevel04',
   Game02ProgressLevel05: 'Game02ProgressLevel05',
   Game02ProgressLevel06: 'Game02ProgressLevel06',
+
 };
 

src/navigations/ExerciseNavigator.js

@@ -69,6 +69,9 @@ function ExerciseNavigator() {
           <Stack.Screen name={ROUTES.EXERCISE_WELCOME} component={WelcomeExercise} key="ExerciseWelcome" />
           <Stack.Screen name={ROUTES.EXERCISE_FORM} component={HealthFormExercise} key="ExerciseForm" />
           <Stack.Screen name={ROUTES.EXERCISE_MAIN_NEW_MENU} component={MainMenuExercise} key="MainMenuNewExercise" />
+          <Stack.Screen name={ROUTES.EXERCISE_NEW_VIEW} component={ExerciseView} key="ExerciseNewView" />
+          <Stack.Screen name={ROUTES.EXERCISE_NEW_ACTION_VIEW} component={ExerciseActionView} key="ExerciseActionNewView" />
+          <Stack.Screen name={ROUTES.EXERCISE_NEW_PROGRESS} component={ExercisesProgress} key="ExercisesNewProgress" />
         </>
       )}
     </Stack.Navigator>

src/screens/home/exercise/HealthFormExercise.js

@@ -75,7 +75,7 @@ const HealthFormExercise = (props) => {
             if (responds.data) {
                 try {
                     await AsyncStorage.setItem('userData', JSON.stringify(userData));
-                    navigation.navigate(ROUTES.EXERCISE_MAIN_MENU)
+                    navigation.navigate(ROUTES.EXERCISE_MAIN_NEW_MENU)
                     ToastAndroid.show('userData updated successfully !', ToastAndroid.SHORT);
                 } catch (error) {
                     ToastAndroid.show('Error updating userData !', ToastAndroid.SHORT);
@@ -163,6 +163,7 @@ const HealthFormExercise = (props) => {
                                             </TouchableOpacity>
                                             <TouchableOpacity
                                                 onPress={() => {
+                                                    setIsWearbleDevice(false)
                                                     setWearableModalVisible(false);
                                                 }}
 

src/screens/home/exercise/MainMenuExercise.js

@@ -94,9 +94,11 @@ const MainMenuExercise = (props) => {
             dataNum = 2;
         }
         if (todayDateByFormat === "Friday" || todayDateByFormat === "Saturday" || todayDateByFormat === "Sunday") {
-            dataNum = 2;
+            dataNum = 3;
         }
+        console.log("data",userData._id, dataNum)
         let exerciseData = await getAllExerciseDay(userData._id, dataNum);
+        console.log("dAT",exerciseData.data.data)
         let dataArray = exerciseData.data.data;
         if (dataArray.length > 0) {
             let exerciseModifiedAarray = [];
@@ -138,6 +140,7 @@ const MainMenuExercise = (props) => {
 
     useEffect(() => {
         retriveExerciseList()
+        setSelectedId(null)
     }, [])
 
     return (
@@ -155,7 +158,7 @@ const MainMenuExercise = (props) => {
                     renderItem={renderItem}
                     keyExtractor={item => item._id}
                     extraData={selectedId}
-                    style={{ marginBottom: 20 }}
+                    style={{ marginBottom: 20}}
                 />
                  {loading && <ActivityIndicator style={styles.loader} size="large" color="#0000ff" />}
             </ScrollView>