update

src/navigation/BottomTab.js

@@ -18,6 +18,7 @@ import HomeStack from "./HomeStack";
 import ChatStack from "./ChatStack";
 import SettingsStack from "./SettingsStack";
 import Library from "../screens/Library/Library.js";
+import Profile from "../screens/Profile/Profile.js";
 
 const bottomTabStyles = StyleSheet.create({
   icon: {
@@ -91,7 +92,7 @@ export const BottomTabScreen = () => {
       />
       <BottomTab.Screen
         name={Routes.Profile}
-        component={SettingsStack}
+        component={Profile}
         options={{
           tabBarLabel: "Profil",
           headerShown: false,

src/navigation/MainStack.js

@@ -11,7 +11,7 @@ import Onboarding from "../screens/Onboarding";
 import Login from "../screens/Login";
 import ForgotPassword from "../screens/ForgotPassword";
 
-import Notifications from "../screens/Notifications";
+import Notifications from "../screens/Profile/Notifications";
 
 import TermsOfUse from "../screens/TermsOfUse";
 import PrivacyPolicy from "../screens/PrivacyPolicy";
@@ -51,6 +51,12 @@ import AllMyLikedMusic from "../screens/Library/AllMyLikedMusic";
 import Research from "../screens/Library/Research";
 import MusicDetails from "../screens/Library/MusicDetails";
 import SingerProfile from "../screens/Profile/SingerProfile";
+import EditProfile from "../screens/Profile/EditProfile";
+import Settings from "../screens/Profile/Settings";
+import ChangeEmailAddress from "../screens/Profile/ChangeEmailAddress";
+import ChangePassword from "../screens/Profile/ChangePassword";
+import Language from "../screens/Profile/Language";
+import Reels from "../screens/Profile/Reels";
 
 const screenOptions = {
   headerShown: false,
@@ -79,11 +85,6 @@ const screens = [
     component: BottomTabScreen,
     options: { animationEnabled: false },
   },
-  {
-    name: Routes.Notifications,
-    component: Notifications,
-    title: "Notifications",
-  },
   {
     name: Routes.TermsOfUse,
     component: TermsOfUse,
@@ -238,6 +239,34 @@ const screens = [
     name: Routes.SingerProfile,
     component: SingerProfile,
   },
+  {
+    name: Routes.EditProfile,
+    component: EditProfile,
+  },
+  {
+    name: Routes.Settings,
+    component: Settings,
+  },
+  {
+    name: Routes.ChangeEmailAddress,
+    component: ChangeEmailAddress,
+  },
+  {
+    name: Routes.ChangePassword,
+    component: ChangePassword,
+  },
+  {
+    name: Routes.Notifications,
+    component: Notifications,
+  },
+  {
+    name: Routes.Language,
+    component: Language,
+  },
+  {
+    name: Routes.Reels,
+    component: Reels,
+  },
 ];
 
 export default function Main() {

src/navigation/Routes.js

@@ -6,7 +6,6 @@ export const Routes = {
 
   BottomTab: "BottomTab",
   Welcome: "Welcome",
-  Notifications: "Notifications",
 
   HomeStack: "HomeStack",
   Home: "Home",
@@ -16,7 +15,6 @@ export const Routes = {
   Chat: "Chat",
 
   SettingsStack: "SettingsStack",
-  Settings: "Settings",
   ProjectSettings: "ProjectSettings",
   AccountSettings: "AccountSettings",
 
@@ -70,4 +68,11 @@ export const Routes = {
 
   Profile: "Profile",
   SingerProfile: "SingerProfile",
+  EditProfile: "EditProfile",
+  Settings: "Settings",
+  ChangeEmailAddress: "ChangeEmailAddress",
+  ChangePassword: "ChangePassword",
+  Notifications: "Notifications",
+  Language: "Language",
+  Reels: "Reels",
 };

src/navigation/SettingsStack.js

@@ -4,9 +4,9 @@ import { createStackNavigator } from "@react-navigation/stack";
 import { Palette } from "../styles";
 import { Routes } from "./Routes";
 
-import Settings from "../screens/Settings";
 import ProjectSettings from "../screens/ProjectSettings";
 import AccountSettings from "../screens/AccountSettings";
+import Settings from "../screens/Profile/Settings";
 
 const screenOptions = {
   headerShown: false,