diff --git a/LeftOvers/App.tsx b/LeftOvers/App.tsx
index 4653f54..a1a079d 100644
--- a/LeftOvers/App.tsx
+++ b/LeftOvers/App.tsx
@@ -11,6 +11,7 @@ import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
import HomeStackScreen from './navigation/HomeStackScreen';
import ProfilesStackScreen from './navigation/ProfileStackScreen';
+import CookingStackScreen from './navigation/CookingStackScreen';
const Tab = createBottomTabNavigator();
@@ -45,9 +46,10 @@ export default function App() {
return (
-
-
-
+
+
+
+
//
diff --git a/LeftOvers/components/TopBar.tsx b/LeftOvers/components/TopBar.tsx
index 5a7f0c0..ee4bd4d 100644
--- a/LeftOvers/components/TopBar.tsx
+++ b/LeftOvers/components/TopBar.tsx
@@ -7,20 +7,19 @@ interface TopBarProps{
}
export default function TopBar(props) {
- const _goBack = () => console.log('Went back');
const _handleSearch = () => console.log('Searching');
const _handleMore = () => console.log('Shown more');
return (
-
- {props.isVisible &&(
- <>
-
- >
+ {props.isVisible && (
+ <>
+
+
+ >
)}
-
+
);
}
\ No newline at end of file
diff --git a/LeftOvers/navigation/CookingStackScreen.tsx b/LeftOvers/navigation/CookingStackScreen.tsx
index e69de29..836eca3 100644
--- a/LeftOvers/navigation/CookingStackScreen.tsx
+++ b/LeftOvers/navigation/CookingStackScreen.tsx
@@ -0,0 +1,21 @@
+import React from 'react'
+import { StyleSheet } from 'react-native'
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
+
+import IngredientSelection from '../screens/IngredientSelection';
+
+const CookingStack = createNativeStackNavigator()
+
+export default function CookingStackScreen() {
+ return (
+
+
+
+ )
+}
+
+const styles = StyleSheet.create({
+})
\ No newline at end of file
diff --git a/LeftOvers/navigation/HomeStackScreen.tsx b/LeftOvers/navigation/HomeStackScreen.tsx
index fb0a616..4a0e77d 100644
--- a/LeftOvers/navigation/HomeStackScreen.tsx
+++ b/LeftOvers/navigation/HomeStackScreen.tsx
@@ -8,64 +8,74 @@ import appLogo from '../assets/images/icon.png';
const HomeStack = createNativeStackNavigator()
+function AppIcon() {
+ return (
+
+ )
+}
+
+function TextTitle(props) {
+ return (
+
+ {props.title}
+
+ )
+}
+
export default function HomeStackScreen() {
- return (
-
- (
-
-
-
- ),
- headerTitle: () => (
-
- LeftOvers
-
- ),
- headerRight: () => (
-
- ),
- headerTitleAlign: 'center'
- }}
- />
-
-
- )
+ return (
+
+ (
+
+ ),
+
+ headerTitle: () => (
+
+ ),
+ headerTitleAlign: 'center',
+
+ headerRight: () => (
+
+ ),
+ }}
+ />
+ (
+
+ )
+ }}
+ />
+
+ )
}
const styles = StyleSheet.create({
headerBarContainer: {
- flexDirection: 'row',
- width: "100%",
- alignItems: 'center',
- justifyContent: 'center',
backgroundColor: '#F2F0E4',
- padding: 5,
},
headerTitle: {
fontSize: 20,
fontWeight: "bold",
color: '#3F3C42',
- textAlign: "center",
- textAlignVertical: 'center',
- flex: 0.8,
},
headerAppIcon: {
width: 35,
- height: 35
- },
- headerAppIconContainer: {
-
+ height: 35,
+ borderRadius: 20,
+ overflow:'hidden',
+ marginHorizontal: 10,
}
})
\ No newline at end of file
diff --git a/LeftOvers/navigation/ProfileStackScreen.tsx b/LeftOvers/navigation/ProfileStackScreen.tsx
index 48c6987..a268479 100644
--- a/LeftOvers/navigation/ProfileStackScreen.tsx
+++ b/LeftOvers/navigation/ProfileStackScreen.tsx
@@ -1,18 +1,24 @@
import React from 'react'
-import { View, Image, Text, StyleSheet } from 'react-native'
+import { View, StyleSheet } from 'react-native'
import { createNativeStackNavigator } from '@react-navigation/native-stack';
import Profiles from '../screens/Profiles';
+import TopBar from '../components/TopBar';
const ProfilesStack = createNativeStackNavigator()
export default function ProfilesStackScreen() {
return (
-
+ (
+
+ )
+ }}
+ />
)
}
diff --git a/LeftOvers/screens/HomePage.tsx b/LeftOvers/screens/HomePage.tsx
index e35d220..c886d86 100644
--- a/LeftOvers/screens/HomePage.tsx
+++ b/LeftOvers/screens/HomePage.tsx
@@ -42,11 +42,6 @@ export default function HomePage({ navigation , props}) {
return (
-
-
- LeftOvers
-
-
@@ -109,23 +104,22 @@ export default function HomePage({ navigation , props}) {
}
const styles = StyleSheet.create({
- container: {
- height: "100%",
- width: "100%",
- flex: 1,
- backgroundColor: '#3F3C42',
- alignItems: 'center',
- justifyContent: 'center',
- },
- linearGradient: {
- height: "100%",
- width: "100%",
- flex: 1,
- padding: 10,
- paddingTop: 0,
- },
-
- filterBar: {
+ container: {
+ height: "100%",
+ width: "100%",
+ flex: 1,
+ backgroundColor: '#3F3C42',
+ alignItems: 'center',
+ justifyContent: 'center',
+ },
+ linearGradient: {
+ height: "100%",
+ width: "100%",
+ flex: 1,
+ padding: 10,
+ paddingTop: 0,
+ },
+ filterBar: {
flexDirection: "row",
width: 300,
paddingTop: 10,
@@ -133,8 +127,8 @@ const styles = StyleSheet.create({
alignItems: "flex-end",
justifyContent: "center",
flex: 0.2,
- },
- filters: {
+ },
+ filters: {
flex: 0.8,
fontSize: 20,
color: '#ACA279',
@@ -142,14 +136,13 @@ const styles = StyleSheet.create({
padding: 5,
paddingLeft: 0,
paddingBottom: 0,
- },
- nbSelected: {
+ },
+ nbSelected: {
fontSize: 11,
color: "#3F3C42",
textAlign: "right",
- },
-
- profilesSelection: {
+ },
+ profilesSelection: {
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
@@ -157,8 +150,8 @@ const styles = StyleSheet.create({
backgroundColor: '#F2F0E4',
paddingTop: 5,
marginHorizontal: 10,
- },
- welcome: {
+ },
+ welcome: {
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
@@ -167,18 +160,18 @@ const styles = StyleSheet.create({
paddingVertical: 10,
paddingHorizontal: 25,
marginHorizontal: 10,
- },
- text: {
+ },
+ text: {
fontSize: 20,
color: '#ACA279',
- },
- name: {
+ },
+ name: {
fontSize: 20,
fontWeight: "bold",
color: '#59BDCD',
textAlign: "left",
- },
- ingredientSelection: {
+ },
+ ingredientSelection: {
flexDirection: 'column',
width: "90%",
alignItems: 'center',
@@ -189,20 +182,5 @@ const styles = StyleSheet.create({
borderColor: "#ACA279",
marginHorizontal: 10,
padding: 5
- },
- appName: {
- fontSize: 20,
- fontWeight: "bold",
- color: '#3F3C42',
- textAlign: "center",
- flex: 0.8,
- },
- topBar: {
- flexDirection: 'row',
- width: "100%",
- alignItems: 'center',
- justifyContent: 'center',
- backgroundColor: '#F2F0E4',
- padding: 5,
- },
+ },
});
\ No newline at end of file