From c07e7c98c5db2f62b8644ee98bdb961ccfe68ac5 Mon Sep 17 00:00:00 2001 From: dlrjswns Date: Wed, 16 Sep 2026 10:35:07 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[ADD]=20xmarkCircleFillGray=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=97=90=EC=85=8B=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Contents.json | 23 ++++++++++++++++++ .../xmarkCircleFillGray.imageset/Union.png | Bin 0 -> 473 bytes .../xmarkCircleFillGray.imageset/Union@2x.png | Bin 0 -> 842 bytes .../xmarkCircleFillGray.imageset/Union@3x.png | Bin 0 -> 1130 bytes 4 files changed, 23 insertions(+) create mode 100644 GAMSS/Resources/Assets.xcassets/xmarkCircleFillGray.imageset/Contents.json create mode 100644 GAMSS/Resources/Assets.xcassets/xmarkCircleFillGray.imageset/Union.png create mode 100644 GAMSS/Resources/Assets.xcassets/xmarkCircleFillGray.imageset/Union@2x.png create mode 100644 GAMSS/Resources/Assets.xcassets/xmarkCircleFillGray.imageset/Union@3x.png 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 0000000000000000000000000000000000000000..496136f675be7f68edba164535cd6aa3efc71a98 GIT binary patch literal 473 zcmV;~0Ve*5P)f>=O-dQa6Fx3 z&Xaa=f;=W6t{dfu5}E6+9Dx_m?OIK9APE9LF3xf2Ox|VDhCT3m2_h;IZO1sf9ipX* zH16nYv-wC*j!&P&<|9eBc9ymx5zW+T<6jeclX3)`#B$9ug7{TtYV&>o^^T6=q`V*z P00000NkvXXu0mjf>%PM< literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f6eb533c2d5575d1ea73a06e8140b12de83de35d GIT binary patch literal 842 zcmV-Q1GW5#P)YGbifx7et>M6JfMiv(P1iE!jYCgFjZ`%+~LfwZLQ6Eca6-kWRK_0&bfD9 zcbQV)x^C{aZ&e{aB$5sM+L7fZ5&O(^y1ZySpqu22Q%DYorAk6MN{27Z$Cfc4FD^Vk zGg+zfq()>8Gm`vGN>cxP?s=073zLfN%H9Esyn(n(|ArhBKfAY9q?;eD>#1Y|qC=Vk z5HcrUDE_+Xw7y1kA<7lED#9OV&cNokki*7^tXy_&B=?HOD{WrzSC(W`E7j6}Vxj7$ z60wKft-`7vzb6Ja_ufH%Kei2&y6V52c}*0> z=`;r-QVYoNaVQZ|)1FhQzZ4XYKUna|m?IT}G>AM;aFTSIh3nkmlXzL?{hfxI^Q=j2^^qFKZhC|Jh zidvba%3d&Ov_RO%E@c2K8NRMlEk#C^7hF5&%V@#SME}LQAo`9lN+Zc=*tjZh@3_dB z><=D42nGUhd495=FhN2;BA(S-BrhfI!O7Jzro`KbK8M~J4eq1~LSeoe3x2!ZD-?<= zP&iWzH*i(J7rlnOKCx!!*NS#Ne_vhm}HPg5UZUR5FJ zv*;L_DWab6n<}lXuIWKymw!C~>|#ZoUw(Ywfr3C2VaIW--+$E`B--Jj4JN>V zu#3KbaCzx^W=l=T0qte9RSbwHCS<3Q49z-t3#OXW03o)nFHR4p$xS4=QQvN|X+?)8=G6(hal#?A9$>c^>OCUC3(*TV|Yso^fXVSDmx)2o&!OFecQ*g zyc?C|K!OB({{-d-d->55>-){utK?)#lTj4U8MIfcIo0IMkYs3P%{0S_89CSSm8UO@ zE@*;NQ#1Vt1~a$$#%E2EDF@%&YRJ0k*bRXi*KIc-SgUWhh^VQt2Sm}{k?T;CD%ix< zT8!99Mj$_IH!OL%6pv$q;XbMZnn-FhAW4K;Zx_mvBV{rk2f2+XuWGQyp_N)Y@LzyF zsI)gdmZ7O98QBDVPns z?8Ki%=)sJj#wTJuusL#%0TM_U22v>y4SHhk5+u=Og019CGUCHDMEg(zN&%BZ>_Rbc zH|?hgNF=i#rt)E!=%E7z@$eydtV#L_1t6wOnprd$orkK~L?4;m19NmGohg2Rb_)dfQJ*LoAt2E3P(PzfHr8T_2H3r zT8EuMhgIqYHFh-byIN#PgGGFfGnf+j4}27`T(1M|#_$HOD- z&CR#o^77+8i_~C_VAFP(U@HHnYIoVhI|Im3WF%FMG#LE_YCy5XTMnECeWXTSA232P zY7ExlK8XrJp!H7|Zf=RrZPlU*vCfN&)^!tjlL!i?e?+Z0t?UH04BS`N&GeGC*|yJJ@n~#aS@Itec2sdRscbVqtp&-V{IB?-oRs- wb1A*a&dCIYNM;eWWp-xTV~zDpG&T Date: Wed, 16 Sep 2026 10:48:07 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[FEAT]=20=EA=B2=80=EC=83=89=EC=B0=BD=20xmar?= =?UTF-8?q?k=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 입력 텍스트 유무에 따른 xmark버튼 숨김처리 --- .../Components/ConversationSearchView.swift | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) 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: {