diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index f8d25d2..85dfe12 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -12,7 +12,7 @@ android:supportsRtl="true" android:theme="@style/Theme.CatchyTape"> 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..2e30d41 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..2e30d41 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/app/src/main/res/navigation/catchytape_navigation.xml b/android/app/src/main/res/navigation/catchytape_navigation.xml index 541645a..342d242 100644 --- a/android/app/src/main/res/navigation/catchytape_navigation.xml +++ b/android/app/src/main/res/navigation/catchytape_navigation.xml @@ -2,8 +2,9 @@ + app:startDestination="@id/login_nav_graph"> + \ No newline at end of file diff --git a/android/build-logic/src/main/kotlin/gradle/plugin/AndroidFeaturePlugin.kt b/android/build-logic/src/main/kotlin/gradle/plugin/AndroidFeaturePlugin.kt index dfcb638..5bd3af0 100644 --- a/android/build-logic/src/main/kotlin/gradle/plugin/AndroidFeaturePlugin.kt +++ b/android/build-logic/src/main/kotlin/gradle/plugin/AndroidFeaturePlugin.kt @@ -29,6 +29,7 @@ class AndroidFeaturePlugin : Plugin { dependencies { add("implementation", project(":core:ui")) add("implementation", project(":core:domain")) + add("implementation", libs.findLibrary("timber").get()) add("testImplementation", libs.findLibrary("junit").get()) } 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..1d7de23 --- /dev/null +++ b/android/core/ui/src/main/res/drawable/ic_google.xml @@ -0,0 +1,18 @@ + + + + + + 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..5215d52 --- /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..4987c94 100644 --- a/android/core/ui/src/main/res/values/dimens.xml +++ b/android/core/ui/src/main/res/values/dimens.xml @@ -9,4 +9,8 @@ 32dp 120dp + 168dp + + 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/AndroidManifest.xml b/android/feature/login/src/main/AndroidManifest.xml index a5918e6..d9763b9 100644 --- a/android/feature/login/src/main/AndroidManifest.xml +++ b/android/feature/login/src/main/AndroidManifest.xml @@ -1,4 +1,10 @@ + + + + \ No newline at end of file diff --git a/android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/LoginActivity.kt b/android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/LoginActivity.kt new file mode 100644 index 0000000..59d0628 --- /dev/null +++ b/android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/LoginActivity.kt @@ -0,0 +1,14 @@ +package com.ohdodok.catchytape.feature.login + +import androidx.appcompat.app.AppCompatActivity +import android.os.Bundle +import dagger.hilt.android.AndroidEntryPoint + + +@AndroidEntryPoint +class LoginActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_login) + } +} \ No newline at end of file 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..9649dfe --- /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..3c8371e --- /dev/null +++ b/android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/LoginViewModel.kt @@ -0,0 +1,7 @@ +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/activity_login.xml b/android/feature/login/src/main/res/layout/activity_login.xml new file mode 100644 index 0000000..911b9c0 --- /dev/null +++ b/android/feature/login/src/main/res/layout/activity_login.xml @@ -0,0 +1,25 @@ + + + + + + + + + + \ 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..90ce733 --- /dev/null +++ b/android/feature/login/src/main/res/layout/fragment_login.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + \ 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 new file mode 100644 index 0000000..dbfb6d5 --- /dev/null +++ b/android/feature/login/src/main/res/navigation/login_navigation.xml @@ -0,0 +1,21 @@ + + + + + + + + + \ No newline at end of file