Skip to content

Commit

Permalink
ft(onBoarding): resolve conflict to merge on develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Irirwanirira committed May 3, 2024
2 parents f526e3a + 2962aec commit 355051e
Show file tree
Hide file tree
Showing 12 changed files with 1,228 additions and 185 deletions.
20 changes: 14 additions & 6 deletions app/index.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { Text } from "@/components/Themed";
import { Text, View, StyleSheet } from "react-native"
import { router } from "expo-router";
import { useEffect } from "react";
import FirstScreen from "./onBoarding/FirstScreen";

export default function Index() {
useEffect(() => {
setTimeout(() => {
router.push("/(auth)/SignIn&SignOut/SetYourFingerPrint");
}, 2000);
});
// useEffect(() => {
// setTimeout(() => {
// router.push("/(auth)/SignIn&SignOut/SetYourFingerPrint");
// }, 2000);
// });

return (
<View style={styles.container}>
Expand All @@ -17,3 +17,11 @@ export default function Index() {
</View>
);
}

const styles = StyleSheet.create({
container: {
flex: 1,
alignItems: "center",
justifyContent: "center"
}
})
3 changes: 2 additions & 1 deletion app/onBoarding/FirstScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ const darkImg = require("../../assets/images/OnBoardingImages/firstDarkImg.png")

const FirstScreen = () => {
const {theme, changeTheme} = useContext(ThemeContext)
console.log(theme)

return (
<View style={styles.container}>
<OnboardingComponent
image={theme === "dark" ? darkImg : image}
image={theme === "light" ? image : darkImg}
text="Thousands of doctors & experts to help your health!"
action="Next"
direction="/onBoarding/SecondScreen"
Expand Down
2 changes: 1 addition & 1 deletion app/onBoarding/SecondScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const SecondScreen = () => {
return (
<View>
<OnboardingComponent
image={theme === "dark" ? darkImg : image}
image={theme === "light" ? image : darkImg}
text="Health checks & consultations easily anywhere anytime"
action="Next"
direction="/onBoarding/ThirdScreen">
Expand Down
4 changes: 2 additions & 2 deletions app/onBoarding/ThirdScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import OnboardingComponent from '@/components/OnBoarding/OnboardingComponent'
import { ThemeContext } from '@/ctx/ThemeContext'

const image = require("../../assets/images/OnBoardingImages/thirdLightImg.png")
const darkImg = require("../../assets/images/OnBoardingImages/thirdDarkImg.png")
const darkImg = require("../../assets/images/OnBoardingImages/thirdDarkImg.png.png")


const ThirdScreen = () => {
Expand All @@ -14,7 +14,7 @@ const ThirdScreen = () => {
return (
<View style={styles.container}>
<OnboardingComponent
image={ theme=== "dark" ? darkImg : image}
image={theme === "light" ? image : darkImg}
text="Let's start living healthy and well with us right now!"
action="Get Started"
direction="/"
Expand Down
Binary file added assets/images/OnBoardingImages/firstDarkImg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/OnBoardingImages/firstLightImg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/OnBoardingImages/secondDarkImg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/OnBoardingImages/secondLightImg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/OnBoardingImages/thirdLightImg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion components/OnBoarding/OnboardingComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const OnboardingComponent = ({
<Image source={image} />
</View>
<View style={styles.LowerSection}>
<Text style={theme === "light" ? styles.titleDark : styles.titleLight}>
<Text style={theme === "light" ? styles.titleLight : styles.titleDark}>
{text}
</Text>
<View style={{ flexDirection: "row", alignSelf: "center" }}>
Expand Down
Loading

0 comments on commit 355051e

Please sign in to comment.