Skip to content

Commit

Permalink
conflict resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
@ankitaNioclass
ankitaNioclass committed Jun 21, 2024
2 parents 12c6c8a + 485f1f0 commit bae5451
Show file tree
Hide file tree
Showing 17 changed files with 775 additions and 176 deletions.
310 changes: 160 additions & 150 deletions App.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
Touchable,
Pressable,
} from "react-native";
import { GestureHandlerRootView } from "react-native-gesture-handler";
import { NavigationContainer } from "@react-navigation/native";
import { createNativeStackNavigator } from "@react-navigation/native-stack";
import Calculator from "./src/screens/Calculator/calculator";
Expand All @@ -35,169 +36,178 @@ import WorkoutOverview from "./src/screens/FitnessTracker/WorkoutOverview";
import AddExpense from "./src/screens/ExpenseTracker/AddExpense";
import Dashboard from "./src/screens/ExpenseTracker/Dasboard";
import CodingQuiz from "./src/screens/CodingQuiz/CodingQuiz";

import TimerHome from "./src/screens/Timer/TimerHome";

export default function App() {
const Stack = createNativeStackNavigator();
return (
<NavigationContainer>
<Stack.Navigator initialRouteName="Home">
<Stack.Screen
name="Home"
component={Home}
options={{ headerShown: false, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Basic Components"
component={BasicButtons}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Image Gallery"
component={Gallery}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Rock Paper Scissors Game"
component={RPSGame}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Book Finder"
component={BookFinder}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Calculator"
component={Calculator}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<GestureHandlerRootView style={{ flex: 1 }}>
<NavigationContainer>
<Stack.Navigator initialRouteName="Home">
<Stack.Screen
name="Home"
component={Home}
options={{ headerShown: false, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Basic Components"
component={BasicButtons}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Image Gallery"
component={Gallery}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Rock Paper Scissors Game"
component={RPSGame}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Book Finder"
component={BookFinder}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Calculator"
component={Calculator}
options={{ headerShown: true, animation: "slide_from_right" }}
/>

<Stack.Screen
name="Movie Finder"
component={MovieFinder}
options={{ headerShown: true, animation: "slide_from_right" }}
/>

<Stack.Screen
name="Hex Color"
component={HexColorGeneratorScreen}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="To Do List"
component={ToDoList}
options={{ headerShown: true, animation: "slide_from_right" }}
/>

<Stack.Screen
name="Movie Finder"
component={MovieFinder}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Add Task"
component={AddTaskScreen}
options={{ headerShown: true, animation: "slide_from_right" }}
/>

<Stack.Screen
name="Hex Color"
component={HexColorGeneratorScreen}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="To Do List"
component={ToDoList}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Dashboard"
component={Dashboard}
options={{ headerShown: true, animation: "slide_from_right" }}
/>

<Stack.Screen
name="Dashboard"
component={Dashboard}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Add Task"
component={AddTaskScreen}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Add Expense"
component={AddExpense}
options={{ headerShown: true, animation: "slide_from_right" }}
/>

<Stack.Screen
name="Add Expense"
component={AddExpense}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="QR Scanner"
component={QRScanner}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="QR Scanner"
component={QRScanner}
options={{ headerShown: true, animation: "slide_from_right" }}
/>

<Stack.Screen
name="QR Generator"
component={QRCodeGenerator}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Recipe Finder"
component={RecipeFinder}
options={{ headerShown: false }}
/>
<Stack.Screen
name="Tic Tac Toe"
component={TicTacToe}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Workout Overview"
component={WorkoutOverview}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Add Workout"
component={AddWorkout}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="QR Generator"
component={QRCodeGenerator}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Recipe Finder"
component={RecipeFinder}
options={{ headerShown: false }}
/>
<Stack.Screen
name="Tic Tac Toe"
component={TicTacToe}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Workout Overview"
component={WorkoutOverview}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Timer App"
component={TimerHome}
options={{ headerShown: false, animation: "slide_from_right" }}
/>
<Stack.Screen
name="Add Workout"
component={AddWorkout}
options={{ headerShown: true, animation: "slide_from_right" }}
/>

<Stack.Screen
name="Anime Finder"
component={AnimeFinder}
options={{
headerShown: true,
headerStyle: {
backgroundColor: "#121212",
},
headerTintColor: "#00ff99",
headerTitleStyle: {
fontWeight: "bold",
},
cardStyle: { backgroundColor: "#121212" },
animationEnabled: true,
animationTypeForReplace: "push",
transitionSpec: {
open: {
animation: "timing",
config: { duration: 300 },
<Stack.Screen
name="Anime Finder"
component={AnimeFinder}
options={{
headerShown: true,
headerStyle: {
backgroundColor: "#121212",
},
headerTintColor: "#00ff99",
headerTitleStyle: {
fontWeight: "bold",
},
cardStyle: { backgroundColor: "#121212" },
animationEnabled: true,
animationTypeForReplace: "push",
transitionSpec: {
open: {
animation: "timing",
config: { duration: 300 },
},
close: {
animation: "timing",
config: { duration: 300 },
},
},
close: {
animation: "timing",
config: { duration: 300 },
}}
/>
<Stack.Screen
name="Pokedex"
component={Pokedex}
options={{
headerShown: true,
headerStyle: {
backgroundColor: "#121212",
},
},
}}
/>
<Stack.Screen
name="Pokedex"
component={Pokedex}
options={{
headerShown: true,
headerStyle: {
backgroundColor: "#121212",
},
headerTintColor: "#00ff99",
headerTitleStyle: {
fontWeight: "bold",
},
cardStyle: { backgroundColor: "#121212" },
animationEnabled: true,
animationTypeForReplace: "push",
transitionSpec: {
open: {
animation: "timing",
config: { duration: 300 },
headerTintColor: "#00ff99",
headerTitleStyle: {
fontWeight: "bold",
},
close: {
animation: "timing",
config: { duration: 300 },
cardStyle: { backgroundColor: "#121212" },
animationEnabled: true,
animationTypeForReplace: "push",
transitionSpec: {
open: {
animation: "timing",
config: { duration: 300 },
},
close: {
animation: "timing",
config: { duration: 300 },
},
},
},
}}
/>
<Stack.Screen
name="Coding Quiz"
component={CodingQuiz}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
</Stack.Navigator>
</NavigationContainer>
}}
/>
<Stack.Screen
name="Coding Quiz"
component={CodingQuiz}
options={{ headerShown: true, animation: "slide_from_right" }}
/>
</Stack.Navigator>
</NavigationContainer>
</GestureHandlerRootView>
);
}
Loading

0 comments on commit bae5451

Please sign in to comment.