From cbbc8696b30cf91853e8951937e448d0feb83a05 Mon Sep 17 00:00:00 2001 From: Seoyeon Park Date: Sat, 29 Jul 2023 21:46:24 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[Feat]=20:=20figma=20=EA=B8=B0=EB=B0=98=20?= =?UTF-8?q?=EC=9E=AC=EB=94=94=EC=9E=90=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/ui/mypage/ProfileActivity.kt | 15 + .../presentation/ui/mypage/ProfileFragment.kt | 21 -- app/src/main/res/drawable/ic_pencil.png | Bin 0 -> 798 bytes app/src/main/res/drawable/ic_photo_back.png | Bin 0 -> 830 bytes app/src/main/res/drawable/ic_photo_camera.png | Bin 0 -> 515 bytes app/src/main/res/drawable/ic_photo_change.xml | 9 + app/src/main/res/drawable/ic_user.xml | 9 + app/src/main/res/drawable/ic_user_back.png | Bin 0 -> 6330 bytes app/src/main/res/drawable/ic_user_img.png | Bin 0 -> 3091 bytes app/src/main/res/drawable/icon_back_arrow.png | Bin 2646 -> 0 bytes app/src/main/res/drawable/icon_edit.png | Bin 12950 -> 0 bytes app/src/main/res/drawable/icon_user_img.png | Bin 19994 -> 0 bytes app/src/main/res/layout/activity_profile.xml | 279 ++++++++++++++++++ app/src/main/res/layout/fragment_mypage.xml | 6 +- app/src/main/res/layout/fragment_profile.xml | 211 ------------- app/src/main/res/values/strings.xml | 10 +- 16 files changed, 319 insertions(+), 241 deletions(-) create mode 100644 app/src/main/java/com/example/cherry_pick_android/presentation/ui/mypage/ProfileActivity.kt delete mode 100644 app/src/main/java/com/example/cherry_pick_android/presentation/ui/mypage/ProfileFragment.kt create mode 100644 app/src/main/res/drawable/ic_pencil.png create mode 100644 app/src/main/res/drawable/ic_photo_back.png create mode 100644 app/src/main/res/drawable/ic_photo_camera.png create mode 100644 app/src/main/res/drawable/ic_photo_change.xml create mode 100644 app/src/main/res/drawable/ic_user.xml create mode 100644 app/src/main/res/drawable/ic_user_back.png create mode 100644 app/src/main/res/drawable/ic_user_img.png delete mode 100644 app/src/main/res/drawable/icon_back_arrow.png delete mode 100644 app/src/main/res/drawable/icon_edit.png delete mode 100644 app/src/main/res/drawable/icon_user_img.png create mode 100644 app/src/main/res/layout/activity_profile.xml delete mode 100644 app/src/main/res/layout/fragment_profile.xml diff --git a/app/src/main/java/com/example/cherry_pick_android/presentation/ui/mypage/ProfileActivity.kt b/app/src/main/java/com/example/cherry_pick_android/presentation/ui/mypage/ProfileActivity.kt new file mode 100644 index 00000000..28e71bd7 --- /dev/null +++ b/app/src/main/java/com/example/cherry_pick_android/presentation/ui/mypage/ProfileActivity.kt @@ -0,0 +1,15 @@ +package com.example.cherry_pick_android.presentation.ui.mypage + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import com.example.cherry_pick_android.databinding.ActivityProfileBinding + +class ProfileActivity : AppCompatActivity() { + private lateinit var binding: ActivityProfileBinding + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + binding = ActivityProfileBinding.inflate(layoutInflater) + val view = binding.root + setContentView(view) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/cherry_pick_android/presentation/ui/mypage/ProfileFragment.kt b/app/src/main/java/com/example/cherry_pick_android/presentation/ui/mypage/ProfileFragment.kt deleted file mode 100644 index 64aa3ade..00000000 --- a/app/src/main/java/com/example/cherry_pick_android/presentation/ui/mypage/ProfileFragment.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.example.cherry_pick_android.presentation.ui.mypage - - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.fragment.app.Fragment -import com.example.cherry_pick_android.R - -class ProfileFragment : Fragment() { - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View { - // Inflate the layout for this fragment - return inflater.inflate(R.layout.fragment_profile, container, false) - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_pencil.png b/app/src/main/res/drawable/ic_pencil.png new file mode 100644 index 0000000000000000000000000000000000000000..fbdf502b07bd6ef6a610f732fb6f74d7e3e5662a GIT binary patch literal 798 zcmV+(1L6FMP)BvxR5eNCv_E+~p419LK*^T}yD-8J060;1chuLVdh`--b%cvAqG?-%0FudU z2c$e!xAtqEas?60@caB*-D|Li7RU>AYqIsp5$xAtSwppuWi?o~P$Ohn1vUb%<;SEx zl3K%=+B`vj@5*eEe^~Z zr7`27tMt5oe$lH6;BNE$%Rbb#C6*m4P%r?^sQ59i)Ec#tOWJ;?er|$4mwJ6?P@=a z3Hf9GvAo*})Np}rj=hJZyhE+tg_vL~kd#-bC90bqe*2EECz1ZgHZu_I0*k=m<&C#FJ=l;|AIxviOBkfM(Xv z?vd&|`Lp^I(v;OP+6%H`G0-MsXh=xP2pSra(uRhJq_m)+BB|EUkdag?Xy{04D|84* zsu4OABvlI?5|XNf4h=~?fDRE!JzUfe5J}yE%2$WSLqt+{_b7t)8(O0}Mp8G&Xnt(2 z|AOy&KvElf^xFTB?FmWULf6qQ_^d}Hbqhs&2EOVUNo@>W8H0})AgOFJ@-`7MK~lvY z^)L}JLQ(}3-9nimsT?Y!7vL&}NUGSQjwT|eND7@zM2wNtIG>0tuS}qPkLRZ+z_>A_ z7;8F3_Q?c^e;`^f)k`dOFX8pkn6CS)Kf3PcBLBDr{8HaVD5$E61;at2u!oRcWQE_M cqaJnt0dqF(HVD+F{{R3007*qoM6N<$f){UU^Z)<= literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_photo_back.png b/app/src/main/res/drawable/ic_photo_back.png new file mode 100644 index 0000000000000000000000000000000000000000..9c7b42c38dd9fb880b392dbfa3767ec445bf32a7 GIT binary patch literal 830 zcmV-E1Ht@>P)YzHwd{w1Qf**Zr~IY+vo;%PJlQ8UWZ6cYh=Zi z|1y>oOC$KIT+-OGJkLGT)9M~Vh49nYT{un;3Wor7<*kmq+@;GxxiSQ+2{`_RC<^Gu zrwJ;8P!fLjMg%y05FaBIP=rwK6yQ(fmlao7kQU<5ncSj>YMCHrpT2$gf&%O;=mCW+ z6M}AzX!JSU1@S;U z7axe2!V|tKrl4C9wcTl`Z6ETB)0ZM7=H`n@aMQl#$ysPN)PBMyqWFlu ze+;r_-a>kNJNbeadt%(TCtGi0NO$n^%P=q(H0~*qh!z>qBW?l3_0bZHE>7S z869lIRcIOi1vMQJL?PNkm^cNa1fCtR2x45LEihdxD6XuOQ9GPi2vLBx;5dO!l5qd@ zH=3J+GbNl6D4JBOlAzXeFuaEjDw4Xe2peh7VhizAl$kR-o#s7MGs4p3%y<&ccA$8vVoK^Sy%lkE|e7$l2LvGVB$35gP{z`Cnc;l)z4(| z7*kY8MrlEdq@_(M&mDuW`cGD@pQ2{H@(DmNCJ2C-Mu(X zWa-6{H!*T*DDK4>f;_?G=BX$-*en!~XU^_w(;q!=FQe2M3VG0@V5g~1MW9}6VDBxBua4x}D9d>T5EGY);Z$t~n_L)x`&Y`gbe7^EN0wjoP%*nWJ zMyc~mvA-LB3y3K~2~xU~CEwuAq=w8YNpn)6PGb)v1+Ka7dXjH#o=c5Lp=K0`zNeuA z3mO1!3N%dzZEt@4FIiK7!XVq}n#RE=_+pFpf(!lxz5ql3Bm5pPQF{OY002ovPDHLk FV1f?p(Z2uy literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_photo_change.xml b/app/src/main/res/drawable/ic_photo_change.xml new file mode 100644 index 00000000..7716e37c --- /dev/null +++ b/app/src/main/res/drawable/ic_photo_change.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml new file mode 100644 index 00000000..e8a17c2a --- /dev/null +++ b/app/src/main/res/drawable/ic_user.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_user_back.png b/app/src/main/res/drawable/ic_user_back.png new file mode 100644 index 0000000000000000000000000000000000000000..bd33939ce80791029273ad3d527fcadccb3555c5 GIT binary patch literal 6330 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 QIRO3{>YC}4Yq{L|9|av?egFUf literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_user_img.png b/app/src/main/res/drawable/ic_user_img.png new file mode 100644 index 0000000000000000000000000000000000000000..3aefa79a190ba4147584cf29e72eb9c93a3e4089 GIT binary patch literal 3091 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/icon_back_arrow.png b/app/src/main/res/drawable/icon_back_arrow.png deleted file mode 100644 index d9315870250701333c7d0357183ba18e6b15e39f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2646 zcmeHJX;4#V6n%LlWr?`9K~cmi6cs|T$ReOYhgDe=a6!OG(L^OcAb|&heNm~3ir^sP z22rUSB0*LSB2imWEK5{~hzThmCJ=&1V$hiP`e-|j&Nx$B{nx&k@0|PHbLYF~-d`_c zd4RXEk*N^?0LH#P9zg&AVj&0^=wWp0ti>IS^jJ%LLktWII(`e3Vpl_^Pbdoj#?nU* zE-Pb4JeHio_FTgbj-#=m$b^jm1VOf&W20G7k<5*@aS8O}N;gyNRs3?l5Kk0EvHJhN z|MCV7MmC3F^Iv2K1q1^)P!CV|Lf^oUIA-j)@e?L~`4wr3>2&iMUt3sO&7L#Y+J^k? zdbAg{)k)CUk9Bcmy?aBaOZ(nh_J1z+ywmTT?kZ(s%9N zv;RO=&Y|4AW5)})Cr_O@cfROi@ud=8>E*JD%Bt!sSNS#9>jbxcx!rKDu|;_Q!NWGu zqxQ#7q+Q)TPkW!q^d9FqKaK&*vC zdeiEMZWkXsv}~{KcRh|dTFZ1hQMk2c*{M6dZA)YCl4t(BVQ$_-ni{dvH7scDJ>fv* zin`S%ifh~~R#MZ;S3gjK&pw*BuD;8=Aho-2a2K?#EWWYmjJ=t~7W=#sZ6$JDs8PCh zga$c61DnifVYbk*^!yC9G8xQ(eSG8L6eWYjEIc?WAl8m!m@PKWVIH)KYMAouSWQp!-%B zy#GOo>R{JO&e5)}RU8rOE>2Hqk|BvQQ+^Noi0`hMX}Oi?mhWk}_)2ZSk= zPa+GoB4zLi$E)y4UWb>4hpW$2QuWU+h)Y0=qQy>pxK=6<>iVNi4q)jM&U`qRm-DNV zidY^I*O6RVY?R-ak3FFtYbLIPstwRz3@8#Lw#{W3(oJ<4078OnZ+Amb-X z;N2{54ey-Tl@F)n`6Qu`nHwLDkaY=l+Hf~MDg&(omDDWP6gKK#Uz3u64lJ5%DuxH$ zoC1{;MP*mJj+eyJ`NI!7RZjnsL{wO({&e{F21bp44hPsA;_y$|gwuO2DD>Lb-aL8; z+SAxk2*04Eoq<)7Hpa2Agt8|4>AtH?KEP+*rW!&0ItaKX>5!U#jiiM}(msN6Z zEk%_jVe87BsHh^bpIdue)hxM`gOfh9-5uMi_G{pABJdS`{Jk7m{#v{TFD9L%7&w1- zBC{l_x@(mQPFPc7ut!o636@n~#saaYyDDJ%%o(W~OzMAgn4=(DgQrE;GqGUgM~)&Q zC7YvIxE#M>&=V{Z4Y}a(_1h4u8$-?H=qxL6Wlz&Wkf)J$~{( zBL8a~^}Ai|=4iLSZE6!NNc(eF#hz^eZ@c~NER$@cHr~yo=koa&wupLV?cj9QFlo~B zJ`3WN8;#|JF$F!nST5-W1D8s3PO0Lov@Ia7@05??(VcXn3>swM>H-rnTHi+E02+-Y4l7|Y1@iILfSmBe-1%W z(0}?a=#~0p7@jT7HPmDBqP>V~BJUF7zb(puvB*x zY|AW1jjFfw9td+Ncry#)heSd5ka=2^eZk%#dEa&OLX^I4Qiq~(tGs2!3-jdr%f6pl zH!N`pLUu;eTmx^~rl6&-v?eb84YbbTraP3r!TuWEe0s)Xm8JEnxRGRL^0PK4F03kQ cB5CCaDC6Y2O`HZwNB?JhJp(*SmaO0LJI${AQvd(} diff --git a/app/src/main/res/drawable/icon_edit.png b/app/src/main/res/drawable/icon_edit.png deleted file mode 100644 index b256429f9217d746828febc8e27d365ca899c468..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12950 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 f7`KlJqSe0UpWQpLgYw}2kU-F& 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mypage.xml b/app/src/main/res/layout/fragment_mypage.xml index cdd7e285..6379ceec 100644 --- a/app/src/main/res/layout/fragment_mypage.xml +++ b/app/src/main/res/layout/fragment_mypage.xml @@ -28,11 +28,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 21b455b3..0637f2f4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,13 +12,15 @@ 개인정보처리방침 - 프로필 - 사진변경 + 계정 설정 + 회원탈퇴 이름 - 생일 성별 + 생년월일 + 직군 정보 + 로그아웃 - 회원탈퇴 + \ No newline at end of file From 84406b682beb3d0a2f839f1c12bbb8e6bbd92065 Mon Sep 17 00:00:00 2001 From: Seoyeon Park Date: Sat, 29 Jul 2023 21:55:51 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[Feat]=20:=20figma=20=EA=B8=B0=EB=B0=98=20?= =?UTF-8?q?=EC=9E=AC=EB=94=94=EC=9E=90=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_profile.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml index fb9a7e8e..8cbd12cf 100644 --- a/app/src/main/res/layout/activity_profile.xml +++ b/app/src/main/res/layout/activity_profile.xml @@ -32,7 +32,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/mypage_profile_setting" - android:textSize="20dp" + android:textSize="20sp" android:textColor="@color/black" android:layout_gravity="left" /> @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/profile_leave_account" - android:textSize="14dp" + android:textSize="14sp" android:textColor="@color/gray_4" android:layout_margin="20dp" android:layout_gravity="right" /> @@ -60,6 +60,7 @@ android:id="@+id/cl_profile" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_margin="10dp" app:layout_constraintBottom_toTopOf="@+id/ll_profile" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" > @@ -151,7 +152,7 @@ @@ -183,7 +184,7 @@ @@ -215,7 +216,7 @@ @@ -267,7 +268,7 @@ From e70b66a74f230c9d34f7c6f3bdc4b809e26d13b0 Mon Sep 17 00:00:00 2001 From: Seoyeon Park Date: Sat, 29 Jul 2023 22:10:25 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[Feat]=20:=20figma=EA=B8=B0=EB=B0=98=20?= =?UTF-8?q?=EC=9E=AC=EB=94=94=EC=9E=90=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_profile.xml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml index 8cbd12cf..7c533362 100644 --- a/app/src/main/res/layout/activity_profile.xml +++ b/app/src/main/res/layout/activity_profile.xml @@ -129,8 +129,7 @@ android:background="@null" android:text="@string/mypage_user_id" android:textColor="@color/black" - android:textSize="18sp" - android:textStyle="normal" /> + android:textSize="18sp" /> + android:textSize="18sp"/> @@ -209,8 +207,7 @@ android:background="@null" android:text="@string/profile_birth" android:textColor="@color/black" - android:textSize="18sp" - android:textStyle="normal" /> + android:textSize="18sp" /> @@ -247,8 +244,7 @@ android:background="@null" android:text="@string/profile_job" android:textColor="@color/black" - android:textSize="18sp" - android:textStyle="normal" /> + android:textSize="18sp" />