Skip to content

디자인 수정 반영 #69

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.

Sign up for GitHub

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

Merged
minneee merged 2 commits into from
Dec 18, 2025
Merged

디자인 수정 반영 #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08a7085
[chore] 앱 전체 간격 수정
minneee Dec 17, 2025
8e11546
[chore] DatePicker에 오늘 날짜를 default로 설정
minneee Dec 17, 2025
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
4 changes: 2 additions & 2 deletions DesignSystem/Sources/View/Dashboard/DashboardSkeletonView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public struct DashboardSkeletonView: View {
cardPlaceholder()
}
}
.padding(.horizontal, 16)
.padding(.horizontal, 20)
.padding(.bottom, 32)
}
.background(Color.primary50.ignoresSafeArea())
Expand Down Expand Up @@ -65,7 +65,7 @@ private extension DashboardSkeletonView {
placeholder(width: 40, height: 12, color: .gray3)
}
}
.padding(.horizontal, 16)
.padding(.horizontal, 20)
.padding(.vertical, 14)
.frame(maxWidth: .infinity, alignment: .leading)
.background(
Expand Down
14 changes: 7 additions & 7 deletions DesignSystem/Sources/View/Profile/ProfileSkeletonView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,27 +27,27 @@ public struct ProfileSkeletonView: View {

Divider()
.background(.gray2.opacity(0.4))
.padding(.horizontal, 16)
.padding(.horizontal, 20)

Spacer().frame(height: 32)

sectionPlaceholder()
.padding(.horizontal, 16)
.padding(.horizontal, 20)

Spacer().frame(height: 12)

cardPlaceholder()
.padding(.horizontal, 16)
.padding(.horizontal, 20)

Spacer().frame(height: 28)

sectionPlaceholder()
.padding(.horizontal, 16)
.padding(.horizontal, 20)

Spacer().frame(height: 12)

cardPlaceholder()
.padding(.horizontal, 16)
.padding(.horizontal, 20)

// sectionPlaceholder()
// .padding(.horizontal, 16)
Expand Down Expand Up @@ -87,7 +87,7 @@ private extension ProfileSkeletonView {

Spacer()
}
.padding(.horizontal, 16)
.padding(.horizontal, 20)
.padding(.top, 12)
}

Expand Down Expand Up @@ -134,7 +134,7 @@ private extension ProfileSkeletonView {
.frame(height: 14)
.shimmer(phase: shimmerPhase)
}
.padding(.horizontal, 16)
.padding(.horizontal, 20)
.frame(height: 52)

if index == 0 {
Expand Down
3 changes: 2 additions & 1 deletion DesignSystem/Sources/View/Travel/TravelListSkeletonView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ public struct TravelListSkeletonView: View {
cardSkeleton()
}
}
.padding(16)
.padding(.vertical, 16)
.padding(.horizontal, 20)
}
.onAppear {
withAnimation(
Expand Down
10 changes: 6 additions & 4 deletions DesignSystem/Sources/View/Travel/TravelSettingSkeletonView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public struct TravelSettingSkeletonView: View {

manageCard()
}
.padding(.horizontal, 16)
.padding(.horizontal, 20)
.padding(.bottom, 28)
}
.background(Color.primary50.ignoresSafeArea())
Expand Down Expand Up @@ -86,7 +86,8 @@ private extension TravelSettingSkeletonView {
smallBar()
}
}
.padding(16)
.padding(.vertical, 16)
.padding(.horizontal, 20)
.frame(maxWidth: .infinity, alignment: .leading)
.background(
RoundedRectangle(cornerRadius: 12)
Expand All @@ -109,7 +110,8 @@ private extension TravelSettingSkeletonView {
fullBar(height: 20)
}
}
.padding(16)
.padding(.vertical, 16)
.padding(.horizontal, 20)
.frame(maxWidth: .infinity, alignment: .leading)
.background(
RoundedRectangle(cornerRadius: 12)
Expand All @@ -132,7 +134,7 @@ private extension TravelSettingSkeletonView {

manageRow()
}
.padding(.horizontal, 16)
.padding(.horizontal, 20)
.padding(.vertical, 14)
.frame(maxWidth: .infinity, alignment: .leading)
.background(
Expand Down
2 changes: 1 addition & 1 deletion Features/ExpenseList/Sources/Components/ExpenseCardView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public struct ExpenseCardView: View {
.font(.app(.caption1, weight: .medium))
.foregroundStyle(Color.gray7)
}
.padding(16)
.padding(20)
.background(Color.primary50)
.clipShape(RoundedRectangle(cornerRadius: 16))
.overlay(
Expand Down
5 changes: 3 additions & 2 deletions Features/Member/Sources/View/MemberView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public struct MemberView: View {

Spacer()
}
.padding(.horizontal, 16)
.padding(.horizontal, 20)
.padding(.vertical, 20)

ScrollView {
Expand All @@ -52,7 +52,8 @@ public struct MemberView: View {
}
}
}
.padding(16)
.padding(.vertical, 16)
.padding(.horizontal, 20)
}
}
.navigationBarBackButtonHidden(true)
Expand Down
2 changes: 1 addition & 1 deletion Features/Profile/Sources/View/Components/SettingRow.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,5 @@ public struct SettingRow: View {
action: {},
tapTermAction: {}
)
.padding(.horizontal, 16)
.padding(.horizontal, 20)
}
8 changes: 4 additions & 4 deletions Features/Profile/Sources/View/ProfileView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ extension ProfileView {
store.send(.delegate(.backToTravel))
}
}
.padding(.horizontal, 16)
.padding(.horizontal, 20)
}

@ViewBuilder
Expand Down Expand Up @@ -227,7 +227,7 @@ extension ProfileView {
)

}
.padding(.horizontal, 16)
.padding(.horizontal, 20)
.background(.white)
.cornerRadius(8)
}
Expand Down Expand Up @@ -278,7 +278,7 @@ extension ProfileView {
)

}
.padding(.horizontal, 16)
.padding(.horizontal, 20)
.background(.white)
.cornerRadius(8)
}
Expand Down Expand Up @@ -328,7 +328,7 @@ extension ProfileView {
.padding(.vertical, 12)

}
.padding(.horizontal, 16)
.padding(.horizontal, 20)
.background(.white)
.cornerRadius(8)
}
Expand Down
2 changes: 1 addition & 1 deletion Features/SaveExpense/Sources/Components/InputContainer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ struct InputContainer<Content: View>: View {
HStack {
content
}
.padding(.horizontal, 16)
.padding(.horizontal, 20)
.frame(height: 52)
.background(Color.white)
.overlay(
Expand Down
3 changes: 2 additions & 1 deletion Features/SaveExpense/Sources/Components/ParticipantSelector/ParticipantSelectorView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ public struct ParticipantSelectorView: View {
)
}
}
.padding(16)
.padding(.vertical, 16)
.padding(.horizontal, 20)
.background(Color.white)
.cornerRadius(12)
.overlay(
Expand Down
2 changes: 1 addition & 1 deletion Features/SaveExpense/Sources/SaveExpenseView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public struct SaveExpenseView: View {
send(.saveButtonTapped)
}
}
.padding(.horizontal, 16)
.padding(.horizontal, 20)
.padding(.bottom, 16)
.navigationBarBackButtonHidden(true)
.background(Color.white)
Expand Down
2 changes: 1 addition & 1 deletion Features/SettlementDetail/Sources/Components/MemberDetailCard.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ struct MemberDetailCard: View {
.padding(.vertical, 16)
}
}
.padding(.horizontal, 16)
.padding(.horizontal, 20)
.transition(.asymmetric(
insertion: .scale(scale: 0.95, anchor: .top).combined(with: .opacity),
removal: .scale(scale: 0.95, anchor: .top).combined(with: .opacity)
Expand Down
4 changes: 2 additions & 2 deletions Features/SettlementResult/Sources/Components/PaymentSectionView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ struct PaymentSectionView: View {
.foregroundStyle(Color.black)

// 결제 리스트
VStack(spacing: 12) {
VStack(spacing: 20) {
ForEach(payments) { payment in
PaymentRowView(payment: payment)
}
Expand Down Expand Up @@ -62,7 +62,7 @@ private struct PaymentRowView: View {
.frame(width: 32, height: 32)

Text(payment.name)
.font(.app(.title3, weight: .medium))
.font(.app(.body, weight: .medium))
.foregroundStyle(Color.black)

Spacer()
Expand Down
14 changes: 14 additions & 0 deletions Features/Travel/Sources/View/CreateTravel/Components/DateRangeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ struct DateRangeView: View {
title: "시작",
date: startDate
) {
if startDate == nil {
startDate = today
}
showStartPicker.toggle()
}
.sheet(isPresented: $showStartPicker) {
Expand Down Expand Up @@ -74,6 +77,9 @@ struct DateRangeView: View {
title: "종료",
date: endDate
) {
if endDate == nil {
endDate = startDate ?? today
}
showEndPicker.toggle()
}
.sheet(isPresented: $showEndPicker) {
Expand Down Expand Up @@ -101,6 +107,14 @@ struct DateRangeView: View {
}
}
}
.onAppear {
if startDate == nil {
startDate = today
}
if endDate == nil {
endDate = startDate ?? today
}
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion Features/Travel/Sources/View/CreateTravel/Components/TravelInfoView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ struct TravelInfoView: View {
var body: some View {
VStack(alignment: .leading, spacing: 20) {
Text("여행 정보")
.font(.app(.title3, weight: .semibold))
.font(.app(.title2, weight: .semibold))
.foregroundStyle(Color.appBlack)

VStack(spacing: 16) {
Expand Down
7 changes: 3 additions & 4 deletions Features/Travel/Sources/View/CreateTravel/CreateTravelView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ public struct CreateTravelView: View {

Spacer()
}
.padding(.horizontal, 16)
.padding(.vertical, 20)
.padding(20)

ScrollView {
VStack(spacing: 16) {
Expand Down Expand Up @@ -68,7 +67,7 @@ public struct CreateTravelView: View {
)
}
}
.padding(.horizontal, 16)
.padding(.horizontal, 20)
}
.scrollDismissesKeyboard(.immediately)
.scrollIndicators(.hidden)
Expand All @@ -77,7 +76,7 @@ public struct CreateTravelView: View {
SaveButton(isEnabled: store.isSaveEnabled && !store.isSubmitting) {
store.send(.saveButtonTapped)
}
.padding(.horizontal, 16)
.padding(.horizontal, 20)
.padding(.vertical, 10)
}
.onAppear {
Expand Down
3 changes: 2 additions & 1 deletion Features/Travel/Sources/View/TravelSetting/Components/BasicSettingView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ struct BasicSettingView: View {

inviteSection
}
.padding(16)
.padding(.vertical, 16)
.padding(.horizontal, 20)
.background(RoundedRectangle(cornerRadius: 8).fill(Color(.appWhite)))
}
}
Expand Down
3 changes: 2 additions & 1 deletion Features/Travel/Sources/View/TravelSetting/Components/MemberSettingView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ struct MemberSettingView: View {
myId: myId,
ownerId: ownerId ?? ""
)
.padding(16)
.padding(.vertical, 16)
.padding(.horizontal, 20)
.background(
RoundedRectangle(cornerRadius: 8)
.fill(Color(.appWhite))
Expand Down
2 changes: 1 addition & 1 deletion Features/Travel/Sources/View/TravelSetting/Components/SectionHeader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ struct SectionHeader: View {
} label: {
Text(isEditing ? "완료" : "수정")
.underline(true, color: Color.gray7)
.font(.app(.caption1, weight: .medium))
.font(.app(.body, weight: .medium))
.foregroundColor(Color.gray7)
}
}
Expand Down
2 changes: 1 addition & 1 deletion Features/Travel/Sources/View/TravelSetting/Components/TravelManageView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ struct TravelManageView: View {
.disabled(store.isSubmitting)
}
}
.padding(16)
.padding(20)
.background(RoundedRectangle(cornerRadius: 8).fill(Color(.appWhite)))
}
}
Expand Down
6 changes: 3 additions & 3 deletions Features/Travel/Sources/View/TravelSetting/TravelSettingView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ private extension TravelSettingView {

Spacer()
}
.padding(.horizontal, 16)
.padding(.vertical, 20)
.padding(20)

ScrollView {
VStack(spacing: 16) {
Expand All @@ -99,7 +98,8 @@ private extension TravelSettingView {
TravelManageView(store: manageStore)
}
}
.padding(16)
.padding(.vertical, 16)
.padding(.horizontal, 20)
}
.scrollDismissesKeyboard(.immediately)
.scrollIndicators(.hidden)
Expand Down
13 changes: 12 additions & 1 deletion Features/Travel/Sources/View/Travels/Components/InviteCodeModalView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,24 @@ struct InviteCodeModalView: View {

Button(action: onConfirm) {
Text("확인")
.foregroundColor(.white)
.foregroundColor(Color.appWhite)
.font(.app(.title3, weight: .semibold))
.frame(maxWidth: .infinity)
.padding(.vertical, 13)
.background(Color.primary500)
.cornerRadius(26)
}
.padding(.bottom, 10)

Button(action: onCancel) {
Text("취소")
.foregroundColor(Color.appBlack)
.font(.app(.title3, weight: .semibold))
.frame(maxWidth: .infinity)
.padding(.vertical, 13)
.background(Color.gray1)
.cornerRadius(26)
}
}
.padding(14)
.background(
Expand Down
Loading
Loading