diff --git a/assets/icons/list_box_outline.svg b/assets/icons/list_box_outline.svg new file mode 100644 index 0000000..cdb8b11 --- /dev/null +++ b/assets/icons/list_box_outline.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/icons/mobile_friendly.svg b/assets/icons/mobile_friendly.svg new file mode 100644 index 0000000..f441442 --- /dev/null +++ b/assets/icons/mobile_friendly.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/navigation/RootStack.tsx b/src/navigation/RootStack.tsx index 79acdca..01ab646 100644 --- a/src/navigation/RootStack.tsx +++ b/src/navigation/RootStack.tsx @@ -18,6 +18,8 @@ import ExpressPassportScreen from '../screens/expressPassport'; import GuidebookScreen from '../screens/guidebook'; import EazyPassportScreen from '../screens/eazyPassport'; import ApplicationDetailScreen from '../screens/applicationDetail'; +import PassportRequirementsScreen from '../screens/passportRequirements'; +import ApplicationGuideScreen from '../screens/applicationGuide'; const Stack = createNativeStackNavigator(); @@ -107,6 +109,16 @@ function RootStack() { component={ApplicationDetailScreen} options={{headerShown: false}} /> + + ); } diff --git a/src/navigation/type.ts b/src/navigation/type.ts index 78a8cac..170ecf1 100644 --- a/src/navigation/type.ts +++ b/src/navigation/type.ts @@ -18,4 +18,6 @@ export type RootStackParamList = { Guidebook: undefined; EazyPassport: undefined; ApplicationDetail: {data: PassportAppointmentData}; + ApplicationGuide: undefined; + PassportRequirements: undefined; }; diff --git a/src/screens/applicationDetail/styles.tsx b/src/screens/applicationDetail/styles.tsx index 281a8aa..4664845 100644 --- a/src/screens/applicationDetail/styles.tsx +++ b/src/screens/applicationDetail/styles.tsx @@ -18,6 +18,7 @@ const styles = StyleSheet.create({ ...FontFamily.notoSansRegular, fontSize: 22, marginStart: 16, + includeFontPadding: false, }, appBarIcon: { marginLeft: 16, diff --git a/src/screens/applicationGuide/index.tsx b/src/screens/applicationGuide/index.tsx new file mode 100644 index 0000000..aa58a6f --- /dev/null +++ b/src/screens/applicationGuide/index.tsx @@ -0,0 +1,38 @@ +import React from 'react'; +import {StatusBar, Text, View} from 'react-native'; +import styles from './styles'; +import Colors from '../../../assets/styles/Colors'; +import Icon from 'react-native-vector-icons/MaterialCommunityIcons'; +import { RootStackParamList } from '../../navigation/type'; +import { useNavigation } from '@react-navigation/native'; +import { NativeStackNavigationProp } from '@react-navigation/native-stack'; + +type ApplicationGuideScreenNavigationProp = NativeStackNavigationProp< + RootStackParamList, + 'ApplicationGuide' +>; + +function ApplicationGuideScreen() { + const navigation = useNavigation(); + + return ( + + + + navigation.goBack()} + /> + Panduan Aplikasi + + + ); +} + +export default ApplicationGuideScreen; diff --git a/src/screens/applicationGuide/styles.tsx b/src/screens/applicationGuide/styles.tsx new file mode 100644 index 0000000..e7a8ee8 --- /dev/null +++ b/src/screens/applicationGuide/styles.tsx @@ -0,0 +1,28 @@ +import {StyleSheet} from 'react-native'; +import Colors from '../../../assets/styles/Colors'; +import FontFamily from '../../../assets/styles/FontFamily'; + +const styles = StyleSheet.create({ + container: { + flex: 1, + backgroundColor: Colors.neutral100.color, + }, + appBarTitle: { + color: Colors.secondary30.color, + ...FontFamily.notoSansRegular, + fontSize: 22, + marginStart: 16, + includeFontPadding: false, + }, + appBarIcon: { + marginLeft: 16, + }, + appBarContainer: { + height: 64, + flexDirection: 'row', + alignItems: 'center', + backgroundColor: Colors.neutral100.color, + }, +}); + +export default styles; diff --git a/src/screens/closeAccount/styles.tsx b/src/screens/closeAccount/styles.tsx index 42a6762..06299d5 100644 --- a/src/screens/closeAccount/styles.tsx +++ b/src/screens/closeAccount/styles.tsx @@ -12,6 +12,7 @@ const styles = StyleSheet.create({ ...FontFamily.notoSansRegular, fontSize: 22, marginStart: 16, + includeFontPadding: false, }, appBarIcon: { marginLeft: 16, diff --git a/src/screens/eazyPassport/styles.tsx b/src/screens/eazyPassport/styles.tsx index a1304cc..6a0ce10 100644 --- a/src/screens/eazyPassport/styles.tsx +++ b/src/screens/eazyPassport/styles.tsx @@ -16,12 +16,14 @@ const styles = StyleSheet.create({ fontSize: 12, includeFontPadding: false, textAlign: 'justify', + lineHeight: 24, }, appBarTitle: { color: Colors.neutral100.color, ...FontFamily.notoSansRegular, fontSize: 22, marginStart: 16, + includeFontPadding: false, }, appBarIcon: { marginLeft: 16, diff --git a/src/screens/editProfile/styles.tsx b/src/screens/editProfile/styles.tsx index 3128b92..b987b96 100644 --- a/src/screens/editProfile/styles.tsx +++ b/src/screens/editProfile/styles.tsx @@ -11,6 +11,7 @@ const styles = StyleSheet.create({ color: Colors.neutral100.color, ...FontFamily.notoSansRegular, fontSize: 22, + includeFontPadding: false, marginStart: 16, }, appBarIcon: { diff --git a/src/screens/expressPassport/index.tsx b/src/screens/expressPassport/index.tsx index e299334..2dca1a6 100644 --- a/src/screens/expressPassport/index.tsx +++ b/src/screens/expressPassport/index.tsx @@ -1,160 +1,11 @@ -import React, {useState} from 'react'; -import {Button, Text, View} from 'react-native'; +import React from 'react'; +import {Text, View} from 'react-native'; import styles from './styles'; -import Colors from '../../../assets/styles/Colors'; -import StepIndicator from '../../components/StepIndicator'; - -const renderContent = ( - step: number, - subStep: number, - setStep: (step: number) => void, - setSubStep: (step: number) => void, -) => { - if (step === 1) { - switch (subStep) { - case 1: - return ( - - Step 1.1 -