diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c1c43f7f..0a2fa175 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -34,11 +34,10 @@ - + android:exported="false" + android:screenOrientation="portrait"> @@ -48,10 +47,19 @@ + + + diff --git a/app/src/main/java/com/sopetit/softie/ui/main/LoginActivity.kt b/app/src/main/java/com/sopetit/softie/ui/main/LoginActivity.kt new file mode 100644 index 00000000..6fc56480 --- /dev/null +++ b/app/src/main/java/com/sopetit/softie/ui/main/LoginActivity.kt @@ -0,0 +1,25 @@ +package com.sopetit.softie.ui.main + +import android.content.Intent +import android.os.Bundle +import com.sopetit.softie.R +import com.sopetit.softie.databinding.ActivityLoginBinding +import com.sopetit.softie.ui.storytelling.StoryTellingActivity +import com.sopetit.softie.util.binding.BindingActivity + +class LoginActivity : BindingActivity(R.layout.activity_login) { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + initSetLogInBtn() + } + + private fun initSetLogInBtn() { + val intent = Intent(this, StoryTellingActivity::class.java) + binding.btnLoginKakao.setOnClickListener { + startActivity(intent) + finish() + } + } +} diff --git a/app/src/main/java/com/sopetit/softie/ui/onboarding/splash/SplashActivity.kt b/app/src/main/java/com/sopetit/softie/ui/onboarding/splash/SplashActivity.kt new file mode 100644 index 00000000..a4a26e41 --- /dev/null +++ b/app/src/main/java/com/sopetit/softie/ui/onboarding/splash/SplashActivity.kt @@ -0,0 +1,46 @@ +package com.sopetit.softie.ui.onboarding.splash + +import android.content.Intent +import android.os.Bundle +import android.os.Handler +import android.os.Looper +import com.sopetit.softie.R +import com.sopetit.softie.databinding.ActivitySplashBinding +import com.sopetit.softie.ui.main.LoginActivity +import com.sopetit.softie.util.binding.BindingActivity +import kotlin.random.Random + +class SplashActivity : BindingActivity(R.layout.activity_splash) { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + initCreateRandomVersion() + } + + private fun initCreateRandomVersion() { + when (Random.nextInt(1, 5)) { + 1 -> makeSplashImg(R.drawable.ic_splash1) + 2 -> makeSplashImg(R.drawable.ic_splash2) + 3 -> makeSplashImg(R.drawable.ic_splash3) + 4 -> makeSplashImg(R.drawable.ic_splash4) + } + } + + private fun makeSplashImg(image: Int) { + binding.ivSplashBackground.setBackgroundResource(image) + initMakeSplash() + } + + private fun initMakeSplash() { + Handler(Looper.getMainLooper()).postDelayed({ + val intent = Intent(this, LoginActivity::class.java) + startActivity(intent) + finish() + }, SPLASH_DELAY) + } + + companion object { + const val SPLASH_DELAY = 2000L + } +} diff --git a/app/src/main/res/drawable/ic_login_kakao.xml b/app/src/main/res/drawable/ic_login_kakao.xml new file mode 100644 index 00000000..37d091e1 --- /dev/null +++ b/app/src/main/res/drawable/ic_login_kakao.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_logo_main1.xml b/app/src/main/res/drawable/ic_logo_main1.xml new file mode 100644 index 00000000..b318b974 --- /dev/null +++ b/app/src/main/res/drawable/ic_logo_main1.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_speech_dark.xml b/app/src/main/res/drawable/ic_speech_dark.xml new file mode 100644 index 00000000..cd3bca03 --- /dev/null +++ b/app/src/main/res/drawable/ic_speech_dark.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_splash1.png b/app/src/main/res/drawable/ic_splash1.png new file mode 100644 index 00000000..7301792d Binary files /dev/null and b/app/src/main/res/drawable/ic_splash1.png differ diff --git a/app/src/main/res/drawable/ic_splash2.png b/app/src/main/res/drawable/ic_splash2.png new file mode 100644 index 00000000..b9e22ed4 Binary files /dev/null and b/app/src/main/res/drawable/ic_splash2.png differ diff --git a/app/src/main/res/drawable/ic_splash3.png b/app/src/main/res/drawable/ic_splash3.png new file mode 100644 index 00000000..102e7dc9 Binary files /dev/null and b/app/src/main/res/drawable/ic_splash3.png differ diff --git a/app/src/main/res/drawable/ic_splash4.png b/app/src/main/res/drawable/ic_splash4.png new file mode 100644 index 00000000..871c7f80 Binary files /dev/null and b/app/src/main/res/drawable/ic_splash4.png differ 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..c243be47 --- /dev/null +++ b/app/src/main/res/layout/activity_login.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml new file mode 100644 index 00000000..c702ef66 --- /dev/null +++ b/app/src/main/res/layout/activity_splash.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 1029e053..7bb3d01f 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -39,4 +39,7 @@ #FFE1E1E1 + + + #CEB59E diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 84dc2613..ab5cead9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -36,6 +36,9 @@ 한 번 선택한 인형은 바꿀 수 없어요 이 친구와 함께 할래 + + 친구와 함께 하는 일상 속 작은 습관 + 진행 중