Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Refactor][온보딩] onboarding image 변경 #141

Merged
merged 2 commits into from
May 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 3 additions & 30 deletions App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@ import { Provider as PaperProvider } from 'react-native-paper';
import OnboardingIntroHeaderButton from './src/components/buttons/OnboardingIntroHeaderButton';
import { RootScreen } from './src/navigation';
import ChallengeSubjectCreationScreen from './src/screens/challenge/ChallengeSubjectCreationScreen';
import ServiceIntroOneScreen from './src/screens/onboarding/ServiceIntroOneScreen';
import ServiceIntroTwoScreen from './src/screens/onboarding/ServiceIntroTwoScreen';
import ServiceIntroScreen from './src/screens/onboarding/ServiceIntroScreen';
import TempSheetScreen from './src/screens/upload/TempSheetScreen';
import UploadScreen from './src/screens/upload/UploadScreen';
import DetailedPostScreen from './src/screens/detailedPost/DetailedPostScreen';
import light from './src/theme/light';
import ServiceIntroThreeScreen from './src/screens/onboarding/ServiceIntroThreeScreen';
import InsightSampleScreen from './src/screens/onboarding/InsightSampleScreen';
import Tabs from './src/screens/Main/Tabs';
import ChallengeParticipationScreen from './src/screens/Main/challenge/ChallengeParticipationScreen';
Expand Down Expand Up @@ -303,8 +301,8 @@ export default function App() {
options={headerOptions}
/>
<Stack.Screen
name="ServiceIntroOne"
component={ServiceIntroOneScreen}
name="ServiceIntro"
component={ServiceIntroScreen}
options={{
headerTransparent: true,
headerTitle: '',
Expand All @@ -315,31 +313,6 @@ export default function App() {
},
}}
/>
<Stack.Screen
name="ServiceIntroTwo"
component={ServiceIntroTwoScreen}
options={{
headerTransparent: true,
headerTitle: '',
headerLeft: () => <View></View>,
headerRight: () => <OnboardingIntroHeaderButton />,
headerStyle: {
backgroundColor: 'transparent',
},
}}
/>
<Stack.Screen
name="ServiceIntroThree"
component={ServiceIntroThreeScreen}
options={{
headerTransparent: true,
headerTitle: '',
headerLeft: () => <View></View>,
headerStyle: {
backgroundColor: 'transparent',
},
}}
/>
<Stack.Screen
name="InsightSample"
options={{ ...headerOptions, headerStyle: { backgroundColor: '#F8F8F4' } }}
Expand Down
Binary file added assets/images/onboarding_01.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/onboarding_02.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/onboarding_03.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 removed assets/images/따봉도치.jpg
Binary file not shown.
3 changes: 2 additions & 1 deletion src/components/buttons/OnboardingIntroHeaderButton.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import React from 'react';
import { navigate } from '../../utils/hooks/navigaton/navigator';
import HeaderRightButton from '../header/HeaderRightButton';

const OnboardingIntroHeaderButton = () => {
function handlePress() {
alert('시작하기');
navigate('Feed', {});
}
return (
<HeaderRightButton
Expand Down
11 changes: 11 additions & 0 deletions src/navigation/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,17 @@ export function RootScreen() {
<Text> ChallengeParticipationScreen.tsx</Text>
</View>
</Pressable>
<Pressable onPress={() => navigation.navigate('ServiceIntro')}>
<View
style={{
backgroundColor: 'brown',
height: 100,
width: 150,
}}
>
<Text> onboarding.tsx</Text>
</View>
</Pressable>
</ScrollView>
</ScrollView>
);
Expand Down
156 changes: 0 additions & 156 deletions src/screens/onboarding/ServiceIntroOneScreen.tsx

This file was deleted.

Loading