diff --git a/assets/images/bank.svg b/assets/images/bank.svg new file mode 100644 index 0000000..d464cc8 --- /dev/null +++ b/assets/images/bank.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/assets/images/banks/busan.png b/assets/images/banks/busan.png new file mode 100644 index 0000000..9f5f360 Binary files /dev/null and b/assets/images/banks/busan.png differ diff --git a/assets/images/banks/citi.png b/assets/images/banks/citi.png new file mode 100644 index 0000000..0a099fa Binary files /dev/null and b/assets/images/banks/citi.png differ diff --git a/assets/images/banks/cu.png b/assets/images/banks/cu.png new file mode 100644 index 0000000..435b1f4 Binary files /dev/null and b/assets/images/banks/cu.png differ diff --git a/assets/images/banks/gwangju.png b/assets/images/banks/gwangju.png new file mode 100644 index 0000000..183fae0 Binary files /dev/null and b/assets/images/banks/gwangju.png differ diff --git a/assets/images/banks/hana.png b/assets/images/banks/hana.png new file mode 100644 index 0000000..001a870 Binary files /dev/null and b/assets/images/banks/hana.png differ diff --git a/assets/images/banks/ibk.png b/assets/images/banks/ibk.png new file mode 100644 index 0000000..90d39ba Binary files /dev/null and b/assets/images/banks/ibk.png differ diff --git a/assets/images/banks/imbank.png b/assets/images/banks/imbank.png new file mode 100644 index 0000000..10bf169 Binary files /dev/null and b/assets/images/banks/imbank.png differ diff --git a/assets/images/banks/jeju.png b/assets/images/banks/jeju.png new file mode 100644 index 0000000..407ece9 Binary files /dev/null and b/assets/images/banks/jeju.png differ diff --git a/assets/images/banks/kakaobank.jpg b/assets/images/banks/kakaobank.jpg new file mode 100644 index 0000000..d0a6f7d Binary files /dev/null and b/assets/images/banks/kakaobank.jpg differ diff --git a/assets/images/banks/kbank.png b/assets/images/banks/kbank.png new file mode 100644 index 0000000..686153e Binary files /dev/null and b/assets/images/banks/kbank.png differ diff --git a/assets/images/banks/kdb.png b/assets/images/banks/kdb.png new file mode 100644 index 0000000..f428022 Binary files /dev/null and b/assets/images/banks/kdb.png differ diff --git a/assets/images/banks/kfcc.png b/assets/images/banks/kfcc.png new file mode 100644 index 0000000..cc4e233 Binary files /dev/null and b/assets/images/banks/kfcc.png differ diff --git a/assets/images/banks/kookmin.png b/assets/images/banks/kookmin.png new file mode 100644 index 0000000..06ece1b Binary files /dev/null and b/assets/images/banks/kookmin.png differ diff --git a/assets/images/banks/kyongnam.png b/assets/images/banks/kyongnam.png new file mode 100644 index 0000000..f1c0f1a Binary files /dev/null and b/assets/images/banks/kyongnam.png differ diff --git a/assets/images/banks/nfcf.png b/assets/images/banks/nfcf.png new file mode 100644 index 0000000..6cbd70a Binary files /dev/null and b/assets/images/banks/nfcf.png differ diff --git a/assets/images/banks/nonghyup.png b/assets/images/banks/nonghyup.png new file mode 100644 index 0000000..5d394aa Binary files /dev/null and b/assets/images/banks/nonghyup.png differ diff --git a/assets/images/banks/post.png b/assets/images/banks/post.png new file mode 100644 index 0000000..9c1cedf Binary files /dev/null and b/assets/images/banks/post.png differ diff --git a/assets/images/banks/savings.png b/assets/images/banks/savings.png new file mode 100644 index 0000000..10ff385 Binary files /dev/null and b/assets/images/banks/savings.png differ diff --git a/assets/images/banks/sc.png b/assets/images/banks/sc.png new file mode 100644 index 0000000..d622517 Binary files /dev/null and b/assets/images/banks/sc.png differ diff --git a/assets/images/banks/shinhan.png b/assets/images/banks/shinhan.png new file mode 100644 index 0000000..6b3afd2 Binary files /dev/null and b/assets/images/banks/shinhan.png differ diff --git a/assets/images/banks/suhyup.png b/assets/images/banks/suhyup.png new file mode 100644 index 0000000..df52692 Binary files /dev/null and b/assets/images/banks/suhyup.png differ diff --git a/assets/images/banks/tossbank.png b/assets/images/banks/tossbank.png new file mode 100644 index 0000000..35d0f91 Binary files /dev/null and b/assets/images/banks/tossbank.png differ diff --git a/src/features/tutoring/BankSheet.tsx b/src/features/tutoring/BankSheet.tsx new file mode 100644 index 0000000..b30394c --- /dev/null +++ b/src/features/tutoring/BankSheet.tsx @@ -0,0 +1,262 @@ +import busanLogo from '../../../assets/images/banks/busan.png'; +import citiLogo from '../../../assets/images/banks/citi.png'; +import cuLogo from '../../../assets/images/banks/cu.png'; +import gwangjuLogo from '../../../assets/images/banks/gwangju.png'; +import hanaLogo from '../../../assets/images/banks/hana.png'; +import ibkLogo from '../../../assets/images/banks/ibk.png'; +import imbankLogo from '../../../assets/images/banks/imbank.png'; +import jejuLogo from '../../../assets/images/banks/jeju.png'; +import kakaobankLogo from '../../../assets/images/banks/kakaobank.jpg'; +import kbankLogo from '../../../assets/images/banks/kbank.png'; +import kdbLogo from '../../../assets/images/banks/kdb.png'; +import kfccLogo from '../../../assets/images/banks/kfcc.png'; +import kookminLogo from '../../../assets/images/banks/kookmin.png'; +import kyongnamLogo from '../../../assets/images/banks/kyongnam.png'; +import nfcfLogo from '../../../assets/images/banks/nfcf.png'; +import nonghyupLogo from '../../../assets/images/banks/nonghyup.png'; +import postLogo from '../../../assets/images/banks/post.png'; +import savingsLogo from '../../../assets/images/banks/savings.png'; +import scLogo from '../../../assets/images/banks/sc.png'; +import shinhanLogo from '../../../assets/images/banks/shinhan.png'; +import suhyupLogo from '../../../assets/images/banks/suhyup.png'; +import tossbankLogo from '../../../assets/images/banks/tossbank.png'; +import { useState } from 'react'; +import { Modal, Pressable, ScrollView, StyleSheet, Text, View } from 'react-native'; +import { Image } from 'expo-image'; +import { useSafeAreaInsets } from 'react-native-safe-area-context'; +import { SearchBar } from '@/components/SearchBar'; +import { semantic } from '@/styles/colors'; +import { gap, padding, radius } from '@/styles/measurement'; +import { typography } from '@/styles/typography'; + +type BankInfo = { + name: string; + /** 로고가 없으면 이름 첫 글자를 대신 보여 줍니다. */ + logo?: number; + /** 디자인에서 로고를 칸에 맞추는 방식입니다. 대부분 cover, 일부 로고는 contain입니다. */ + fit?: 'cover' | 'contain'; +}; + +/** + * 입력값 규칙의 은행 목록 순서입니다. 전북은 디자인에서 광주 로고를 씁니다. + * TODO: 기타는 디자인에 없어 로고 대신 이름 첫 글자를 보여 줍니다. 로고가 나오면 바꿉니다. + */ +export const BANKS = [ + { name: '국민', logo: kookminLogo, fit: 'contain' }, + { name: '신한', logo: shinhanLogo }, + { name: '하나', logo: hanaLogo }, + { name: '농협', logo: nonghyupLogo }, + { name: '기업', logo: ibkLogo }, + { name: 'SC제일', logo: scLogo, fit: 'contain' }, + { name: '씨티', logo: citiLogo }, + { name: '카카오뱅크', logo: kakaobankLogo }, + { name: '토스뱅크', logo: tossbankLogo }, + { name: '케이뱅크', logo: kbankLogo }, + { name: 'iM뱅크(대구)', logo: imbankLogo }, + { name: '부산', logo: busanLogo }, + { name: '경남', logo: kyongnamLogo }, + { name: '광주', logo: gwangjuLogo, fit: 'contain' }, + { name: '전북', logo: gwangjuLogo }, + { name: '제주', logo: jejuLogo }, + { name: '수협', logo: suhyupLogo, fit: 'contain' }, + { name: '산업', logo: kdbLogo }, + { name: '새마을금고', logo: kfccLogo, fit: 'contain' }, + { name: '신협', logo: cuLogo, fit: 'contain' }, + { name: '우체국', logo: postLogo }, + { name: '저축은행', logo: savingsLogo }, + { name: '산림조합', logo: nfcfLogo }, + { name: '기타' }, +] as const satisfies readonly BankInfo[]; + +export type Bank = (typeof BANKS)[number]['name']; + +/** '기타'를 고르면 은행 이름을 직접 입력합니다. */ +export const OTHER_BANK = '기타' satisfies Bank; + +/** "국민은행"처럼 "은행"을 붙여 검색해도 찾을 수 있게 공백과 "은행"을 빼고 비교합니다. */ +const normalize = (text: string) => text.replace(/\s|은행/g, '').toLowerCase(); + +export type BankSheetProps = { + visible: boolean; + selected: Bank | null; + onSelect: (bank: Bank) => void; + onClose: () => void; +}; + +/** T-07 은행 선택 바텀시트 */ +export function BankSheet({ visible, selected, onSelect, onClose }: BankSheetProps) { + const [query, setQuery] = useState(''); + const insets = useSafeAreaInsets(); + + const keyword = normalize(query); + const banks = keyword ? BANKS.filter((bank) => normalize(bank.name).includes(keyword)) : BANKS; + // "국민은행"처럼 은행 이름을 그대로 입력하고 완료를 누르면 그 은행을 고릅니다. + const exactMatch = keyword ? BANKS.find((bank) => normalize(bank.name) === keyword) : undefined; + + const close = () => { + setQuery(''); + onClose(); + }; + + const select = (name: Bank) => { + setQuery(''); + onSelect(name); + }; + + const submitSearch = () => { + if (exactMatch) select(exactMatch.name); + }; + + return ( + + + + + + + + + + 은행 선택 + + + + + + {toRows(banks).map((row) => ( + + {row.map((bank) => ( + select(bank.name)} + style={({ pressed }) => [s.cell, s.bank, pressed && s.bankPressed]} + > + + {'logo' in bank ? ( + + ) : ( + {bank.name.slice(0, 1)} + )} + + + {bank.name} + + + ))} + {/* 마지막 줄이 3칸보다 적으면 빈 칸으로 채워 칸 너비를 맞춥니다. */} + {Array.from({ length: COLUMNS - row.length }, (_, i) => ( + + ))} + + ))} + + {banks.length === 0 ? 검색 결과가 없어요 : null} + + + + + ); +} + +const COLUMNS = 3; +const LOGO_SIZE = 40; + +const toRows = (items: readonly T[]) => + Array.from({ length: Math.ceil(items.length / COLUMNS) }, (_, i) => + items.slice(i * COLUMNS, i * COLUMNS + COLUMNS), + ); + +const s = StyleSheet.create({ + backdrop: { + flex: 1, + backgroundColor: '#2D303D80', + justifyContent: 'flex-end', + alignItems: 'center', + }, + sheet: { + width: '100%', + maxWidth: 390, + maxHeight: '80%', + gap: gap[8], + backgroundColor: semantic.surface.subtle, + borderTopLeftRadius: radius.large, + borderTopRightRadius: radius.large, + }, + handleArea: { alignItems: 'center', paddingVertical: padding[12] }, + handle: { + width: 56, + height: 4, + borderRadius: radius.full, + backgroundColor: semantic.border.default, + }, + header: { gap: gap[20], paddingHorizontal: padding[24] }, + heading: { ...typography.heading[1].bold, color: semantic.text.default.strong }, + list: { paddingHorizontal: padding[24], paddingTop: padding[12] }, + // 3열 그리드: 열 사이 6px, 줄 사이 8px + grid: { gap: gap[8] }, + row: { flexDirection: 'row', gap: 6 }, + // 빈 칸도 같은 좌우 여백을 가져야 flex로 나눌 때 칸 너비가 똑같아집니다. + cell: { flex: 1, paddingHorizontal: padding[12] }, + bank: { + flex: 1, + alignItems: 'center', + justifyContent: 'center', + gap: gap[8], + paddingVertical: padding[8], + borderRadius: radius.medium, + backgroundColor: semantic.surface.subtle, + }, + bankPressed: { backgroundColor: semantic.surface.default }, + logoBox: { + width: LOGO_SIZE, + height: LOGO_SIZE, + borderRadius: radius.medium, + overflow: 'hidden', + backgroundColor: semantic.surface.input, + }, + logo: { width: LOGO_SIZE, height: LOGO_SIZE }, + logoFallback: { + alignItems: 'center', + justifyContent: 'center', + backgroundColor: semantic.surface.default, + }, + logoFallbackText: { ...typography.body[4].semiBold, color: semantic.text.default.weak }, + bankName: { + ...typography.caption[1].semiBold, + height: 24, + textAlign: 'center', + color: semantic.text.default.neutral, + }, + bankNameSelected: { color: semantic.text.brand.assistive }, + empty: { + ...typography.body[4].medium, + color: semantic.text.default.weak, + textAlign: 'center', + paddingVertical: padding[24], + }, +}); diff --git a/src/features/tutoring/SettlementScreen.tsx b/src/features/tutoring/SettlementScreen.tsx index 2b2f1f5..2a8140f 100644 --- a/src/features/tutoring/SettlementScreen.tsx +++ b/src/features/tutoring/SettlementScreen.tsx @@ -7,33 +7,35 @@ import { Chip } from '@/components/Chip'; import { semantic } from '@/styles/colors'; import { gap, lineWeight, padding, radius } from '@/styles/measurement'; import { typography } from '@/styles/typography'; -import { FieldLabel, TextField } from './FormFields'; -import { PrefillNotice, TutoringFormLayout, useSubmit } from './TutoringFormLayout'; +import { TextInput } from '@/components/TextInput'; +import { BankSheet, OTHER_BANK } from './BankSheet'; +import type { Bank } from './BankSheet'; +import { FieldLabel, TOO_LONG_MESSAGE, TextField, isTooLong } from './FormFields'; +import { PrefillNotice, TutoringFormLayout } from './TutoringFormLayout'; import type { PrefillSource } from './TutoringFormLayout'; -const CYCLES = ['4회차', '8회차', '직접'] as const; +const CYCLES = ['4회차', '8회차', '12회차', '직접'] as const; const TIMINGS = ['선불', '후불'] as const; -// TODO: 은행 선택 바텀시트 디자인이 나오면 바꿉니다. 지금은 입력칸 아래에 목록을 펼칩니다. -const BANKS = [ - 'KB국민', - '신한', - '우리', - '하나', - 'NH농협', - 'IBK기업', - '카카오뱅크', - '토스뱅크', - '케이뱅크', -] as const; type Cycle = (typeof CYCLES)[number]; type Timing = (typeof TIMINGS)[number]; -type Bank = (typeof BANKS)[number]; const FEE_SUFFIX = '원'; +// 입력값 규칙 +const CUSTOM_CYCLE_MIN = 1; +const CUSTOM_CYCLE_MAX = 20; +const FEE_MIN = 10_000; +const FEE_MAX = 10_000_000; +const BANK_NAME_MAX = 20; +const ACCOUNT_DIGITS_MIN = 10; +const ACCOUNT_DIGITS_MAX = 14; +const HOLDER_MAX = 20; + const onlyDigits = (text: string) => text.replace(/[^0-9]/g, ''); +const inRange = (value: number, min: number, max: number) => value >= min && value <= max; + /** "360000" → "360,000원" */ const formatFee = (digits: string) => digits ? `${Number(digits).toLocaleString('ko-KR')}${FEE_SUFFIX}` : ''; @@ -46,12 +48,19 @@ export type SettlementScreenProps = { /** T-07 과외 만들기 · 정산 조건 · 입금 계좌 (4/5 단계) */ export function SettlementScreen({ prefillSource }: SettlementScreenProps) { const [cycle, setCycle] = useState(null); + const [customCycle, setCustomCycle] = useState(''); const [timing, setTiming] = useState(null); const [fee, setFee] = useState(''); const [bank, setBank] = useState(null); + const [otherBankName, setOtherBankName] = useState(''); const [bankOpen, setBankOpen] = useState(false); + /** 하이픈 입력을 허용합니다. 저장할 때는 숫자만 씁니다(accountDigits). */ const [accountNumber, setAccountNumber] = useState(''); const [holder, setHolder] = useState(''); + /** 범위 오류는 입력을 마친 뒤(포커스가 빠진 뒤)에 보여 줍니다. */ + const [touched, setTouched] = useState({ cycle: false, fee: false, account: false }); + const touch = (field: keyof typeof touched) => + setTouched((prev) => (prev[field] ? prev : { ...prev, [field]: true })); const changeFee = (text: string) => { const digits = onlyDigits(text); @@ -63,24 +72,49 @@ export function SettlementScreen({ prefillSource }: SettlementScreenProps) { setFee(digits.replace(/^0+/, '')); }; - const canProceed = + const cycleValid = cycle !== null && - timing !== null && - fee.length > 0 && + (cycle !== '직접' || + (customCycle.length > 0 && inRange(Number(customCycle), CUSTOM_CYCLE_MIN, CUSTOM_CYCLE_MAX))); + const feeValid = fee.length > 0 && inRange(Number(fee), FEE_MIN, FEE_MAX); + // '기타'를 골랐는데 은행 이름이 비어 있으면 고르지 않은 것으로 봅니다. + const otherBankNameTooLong = isTooLong(otherBankName, BANK_NAME_MAX); + const bankValid = bank !== null && - accountNumber.length > 0 && - holder.trim().length > 0; + (bank !== OTHER_BANK || (otherBankName.trim().length > 0 && !otherBankNameTooLong)); + const accountDigits = onlyDigits(accountNumber); + const accountValid = inRange(accountDigits.length, ACCOUNT_DIGITS_MIN, ACCOUNT_DIGITS_MAX); + const holderTooLong = isTooLong(holder, HOLDER_MAX); + const holderValid = holder.trim().length > 0 && !holderTooLong; + + const cycleError = + touched.cycle && cycle === '직접' && customCycle.length > 0 && !cycleValid + ? `${CUSTOM_CYCLE_MIN}~${CUSTOM_CYCLE_MAX}회 사이로 입력해 주세요` + : undefined; + const feeError = + touched.fee && fee.length > 0 && !feeValid + ? `${FEE_MIN.toLocaleString('ko-KR')}원 ~ ${FEE_MAX.toLocaleString('ko-KR')}원 사이로 입력해 주세요` + : undefined; + const accountError = + (touched.account && accountDigits.length > 0 && !accountValid) || + accountDigits.length > ACCOUNT_DIGITS_MAX + ? `계좌번호는 숫자 ${ACCOUNT_DIGITS_MIN}~${ACCOUNT_DIGITS_MAX}자리예요` + : undefined; + + const canProceed = + cycleValid && timing !== null && feeValid && bankValid && accountValid && holderValid; // TODO: 입력한 정산 조건과 계좌를 다음 단계로 넘기거나 저장합니다. - const { submitting, submit } = useSubmit(() => router.push('/tutoring/invite')); + // 계좌번호는 숫자만(accountDigits), 은행이 '기타'면 otherBankName.trim()을 저장합니다. + const handleNext = () => router.push('/tutoring/invite'); return ( @@ -114,14 +148,29 @@ export function SettlementScreen({ prefillSource }: SettlementScreenProps) { ))} + {cycle === '직접' ? ( + setCustomCycle(onlyDigits(text).replace(/^0+/, ''))} + onBlur={() => touch('cycle')} + keyboardType="number-pad" + maxLength={2} + placeholder={`정산 회차를 입력해 주세요 (${CUSTOM_CYCLE_MIN}~${CUSTOM_CYCLE_MAX}회)`} + accessibilityLabel="정산 회차 직접 입력" + returnKeyType="done" + errorMessage={cycleError} + /> + ) : null} touch('fee')} keyboardType="number-pad" placeholder="수업료를 입력해 주세요" + errorMessage={feeError} /> @@ -139,7 +188,7 @@ export function SettlementScreen({ prefillSource }: SettlementScreenProps) { role="combobox" accessibilityLabel="은행" aria-expanded={bankOpen} - onPress={() => setBankOpen((open) => !open)} + onPress={() => setBankOpen(true)} style={[s.select, bankOpen && s.selectOpen]} > @@ -147,44 +196,46 @@ export function SettlementScreen({ prefillSource }: SettlementScreenProps) { - {bankOpen ? ( - - {BANKS.map((option) => ( - { - setBank(option); - setBankOpen(false); - }} - style={({ pressed }) => [s.option, pressed && s.optionPressed]} - > - - {option} - - - ))} - + {bank === OTHER_BANK ? ( + ) : null} setAccountNumber(onlyDigits(text))} + onChangeText={(text) => setAccountNumber(text.replace(/[^0-9-]/g, ''))} + onBlur={() => touch('account')} keyboardType="number-pad" placeholder="계좌 번호를 입력해 주세요" + errorMessage={accountError} /> + { + setBank(next); + setBankOpen(false); + }} + onClose={() => setBankOpen(false)} + /> ); } @@ -219,15 +270,4 @@ const s = StyleSheet.create({ selectTextFilled: { color: semantic.text.default.normal }, // 디자인에서 16px 아이콘을 26px 칸에 맞춰 키워 씁니다. arrow: { width: 26, height: 26 }, - options: { - borderRadius: radius.small, - borderWidth: lineWeight.regular, - borderColor: semantic.border.default, - backgroundColor: semantic.surface.input, - overflow: 'hidden', - }, - option: { paddingVertical: padding[12], paddingHorizontal: padding[12] }, - optionPressed: { backgroundColor: semantic.surface.default }, - optionText: { ...typography.body[4].medium, color: semantic.text.default.normal }, - optionTextSelected: { color: semantic.text.brand.assistive }, }); diff --git a/src/types/assets.d.ts b/src/types/assets.d.ts index 75abba1..25a749d 100644 --- a/src/types/assets.d.ts +++ b/src/types/assets.d.ts @@ -7,3 +7,8 @@ declare module '*.png' { const source: number; export default source; } + +declare module '*.jpg' { + const source: number; + export default source; +}