diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0139367..20a1421 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,7 +47,9 @@ jobs: -configuration Debug \ -skipMacroValidation \ -destination "generic/platform=iOS Simulator" \ - clean build + -jobs 1 \ + SWIFT_ENABLE_EXPLICIT_MODULES=NO \ + build - name: Run unit tests (all *Tests schemes) run: | @@ -88,5 +90,7 @@ jobs: -configuration Debug \ -skipMacroValidation \ -destination "id=${SIMULATOR_ID}" \ + -jobs 1 \ + SWIFT_ENABLE_EXPLICIT_MODULES=NO \ test done <<< "${TEST_SCHEMES}" diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_birthday.imageset/Contents.json b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_birthday.imageset/Contents.json index 7fdc1b7..baa1d63 100644 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_birthday.imageset/Contents.json +++ b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_birthday.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "baddori_birthday.svg", + "filename" : "ic_baddori_birthday.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_birthday.imageset/baddori_birthday.svg b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_birthday.imageset/baddori_birthday.svg deleted file mode 100644 index 526cc81..0000000 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_birthday.imageset/baddori_birthday.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_birthday.imageset/ic_baddori_birthday.png b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_birthday.imageset/ic_baddori_birthday.png new file mode 100644 index 0000000..b1222e6 Binary files /dev/null and b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_birthday.imageset/ic_baddori_birthday.png differ diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_etc.imageset/Contents.json b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_etc.imageset/Contents.json index d83d45a..4fc19e7 100644 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_etc.imageset/Contents.json +++ b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_etc.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "baddori_etc.svg", + "filename" : "ic_baddori_etc.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_etc.imageset/baddori_etc.svg b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_etc.imageset/baddori_etc.svg deleted file mode 100644 index 9f9f0c9..0000000 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_etc.imageset/baddori_etc.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_etc.imageset/ic_baddori_etc.png b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_etc.imageset/ic_baddori_etc.png new file mode 100644 index 0000000..db50ff7 Binary files /dev/null and b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_etc.imageset/ic_baddori_etc.png differ diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_firstBirthday.imageset/Contents.json b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_firstBirthday.imageset/Contents.json index bcb41e2..8aacde2 100644 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_firstBirthday.imageset/Contents.json +++ b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_firstBirthday.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "baddori_firstBirthday.svg", + "filename" : "ic_baddori_firstBirthday.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_firstBirthday.imageset/baddori_firstBirthday.svg b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_firstBirthday.imageset/baddori_firstBirthday.svg deleted file mode 100644 index aa7ad26..0000000 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_firstBirthday.imageset/baddori_firstBirthday.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_firstBirthday.imageset/ic_baddori_firstBirthday.png b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_firstBirthday.imageset/ic_baddori_firstBirthday.png new file mode 100644 index 0000000..5025c0b Binary files /dev/null and b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_firstBirthday.imageset/ic_baddori_firstBirthday.png differ diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_funeral.imageset/Contents.json b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_funeral.imageset/Contents.json index 437cd1f..033ce00 100644 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_funeral.imageset/Contents.json +++ b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_funeral.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "baddori_funeral.svg", + "filename" : "ic_baddori_funeral.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_funeral.imageset/baddori_funeral.svg b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_funeral.imageset/baddori_funeral.svg deleted file mode 100644 index e593426..0000000 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_funeral.imageset/baddori_funeral.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_funeral.imageset/ic_baddori_funeral.png b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_funeral.imageset/ic_baddori_funeral.png new file mode 100644 index 0000000..fb28241 Binary files /dev/null and b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_funeral.imageset/ic_baddori_funeral.png differ diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_housewarming.imageset/Contents.json b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_housewarming.imageset/Contents.json index 697c39a..01bd607 100644 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_housewarming.imageset/Contents.json +++ b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_housewarming.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "baddori_housewarming.svg", + "filename" : "ic_baddori_housewarming.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_housewarming.imageset/baddori_housewarming.svg b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_housewarming.imageset/baddori_housewarming.svg deleted file mode 100644 index cd63c12..0000000 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_housewarming.imageset/baddori_housewarming.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_housewarming.imageset/ic_baddori_housewarming.png b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_housewarming.imageset/ic_baddori_housewarming.png new file mode 100644 index 0000000..2ee2612 Binary files /dev/null and b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_housewarming.imageset/ic_baddori_housewarming.png differ diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_wedding.imageset/Contents.json b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_wedding.imageset/Contents.json index 2c75a74..c61f2a0 100644 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_wedding.imageset/Contents.json +++ b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_wedding.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "baddori_wedding.svg", + "filename" : "ic_baddori_wedding.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_wedding.imageset/baddori_wedding.svg b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_wedding.imageset/baddori_wedding.svg deleted file mode 100644 index 56cbd90..0000000 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_wedding.imageset/baddori_wedding.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_wedding.imageset/ic_baddori_wedding.png b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_wedding.imageset/ic_baddori_wedding.png new file mode 100644 index 0000000..5c718cf Binary files /dev/null and b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/baddori_wedding.imageset/ic_baddori_wedding.png differ diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/icon_baddori.imageset/Contents.json b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/icon_baddori.imageset/Contents.json index 6df9f07..ced909f 100644 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/icon_baddori.imageset/Contents.json +++ b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/icon_baddori.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "icon_baddori.png", + "filename" : "ic_baddori.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/icon_baddori.imageset/ic_baddori.png b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/icon_baddori.imageset/ic_baddori.png new file mode 100644 index 0000000..863a097 Binary files /dev/null and b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/icon_baddori.imageset/ic_baddori.png differ diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/icon_baddori.imageset/icon_baddori.png b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/icon_baddori.imageset/icon_baddori.png deleted file mode 100644 index 7acc012..0000000 Binary files a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/baddori/icon_baddori.imageset/icon_baddori.png and /dev/null differ diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/icon_judori.imageset/Contents.json b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/icon_judori.imageset/Contents.json index 8e68c88..fc9e103 100644 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/icon_judori.imageset/Contents.json +++ b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/icon_judori.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "icon_judori.png", + "filename" : "ic_judori.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/icon_judori.imageset/ic_judori.png b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/icon_judori.imageset/ic_judori.png new file mode 100644 index 0000000..a175596 Binary files /dev/null and b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/icon_judori.imageset/ic_judori.png differ diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/icon_judori.imageset/icon_judori.png b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/icon_judori.imageset/icon_judori.png deleted file mode 100644 index 86bde0c..0000000 Binary files a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/icon_judori.imageset/icon_judori.png and /dev/null differ diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_birthday.imageset/Contents.json b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_birthday.imageset/Contents.json index bb35a50..44dda79 100644 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_birthday.imageset/Contents.json +++ b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_birthday.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "judori_birthday.svg", + "filename" : "ic_judori_birthday.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_birthday.imageset/ic_judori_birthday.png b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_birthday.imageset/ic_judori_birthday.png new file mode 100644 index 0000000..b2bc111 Binary files /dev/null and b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_birthday.imageset/ic_judori_birthday.png differ diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_birthday.imageset/judori_birthday.svg b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_birthday.imageset/judori_birthday.svg deleted file mode 100644 index fd17661..0000000 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_birthday.imageset/judori_birthday.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_etc.imageset/Contents.json b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_etc.imageset/Contents.json index 93600dc..fb81eb4 100644 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_etc.imageset/Contents.json +++ b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_etc.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "judori_etc.svg", + "filename" : "ic_judori_etc.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_etc.imageset/ic_judori_etc.png b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_etc.imageset/ic_judori_etc.png new file mode 100644 index 0000000..3db59c9 Binary files /dev/null and b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_etc.imageset/ic_judori_etc.png differ diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_etc.imageset/judori_etc.svg b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_etc.imageset/judori_etc.svg deleted file mode 100644 index 9075b78..0000000 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_etc.imageset/judori_etc.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_firstBirthday.imageset/Contents.json b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_firstBirthday.imageset/Contents.json index de4119c..a15ba7b 100644 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_firstBirthday.imageset/Contents.json +++ b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_firstBirthday.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "judori_firstBirthday.svg", + "filename" : "ic_judori_firstBirthday.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_firstBirthday.imageset/ic_judori_firstBirthday.png b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_firstBirthday.imageset/ic_judori_firstBirthday.png new file mode 100644 index 0000000..1d3b4c1 Binary files /dev/null and b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_firstBirthday.imageset/ic_judori_firstBirthday.png differ diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_firstBirthday.imageset/judori_firstBirthday.svg b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_firstBirthday.imageset/judori_firstBirthday.svg deleted file mode 100644 index ee657c0..0000000 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_firstBirthday.imageset/judori_firstBirthday.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_funeral.imageset/Contents.json b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_funeral.imageset/Contents.json index 91bed96..f9cfa65 100644 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_funeral.imageset/Contents.json +++ b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_funeral.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "judori_funeral.svg", + "filename" : "ic_judori_funeral.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_funeral.imageset/ic_judori_funeral.png b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_funeral.imageset/ic_judori_funeral.png new file mode 100644 index 0000000..d4981d8 Binary files /dev/null and b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_funeral.imageset/ic_judori_funeral.png differ diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_funeral.imageset/judori_funeral.svg b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_funeral.imageset/judori_funeral.svg deleted file mode 100644 index b000d48..0000000 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_funeral.imageset/judori_funeral.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_housewarming.imageset/Contents.json b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_housewarming.imageset/Contents.json index 6c1d17e..69a8b60 100644 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_housewarming.imageset/Contents.json +++ b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_housewarming.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "judori_housewarming.svg", + "filename" : "ic_judori_housewarming.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_housewarming.imageset/ic_judori_housewarming.png b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_housewarming.imageset/ic_judori_housewarming.png new file mode 100644 index 0000000..3116ffb Binary files /dev/null and b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_housewarming.imageset/ic_judori_housewarming.png differ diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_housewarming.imageset/judori_housewarming.svg b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_housewarming.imageset/judori_housewarming.svg deleted file mode 100644 index 6aa02ac..0000000 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_housewarming.imageset/judori_housewarming.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_wedding.imageset/Contents.json b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_wedding.imageset/Contents.json index f33b340..27e6642 100644 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_wedding.imageset/Contents.json +++ b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_wedding.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "judori_wedding.svg", + "filename" : "ic_judori_wedding.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_wedding.imageset/ic_judori_wedding.png b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_wedding.imageset/ic_judori_wedding.png new file mode 100644 index 0000000..2733372 Binary files /dev/null and b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_wedding.imageset/ic_judori_wedding.png differ diff --git a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_wedding.imageset/judori_wedding.svg b/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_wedding.imageset/judori_wedding.svg deleted file mode 100644 index 83d1a77..0000000 --- a/Projects/Core/DoriDesignSystem/Resources/Icons.xcassets/judori/judori_wedding.imageset/judori_wedding.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/Projects/Core/DoriDesignSystem/Sources/Components/DoriCircleIcon.swift b/Projects/Core/DoriDesignSystem/Sources/Components/DoriCircleIcon.swift new file mode 100644 index 0000000..5c48dae --- /dev/null +++ b/Projects/Core/DoriDesignSystem/Sources/Components/DoriCircleIcon.swift @@ -0,0 +1,62 @@ +// +// DoriCircleIcon.swift +// Dori-iOS +// +// Created by 강동영 on 6/23/26. +// + +import SwiftUI + +/// 주도리/받도리 아이콘을 원형 배경 배지로 렌더한다. +/// path 는 템플릿으로 틴팅되고, 전경/배경 색은 모두 semantic 토큰을 경유하므로 다크모드가 자동 적응한다. +public struct DoriCircleIcon: View { + public enum Style { + case judori + case baddori + + var foreground: Color { + switch self { + case .judori: return UIAsset.Colors.onBrand.color // white / black + case .baddori: return UIAsset.Colors.textSecondary.color // #6B7684 / #A0A0A0 + } + } + + var background: Color { + switch self { + case .judori: return UIAsset.Colors.brandMain.color // #20346F / #6C8FF0 + case .baddori: return UIAsset.Colors.borderDefault.color // #E5E8EB / #2E2E2E + } + } + } + + private let icon: UIAsset.Icons + private let style: Style + private let diameter: CGFloat = 34 + private let iconSize: CGFloat = 26 + + public init(_ icon: UIAsset.Icons, style: Style) { + self.icon = icon + self.style = style + } + + public var body: some View { + icon.image + .renderingMode(.template) + .resizable() + .scaledToFit() + .frame(width: iconSize, height: iconSize) + .foregroundStyle(style.foreground) + .frame(width: diameter, height: diameter) + .background(Circle().fill(style.background)) + } +} + +#Preview { + HStack(spacing: 16) { + DoriCircleIcon(.judoriWedding, style: .judori) + DoriCircleIcon(.baddoriWedding, style: .baddori) + DoriCircleIcon(.judoriEtc, style: .judori) + DoriCircleIcon(.baddoriEtc, style: .baddori) + } + .padding() +} diff --git a/Projects/Feature/Calendar/Sources/Components/DayDetailSheet.swift b/Projects/Feature/Calendar/Sources/Components/DayDetailSheet.swift index 4d854aa..6c11240 100644 --- a/Projects/Feature/Calendar/Sources/Components/DayDetailSheet.swift +++ b/Projects/Feature/Calendar/Sources/Components/DayDetailSheet.swift @@ -107,9 +107,7 @@ private struct CalendarDoriRow: View { public var body: some View { HStack { - eventIcon.image - .resizable() - .frame(width: 34, height: 34) + DoriCircleIcon(eventIcon, style: isJudori ? .judori : .baddori) VStack(spacing: 4) { HStack(spacing: 2) { diff --git a/Projects/Feature/History/Sources/Components/DoriBarGraphView.swift b/Projects/Feature/History/Sources/Components/DoriBarGraphView.swift index 65585f3..252121f 100644 --- a/Projects/Feature/History/Sources/Components/DoriBarGraphView.swift +++ b/Projects/Feature/History/Sources/Components/DoriBarGraphView.swift @@ -58,6 +58,7 @@ public struct DoriBarGraphView: View { if givenAmount > 0 { HStack(spacing: 3) { UIAsset.Icons.iconJudori.image + .renderingMode(.template) .resizable() .frame(width: 26, height: 26) .padding(.leading, 4) @@ -75,6 +76,7 @@ public struct DoriBarGraphView: View { Text("받도리") .pretendard(.body(.sb6)) UIAsset.Icons.iconBaddori.image + .renderingMode(.template) .resizable() .frame(width: 26, height: 26) .padding(.trailing, 4) diff --git a/Projects/Feature/History/Sources/Components/TransactionRowView.swift b/Projects/Feature/History/Sources/Components/TransactionRowView.swift index 24464ce..680583c 100644 --- a/Projects/Feature/History/Sources/Components/TransactionRowView.swift +++ b/Projects/Feature/History/Sources/Components/TransactionRowView.swift @@ -50,9 +50,7 @@ public struct TransactionRowView: View { public var body: some View { HStack { - eventIcon.image - .resizable() - .frame(width: 34, height: 34) + DoriCircleIcon(eventIcon, style: isJudori ? .judori : .baddori) .padding(4) VStack(alignment: .leading, spacing: 4) { diff --git a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriBarGraphSnapshotTests/test_doriBarGraph_balanced_dark.1.png b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriBarGraphSnapshotTests/test_doriBarGraph_balanced_dark.1.png index 473f733..3cdfdfa 100644 Binary files a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriBarGraphSnapshotTests/test_doriBarGraph_balanced_dark.1.png and b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriBarGraphSnapshotTests/test_doriBarGraph_balanced_dark.1.png differ diff --git a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriBarGraphSnapshotTests/test_doriBarGraph_balanced_light.1.png b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriBarGraphSnapshotTests/test_doriBarGraph_balanced_light.1.png index 9360917..2e9276f 100644 Binary files a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriBarGraphSnapshotTests/test_doriBarGraph_balanced_light.1.png and b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriBarGraphSnapshotTests/test_doriBarGraph_balanced_light.1.png differ diff --git a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriBarGraphSnapshotTests/test_doriBarGraph_judoriHeavy_dark.1.png b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriBarGraphSnapshotTests/test_doriBarGraph_judoriHeavy_dark.1.png index 4ae7b04..3f7694f 100644 Binary files a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriBarGraphSnapshotTests/test_doriBarGraph_judoriHeavy_dark.1.png and b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriBarGraphSnapshotTests/test_doriBarGraph_judoriHeavy_dark.1.png differ diff --git a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriBarGraphSnapshotTests/test_doriBarGraph_judoriHeavy_light.1.png b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriBarGraphSnapshotTests/test_doriBarGraph_judoriHeavy_light.1.png index 75927bb..09f5377 100644 Binary files a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriBarGraphSnapshotTests/test_doriBarGraph_judoriHeavy_light.1.png and b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriBarGraphSnapshotTests/test_doriBarGraph_judoriHeavy_light.1.png differ diff --git a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriListPopulatedSnapshotTests/test_doriList_populated_dark.1.png b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriListPopulatedSnapshotTests/test_doriList_populated_dark.1.png index fe02bce..4562cdf 100644 Binary files a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriListPopulatedSnapshotTests/test_doriList_populated_dark.1.png and b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriListPopulatedSnapshotTests/test_doriList_populated_dark.1.png differ diff --git a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriListPopulatedSnapshotTests/test_doriList_populated_light.1.png b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriListPopulatedSnapshotTests/test_doriList_populated_light.1.png index 04e3f7c..ddf3ee5 100644 Binary files a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriListPopulatedSnapshotTests/test_doriList_populated_light.1.png and b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/DoriListPopulatedSnapshotTests/test_doriList_populated_light.1.png differ diff --git a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_all_dark.1.png b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_all_dark.1.png index d31950c..3c31f18 100644 Binary files a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_all_dark.1.png and b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_all_dark.1.png differ diff --git a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_all_light.1.png b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_all_light.1.png index c74a383..38924d0 100644 Binary files a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_all_light.1.png and b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_all_light.1.png differ diff --git a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_baddoriOnly_dark.1.png b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_baddoriOnly_dark.1.png index c61799f..25828ef 100644 Binary files a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_baddoriOnly_dark.1.png and b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_baddoriOnly_dark.1.png differ diff --git a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_baddoriOnly_light.1.png b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_baddoriOnly_light.1.png index 646bffe..8cffde9 100644 Binary files a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_baddoriOnly_light.1.png and b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_baddoriOnly_light.1.png differ diff --git a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_judoriOnly_dark.1.png b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_judoriOnly_dark.1.png index 28f5f48..7278bfc 100644 Binary files a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_judoriOnly_dark.1.png and b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_judoriOnly_dark.1.png differ diff --git a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_judoriOnly_light.1.png b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_judoriOnly_light.1.png index b455968..2ae1ffe 100644 Binary files a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_judoriOnly_light.1.png and b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PartnerDoriHistorySnapshotTests/test_partnerDoriHistory_judoriOnly_light.1.png differ diff --git a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PersonCardSnapshotTests/test_personCard_collapsed_dark.1.png b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PersonCardSnapshotTests/test_personCard_collapsed_dark.1.png index f3ac94c..ee964fb 100644 Binary files a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PersonCardSnapshotTests/test_personCard_collapsed_dark.1.png and b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PersonCardSnapshotTests/test_personCard_collapsed_dark.1.png differ diff --git a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PersonCardSnapshotTests/test_personCard_collapsed_light.1.png b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PersonCardSnapshotTests/test_personCard_collapsed_light.1.png index 0d9b89d..f0f320f 100644 Binary files a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PersonCardSnapshotTests/test_personCard_collapsed_light.1.png and b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/PersonCardSnapshotTests/test_personCard_collapsed_light.1.png differ diff --git a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/TransactionRowSnapshotTests/test_transactionRow_baddori_dark.1.png b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/TransactionRowSnapshotTests/test_transactionRow_baddori_dark.1.png index c38818d..26e74ca 100644 Binary files a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/TransactionRowSnapshotTests/test_transactionRow_baddori_dark.1.png and b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/TransactionRowSnapshotTests/test_transactionRow_baddori_dark.1.png differ diff --git a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/TransactionRowSnapshotTests/test_transactionRow_baddori_light.1.png b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/TransactionRowSnapshotTests/test_transactionRow_baddori_light.1.png index f464fa4..8d5636a 100644 Binary files a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/TransactionRowSnapshotTests/test_transactionRow_baddori_light.1.png and b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/TransactionRowSnapshotTests/test_transactionRow_baddori_light.1.png differ diff --git a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/TransactionRowSnapshotTests/test_transactionRow_judori_dark.1.png b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/TransactionRowSnapshotTests/test_transactionRow_judori_dark.1.png index b15d764..c7b3e8a 100644 Binary files a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/TransactionRowSnapshotTests/test_transactionRow_judori_dark.1.png and b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/TransactionRowSnapshotTests/test_transactionRow_judori_dark.1.png differ diff --git a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/TransactionRowSnapshotTests/test_transactionRow_judori_light.1.png b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/TransactionRowSnapshotTests/test_transactionRow_judori_light.1.png index 837f7c2..c375f87 100644 Binary files a/Projects/Feature/History/Tests/Snapshot/__Snapshots__/TransactionRowSnapshotTests/test_transactionRow_judori_light.1.png and b/Projects/Feature/History/Tests/Snapshot/__Snapshots__/TransactionRowSnapshotTests/test_transactionRow_judori_light.1.png differ diff --git a/Tuist/Package.swift b/Tuist/Package.swift index 2920595..1e07655 100644 --- a/Tuist/Package.swift +++ b/Tuist/Package.swift @@ -8,6 +8,12 @@ import ProjectDescription let packageSettings = PackageSettings( productTypes: [ "ComposableArchitecture": .framework, + "Dependencies": .framework, + "CombineSchedulers": .framework, + "Clocks": .framework, + "CasePaths": .framework, + "SwiftNavigation": .framework, + "ConcurrencyExtras": .framework, "Swinject": .framework, "Alamofire": .framework, "KakaoSDKCommon": .framework, @@ -17,7 +23,8 @@ let packageSettings = PackageSettings( baseSettings: .settings( base: [ "CODE_SIGNING_ALLOWED": "NO", - "CODE_SIGN_IDENTITY": "" + "CODE_SIGN_IDENTITY": "", + "SWIFT_ENABLE_EXPLICIT_MODULES": "NO" ] ) ) @@ -27,6 +34,10 @@ let package = Package( name: "DoriDependencies", dependencies: [ .package(url: "https://github.com/pointfreeco/swift-composable-architecture", from: "1.25.5"), + // swift-navigation 2.10.1+ / swift-case-paths 1.8.0+ have Xcode 26.3 macro host build issues. + // Pin to versions known to work (same as develop CI June 15). + .package(url: "https://github.com/pointfreeco/swift-navigation", .upToNextMinor(from: "2.8.0")), + .package(url: "https://github.com/pointfreeco/swift-case-paths", .upToNextMinor(from: "1.7.3")), .package(url: "https://github.com/Swinject/Swinject.git", from: "2.9.1"), .package(url: "https://github.com/Alamofire/Alamofire.git", from: "5.11.1"), .package(url: "https://github.com/kakao/kakao-ios-sdk", from: "2.0.0"),