diff --git a/app/_layout.tsx b/app/_layout.tsx index 56b2272..a361ea0 100644 --- a/app/_layout.tsx +++ b/app/_layout.tsx @@ -1,118 +1,13 @@ import "../global.css"; -import { GluestackUIProvider } from "@/app/components/ui/gluestack-ui-provider"; -import HomeScreen from "@/app/HomeScreen"; -import ProfileScreen from "@/app/ProfileScreen"; +import {GluestackUIProvider} from "@/app/components/ui/gluestack-ui-provider"; import React from "react"; -import { createBottomTabNavigator } from "@react-navigation/bottom-tabs"; -import { - AntDesign, - Entypo, - MaterialCommunityIcons, - MaterialIcons, -} from "@expo/vector-icons"; +import NavBar from "@/app/components/NavBar"; export default function RootLayout() { - const BottomTabNavigator = createBottomTabNavigator(); return ( - - - - tabBarIcon: ({ color, size, focused }) => ( - - - ), - }} - /> - - ( - - ), - }} - /> - - ( - - ), - tabBarItemStyle: { - borderRadius: 50, - backgroundColor: "orange", - }, - }} - /> - - ( - - ), - }} - /> - - ( - - - - ), - }} - /> - ); } diff --git a/app/components/ExerciceOverview.tsx b/app/components/ExerciceOverview.tsx index 2ee989b..7de2292 100644 --- a/app/components/ExerciceOverview.tsx +++ b/app/components/ExerciceOverview.tsx @@ -19,7 +19,7 @@ export default function ExerciceOverview() { const image = {uri: exercise.imageUri}; return ( - + - {exercise.name} - {exercise.sets} Sets - {exercise.difficulty} Difficulty + + {exercise.name} + {exercise.sets} Sets + {exercise.difficulty} Difficulty + - diff --git a/app/components/NavBar.tsx b/app/components/NavBar.tsx new file mode 100644 index 0000000..708619e --- /dev/null +++ b/app/components/NavBar.tsx @@ -0,0 +1,109 @@ +import HomeScreen from "@/app/HomeScreen"; +import {AntDesign, Entypo, MaterialCommunityIcons, MaterialIcons} from "@expo/vector-icons"; +import ProfileScreen from "@/app/ProfileScreen"; +import React from "react"; +import {createBottomTabNavigator} from "@react-navigation/bottom-tabs"; + + export default function NavBar() { + const BottomTabNavigator = createBottomTabNavigator(); + return ( + + ( + + + ), + }} + /> + + ( + + ), + }} + /> + + ( + + ), + tabBarItemStyle: { + borderRadius: 50, + backgroundColor: "orange", + }, + }} + /> + + ( + + ), + }} + /> + + ( + + + + ), + }} + /> + + ); +} \ No newline at end of file