From 73f2b74a0229f1ac017b5950929b26a7fe3ae0e8 Mon Sep 17 00:00:00 2001 From: youlalala Date: Thu, 16 Nov 2023 00:48:42 +0900 Subject: [PATCH 1/5] =?UTF-8?q?feat=20:=20Button=20=EC=8A=A4=ED=83=80?= =?UTF-8?q?=EC=9D=BC=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{btn_login.xml => btn_background.xml} | 5 ++- .../core/ui/src/main/res/drawable/ic_logo.xml | 2 +- .../core/ui/src/main/res/values/dimens.xml | 2 +- .../core/ui/src/main/res/values/themes.xml | 7 ++++ .../src/main/res/layout/fragment_login.xml | 10 ++---- .../src/main/res/layout/fragment_nickname.xml | 32 +++++++++++++++++++ .../login/src/main/res/values/strings.xml | 5 +++ 7 files changed, 50 insertions(+), 13 deletions(-) rename android/core/ui/src/main/res/drawable/{btn_login.xml => btn_background.xml} (58%) create mode 100644 android/feature/login/src/main/res/values/strings.xml diff --git a/android/core/ui/src/main/res/drawable/btn_login.xml b/android/core/ui/src/main/res/drawable/btn_background.xml similarity index 58% rename from android/core/ui/src/main/res/drawable/btn_login.xml rename to android/core/ui/src/main/res/drawable/btn_background.xml index a10613e..50da2f6 100644 --- a/android/core/ui/src/main/res/drawable/btn_login.xml +++ b/android/core/ui/src/main/res/drawable/btn_background.xml @@ -1,7 +1,6 @@ - - - + + \ No newline at end of file diff --git a/android/core/ui/src/main/res/drawable/ic_logo.xml b/android/core/ui/src/main/res/drawable/ic_logo.xml index 0058c09..ec2704c 100644 --- a/android/core/ui/src/main/res/drawable/ic_logo.xml +++ b/android/core/ui/src/main/res/drawable/ic_logo.xml @@ -4,6 +4,6 @@ android:viewportWidth="231" android:viewportHeight="48"> diff --git a/android/core/ui/src/main/res/values/dimens.xml b/android/core/ui/src/main/res/values/dimens.xml index 4987c94..f7c539f 100644 --- a/android/core/ui/src/main/res/values/dimens.xml +++ b/android/core/ui/src/main/res/values/dimens.xml @@ -12,5 +12,5 @@ 168dp 50dp - 10dp + 10dp \ No newline at end of file diff --git a/android/core/ui/src/main/res/values/themes.xml b/android/core/ui/src/main/res/values/themes.xml index 608e4c5..0e001d8 100644 --- a/android/core/ui/src/main/res/values/themes.xml +++ b/android/core/ui/src/main/res/values/themes.xml @@ -1,4 +1,5 @@ + + \ No newline at end of file diff --git a/android/feature/login/src/main/res/layout/fragment_login.xml b/android/feature/login/src/main/res/layout/fragment_login.xml index 90ce733..a27bf16 100644 --- a/android/feature/login/src/main/res/layout/fragment_login.xml +++ b/android/feature/login/src/main/res/layout/fragment_login.xml @@ -14,7 +14,6 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - \ No newline at end of file diff --git a/android/feature/login/src/main/res/layout/fragment_nickname.xml b/android/feature/login/src/main/res/layout/fragment_nickname.xml index 80b7b4f..568b5f4 100644 --- a/android/feature/login/src/main/res/layout/fragment_nickname.xml +++ b/android/feature/login/src/main/res/layout/fragment_nickname.xml @@ -21,6 +21,38 @@ app:layout_constraintTop_toTopOf="parent" app:navigationIcon="@drawable/ic_arrow_back" /> + + + + + + \ No newline at end of file diff --git a/android/feature/login/src/main/res/values/strings.xml b/android/feature/login/src/main/res/values/strings.xml new file mode 100644 index 0000000..dd0b10f --- /dev/null +++ b/android/feature/login/src/main/res/values/strings.xml @@ -0,0 +1,5 @@ + + + 사용하실 닉네임을\n 입력해주세요 :) + 시작하기 + \ No newline at end of file From f8b492a93216d14991c8afe3aeb131a4343af1d1 Mon Sep 17 00:00:00 2001 From: youlalala Date: Thu, 16 Nov 2023 00:51:56 +0900 Subject: [PATCH 2/5] =?UTF-8?q?feat=20:=20Login=20->=20Nickname=20navigati?= =?UTF-8?q?on=20action=20=EC=A0=95=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ohdodok/catchytape/feature/login/LoginFragment.kt | 6 ++++++ .../login/src/main/res/navigation/login_navigation.xml | 6 +++++- android/feature/login/src/main/res/values/strings.xml | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/LoginFragment.kt b/android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/LoginFragment.kt index 9649dfe..c13cff3 100644 --- a/android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/LoginFragment.kt +++ b/android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/LoginFragment.kt @@ -3,6 +3,7 @@ package com.ohdodok.catchytape.feature.login import android.os.Bundle import android.view.View import androidx.fragment.app.viewModels +import androidx.navigation.fragment.findNavController import com.ohdodok.catchytape.core.ui.BaseFragment import com.ohdodok.catchytape.feature.login.databinding.FragmentLoginBinding import dagger.hilt.android.AndroidEntryPoint @@ -15,5 +16,10 @@ class LoginFragment : BaseFragment(R.layout.fragment_login override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) binding.viewModel = viewModel + + // TODO : Nickname Fragment Test 를 위한 코드로 추후 변경 해야함 + binding.btnGoogleLogin.setOnClickListener { + findNavController().navigate(R.id.action_login_fragment_to_nickname_fragment) + } } } \ No newline at end of file diff --git a/android/feature/login/src/main/res/navigation/login_navigation.xml b/android/feature/login/src/main/res/navigation/login_navigation.xml index dbfb6d5..3f76876 100644 --- a/android/feature/login/src/main/res/navigation/login_navigation.xml +++ b/android/feature/login/src/main/res/navigation/login_navigation.xml @@ -9,8 +9,12 @@ android:id="@+id/login_fragment" android:name="com.ohdodok.catchytape.feature.login.LoginFragment" android:label="login" - tools:layout="@layout/fragment_login"/> + tools:layout="@layout/fragment_login"> + + - 사용하실 닉네임을\n 입력해주세요 :) + 사용하실 닉네임을\n입력해주세요 :) 시작하기 \ No newline at end of file From cbbcb0780bb7b30a35b44d4b6fcb59c57dce8db0 Mon Sep 17 00:00:00 2001 From: youlalala Date: Thu, 16 Nov 2023 03:09:52 +0900 Subject: [PATCH 3/5] =?UTF-8?q?feat=20:=20Edit=20Text=20=EC=8A=A4=ED=83=80?= =?UTF-8?q?=EC=9D=BC=20=EC=A0=95=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/src/main/res/drawable/et_background.xml | 17 +++++++++++++++++ android/core/ui/src/main/res/values/colors.xml | 1 + android/core/ui/src/main/res/values/dimens.xml | 2 ++ android/core/ui/src/main/res/values/strings.xml | 7 ------- android/core/ui/src/main/res/values/themes.xml | 15 ++++++++++++++- .../feature/login/NicknameFragment.kt | 8 ++++++++ .../src/main/res/layout/fragment_nickname.xml | 13 ++++++++----- .../login/src/main/res/values/strings.xml | 5 +++++ 8 files changed, 55 insertions(+), 13 deletions(-) create mode 100644 android/core/ui/src/main/res/drawable/et_background.xml diff --git a/android/core/ui/src/main/res/drawable/et_background.xml b/android/core/ui/src/main/res/drawable/et_background.xml new file mode 100644 index 0000000..d360c01 --- /dev/null +++ b/android/core/ui/src/main/res/drawable/et_background.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/core/ui/src/main/res/values/colors.xml b/android/core/ui/src/main/res/values/colors.xml index 0fc6d89..c8cb6d0 100644 --- a/android/core/ui/src/main/res/values/colors.xml +++ b/android/core/ui/src/main/res/values/colors.xml @@ -3,6 +3,7 @@ #FF000000 #FFFFFFFF #FFBB2649 + #FFF5D4DC #FFF5F5F5 #FFBB2649 diff --git a/android/core/ui/src/main/res/values/dimens.xml b/android/core/ui/src/main/res/values/dimens.xml index f7c539f..aaac538 100644 --- a/android/core/ui/src/main/res/values/dimens.xml +++ b/android/core/ui/src/main/res/values/dimens.xml @@ -13,4 +13,6 @@ 50dp 10dp + + 50dp \ No newline at end of file diff --git a/android/core/ui/src/main/res/values/strings.xml b/android/core/ui/src/main/res/values/strings.xml index 3b7ce4d..f1d1bcb 100644 --- a/android/core/ui/src/main/res/values/strings.xml +++ b/android/core/ui/src/main/res/values/strings.xml @@ -1,9 +1,5 @@ - 구글로 로그인 - 가입 완료 - 닉네임을 입력하세요 - 검색 재생목록 @@ -33,7 +29,4 @@ 제목 장르 설명 - - 구글계정으로 로그인 - \ No newline at end of file diff --git a/android/core/ui/src/main/res/values/themes.xml b/android/core/ui/src/main/res/values/themes.xml index 0e001d8..a99cbe5 100644 --- a/android/core/ui/src/main/res/values/themes.xml +++ b/android/core/ui/src/main/res/values/themes.xml @@ -1,7 +1,8 @@ + + \ No newline at end of file diff --git a/android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/NicknameFragment.kt b/android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/NicknameFragment.kt index 969ae33..9709da0 100644 --- a/android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/NicknameFragment.kt +++ b/android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/NicknameFragment.kt @@ -2,6 +2,7 @@ package com.ohdodok.catchytape.feature.login import android.os.Bundle import android.view.View +import androidx.navigation.fragment.findNavController import com.ohdodok.catchytape.core.ui.BaseFragment import com.ohdodok.catchytape.feature.login.databinding.FragmentNicknameBinding import dagger.hilt.android.AndroidEntryPoint @@ -11,5 +12,12 @@ class NicknameFragment : BaseFragment(R.layout.fragment override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + setUpAppbar() + } + + private fun setUpAppbar() { + binding.tbNickname.setNavigationOnClickListener { + findNavController().popBackStack() + } } } \ No newline at end of file diff --git a/android/feature/login/src/main/res/layout/fragment_nickname.xml b/android/feature/login/src/main/res/layout/fragment_nickname.xml index 568b5f4..175bd1c 100644 --- a/android/feature/login/src/main/res/layout/fragment_nickname.xml +++ b/android/feature/login/src/main/res/layout/fragment_nickname.xml @@ -33,14 +33,17 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tb_nickname" /> - + app:layout_constraintTop_toBottomOf="@id/tv_nickname_title" /> + + 구글계정으로 로그인 + + 사용하실 닉네임을\n입력해주세요 :) + 닉네임 시작하기 \ No newline at end of file From 8d58e045d3b7e818cdc8f04a804d964a645cf8ec Mon Sep 17 00:00:00 2001 From: youlalala Date: Thu, 16 Nov 2023 03:31:00 +0900 Subject: [PATCH 4/5] =?UTF-8?q?feat=20:=20night=20theme=20colorAccent=20?= =?UTF-8?q?=EC=A0=95=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/core/ui/src/main/res/values-night/themes.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android/core/ui/src/main/res/values-night/themes.xml b/android/core/ui/src/main/res/values-night/themes.xml index 7389384..1d3cb6b 100644 --- a/android/core/ui/src/main/res/values-night/themes.xml +++ b/android/core/ui/src/main/res/values-night/themes.xml @@ -1,6 +1,7 @@