Skip to content

Commit 1a46d4f

Browse files
authored
Merge pull request #14 from KvColorPalette/feature/consumes-kvColorPalette-iOS-v2.1.0
Start to consume KvColorPalette v2.1.0
2 parents cd6d236 + 1920bf6 commit 1a46d4f

File tree

4 files changed

+22
-6
lines changed

4 files changed

+22
-6
lines changed

KvColorPalette-iOS-App/KvColorPaletteAppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import Foundation
99
import UIKit
10-
import SwiftUICore
10+
import SwiftUI
1111
import KvColorPalette_iOS
1212

1313
@MainActor

KvColorPalette-iOS-App/ui/detail/ThemeGenDetailUI.swift

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,21 @@ struct ThemeGenDetailUI: View {
4646

4747
VStack (spacing: 0) {
4848
ThemeColorItem(color: themeColorPalette.light.primary, itemName: "Primary")
49+
ThemeColorItem(color: themeColorPalette.light.defaultColor, itemName: "Default")
50+
ThemeColorItem(color: themeColorPalette.light.inverseDefaultColor, itemName: "Default Inverse")
4951
ThemeColorItem(color: themeColorPalette.light.secondary, itemName: "Secondary")
5052
ThemeColorItem(color: themeColorPalette.light.tertiary, itemName: "Tertiary")
5153
ThemeColorItem(color: themeColorPalette.light.quaternary, itemName: "Quaternary")
52-
ThemeColorItem(color: themeColorPalette.light.onPrimary, itemName: "onPrimary")
53-
ThemeColorItem(color: themeColorPalette.light.onSecondary, itemName: "onSecondary")
5454
ThemeColorItem(color: themeColorPalette.light.background, itemName: "Background")
55+
ThemeColorItem(color: themeColorPalette.light.surface, itemName: "Surface")
56+
ThemeColorItem(color: themeColorPalette.light.scrim, itemName: "Scrim")
5557
ThemeColorItem(color: themeColorPalette.light.shadow, itemName: "Shadow")
58+
ThemeColorItem(color: themeColorPalette.light.onPrimary, itemName: "onPrimary")
59+
ThemeColorItem(color: themeColorPalette.light.inverseOnPrimary, itemName: "onPrimary Inverse")
60+
ThemeColorItem(color: themeColorPalette.light.onSecondary, itemName: "onSecondary")
61+
ThemeColorItem(color: themeColorPalette.light.onBackground, itemName: "OnBackground")
62+
ThemeColorItem(color: themeColorPalette.light.inverseOnBackground, itemName: "OnBackground Inverse")
63+
ThemeColorItem(color: themeColorPalette.light.onSurface, itemName: "OnSurface")
5664
}
5765
.cornerRadius(12)
5866
.padding(.trailing, 2)
@@ -65,13 +73,21 @@ struct ThemeGenDetailUI: View {
6573

6674
VStack (spacing: 0) {
6775
ThemeColorItem(color: themeColorPalette.dark.primary, itemName: "Primary")
76+
ThemeColorItem(color: themeColorPalette.dark.defaultColor, itemName: "Default")
77+
ThemeColorItem(color: themeColorPalette.dark.inverseDefaultColor, itemName: "Default Inverse")
6878
ThemeColorItem(color: themeColorPalette.dark.secondary, itemName: "Secondary")
6979
ThemeColorItem(color: themeColorPalette.dark.tertiary, itemName: "Tertiary")
7080
ThemeColorItem(color: themeColorPalette.dark.quaternary, itemName: "Quaternary")
71-
ThemeColorItem(color: themeColorPalette.dark.onPrimary, itemName: "onPrimary")
72-
ThemeColorItem(color: themeColorPalette.dark.onSecondary, itemName: "onSecondary")
7381
ThemeColorItem(color: themeColorPalette.dark.background, itemName: "Background")
82+
ThemeColorItem(color: themeColorPalette.dark.surface, itemName: "Surface")
83+
ThemeColorItem(color: themeColorPalette.dark.scrim, itemName: "Scrim")
7484
ThemeColorItem(color: themeColorPalette.dark.shadow, itemName: "Shadow")
85+
ThemeColorItem(color: themeColorPalette.dark.onPrimary, itemName: "onPrimary")
86+
ThemeColorItem(color: themeColorPalette.dark.inverseOnPrimary, itemName: "onPrimary Inverse")
87+
ThemeColorItem(color: themeColorPalette.dark.onSecondary, itemName: "onSecondary")
88+
ThemeColorItem(color: themeColorPalette.dark.onBackground, itemName: "OnBackground")
89+
ThemeColorItem(color: themeColorPalette.dark.inverseOnBackground, itemName: "OnBackground Inverse")
90+
ThemeColorItem(color: themeColorPalette.dark.onSurface, itemName: "OnSurface")
7591
}
7692
.cornerRadius(12)
7793
.padding(.leading, 2)

KvColorPalette-iOS-App/ui/model/ColorItem.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Created by Kavimal Wijewardana on 12/30/24.
66
//
77
import Foundation
8-
import SwiftUICore
8+
import SwiftUI
99

1010
public struct ColorItem {
1111
var id: String = UUID().uuidString

0 commit comments

Comments
 (0)