From 5ff00d7e1e9681794dcc7f3dd0d3197def5074d2 Mon Sep 17 00:00:00 2001 From: b1urrrr Date: Sun, 9 Jul 2023 23:52:59 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[ADD/#34]=20=EC=84=A4=EC=A0=95=20=ED=85=8D?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EB=B7=B0=20=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable/ic_setting_kakao.xml | 25 +++++++ app/src/main/res/layout/fragment_setting.xml | 74 ++++++++++++++++++- app/src/main/res/values/strings.xml | 7 +- 3 files changed, 100 insertions(+), 6 deletions(-) create mode 100644 app/src/main/res/drawable/ic_setting_kakao.xml diff --git a/app/src/main/res/drawable/ic_setting_kakao.xml b/app/src/main/res/drawable/ic_setting_kakao.xml new file mode 100644 index 0000000..500de75 --- /dev/null +++ b/app/src/main/res/drawable/ic_setting_kakao.xml @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml index 6b609ff..24ca009 100644 --- a/app/src/main/res/layout/fragment_setting.xml +++ b/app/src/main/res/layout/fragment_setting.xml @@ -1,16 +1,82 @@ + android:layout_height="match_parent" + android:background="@color/gray050"> + android:id="@+id/tv_setting_title" + style="@style/HeadingSemibold24" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="25dp" + android:layout_marginTop="56dp" + android:text="@string/setting_title" + 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 9c30731..3568bc0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -54,11 +54,14 @@ 삭제하기 삭제 완료 - + + 설정 + + 검색결과가 없습니다. 네트워크 연결에 실패했습니다. Hello blank fragment - + 로그인 정보 \ No newline at end of file From f143ca976e71bc52be8a240b3534eab29043af19 Mon Sep 17 00:00:00 2001 From: b1urrrr Date: Mon, 10 Jul 2023 05:25:11 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[UI/#34]=20=EC=84=A4=EC=A0=95=20UI=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable/ic_setting_detail.xml | 13 + app/src/main/res/layout/fragment_setting.xml | 282 +++++++++++++----- app/src/main/res/values/strings.xml | 8 + 3 files changed, 231 insertions(+), 72 deletions(-) create mode 100644 app/src/main/res/drawable/ic_setting_detail.xml diff --git a/app/src/main/res/drawable/ic_setting_detail.xml b/app/src/main/res/drawable/ic_setting_detail.xml new file mode 100644 index 0000000..a007e65 --- /dev/null +++ b/app/src/main/res/drawable/ic_setting_detail.xml @@ -0,0 +1,13 @@ + + + diff --git a/app/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml index 24ca009..7c76f07 100644 --- a/app/src/main/res/layout/fragment_setting.xml +++ b/app/src/main/res/layout/fragment_setting.xml @@ -4,79 +4,217 @@ xmlns:tools="http://schemas.android.com/tools" tools:context=".presentation.main.setting.SettingFragment"> - + android:layout_height="match_parent"> - - - - - - - - - - - - + android:background="@color/gray050"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 3568bc0..99650af 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -64,4 +64,12 @@ Hello blank fragment 로그인 정보 + 자동 로그인 사용 + 푸시 알람 설정 + 버전 정보 + 서비스 이용 약관 + 개인정보 처리방침 + 오픈소스 라이센스 + 로그아웃 + 탈퇴하기 \ No newline at end of file From 5975a997b0a5949a05dc44c0468c6751091a1669 Mon Sep 17 00:00:00 2001 From: b1urrrr Date: Mon, 10 Jul 2023 05:26:01 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[MOD/#34]=20setting=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?string=EA=B0=92=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/strings.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 99650af..8d9165d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -56,13 +56,6 @@ 설정 - - - 검색결과가 없습니다. - 네트워크 연결에 실패했습니다. - - - Hello blank fragment 로그인 정보 자동 로그인 사용 푸시 알람 설정 @@ -72,4 +65,11 @@ 오픈소스 라이센스 로그아웃 탈퇴하기 + + + 검색결과가 없습니다. + 네트워크 연결에 실패했습니다. + + + Hello blank fragment \ No newline at end of file