diff --git a/assets/images/favicon.png b/assets/images/favicon.png index 96fcf37..83f2fac 100644 Binary files a/assets/images/favicon.png and b/assets/images/favicon.png differ diff --git a/assets/images/favicon.svg b/assets/images/favicon.svg index 9cf5ab6..ed85795 100644 --- a/assets/images/favicon.svg +++ b/assets/images/favicon.svg @@ -1,37 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file diff --git a/assets/images/income-graphic.svg b/assets/images/income-graphic.svg new file mode 100644 index 0000000..a27736f --- /dev/null +++ b/assets/images/income-graphic.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/docs/home.md b/docs/home.md index 7fcb83a..c267837 100644 --- a/docs/home.md +++ b/docs/home.md @@ -33,3 +33,10 @@ - 홈 배너에서 설치 안내 바텀시트 표시. 배경 탭·뒤로 가기·나중에로 닫기 - 알림 허용하기는 준비 중 안내만 표시. 실제 알림 권한 요청·Web Push 구독·설치 여부 판정은 미연결이며 허용 완료로 표시하지 않음 - 시안의 iOS 조건은 설치 안내 문구이며 현재 배포가 푸시를 지원한다는 의미가 아님 + +## 실제 브라우저 여백 조정 + +- 웹에 그려둔 44px 상태바 여백을 홈·약관·프로필·수입·기록·과외 작성·설정에서 제거. SafeArea 처리는 유지 +- 홈 헤더 56px, 설치 배너 76px, 탭 위 12px·아래 최소 8px로 조정 +- 100dvh 지원 브라우저는 주소창을 제외한 실제 가시 높이에 루트를 맞춤. 브라우저 자체 UI 높이는 앱에서 조절하지 않음 +- 남는 내용을 숨기지 않고 기존 ScrollView에서 끝까지 스크롤하도록 유지 diff --git a/docs/income-status.md b/docs/income-status.md index 9413f90..2be7d05 100644 --- a/docs/income-status.md +++ b/docs/income-status.md @@ -25,3 +25,7 @@ API는 미확정입니다. `IncomeState`/`IncomeData`는 화면 모델이며 실 - `/dev/income?state=error`: 조회 실패 및 재시도 개발용 진입점은 프로필이 없으면 메모리에 미리보기 프로필을 설정해 기존 탭으로 이동합니다. production에서는 이 진입을 허용하지 않습니다. 실제 수입 탭은 `/income`이며 다른 탭의 이동 구조·공통 탭 아이콘 구현은 유지합니다. + +## 공통 수입 그래픽 + +전달받은 graphic.svg 원본을 income-graphic.svg로 보관하고 공통 IncomeGraphic 컴포넌트로 표시합니다. 기본 100×100, 수입 요약 카드는 88×88로 적용합니다. 배치용 style과 size를 받을 수 있으며 장식 이미지이므로 접근성 읽기에서는 제외합니다. 원본의 민트색 카드·투명 효과는 보존합니다. diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png new file mode 100644 index 0000000..5a706ae Binary files /dev/null and b/public/apple-touch-icon.png differ diff --git a/public/favicon.svg b/public/favicon.svg index 9cf5ab6..ed85795 100644 --- a/public/favicon.svg +++ b/public/favicon.svg @@ -1,37 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file diff --git a/src/components/IncomeGraphic.tsx b/src/components/IncomeGraphic.tsx new file mode 100644 index 0000000..4d64940 --- /dev/null +++ b/src/components/IncomeGraphic.tsx @@ -0,0 +1,20 @@ +import { Image } from 'expo-image'; +import type { ImageProps } from 'expo-image'; +import graphic from '../../assets/images/income-graphic.svg'; + +type Props = { + size?: number; + style?: ImageProps['style']; +}; + +/** 수입 관련 카드에서 재사용하는 장식 그래픽. 텍스트 정보는 부모 화면에서 제공합니다. */ +export function IncomeGraphic({ size = 100, style }: Props) { + return ( + + ); +} diff --git a/src/features/home/HomeScreen.tsx b/src/features/home/HomeScreen.tsx index acddc8c..9f4e134 100644 --- a/src/features/home/HomeScreen.tsx +++ b/src/features/home/HomeScreen.tsx @@ -43,7 +43,6 @@ export function HomeScreen({ const todoCount = data.tasks.reduce((sum, task) => sum + task.count, 0); return ( - void }) { /> diff --git a/src/features/home/styles.ts b/src/features/home/styles.ts index 954506a..23651a3 100644 --- a/src/features/home/styles.ts +++ b/src/features/home/styles.ts @@ -1,11 +1,10 @@ -import { Platform, StyleSheet } from 'react-native'; +import { StyleSheet } from 'react-native'; import { primitive } from '@/styles/colors'; const { blue, gray, orange } = primitive; export const s = StyleSheet.create({ safe: { flex: 1, backgroundColor: '#fff' }, - webInset: { height: Platform.OS === 'web' ? 44 : 0 }, header: { - height: 64, + height: 56, paddingHorizontal: 24, flexDirection: 'row', alignItems: 'center', @@ -21,7 +20,7 @@ export const s = StyleSheet.create({ }, profileText: { fontSize: 12, fontWeight: '600', color: blue[500] }, content: { paddingBottom: 24 }, - banner: { height: 92, backgroundColor: blue[100] }, + banner: { height: 76, backgroundColor: blue[100] }, bannerBody: { flex: 1, flexDirection: 'row', @@ -29,9 +28,9 @@ export const s = StyleSheet.create({ paddingHorizontal: 24, paddingRight: 32, }, - art: { width: 64, height: 64 }, + art: { width: 56, height: 56 }, bannerCopy: { flex: 1, marginLeft: 12 }, - bannerTitle: { fontSize: 15, fontWeight: '700', color: blue[500], marginBottom: 4 }, + bannerTitle: { fontSize: 14, fontWeight: '700', color: blue[500], marginBottom: 4 }, bannerText: { fontSize: 12, lineHeight: 17, color: blue[600] }, close: { position: 'absolute', @@ -43,7 +42,7 @@ export const s = StyleSheet.create({ justifyContent: 'center', }, closeText: { fontSize: 16, color: gray[200] }, - section: { paddingHorizontal: 24, paddingTop: 20 }, + section: { paddingHorizontal: 24, paddingTop: 16 }, sectionHeader: { flexDirection: 'row', alignItems: 'center', @@ -98,7 +97,7 @@ export const s = StyleSheet.create({ emptyTasks: { borderWidth: 1, borderColor: gray[100] }, loadingRoot: { flex: 1 }, skeleton: { backgroundColor: gray[100], borderRadius: 8 }, - bannerSkeleton: { height: 92, backgroundColor: gray[100] }, + bannerSkeleton: { height: 76, backgroundColor: gray[100] }, lessonSkeleton: { height: 168 }, tasksSkeleton: { height: 171 }, skeletonDot: { marginHorizontal: 2 }, diff --git a/src/features/income/IncomeScreen.tsx b/src/features/income/IncomeScreen.tsx index 6611d67..44bdce4 100644 --- a/src/features/income/IncomeScreen.tsx +++ b/src/features/income/IncomeScreen.tsx @@ -6,7 +6,7 @@ import { s } from './styles'; import { paymentStatus, won } from './types'; import type { IncomeInvoice, IncomeState } from './types'; import gradient from '../../../assets/images/income-gradient.svg'; -import card from '../../../assets/images/income-card.svg'; +import { IncomeGraphic } from '@/components/IncomeGraphic'; function InvoiceCard({ invoice }: { invoice: IncomeInvoice }) { const status = paymentStatus(invoice); @@ -79,7 +79,7 @@ export function IncomeScreen({ state, onRetry }: { state: IncomeState; onRetry?: 이번달 교육비 {won(state.data.summary.expectedAmount)} - + 입금 {won(state.data.summary.receivedAmount)} diff --git a/src/features/income/styles.ts b/src/features/income/styles.ts index 4846c1a..9588279 100644 --- a/src/features/income/styles.ts +++ b/src/features/income/styles.ts @@ -1,10 +1,10 @@ -import { StyleSheet, Platform } from 'react-native'; +import { StyleSheet } from 'react-native'; import { primitive, semantic as c } from '@/styles/colors'; import { typography as t } from '@/styles/typography'; import { padding, radius, gap, grid } from '@/styles/measurement'; export const s = StyleSheet.create({ safe: { flex: 1, alignItems: 'center', backgroundColor: c.surface.input }, - phone: { flex: 1, width: '100%', maxWidth: 390, paddingTop: Platform.OS === 'web' ? 44 : 0 }, + phone: { flex: 1, width: '100%', maxWidth: 390 }, header: { height: 67, justifyContent: 'center', paddingHorizontal: grid.margin }, title: { ...t.heading[1].semiBold, color: c.text.default.strong }, scroll: { flex: 1 }, @@ -34,7 +34,7 @@ export const s = StyleSheet.create({ }, totalText: { ...t.body[5].semiBold, color: c.text.default.inverse }, separator: { width: 1, height: 12, backgroundColor: c.border.default }, - illustration: { position: 'absolute', right: padding[16], top: 32, width: 64, height: 80 }, + illustration: { position: 'absolute', right: padding[12], top: 24 }, info: { marginTop: gap[20], minHeight: 48, diff --git a/src/features/main/MainTabBar.tsx b/src/features/main/MainTabBar.tsx index 68799c6..4795987 100644 --- a/src/features/main/MainTabBar.tsx +++ b/src/features/main/MainTabBar.tsx @@ -33,7 +33,7 @@ export function MainTabBar({ insets, }: BottomTabBarProps) { return ( - + {state.routes.map((route, index) => { const focused = index === state.index; const icon = icons[route.name]; @@ -79,7 +79,7 @@ const s = StyleSheet.create({ bar: { flexDirection: 'row', justifyContent: 'space-between', - paddingTop: padding[16], + paddingTop: padding[12], paddingHorizontal: padding[24], backgroundColor: primitive.white[0], }, diff --git a/src/features/notifications/PushBannerProvider.tsx b/src/features/notifications/PushBannerProvider.tsx index 70eae83..d2c339b 100644 --- a/src/features/notifications/PushBannerProvider.tsx +++ b/src/features/notifications/PushBannerProvider.tsx @@ -1,6 +1,6 @@ import { createContext, useCallback, useContext, useEffect, useRef, useState } from 'react'; import type { ReactNode } from 'react'; -import { AppState, Platform, StyleSheet, View } from 'react-native'; +import { AppState, StyleSheet, View } from 'react-native'; import { useSafeAreaInsets } from 'react-native-safe-area-context'; import { PushBanner } from '@/components/PushBanner'; export type BannerNotification = { @@ -57,10 +57,7 @@ export function PushBannerProvider({ children }: { children: ReactNode }) { {children} {active && appState === 'active' && ( - +