Skip to content
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
1 change: 0 additions & 1 deletion Projects/App/Sources/DoriApp.swift
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ struct DoriApp: App {
var body: some Scene {
WindowGroup {
rootView
.preferredColorScheme(.light)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public struct FloatingActionButton: View {
Image(systemName: "plus")
.font(.title2)
.fontWeight(.semibold)
.foregroundColor(.white)
.foregroundStyle(.bgPrimary)
.frame(
width: 56,
height: 56
Expand Down
4 changes: 2 additions & 2 deletions Projects/Feature/Calendar/Sources/CalendarView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ public struct CalendarView: View {
.padding(.horizontal)
}
}
.padding(.top, 10)
.padding(.horizontal, 16)
.padding(.bottom, 80)
}
.scrollDisabled(true)
.navigationTitle("캘린더")
.toolbarTitleDisplayMode(.inline)
.background(.bgPrimary)
.doriNavigationBar(DoriNavigationBarConfig.titleWithActions("캘린더"))
.onAppear { store.send(.onAppear) }
.overlay(alignment: .bottomTrailing) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,13 @@ struct CalendarDayCell: View {

var isTodayCircleColor: Color {
guard isToday else { return .clear }
return selectedType == .judori ? UIAsset.Colors.secondary.color : UIAsset.Colors.textSecondary.color
return selectedType == .judori
? UIAsset.Colors.brandMain.color
: UIAsset.Colors.textSecondary.color
}

var dotColor: UIAsset.Colors {
return selectedType == .judori ? .secondary : .textSecondary
return selectedType == .judori ? .brandMain : .textSecondary
}

var isToday: Bool {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ public struct DoriSegmentControl: View {
// 선택 인디케이터: "하나"만 존재하고 matchedGeometryEffect로 이동
if selectedType == item {
RoundedRectangle(cornerRadius: 10)
.fill(selectedType == .judori ? .secondary : .textSecondary)
.fill(.bgPrimary)
.matchedGeometryEffect(id: "dori.segment.indicator", in: indicatorNS)
}

Text(item.displayName)
.pretendard(selectedType == item ? .caption(.b1) : .body(.m5))
.foregroundStyle(selectedType == item ? .onBrand : .textPrimary)
.foregroundStyle(selectedType == item ? .textPrimary : .textSecondary)
.frame(maxWidth: .infinity)
.padding(.vertical, 6)
.padding(.horizontal, 10)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import SwiftUI
import DoriCore
import DoriDesignSystem

public struct MonthSelectorView: View {
let currentMonth: Date
Expand All @@ -18,20 +19,20 @@ public struct MonthSelectorView: View {
onPrevious()
} label: {
Image(systemName: "chevron.left")
.font(.title3)
.foregroundColor(.primary)
.font(.system(size: 16, weight: .semibold))
.foregroundStyle(.textPrimary)
}

Text(currentMonth.koreanMonth)
.font(.title2)
.fontWeight(.semibold)
.pretendard(.body(.sb2))
.foregroundStyle(.textPrimary)

Button {
onNext()
} label: {
Image(systemName: "chevron.right")
.font(.title3)
.foregroundColor(.primary)
.font(.system(size: 16, weight: .semibold))
.foregroundStyle(.textPrimary)
}
}
.padding(.horizontal)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,21 @@ struct CalendarTotalAmountView: View {
HStack(spacing: 0) {
Text("총 \(selectedType.displayName)")
.pretendard(.body(.m3))
.foregroundStyle(.textSecondary)

Spacer()

AmountLabel(totalAmount)
.pretendard(.body(.sb3))
.foregroundStyle(.textPrimary)
}
.padding(.horizontal, 16)
.padding(.vertical, 11)
.frame(maxWidth: .infinity)
.frame(height: 46)
.foregroundStyle(selectedType == .judori ? .onBrand : .textSecondary)
.background(
RoundedRectangle(cornerRadius: 10)
.fill(selectedType == .judori ? .secondary : .bgSecondary)
.fill(.bgSecondary)
)
}
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading