splash activity 처리

mkw8263 · mkw8263 · commit f42f7ef25a54 · 2019-02-10T14:38:18.000+09:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -16,15 +16,19 @@
         <activity android:name=".ui.LoginActivity"
                   android:screenOrientation="portrait"
                   android:windowSoftInputMode="adjustResize|stateHidden">
+        </activity>
+        <activity
+            android:name=".ui.MainActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".ui.SplashActivity"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".ui.MainActivity">
-        </activity>
-        <activity android:name=".ui.SplashActivity"/>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/ddd/attendance/check/data/LoginRepository.kt b/app/src/main/java/com/ddd/attendance/check/data/LoginRepository.kt
@@ -0,0 +1,15 @@
+package com.ddd.attendance.check.data
+
+import com.ddd.attendance.check.data.source.login.LoginRemoteDataSource
+import com.ddd.attendance.check.model.LoginResponse
+import retrofit2.Response
+import javax.inject.Inject
+
+class LoginRepository @Inject constructor(
+        private val loginRemoteDataSource: LoginRemoteDataSource
+) : Repository {
+
+    suspend fun login(id: String, password: String): Response<LoginResponse> {
+        return loginRemoteDataSource.login(id, password)
+    }
+}
diff --git a/app/src/main/java/com/ddd/attendance/check/data/UserRepository.kt b/app/src/main/java/com/ddd/attendance/check/data/UserRepository.kt
@@ -0,0 +1,15 @@
+package com.ddd.attendance.check.data
+
+import com.ddd.attendance.check.data.source.user.UserLocalDataSource
+import com.ddd.attendance.check.db.entity.User
+import javax.inject.Inject
+
+class UserRepository @Inject constructor(private val userLocalDataSource: UserLocalDataSource) : Repository {
+    suspend fun saveUsers(user: User) {
+        userLocalDataSource.saveUser(user)
+    }
+
+    fun getUsers(): List<User> {
+        return userLocalDataSource.getUsers()
+    }
+}
diff --git a/app/src/main/java/com/ddd/attendance/check/data/login/LoginRepository.kt b/app/src/main/java/com/ddd/attendance/check/data/login/LoginRepository.kt
diff --git a/app/src/main/java/com/ddd/attendance/check/data/login/source/LoginLocalDataSource.kt b/app/src/main/java/com/ddd/attendance/check/data/login/source/LoginLocalDataSource.kt
diff --git a/app/src/main/java/com/ddd/attendance/check/data/source/login/LoginRemoteDataSource.kt b/app/src/main/java/com/ddd/attendance/check/data/source/login/LoginRemoteDataSource.kt
@@ -1,4 +1,4 @@
-package com.ddd.attendance.check.data.login.source
+package com.ddd.attendance.check.data.source.login
 
 import com.ddd.attendance.check.api.ApiService
 import com.ddd.attendance.check.model.LoginResponse
diff --git a/app/src/main/java/com/ddd/attendance/check/data/source/user/UserLocalDataSource.kt b/app/src/main/java/com/ddd/attendance/check/data/source/user/UserLocalDataSource.kt
@@ -0,0 +1,16 @@
+package com.ddd.attendance.check.data.source.user
+
+import com.ddd.attendance.check.db.DDDDataBase
+import com.ddd.attendance.check.db.entity.User
+import javax.inject.Inject
+
+class UserLocalDataSource @Inject constructor(private val dddDataBase: DDDDataBase) {
+
+    suspend fun saveUser(user: User) {
+        dddDataBase.userDao().addUser(user)
+    }
+
+    fun getUsers(): List<User> {
+        return dddDataBase.userDao().getUsers()
+    }
+}
diff --git a/app/src/main/java/com/ddd/attendance/check/di/module/ActivityBindingModule.kt b/app/src/main/java/com/ddd/attendance/check/di/module/ActivityBindingModule.kt
@@ -3,6 +3,7 @@ package com.ddd.attendance.check.di.module
 import com.ddd.attendance.check.di.qualifier.PerActivity
 import com.ddd.attendance.check.ui.LoginActivity
 import com.ddd.attendance.check.ui.MainActivity
+import com.ddd.attendance.check.ui.SplashActivity
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
@@ -17,4 +18,8 @@ abstract class ActivityBindingModule {
     @ContributesAndroidInjector
     abstract fun loginActivity(): LoginActivity
 
+    @PerActivity
+    @ContributesAndroidInjector
+    abstract fun splashActivity(): SplashActivity
+
 }
diff --git a/app/src/main/java/com/ddd/attendance/check/di/module/DataSource.kt b/app/src/main/java/com/ddd/attendance/check/di/module/DataSource.kt
@@ -1,8 +1,8 @@
 package com.ddd.attendance.check.di.module
 
 import com.ddd.attendance.check.api.ApiService
-import com.ddd.attendance.check.data.login.source.LoginLocalDataSource
-import com.ddd.attendance.check.data.login.source.LoginRemoteDataSource
+import com.ddd.attendance.check.data.source.login.LoginRemoteDataSource
+import com.ddd.attendance.check.data.source.user.UserLocalDataSource
 import com.ddd.attendance.check.db.DDDDataBase
 import dagger.Module
 import dagger.Provides
@@ -13,8 +13,8 @@ class DataSource {
 
     @Provides
     @Singleton
-    fun loginLocalDataSource(dddDataBase: DDDDataBase): LoginLocalDataSource {
-        return LoginLocalDataSource(dddDataBase)
+    fun userLocalDataSource(dddDataBase: DDDDataBase): UserLocalDataSource {
+        return UserLocalDataSource(dddDataBase)
     }
 
     @Provides
diff --git a/app/src/main/java/com/ddd/attendance/check/di/module/RepositoryModule.kt b/app/src/main/java/com/ddd/attendance/check/di/module/RepositoryModule.kt
@@ -1,16 +1,22 @@
 package com.ddd.attendance.check.di.module
 
+import com.ddd.attendance.check.data.LoginRepository
 import com.ddd.attendance.check.data.Repository
-import com.ddd.attendance.check.data.login.LoginRepository
-import com.ddd.attendance.check.data.login.source.LoginLocalDataSource
-import com.ddd.attendance.check.data.login.source.LoginRemoteDataSource
+import com.ddd.attendance.check.data.UserRepository
+import com.ddd.attendance.check.data.source.login.LoginRemoteDataSource
+import com.ddd.attendance.check.data.source.user.UserLocalDataSource
 import dagger.Module
 import dagger.Provides
 
 @Module
 class RepositoryModule {
     @Provides
-    fun bindLoginRepository(localDataSource: LoginLocalDataSource, remoteDataSource: LoginRemoteDataSource): Repository {
-        return LoginRepository(localDataSource, remoteDataSource)
+    fun bindLoginRepository(remoteDataSource: LoginRemoteDataSource): Repository {
+        return LoginRepository(remoteDataSource)
+    }
+
+    @Provides
+    fun bindUserRepository(localDataSource: UserLocalDataSource): Repository {
+        return UserRepository(localDataSource)
     }
 }
diff --git a/app/src/main/java/com/ddd/attendance/check/di/module/ViewModelModule.kt b/app/src/main/java/com/ddd/attendance/check/di/module/ViewModelModule.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import com.ddd.attendance.check.vm.LoginViewModel
 import com.ddd.attendance.check.vm.MainViewModel
+import com.ddd.attendance.check.vm.SplashViewModel
 import dagger.Binds
 import dagger.Module
 import dagger.multibindings.IntoMap
@@ -13,6 +14,11 @@ abstract class ViewModelModule {
     @Binds
     internal abstract fun bindViewModelFactory(factory: ViewModelFactory): ViewModelProvider.Factory
 
+    @Binds
+    @IntoMap
+    @ViewModelKey(SplashViewModel::class)
+    abstract fun bindSplashViewModel(viewModel: SplashViewModel): ViewModel
+
     @Binds
     @IntoMap
     @ViewModelKey(MainViewModel::class)
diff --git a/app/src/main/java/com/ddd/attendance/check/ui/LoginActivity.kt b/app/src/main/java/com/ddd/attendance/check/ui/LoginActivity.kt
@@ -29,7 +29,7 @@ class LoginActivity : DDDActivity<ActivityLoginBinding, LoginViewModel>() {
         viewModel.error.observe(this, Observer { msg ->
             Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
         })
-        viewModel.startMainActivity.observe(this, Observer {
+        viewModel.startActivity.observe(this, Observer {
             startActivity(Intent(this, it))
             finish()
         })
diff --git a/app/src/main/java/com/ddd/attendance/check/ui/SplashActivity.kt b/app/src/main/java/com/ddd/attendance/check/ui/SplashActivity.kt
@@ -1,13 +1,48 @@
 package com.ddd.attendance.check.ui
 
+import android.content.Intent
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProviders
 import com.ddd.attendance.check.R
+import com.ddd.attendance.check.base.DDDActivity
+import com.ddd.attendance.check.databinding.ActivitySplashBinding
+import com.ddd.attendance.check.utill.lazyThreadSafetyNone
+import com.ddd.attendance.check.vm.SplashViewModel
+import javax.inject.Inject
 
-class SplashActivity : AppCompatActivity() {
+class SplashActivity : DDDActivity<ActivitySplashBinding, SplashViewModel>() {
+
+    @Inject
+    lateinit var factory: ViewModelProvider.Factory
+    override val viewModel: SplashViewModel by lazyThreadSafetyNone {
+        ViewModelProviders.of(this, factory)[SplashViewModel::class.java]
+    }
+    override val layoutResource: Int = R.layout.activity_splash
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_splash)
+        setDataBinding()
+        viewModel.checkUser()
+
+        viewModel.startLoginActivity.observe(this, Observer {
+            startActivity(Intent(this, it))
+            finish()
+        })
+
+        viewModel.startMainActivity.observe(this, Observer {
+            startActivity(Intent(this, it))
+            finish()
+        })
+
+
+    }
+
+    private fun setDataBinding() {
+        viewDataBinding.apply {
+            splashViewModel = viewModel
+            setLifecycleOwner(this@SplashActivity)
+        }
     }
 }
diff --git a/app/src/main/java/com/ddd/attendance/check/vm/LoginViewModel.kt b/app/src/main/java/com/ddd/attendance/check/vm/LoginViewModel.kt
@@ -6,24 +6,28 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.ddd.attendance.check.common.NetworkHelper
 import com.ddd.attendance.check.common.NetworkHelper.SUCCESS
-import com.ddd.attendance.check.data.login.LoginRepository
+import com.ddd.attendance.check.data.LoginRepository
+import com.ddd.attendance.check.data.UserRepository
 import com.ddd.attendance.check.db.entity.User
 import com.ddd.attendance.check.ui.MainActivity
 import com.ddd.attendance.check.utill.SingleLiveEvent
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-class LoginViewModel @Inject constructor(private val loginRepository: LoginRepository) : ViewModel() {
+class LoginViewModel @Inject constructor(
+        private val loginRepository: LoginRepository,
+        private val userRepository: UserRepository) : ViewModel() {
+
     private val _error = MutableLiveData<String>()
     private val _btnEnableLogin = MutableLiveData<Boolean>()
-    private val _startMainActivity = SingleLiveEvent<Class<MainActivity>>()
+    private val _startActivity = SingleLiveEvent<Class<MainActivity>>()
 
     val editID = ObservableField<String>()
     val editPW = ObservableField<String>()
     val btnEnableLogin: LiveData<Boolean> get() = _btnEnableLogin
     val error: LiveData<String> get() = _error
-    val startMainActivity: LiveData<Class<MainActivity>> get() = _startMainActivity
+    val startActivity: LiveData<Class<MainActivity>> get() = _startActivity
 
     fun onIDTextChanged(input: CharSequence) {
         editID.set(input.toString())
@@ -46,7 +50,7 @@ class LoginViewModel @Inject constructor(private val loginRepository: LoginRepos
                         ?: EMPTY_PW)
                 response.body()?.let { result ->
                     if (result.status == SUCCESS) {
-                        loginRepository.saveUsers(
+                        userRepository.saveUsers(
                             User(
                                 result.user.id,
                                 result.user.name,
@@ -55,7 +59,7 @@ class LoginViewModel @Inject constructor(private val loginRepository: LoginRepos
                                 result.refreshToken
                             )
                         )
-                        _startMainActivity.postValue(MainActivity::class.java)
+                        _startActivity.postValue(MainActivity::class.java)
                     } else {
                         _error.postValue(result.message ?: NetworkHelper.ERROR_MSG)
                     }
diff --git a/app/src/main/java/com/ddd/attendance/check/vm/SplashViewModel.kt b/app/src/main/java/com/ddd/attendance/check/vm/SplashViewModel.kt
@@ -0,0 +1,37 @@
+package com.ddd.attendance.check.vm
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.ViewModel
+import com.ddd.attendance.check.data.UserRepository
+import com.ddd.attendance.check.ui.LoginActivity
+import com.ddd.attendance.check.ui.MainActivity
+import com.ddd.attendance.check.utill.SingleLiveEvent
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+class SplashViewModel @Inject constructor(private val userRepository: UserRepository) : ViewModel() {
+
+    private val _startMainActivity = SingleLiveEvent<Class<MainActivity>>()
+    private val _startLoginActivity = SingleLiveEvent<Class<LoginActivity>>()
+
+    val startMainActivity: LiveData<Class<MainActivity>> get() = _startMainActivity
+    val startLoginActivity: LiveData<Class<MainActivity>> get() = _startMainActivity
+
+    fun checkUser() {
+        GlobalScope.launch {
+            try {
+                delay(DELAY_TIME)
+                if (!userRepository.getUsers().isNullOrEmpty()) _startMainActivity.postValue(MainActivity::class.java)
+                else _startLoginActivity.postValue(LoginActivity::class.java)
+            } catch (error: Throwable) {
+
+            }
+        }
+    }
+
+    companion object {
+        const val DELAY_TIME: Long = 2000
+    }
+}
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
+<layout>
+    <data>
+        <variable name="splashViewModel"
+                  type="com.ddd.attendance.check.vm.SplashViewModel"/>
+    </data>
 <androidx.constraintlayout.widget.ConstraintLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:context=".ui.SplashActivity">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/app/src/test/java/com/ddd/attendance/check/ExampleUnitTest.kt b/app/src/test/java/com/ddd/attendance/check/ExampleUnitTest.kt
@@ -1,9 +1,8 @@
 package com.ddd.attendance.check
 
+import org.junit.Assert.assertEquals
 import org.junit.Test
 
-import org.junit.Assert.*
-
 /**
  * Example local unit test, which will execute on the development machine (host).
  *

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.ddd.attendance.check.data.login.source`
	`1`	`+package com.ddd.attendance.check.data.source.login`
`2`	`2`
`3`	`3`	`import com.ddd.attendance.check.api.ApiService`
`4`	`4`	`import com.ddd.attendance.check.model.LoginResponse`