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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "profile.pdf",
"filename" : "profile.svg",
"idiom" : "universal"
}
],
Expand All @@ -10,6 +10,7 @@
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
"preserves-vector-representation" : true,
"template-rendering-intent" : "original"
}
}
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ private struct ParticipantRowView: View {
// Avatar
Image(asset: .profile)
.resizable()
.foregroundStyle(Color.primary500)
.aspectRatio(contentMode: .fit)
.frame(width: 40, height: 40)

Text(participant.name)
Expand Down
35 changes: 35 additions & 0 deletions Features/SettlementDetail/Sources/Components/DateHeaderRow.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
//
// DateHeaderRow.swift
// SettlementDetailFeature
//
// Created by SseuDam on 2025.
//

import SwiftUI
import DesignSystem

struct DateHeaderRow: View {
let date: Date

var body: some View {
Text(formatDate(date))
.font(.app(.caption1, weight: .medium))
.foregroundStyle(Color.gray6)
.frame(maxWidth: .infinity, alignment: .leading)
}

private func formatDate(_ date: Date) -> String {
let formatter = DateFormatter()
formatter.dateFormat = "yyyy.MM.dd"
return formatter.string(from: date)
}
}

#Preview {
VStack(spacing: 0) {
DateHeaderRow(date: Date())
DateHeaderRow(date: Calendar.current.date(byAdding: .day, value: -1, to: Date())!)
}
.padding(16)
.background(Color.white)
}

This file was deleted.

32 changes: 10 additions & 22 deletions Features/SettlementDetail/Sources/Components/ExpenseRow.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,38 +12,26 @@ struct ExpenseRow: View {
let expense: ExpenseDetail

var body: some View {
HStack(spacing: 8) {
// 지출 제목 + 날짜
VStack(alignment: .leading, spacing: 4) {
Text(expense.title)
.font(.app(.body, weight: .medium))
.foregroundStyle(Color.black)

Text(formatDate(expense.expenseDate))
.font(.app(.caption2, weight: .medium))
.foregroundStyle(Color.gray7)
}
HStack(alignment: .top) {
// 지출 제목
Text(expense.title)
.font(.app(.body, weight: .medium))
.foregroundStyle(Color.black)

Spacer()

// 내 부담 금액
VStack(alignment: .trailing, spacing: 2) {
// 내 부담 금액 + 계산식
VStack(alignment: .trailing, spacing: 4) {
Text("₩\(Int(expense.shareAmount).formatted())")
.font(.app(.body, weight: .semibold))
.font(.app(.body, weight: .medium))
.foregroundStyle(Color.black)

Text("(전체 ₩\(Int(expense.amount).formatted()) ÷ \(expense.participantCount))")
Text("₩\(Int(expense.amount).formatted()) ÷ \(expense.participantCount)")
.font(.app(.caption2, weight: .medium))
.foregroundStyle(Color.gray7)
.foregroundStyle(Color.gray6)
}
}
}

private func formatDate(_ date: Date) -> String {
let formatter = DateFormatter()
formatter.dateFormat = "yyyy.MM.dd"
return formatter.string(from: date)
}
}


Expand Down
Loading
Loading