diff --git a/GAMSS/Resources/Assets.xcassets/xmarkCircleFillGray.imageset/Contents.json b/GAMSS/Resources/Assets.xcassets/xmarkCircleFillGray.imageset/Contents.json new file mode 100644 index 0000000..c34ba9d --- /dev/null +++ b/GAMSS/Resources/Assets.xcassets/xmarkCircleFillGray.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Union.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Union@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Union@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/GAMSS/Resources/Assets.xcassets/xmarkCircleFillGray.imageset/Union.png b/GAMSS/Resources/Assets.xcassets/xmarkCircleFillGray.imageset/Union.png new file mode 100644 index 0000000..496136f Binary files /dev/null and b/GAMSS/Resources/Assets.xcassets/xmarkCircleFillGray.imageset/Union.png differ diff --git a/GAMSS/Resources/Assets.xcassets/xmarkCircleFillGray.imageset/Union@2x.png b/GAMSS/Resources/Assets.xcassets/xmarkCircleFillGray.imageset/Union@2x.png new file mode 100644 index 0000000..f6eb533 Binary files /dev/null and b/GAMSS/Resources/Assets.xcassets/xmarkCircleFillGray.imageset/Union@2x.png differ diff --git a/GAMSS/Resources/Assets.xcassets/xmarkCircleFillGray.imageset/Union@3x.png b/GAMSS/Resources/Assets.xcassets/xmarkCircleFillGray.imageset/Union@3x.png new file mode 100644 index 0000000..5c8312e Binary files /dev/null and b/GAMSS/Resources/Assets.xcassets/xmarkCircleFillGray.imageset/Union@3x.png differ diff --git a/GAMSS/Sources/Presentation/ConversationList/Components/ConversationSearchView.swift b/GAMSS/Sources/Presentation/ConversationList/Components/ConversationSearchView.swift index e4031cb..3559d85 100644 --- a/GAMSS/Sources/Presentation/ConversationList/Components/ConversationSearchView.swift +++ b/GAMSS/Sources/Presentation/ConversationList/Components/ConversationSearchView.swift @@ -14,21 +14,35 @@ struct ConversationSearchView: View { var body: some View { HStack(spacing: 16) { - TextField(text: $editingText) { - Text("검색어 입력") - .typography(.body4Medium) - .foregroundStyle(Color.colorGray400) + HStack(spacing: 8) { + TextField(text: $editingText) { + Text("검색어 입력") + .typography(.body4Medium) + .foregroundStyle(Color.colorGray400) + } + .typography(.body4Medium) + .foregroundStyle(Color.colorGray950) + .submitLabel(.search) + .onSubmit { + onTappedSearchButton?() + } + + if !editingText.isEmpty { + Button { + editingText = "" + } label: { + Image(.xmarkCircleFillGray) + .resizable() + .scaledToFit() + .frame(width: 20, height: 20) + .foregroundStyle(Color.colorGray800) + } + } } - .typography(.body4Medium) - .foregroundStyle(Color.colorGray950) .padding(.vertical, 11) .padding(.horizontal, 16) .background(Color.colorGray075) - .submitLabel(.search) - .onSubmit { - onTappedSearchButton?() - } - + Button { onTappedCancelButton?() } label: {