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
18 changes: 9 additions & 9 deletions AIProject/iCOWidget/CoinWidget.swift
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ struct CoinWidgetEntryView: View {

if entry.coins.count > 1 {
Divider()
.background(Color.aiCoBorderGray)
.background(Color.iCoBorderGray)
.padding(.vertical, 8)
CoinCardView(coin: entry.coins[1], date: entry.date)
}
Expand All @@ -176,13 +176,13 @@ struct CoinWidgetEntryView: View {
} else { emptyView }
}
}
.containerBackground(.aiCoBackground, for: .widget)
.containerBackground(.iCoBackground, for: .widget)
}

private var emptyView: some View {
Text("선택된 코인 없음")
.font(.system(size: 10))
.foregroundColor(.aiCoLabelSecondary)
.foregroundColor(.iCoLabelSecondary)
.frame(maxWidth: .infinity, alignment: .leading)
}
}
Expand Down Expand Up @@ -218,11 +218,11 @@ struct CoinCardView: View {
VStack(alignment: .leading) {
Text(coin.koreanName)
.font(.system(size: isSmall ? 10 : 12, weight: .semibold))
.foregroundColor(.aiCoLabel)
.foregroundColor(.iCoLabel)

Text(coin.symbol)
.font(.system(size: isSmall ? 10 : 12))
.foregroundColor(.aiCoLabelSecondary)
.foregroundColor(.iCoLabelSecondary)
}

HStack(spacing: 0) {
Expand All @@ -233,7 +233,7 @@ struct CoinCardView: View {
Text(date.formatted(date: .omitted, time: .shortened))
.font(.system(size: isSmall ? 8 : 10))
}
.foregroundColor(.aiCoLabelSecondary)
.foregroundColor(.iCoLabelSecondary)
.frame(maxWidth: .infinity, alignment: .trailing)

}
Expand All @@ -244,12 +244,12 @@ struct CoinCardView: View {
HStack {
Text(coin.price.formatKRW)
.font(.system(size: 10))
.foregroundColor(.aiCoLabel)
.foregroundColor(.iCoLabel)
Spacer()

Text("\(coin.change, specifier: "%.2f")%")
.font(.system(size: 10)).bold()
.foregroundColor(coin.change >= 0 ? .aiCoPositive : .aiCoNegative)
.foregroundColor(coin.change >= 0 ? .iCoPositive : .iCoNegative)
}
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
Expand Down Expand Up @@ -289,7 +289,7 @@ struct SparklineView: View {
}
}
}
.stroke(Color.aiCoAccent, style: StrokeStyle(lineWidth: 2, lineJoin: .round))
.stroke(Color.iCoAccent, style: StrokeStyle(lineWidth: 2, lineJoin: .round))

if let last = normalized.last {
let x = geo.size.width
Expand Down
4 changes: 2 additions & 2 deletions AIProject/iCo/Core/Util/Gradient+Util.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ extension Gradient {
var colors: [Color] {
switch self {
case .default:
return [.aiCoGradientDefaultLight, .aiCoGradientDefaultProminent, .aiCoGradientDefaultLight]
return [.iCoGradientDefaultLight, .iCoGradientDefaultProminent, .iCoGradientDefaultLight]
case .accent:
return [.aiCoGradientAccentLight, .aiCoGradientAccentProminent, .aiCoGradientAccentLight]
return [.iCoGradientAccentLight, .iCoGradientAccentProminent, .iCoGradientAccentLight]
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions AIProject/iCo/Core/Util/String+Util.swift
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ extension String {
/// 문자열 내의 숫자와 기호를 찾아 지정한 색상과 두께로 강조한 Text로 반환하는 확장
/// - Regex:
/// - 모든 숫자는 하이라이트 처리
func highlightTextForNumbersOperator(highlightColor: Color = .aiCoLabel, weight: Font.Weight = .bold) -> Text {
func highlightTextForNumbersOperator(highlightColor: Color = .iCoLabel, weight: Font.Weight = .bold) -> Text {
let pattern = #"\d"#
guard let regex = try? NSRegularExpression(pattern: pattern) else {
return Text(self)
Expand Down Expand Up @@ -115,7 +115,7 @@ extension String {
/// - Parameters:
/// - searchTerm: 검색어
func highlighted(_ searchTerm: String,
color: Color = .aiCoAccent,
color: Color = .iCoAccent,
font: Font = Font.system(size: 14, weight: .bold)) -> AttributedString {
var attributed = AttributedString(self)
let lowercasedText = self.lowercased()
Expand Down
2 changes: 1 addition & 1 deletion AIProject/iCo/Data/API/Gemini/DTO/CoinOverviewDTO.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ extension CoinOverviewDTO {
let prefix = AttributedString("- 웹사이트: ")
var link = AttributedString(URL(string: urlString)?.host ?? urlString)
link.link = url
link.foregroundColor = .aiCoAccent
link.foregroundColor = .iCoAccent
link.underlineStyle = .single
overview.append(prefix)
overview.append(link)
Expand Down
14 changes: 7 additions & 7 deletions AIProject/iCo/Domain/Model/Common/Theme.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@ enum Theme: String, CaseIterable {
/// 선택된 테마에 대응하는 상승 색상
var positiveColor: Color {
switch self {
case .basic: return .aiCoPositive
case .pop: return .aiCoPositivePop
case .classic: return .aiCoPositiveClassic
case .basic: return .iCoPositive
case .pop: return .iCoPositivePop
case .classic: return .iCoPositiveClassic
}
}

/// 선택된 테마에 대응하는 하락 색상
var negativeColor: Color {
switch self {
case .basic: return .aiCoNegative
case .pop: return .aiCoNegativePop
case .classic: return .aiCoNegativeClassic
case .basic: return .iCoNegative
case .pop: return .iCoNegativePop
case .classic: return .iCoNegativeClassic
}
}

var neutral: Color { .aiCoNeutral }
var neutral: Color { .iCoNeutral }
}

extension Theme {
Expand Down
2 changes: 1 addition & 1 deletion AIProject/iCo/Domain/Model/Dashboard/Sentiment.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ enum Sentiment: String {
switch self {
case .positive: return theme.positiveColor
case .negative: return theme.negativeColor
case .neutral: return .aiCoNeutral
case .neutral: return .iCoNeutral
}
}
}
4 changes: 2 additions & 2 deletions AIProject/iCo/Features/Base/CircleDeleteButton.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ struct CircleDeleteButton: View {
} label: {
Image(systemName: "xmark")
.font(.system(size: fontSize))
.foregroundStyle(.aiCoLabelSecondary)
.foregroundStyle(.iCoLabelSecondary)
.padding(5)
.background {
Circle()
.fill(.aiCoBackgroundWhite)
.fill(.iCoBackgroundWhite)
}
.overlay {
Circle()
Expand Down
4 changes: 2 additions & 2 deletions AIProject/iCo/Features/Base/CircleIconView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ struct CircleIconView: View {
.scaledToFit()
.frame(height: 16)
.fontWeight(.regular)
.foregroundStyle(.aiCoAccent)
.foregroundStyle(.iCoAccent)
}
.frame(width: 36, height: 36)
.background(.aiCoBackgroundAccent)
.background(.iCoBackgroundAccent)
.clipShape(Circle())
.overlay(Circle().strokeBorder(.accentGradient, lineWidth: 0.5))
}
Expand Down
2 changes: 1 addition & 1 deletion AIProject/iCo/Features/Base/CoinLabelView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import SwiftUI
/// 재사용 가능한 라벨 뱃지 (ex: 코인 심볼)
struct CoinLabelView: View {
let text: String
let foregroundColor: Color = .aiCoLabelSecondary
let foregroundColor: Color = .iCoLabelSecondary
// let backgroundColor: Color

var body: some View {
Expand Down
4 changes: 2 additions & 2 deletions AIProject/iCo/Features/Base/CoinView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ struct CoinView: View {
CachedAsyncImage(resource: .symbol(symbol)) {
Text(String(symbol.prefix(1)))
.font(.system(size: size / 2))
.foregroundStyle(.aiCoAccent)
.foregroundStyle(.iCoAccent)
.frame(maxWidth: .infinity, maxHeight: .infinity)
.background(.aiCoBackgroundAccent)
.background(.iCoBackgroundAccent)
.overlay(
Circle().strokeBorder(.defaultGradient, lineWidth: 0.5)
)
Expand Down
6 changes: 3 additions & 3 deletions AIProject/iCo/Features/Base/CommonPlaceholderView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ struct CommonPlaceholderView: View {
.scaledToFit()
.frame(width: hSizeClass == .regular ? 200 : 130)
.padding(50)
.foregroundStyle(.aiCoLabelSecondary.opacity(colorScheme == .light ? 0.1 : 0.5))
.foregroundStyle(.iCoLabelSecondary.opacity(colorScheme == .light ? 0.1 : 0.5))
.opacity(showLogo && colorScheme == .dark ? 1 : 0.8)
.background(.aiCoBackground)
.background(.iCoBackground)
.clipShape(.circle)
.overlay {
Circle()
Expand All @@ -36,7 +36,7 @@ struct CommonPlaceholderView: View {

Text(text)
.font(.system(size: 14))
.foregroundStyle(.aiCoLabelSecondary)
.foregroundStyle(.iCoLabelSecondary)
.lineSpacing(6)
}
}
Expand Down
14 changes: 7 additions & 7 deletions AIProject/iCo/Features/Base/DefaultProgressView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,22 @@ struct DefaultProgressView: View {
switch status {
case .loading:
ProgressView()
.progressViewStyle(CircularProgressViewStyle(tint: .aiCoAccent))
.progressViewStyle(CircularProgressViewStyle(tint: .iCoAccent))
.scaleEffect(1.7) // 크기 살짝 키우기
.padding(16)
.background(.aiCoBackgroundAccent)
.background(.iCoBackgroundAccent)
case .failure:
Image(systemName: "xmark.octagon")
.font(.system(size: 35))
.foregroundStyle(.aiCoNeutral)
.foregroundStyle(.iCoNeutral)
.padding(8)
.background(.aiCoBackgroundWhite)
.background(.iCoBackgroundWhite)
case .cancel:
Image(systemName: "exclamationmark.octagon")
.font(.system(size: 35))
.foregroundStyle(.aiCoNeutral)
.foregroundStyle(.iCoNeutral)
.padding(8)
.background(.aiCoBackgroundWhite)
.background(.iCoBackgroundWhite)
}
}
.clipShape(.circle)
Expand All @@ -82,7 +82,7 @@ struct DefaultProgressView: View {

Text(message)
.font(.system(size: 14))
.foregroundColor(.aiCoLabel)
.foregroundColor(.iCoLabel)
.multilineTextAlignment(.center)
.lineSpacing(4)
.padding(.bottom, 10)
Expand Down
10 changes: 5 additions & 5 deletions AIProject/iCo/Features/Base/HeaderView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct HeaderView: View {

var showNewBadge = false

init(heading: String, headingColor: Color = .aiCoLabel, topPadding: CGFloat = 30, coinSymbol: String? = nil, showBackButton: Bool = false, onBackButtonTap: ( () -> Void)? = nil, showNewBadge: Bool = false) {
init(heading: String, headingColor: Color = .iCoLabel, topPadding: CGFloat = 30, coinSymbol: String? = nil, showBackButton: Bool = false, onBackButtonTap: ( () -> Void)? = nil, showNewBadge: Bool = false) {
self.heading = heading
self.headingColor = headingColor
self.topPadding = topPadding
Expand Down Expand Up @@ -73,21 +73,21 @@ struct HeaderView: View {
HStack(alignment: .center, spacing: 4) {
Text(heading)
.font(.system(size: heading.count < 11 ? 21 : 18, weight: .black))
.foregroundStyle(.aiCoLabel)
.foregroundStyle(.iCoLabel)
.lineLimit(2)

if showNewBadge {
Text("N")
.font(.system(size: 12, weight: .heavy))
.foregroundStyle(.white)
.padding(4)
.background(Circle().foregroundStyle(.aiCoAccent))
.background(Circle().foregroundStyle(.iCoAccent))
}
}

Text(coin)
.font(.system(size: 14, weight: .bold))
.foregroundStyle(.aiCoLabelSecondary)
.foregroundStyle(.iCoLabelSecondary)
}
}
} else {
Expand Down Expand Up @@ -130,7 +130,7 @@ private struct BackButton: View {
.scaledToFit()
.frame(width: 15, height: 24)
.fontWeight(.regular)
.tint(.aiCoLabelSecondary.opacity(0.6))
.tint(.iCoLabelSecondary.opacity(0.6))
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions AIProject/iCo/Features/Base/ReportSectionView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ struct ReportSectionView<Value, Trailing: View, Content: View>: View {
HStack {
Image(systemName: data.icon)
.font(.system(size: 14, weight: .bold))
.foregroundStyle(.aiCoAccent)
.foregroundStyle(.iCoAccent)

Text(data.title)
.font(.system(size: 16, weight: .bold))
.foregroundStyle(.aiCoLabel)
.foregroundStyle(.iCoLabel)

Spacer()

Expand All @@ -93,7 +93,7 @@ struct ReportSectionView<Value, Trailing: View, Content: View>: View {
case .success(let value):
content(value)
.font(.system(size: 14))
.foregroundStyle(.aiCoLabel)
.foregroundStyle(.iCoLabel)
.lineSpacing(6)
.fixedSize(horizontal: false, vertical: true)
.frame(maxHeight: .infinity, alignment: .top)
Expand All @@ -116,7 +116,7 @@ struct ReportSectionView<Value, Trailing: View, Content: View>: View {
}
.padding(.horizontal, 22)
.padding(.vertical, 20)
.background(.aiCoBackground)
.background(.iCoBackground)
.clipShape(RoundedRectangle(cornerRadius: cornerRadius))
.overlay(
RoundedRectangle(cornerRadius: cornerRadius)
Expand Down
8 changes: 4 additions & 4 deletions AIProject/iCo/Features/Base/RoundedButton.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ struct RoundedButton: View {
if let title {
Text(title)
.font(.system(size: 12, weight: .regular))
.tint(foregroundColor ?? .aiCoLabel)
.tint(foregroundColor ?? .iCoLabel)
}

if let imageName {
Image(systemName: imageName)
.font(.system(size: 10))
.tint(foregroundColor ?? .aiCoLabel)
.tint(foregroundColor ?? .iCoLabel)

}
}
Expand All @@ -39,7 +39,7 @@ struct RoundedButton: View {
.frame(width: title != nil ? nil : 24, height: title != nil ? nil : 24)
.background(
Capsule()
.fill(.aiCoBackgroundWhite)
.fill(.iCoBackgroundWhite)
)
.overlay {
Capsule()
Expand All @@ -57,5 +57,5 @@ struct RoundedButton: View {
RoundedButton(title: nil, imageName: "xmark", action: { })
}
.padding()
.background(.aiCoBackground)
.background(.iCoBackground)
}
6 changes: 3 additions & 3 deletions AIProject/iCo/Features/Base/RoundedRectangleButton.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@ struct RoundedRectangleButton: View {
.resizable()
.scaledToFit()
.frame(height: 16)
.foregroundStyle(.aiCoLabelSecondary)
.foregroundStyle(.iCoLabelSecondary)
.fontWeight(.light)
.offset(y: -1)
}

Text(title)
.font(.system(size: 14, weight: .semibold))
.foregroundStyle(isActive ? .aiCoAccent : .aiCoLabel)
.foregroundStyle(isActive ? .iCoAccent : .iCoLabel)
}
.padding(.horizontal, 14)
.padding(.vertical, 10)
.background(isActive ? .aiCoBackgroundAccent : .aiCoBackground)
.background(isActive ? .iCoBackgroundAccent : .iCoBackground)
.clipShape(RoundedRectangle(cornerRadius: cornerRadius))
.overlay(
RoundedRectangle(cornerRadius: cornerRadius)
Expand Down
Loading
Loading