diff --git a/app/build.gradle b/app/build.gradle index 1ca7c56a..8c8ee129 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,6 +38,13 @@ android { kotlinOptions { jvmTarget = "1.8" } + sourceSets { + main { + res { + srcDirs 'src/main/res', 'src/main/res/2' + } + } + } } dependencies { diff --git a/app/src/main/java/com/engdiary/mureng/ui/login/LoginActivity.kt b/app/src/main/java/com/engdiary/mureng/ui/login/LoginActivity.kt new file mode 100644 index 00000000..bae1b75a --- /dev/null +++ b/app/src/main/java/com/engdiary/mureng/ui/login/LoginActivity.kt @@ -0,0 +1,40 @@ +package com.engdiary.mureng.ui.login + +import android.os.Bundle +import android.util.Log +import androidx.activity.viewModels +import androidx.appcompat.app.AppCompatActivity +import androidx.databinding.DataBindingUtil +import com.engdiary.mureng.R +import com.engdiary.mureng.databinding.ActivityLoginBinding +import com.engdiary.mureng.ui.base.BaseActivity +import com.engdiary.mureng.ui.main.MainViewModel + + +class LoginActivity: BaseActivity(R.layout.activity_login) { + private val TAG = "LoginActivity" + + override val viewModel: LoginViewModel by viewModels() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_login) + + binding.googleLogin.setOnClickListener { + } + + binding.kakaoLogin.setOnClickListener { + } + + + setContentView(binding.root) + +// val binding: ActivityLoginBinding = DataBindingUtil.setContentView(this, R.layout.activity_login) +// +// +// binding.kakaoLogin.setOnClickListener { +// Log.i(TAG, "Log i") +// } + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/engdiary/mureng/ui/login/LoginViewModel.kt b/app/src/main/java/com/engdiary/mureng/ui/login/LoginViewModel.kt new file mode 100644 index 00000000..cc3391d4 --- /dev/null +++ b/app/src/main/java/com/engdiary/mureng/ui/login/LoginViewModel.kt @@ -0,0 +1,23 @@ +package com.engdiary.mureng.ui.login + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import com.engdiary.mureng.network.MurengRepository +import com.engdiary.mureng.ui.base.BaseViewModel +import dagger.hilt.android.lifecycle.HiltViewModel +import javax.inject.Inject + +@HiltViewModel +class LoginViewModel @Inject constructor( + private val murengRepository: MurengRepository +) : BaseViewModel(murengRepository) { + + /** 생성자 */ + init { + + } + + override fun onCleared() { + super.onCleared() + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/group_145.png b/app/src/main/res/drawable-hdpi/group_145.png new file mode 100644 index 00000000..25dcdc74 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/group_145.png differ diff --git a/app/src/main/res/drawable-hdpi/icons_mureng.png b/app/src/main/res/drawable-hdpi/icons_mureng.png new file mode 100644 index 00000000..61e21437 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icons_mureng.png differ diff --git a/app/src/main/res/drawable-hdpi/icons_symbol_132_px.png b/app/src/main/res/drawable-hdpi/icons_symbol_132_px.png new file mode 100644 index 00000000..1bee60f7 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icons_symbol_132_px.png differ diff --git a/app/src/main/res/drawable-hdpi/kakao_login_large_wide_2.png b/app/src/main/res/drawable-hdpi/kakao_login_large_wide_2.png new file mode 100644 index 00000000..f6b70a50 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/kakao_login_large_wide_2.png differ diff --git a/app/src/main/res/drawable-mdpi/group_145.png b/app/src/main/res/drawable-mdpi/group_145.png new file mode 100644 index 00000000..86def6db Binary files /dev/null and b/app/src/main/res/drawable-mdpi/group_145.png differ diff --git a/app/src/main/res/drawable-mdpi/icons_mureng.png b/app/src/main/res/drawable-mdpi/icons_mureng.png new file mode 100644 index 00000000..065a67e5 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icons_mureng.png differ diff --git a/app/src/main/res/drawable-mdpi/icons_symbol_132_px.png b/app/src/main/res/drawable-mdpi/icons_symbol_132_px.png new file mode 100644 index 00000000..8ef0650c Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icons_symbol_132_px.png differ diff --git a/app/src/main/res/drawable-mdpi/kakao_login_large_wide_2.png b/app/src/main/res/drawable-mdpi/kakao_login_large_wide_2.png new file mode 100644 index 00000000..074d4d43 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/kakao_login_large_wide_2.png differ diff --git a/app/src/main/res/drawable-xhdpi/group_145.png b/app/src/main/res/drawable-xhdpi/group_145.png new file mode 100644 index 00000000..d8243967 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/group_145.png differ diff --git a/app/src/main/res/drawable-xhdpi/icons_mureng.png b/app/src/main/res/drawable-xhdpi/icons_mureng.png new file mode 100644 index 00000000..3dbd2867 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icons_mureng.png differ diff --git a/app/src/main/res/drawable-xhdpi/icons_symbol_132_px.png b/app/src/main/res/drawable-xhdpi/icons_symbol_132_px.png new file mode 100644 index 00000000..c2932c48 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icons_symbol_132_px.png differ diff --git a/app/src/main/res/drawable-xhdpi/kakao_login_large_wide_2.png b/app/src/main/res/drawable-xhdpi/kakao_login_large_wide_2.png new file mode 100644 index 00000000..75d4ed63 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/kakao_login_large_wide_2.png differ diff --git a/app/src/main/res/drawable-xxhdpi/group_145.png b/app/src/main/res/drawable-xxhdpi/group_145.png new file mode 100644 index 00000000..fd1d7bc7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/group_145.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icons_mureng.png b/app/src/main/res/drawable-xxhdpi/icons_mureng.png new file mode 100644 index 00000000..2423b8d5 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icons_mureng.png differ diff --git a/app/src/main/res/drawable-xxhdpi/icons_symbol_132_px.png b/app/src/main/res/drawable-xxhdpi/icons_symbol_132_px.png new file mode 100644 index 00000000..c40f6f04 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icons_symbol_132_px.png differ diff --git a/app/src/main/res/drawable-xxhdpi/kakao_login_large_wide_2.png b/app/src/main/res/drawable-xxhdpi/kakao_login_large_wide_2.png new file mode 100644 index 00000000..2e167b09 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/kakao_login_large_wide_2.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/group_145.png b/app/src/main/res/drawable-xxxhdpi/group_145.png new file mode 100644 index 00000000..ab11d134 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/group_145.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/icons_mureng.png b/app/src/main/res/drawable-xxxhdpi/icons_mureng.png new file mode 100644 index 00000000..e1d21e64 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icons_mureng.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/icons_symbol_132_px.png b/app/src/main/res/drawable-xxxhdpi/icons_symbol_132_px.png new file mode 100644 index 00000000..64bf4491 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icons_symbol_132_px.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/kakao_login_large_wide_2.png b/app/src/main/res/drawable-xxxhdpi/kakao_login_large_wide_2.png new file mode 100644 index 00000000..2a2004a0 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/kakao_login_large_wide_2.png differ diff --git a/app/src/main/res/drawable/login_bg_grad.xml b/app/src/main/res/drawable/login_bg_grad.xml new file mode 100644 index 00000000..283bba74 --- /dev/null +++ b/app/src/main/res/drawable/login_bg_grad.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml new file mode 100644 index 00000000..ff637fb7 --- /dev/null +++ b/app/src/main/res/layout/activity_login.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file