From 16c0e2c36528fa8e40142c2c7efd0df327b51e3e Mon Sep 17 00:00:00 2001 From: 2taezeat Date: Wed, 15 Nov 2023 14:32:58 +0900 Subject: [PATCH 1/5] =?UTF-8?q?feat=20:=20LoginFragment=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../catchytape/feature/login/LoginFragment.kt | 19 ++++++++++++++++++ .../feature/login/LoginViewModel.kt | 8 ++++++++ .../src/main/res/layout/fragment_login.xml | 20 +++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/LoginFragment.kt create mode 100644 android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/LoginViewModel.kt create mode 100644 android/feature/login/src/main/res/layout/fragment_login.xml 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 new file mode 100644 index 0000000..9b0c3cf --- /dev/null +++ b/android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/LoginFragment.kt @@ -0,0 +1,19 @@ +package com.ohdodok.catchytape.feature.login + +import android.os.Bundle +import android.view.View +import androidx.fragment.app.viewModels +import com.ohdodok.catchytape.core.ui.BaseFragment +import com.ohdodok.catchytape.feature.login.databinding.FragmentLoginBinding +import dagger.hilt.android.AndroidEntryPoint + + +@AndroidEntryPoint +class LoginFragment : BaseFragment(R.layout.fragment_login){ + private val viewModel: LoginViewModel by viewModels() + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + binding.viewModel = viewModel + } +} \ No newline at end of file diff --git a/android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/LoginViewModel.kt b/android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/LoginViewModel.kt new file mode 100644 index 0000000..c59db7f --- /dev/null +++ b/android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/LoginViewModel.kt @@ -0,0 +1,8 @@ +package com.ohdodok.catchytape.feature.login + +import androidx.lifecycle.ViewModel + +class LoginViewModel : ViewModel() { + + +} \ 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 new file mode 100644 index 0000000..0ee6d63 --- /dev/null +++ b/android/feature/login/src/main/res/layout/fragment_login.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + \ No newline at end of file From 817c5b256ae98aca33114226fcb3b58dcff826ad Mon Sep 17 00:00:00 2001 From: 2taezeat Date: Wed, 15 Nov 2023 16:32:42 +0900 Subject: [PATCH 2/5] =?UTF-8?q?feat=20:=20fragment=5Flogin.xml=20UI=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/mipmap-anydpi-v26/ic_launcher.xml | 2 +- .../mipmap-anydpi-v26/ic_launcher_round.xml | 2 +- .../ui/src/main/res/drawable/btn_login.xml | 7 ++++ .../ui/src/main/res/drawable/ic_google.xml | 22 +++++++++++ .../main/res/drawable/ic_launcher_icon.xml} | 0 .../src/main/res/drawable/ic_login_icon.xml | 34 +++++++++++++++++ .../core/ui/src/main/res/drawable/ic_logo.xml | 9 +++++ .../core/ui/src/main/res/values/colors.xml | 1 + .../core/ui/src/main/res/values/dimens.xml | 7 ++++ .../core/ui/src/main/res/values/strings.xml | 2 + .../src/main/res/layout/fragment_login.xml | 38 +++++++++++++++++++ 11 files changed, 122 insertions(+), 2 deletions(-) create mode 100644 android/core/ui/src/main/res/drawable/btn_login.xml create mode 100644 android/core/ui/src/main/res/drawable/ic_google.xml rename android/{app/src/main/res/drawable/ic_launcher_foreground.xml => core/ui/src/main/res/drawable/ic_launcher_icon.xml} (100%) create mode 100644 android/core/ui/src/main/res/drawable/ic_login_icon.xml create mode 100644 android/core/ui/src/main/res/drawable/ic_logo.xml diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index ae64e17..1082d51 100644 --- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index ae64e17..1082d51 100644 --- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/android/core/ui/src/main/res/drawable/btn_login.xml b/android/core/ui/src/main/res/drawable/btn_login.xml new file mode 100644 index 0000000..a10613e --- /dev/null +++ b/android/core/ui/src/main/res/drawable/btn_login.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/android/core/ui/src/main/res/drawable/ic_google.xml b/android/core/ui/src/main/res/drawable/ic_google.xml new file mode 100644 index 0000000..f816540 --- /dev/null +++ b/android/core/ui/src/main/res/drawable/ic_google.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/android/core/ui/src/main/res/drawable/ic_launcher_icon.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_launcher_foreground.xml rename to android/core/ui/src/main/res/drawable/ic_launcher_icon.xml diff --git a/android/core/ui/src/main/res/drawable/ic_login_icon.xml b/android/core/ui/src/main/res/drawable/ic_login_icon.xml new file mode 100644 index 0000000..0e8fd30 --- /dev/null +++ b/android/core/ui/src/main/res/drawable/ic_login_icon.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/android/core/ui/src/main/res/drawable/ic_logo.xml b/android/core/ui/src/main/res/drawable/ic_logo.xml new file mode 100644 index 0000000..0058c09 --- /dev/null +++ b/android/core/ui/src/main/res/drawable/ic_logo.xml @@ -0,0 +1,9 @@ + + + diff --git a/android/core/ui/src/main/res/values/colors.xml b/android/core/ui/src/main/res/values/colors.xml index b658953..0fc6d89 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 + #FFF5F5F5 #FFBB2649 #FFF8E9ED diff --git a/android/core/ui/src/main/res/values/dimens.xml b/android/core/ui/src/main/res/values/dimens.xml index 97521aa..ab25d8c 100644 --- a/android/core/ui/src/main/res/values/dimens.xml +++ b/android/core/ui/src/main/res/values/dimens.xml @@ -9,4 +9,11 @@ 32dp 120dp + + 201dp + 168dp + + 300dp + 50dp + 10dp \ 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 9551e16..3b7ce4d 100644 --- a/android/core/ui/src/main/res/values/strings.xml +++ b/android/core/ui/src/main/res/values/strings.xml @@ -34,4 +34,6 @@ 장르 설명 + 구글계정으로 로그인 + \ 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 0ee6d63..5c0e10c 100644 --- a/android/feature/login/src/main/res/layout/fragment_login.xml +++ b/android/feature/login/src/main/res/layout/fragment_login.xml @@ -15,6 +15,44 @@ android:layout_height="match_parent"> + + + + + + +