feat: date time 변경

folio-world · Sep 27, 2023 · cab2130 · cab2130
1 parent 8e4ceaf
commit cab2130
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 10 deletions.
diff --git a/Projects/Toolinder/Feature/Calendar/Interface/Sources/Calendar/CalendarStore.swift b/Projects/Toolinder/Feature/Calendar/Interface/Sources/Calendar/CalendarStore.swift
@@ -98,6 +98,9 @@ public struct CalendarStore: Reducer {
         Reduce { state, action in
             switch action {
             case .onAppear:
+                if let id = state.selectedCalendarItemID {
+                    return .send(.refreshTradeItem(state.calendarItem[id: id]?.trades ?? []))
+                }
                 return .none
 
             case .newButtonTapped:
@@ -116,7 +119,7 @@ public struct CalendarStore: Reducer {
                         return .init(
                             trade: trade,
                             dateStyle: .short,
-                            timeStyle: .none
+                            timeStyle: .short
                         )
                     }
                 )

diff --git a/Projects/Toolinder/Feature/Trade/Interface/Sources/Components/Cell/TradeItemCellView.swift b/Projects/Toolinder/Feature/Trade/Interface/Sources/Components/Cell/TradeItemCellView.swift
@@ -36,14 +36,28 @@ public struct TradeItemCellView: View {
 
     private func tradeView(viewStore: ViewStoreOf<TradeItemCellStore>) -> some View {
         HStack(spacing: 10) {
-            Text(
-                viewStore.trade.date.localizedString(
-                    dateStyle: viewStore.state.dateStyle,
-                    timeStyle: viewStore.state.timeStyle
-                )
-            )
-            .font(.headline)
-            .fontWeight(.semibold)
+            VStack(alignment: .trailing) {
+                if viewStore.state.dateStyle != .none {
+                    Text(
+                        viewStore.trade.date.localizedString(
+                            dateStyle: viewStore.state.dateStyle,
+                            timeStyle: .none
+                        )
+                    )
+                    .font(.headline)
+                    .fontWeight(.semibold)
+                }
+
+                if viewStore.state.timeStyle != .none {
+                    Text(
+                        viewStore.trade.date.localizedString(
+                            dateStyle: .none,
+                            timeStyle: viewStore.state.timeStyle
+                        )
+                    )
+                    .font(.caption2)
+                }
+            }
 
             viewStore.state.trade.ticker?.type?.image
                 .font(.title3)
@@ -54,6 +68,14 @@ public struct TradeItemCellView: View {
                 .fontWeight(.semibold)
 
             Spacer()
+
+            VStack(alignment: .trailing, spacing: 1) {
+                Text("\(Int(viewStore.state.trade.price ?? 0)) \(viewStore.state.trade.ticker?.currency?.rawValue ?? "")")
+                    .font(.caption)
+
+                Text("\(Int(viewStore.state.trade.volume ?? 0)) vol")
+                    .font(.caption)
+            }
         }
         .frame(height: 35)
         .padding(10)

diff --git a/Projects/Toolinder/Feature/Trade/Interface/Sources/TradeDetail/TradeDetailStore.swift b/Projects/Toolinder/Feature/Trade/Interface/Sources/TradeDetail/TradeDetailStore.swift
@@ -49,7 +49,7 @@ public struct TradeDetailStore: Reducer {
             case .onAppear:
                 state.tradeItem = .init(
                     uniqueElements: state.trade.ticker?.trades?.compactMap { trade in
-                        return .init(trade: trade, dateStyle: .short, timeStyle: .none)
+                        return .init(trade: trade, dateStyle: .short, timeStyle: .short)
                     } ?? []
                 )
                 return .none