From d83c0b78af80116833e3c51fe30f38514373133f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxixn2=E2=80=9D?= Date: Sun, 19 Jan 2025 16:30:29 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84=20::=20[#76]=20=EC=88=98=EB=9D=BD,?= =?UTF-8?q?=20=EA=B1=B0=EB=B6=80=20=EB=B2=84=ED=8A=BC=20Assets=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../noneCheck.imageset/Contents.json | 21 +++++++++++++++++++ .../noneCheck.imageset/noneCheck.svg | 5 +++++ .../noneTrash.imageset/Contents.json | 21 +++++++++++++++++++ .../noneTrash.imageset/noneTrash.svg | 5 +++++ .../okCheck.imageset/Contents.json | 21 +++++++++++++++++++ .../okCheck.imageset/okCheck.svg | 5 +++++ .../okTrash.imageset/Contents.json | 21 +++++++++++++++++++ .../okTrash.imageset/okTrash.svg | 5 +++++ .../MyPageFeature/Sources/MyPageView.swift | 20 ++++-------------- 9 files changed, 108 insertions(+), 16 deletions(-) create mode 100644 Projects/App/Resources/Assets.xcassets/noneCheck.imageset/Contents.json create mode 100644 Projects/App/Resources/Assets.xcassets/noneCheck.imageset/noneCheck.svg create mode 100644 Projects/App/Resources/Assets.xcassets/noneTrash.imageset/Contents.json create mode 100644 Projects/App/Resources/Assets.xcassets/noneTrash.imageset/noneTrash.svg create mode 100644 Projects/App/Resources/Assets.xcassets/okCheck.imageset/Contents.json create mode 100644 Projects/App/Resources/Assets.xcassets/okCheck.imageset/okCheck.svg create mode 100644 Projects/App/Resources/Assets.xcassets/okTrash.imageset/Contents.json create mode 100644 Projects/App/Resources/Assets.xcassets/okTrash.imageset/okTrash.svg diff --git a/Projects/App/Resources/Assets.xcassets/noneCheck.imageset/Contents.json b/Projects/App/Resources/Assets.xcassets/noneCheck.imageset/Contents.json new file mode 100644 index 0000000..a72e80c --- /dev/null +++ b/Projects/App/Resources/Assets.xcassets/noneCheck.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "noneCheck.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/App/Resources/Assets.xcassets/noneCheck.imageset/noneCheck.svg b/Projects/App/Resources/Assets.xcassets/noneCheck.imageset/noneCheck.svg new file mode 100644 index 0000000..4af0bb1 --- /dev/null +++ b/Projects/App/Resources/Assets.xcassets/noneCheck.imageset/noneCheck.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/Projects/App/Resources/Assets.xcassets/noneTrash.imageset/Contents.json b/Projects/App/Resources/Assets.xcassets/noneTrash.imageset/Contents.json new file mode 100644 index 0000000..31c32fc --- /dev/null +++ b/Projects/App/Resources/Assets.xcassets/noneTrash.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "noneTrash.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/App/Resources/Assets.xcassets/noneTrash.imageset/noneTrash.svg b/Projects/App/Resources/Assets.xcassets/noneTrash.imageset/noneTrash.svg new file mode 100644 index 0000000..f40487e --- /dev/null +++ b/Projects/App/Resources/Assets.xcassets/noneTrash.imageset/noneTrash.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/Projects/App/Resources/Assets.xcassets/okCheck.imageset/Contents.json b/Projects/App/Resources/Assets.xcassets/okCheck.imageset/Contents.json new file mode 100644 index 0000000..cd579f8 --- /dev/null +++ b/Projects/App/Resources/Assets.xcassets/okCheck.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "okCheck.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/App/Resources/Assets.xcassets/okCheck.imageset/okCheck.svg b/Projects/App/Resources/Assets.xcassets/okCheck.imageset/okCheck.svg new file mode 100644 index 0000000..62c8db3 --- /dev/null +++ b/Projects/App/Resources/Assets.xcassets/okCheck.imageset/okCheck.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/Projects/App/Resources/Assets.xcassets/okTrash.imageset/Contents.json b/Projects/App/Resources/Assets.xcassets/okTrash.imageset/Contents.json new file mode 100644 index 0000000..55d0f97 --- /dev/null +++ b/Projects/App/Resources/Assets.xcassets/okTrash.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "okTrash.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Projects/App/Resources/Assets.xcassets/okTrash.imageset/okTrash.svg b/Projects/App/Resources/Assets.xcassets/okTrash.imageset/okTrash.svg new file mode 100644 index 0000000..d3db41b --- /dev/null +++ b/Projects/App/Resources/Assets.xcassets/okTrash.imageset/okTrash.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/Projects/App/Sources/Feature/MyPageFeature/Sources/MyPageView.swift b/Projects/App/Sources/Feature/MyPageFeature/Sources/MyPageView.swift index db2465b..1a02eca 100644 --- a/Projects/App/Sources/Feature/MyPageFeature/Sources/MyPageView.swift +++ b/Projects/App/Sources/Feature/MyPageFeature/Sources/MyPageView.swift @@ -105,6 +105,10 @@ struct MyPageView: View { ) } + HStack(spacing: 0) { + Image("") + } + Spacer() } .padding(.top, 58) @@ -175,22 +179,6 @@ struct MyPageView: View { .expoColor(ExpoColor.black) } } - - @ViewBuilder - func userStateButton( - title: String, - info: String - ) -> some View { - HStack(spacing: 14) { - Text(title) - .expoFont(.caption1R) - .expoColor(ExpoColor.gray500) - - Text(info) - .expoFont(.caption2B) - .expoColor(ExpoColor.black) - } - } } #Preview {