login api 호출 연결, DataSource Module 추가정의

mkw8263 · mkw8263 · commit f7784af89287 · 2019-02-10T00:29:16.000+09:00
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <application
             android:name=".DDDApplication"
-            android:allowBackup="true"
+            android:allowBackup="false"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_launcher_round"
@@ -16,14 +16,14 @@
         <activity android:name=".ui.LoginActivity"
                   android:screenOrientation="portrait"
                   android:windowSoftInputMode="adjustResize|stateHidden">
-        </activity>
-        <activity android:name=".ui.MainActivity">
             <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>
 
diff --git a/app/src/main/java/com/ddd/attendance/check/common/NetworkHelper.kt b/app/src/main/java/com/ddd/attendance/check/common/NetworkHelper.kt
@@ -0,0 +1,7 @@
+package com.ddd.attendance.check.common
+
+object NetworkHelper {
+    const val ERROR_MSG="네트워크 연결을 확인해주시기 바랍니다."
+    const val FAILED="failed"
+    const val SUCCESS="success"
+}
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
@@ -0,0 +1,19 @@
+package com.ddd.attendance.check.data.login
+
+import com.ddd.attendance.check.data.Repository
+import com.ddd.attendance.check.data.login.source.LoginLocalDataSource
+import com.ddd.attendance.check.data.login.source.LoginRemoteDataSource
+import com.ddd.attendance.check.model.LoginResponse
+import retrofit2.Response
+import javax.inject.Inject
+
+class LoginRepository @Inject constructor(private val loginLocalDataSource: LoginLocalDataSource,
+                                          private val remoteDataSource: LoginRemoteDataSource) : Repository {
+    fun saveToken(token: String) {
+        loginLocalDataSource.saveToken(token)
+    }
+
+    suspend fun login(id: String, password: String): Response<LoginResponse> {
+        return remoteDataSource.login(id, password)
+    }
+}
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
@@ -0,0 +1,14 @@
+package com.ddd.attendance.check.data.login.source
+
+import android.app.Application
+import android.content.Context
+import com.ddd.attendance.check.extension.SharedPreferHelper
+import com.ddd.attendance.check.extension.put
+import javax.inject.Inject
+
+class LoginLocalDataSource @Inject constructor(val application: Application) {
+
+    fun saveToken(token: String) {
+        application.getSharedPreferences(SharedPreferHelper.DATA_PREFER, Context.MODE_PRIVATE).put(SharedPreferHelper.TOKEN_KEY, token)
+    }
+}
diff --git a/app/src/main/java/com/ddd/attendance/check/data/login/source/LoginRemoteDataSource.kt b/app/src/main/java/com/ddd/attendance/check/data/login/source/LoginRemoteDataSource.kt
@@ -1,10 +1,10 @@
-package com.ddd.attendance.check.data
+package com.ddd.attendance.check.data.login.source
 
 import com.ddd.attendance.check.api.ApiService
 import com.ddd.attendance.check.model.LoginResponse
 import retrofit2.Response
 
-class LoginRepository(private val apiService: ApiService) {
+class LoginRemoteDataSource(private val apiService: ApiService) {
     suspend fun login(id: String, password: String): Response<LoginResponse> {
         return apiService.login(id, password).await()
     }
diff --git a/app/src/main/java/com/ddd/attendance/check/di/DDDComponent.kt b/app/src/main/java/com/ddd/attendance/check/di/DDDComponent.kt
@@ -13,6 +13,7 @@ import javax.inject.Singleton
         ViewModelModule::class,
         ActivityBindingModule::class,
         AppModule::class,
+        DataSource::class,
         RepositoryModule::class]
 )
 interface DDDComponent {
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
@@ -0,0 +1,25 @@
+package com.ddd.attendance.check.di.module
+
+import com.ddd.attendance.check.DDDApplication
+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 dagger.Module
+import dagger.Provides
+import javax.inject.Singleton
+
+@Module
+class DataSource {
+
+    @Provides
+    @Singleton
+    fun loginLocalDataSource(application: DDDApplication): LoginLocalDataSource {
+        return LoginLocalDataSource(application)
+    }
+
+    @Provides
+    @Singleton
+    fun loginRemoteDataSource(apiService: ApiService): LoginRemoteDataSource {
+        return LoginRemoteDataSource(apiService)
+    }
+}
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,14 +1,16 @@
 package com.ddd.attendance.check.di.module
 
-import com.ddd.attendance.check.api.ApiService
-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 dagger.Module
 import dagger.Provides
 
 @Module
 class RepositoryModule {
     @Provides
-    fun bindLoginRepository(apiService: ApiService): LoginRepository {
-        return LoginRepository(apiService)
+    fun bindLoginRepository(localDataSource: LoginLocalDataSource, remoteDataSource: LoginRemoteDataSource): Repository {
+        return LoginRepository(localDataSource, remoteDataSource)
     }
 }
diff --git a/app/src/main/java/com/ddd/attendance/check/model/LoginReponse.kt b/app/src/main/java/com/ddd/attendance/check/model/LoginReponse.kt
@@ -1,10 +1,11 @@
 package com.ddd.attendance.check.model
 
 data class LoginResponse(
-    val accessToken: String,
-    val refreshToken: String,
-    val status: String,
-    val user: User
+        val accessToken: String,
+        val refreshToken: String,
+        val status: String,
+        val user: User,
+        val message: String? = null
 )
 
 data class User(
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
@@ -1,6 +1,9 @@
 package com.ddd.attendance.check.ui
 
+import android.content.Intent
 import android.os.Bundle
+import android.widget.Toast
+import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelProviders
 import com.ddd.attendance.check.R
@@ -22,6 +25,14 @@ class LoginActivity : DDDActivity<ActivityLoginBinding, LoginViewModel>() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setBinding()
+
+        viewModel.error.observe(this, Observer { msg ->
+            Toast.makeText(this, msg, Toast.LENGTH_SHORT).show()
+        })
+        viewModel.startMainActivity.observe(this, Observer {
+            startActivity(Intent(this, it))
+            finish()
+        })
     }
 
     private fun setBinding() {
diff --git a/app/src/main/java/com/ddd/attendance/check/utill/SingleLiveEvent.kt b/app/src/main/java/com/ddd/attendance/check/utill/SingleLiveEvent.kt
@@ -0,0 +1,31 @@
+package com.ddd.attendance.check.utill
+
+import androidx.annotation.MainThread
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
+import java.util.concurrent.atomic.AtomicBoolean
+
+class SingleLiveEvent<T> : MutableLiveData<T>() {
+
+    private val mPending = AtomicBoolean(false)
+
+    override fun observe(owner: LifecycleOwner, observer: Observer<in T>) {
+        super.observe(owner, Observer { T ->
+            if (mPending.compareAndSet(true, false)) {
+                observer.onChanged(T)
+            }
+        })
+    }
+
+    @MainThread
+    override fun setValue(t: T?) {
+        mPending.set(true)
+        super.setValue(t)
+    }
+
+    @MainThread
+    fun call() {
+        value = null
+    }
+}
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
@@ -1,22 +1,64 @@
 package com.ddd.attendance.check.vm
 
-import android.util.Log
+import androidx.databinding.ObservableField
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.ddd.attendance.check.data.LoginRepository
-import kotlinx.coroutines.CoroutineStart
-import kotlinx.coroutines.Dispatchers
+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.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() {
+    private val _error = MutableLiveData<String>()
+    private val _btnEnableLogin = MutableLiveData<Boolean>()
+    private val _startMainActivity = 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
+
+    fun onIDTextChanged(input: CharSequence) {
+        editID.set(input.toString())
+        isAvailableLoginClick()
+    }
+
+    fun onPWTextChanged(input: CharSequence) {
+        editPW.set(input.toString())
+        isAvailableLoginClick()
+    }
+
+    private fun isAvailableLoginClick() {
+        _btnEnableLogin.value = !editID.get().isNullOrEmpty() && !editPW.get().isNullOrEmpty()
+    }
+
     fun login() {
-        GlobalScope.launch(Dispatchers.Default, CoroutineStart.DEFAULT, null, {
+        GlobalScope.launch {
             try {
-                val items = loginRepository.login("ddd1", "ddd1")
-            } catch (t: Throwable) {
-                Log.e("ee", t.message)
+                val response = loginRepository.login(editID.get() ?: EMPTY_ID, editPW.get()
+                        ?: EMPTY_PW)
+                response.body()?.let { result ->
+                    if (result.status == SUCCESS) {
+                        loginRepository.saveToken(result.accessToken)
+                        _startMainActivity.postValue(MainActivity::class.java)
+                    } else {
+                        _error.postValue(result.message ?: NetworkHelper.ERROR_MSG)
+                    }
+                }
+            } catch (throwable: Throwable) {
+                _error.postValue(NetworkHelper.ERROR_MSG)
             }
-        })
+        }
+    }
+
+    companion object {
+        const val EMPTY_ID = ""
+        const val EMPTY_PW = ""
     }
 }
diff --git a/app/src/main/res/drawable-hdpi/attendance_img.png b/app/src/main/res/drawable-hdpi/attendance_img.png
diff --git a/app/src/main/res/drawable-mdpi/attendance_img.png b/app/src/main/res/drawable-mdpi/attendance_img.png
diff --git a/app/src/main/res/drawable-xhdpi/attendance_img.png b/app/src/main/res/drawable-xhdpi/attendance_img.png
diff --git a/app/src/main/res/drawable-xxhdpi/attendance_img.png b/app/src/main/res/drawable-xxhdpi/attendance_img.png
diff --git a/app/src/main/res/drawable-xxxhdpi/attendance_img.png b/app/src/main/res/drawable-xxxhdpi/attendance_img.png
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -9,7 +9,6 @@
             xmlns:tools="http://schemas.android.com/tools"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:focusable="true"
             android:focusableInTouchMode="true"
             android:paddingStart="35dp"
             android:paddingEnd="35dp"
@@ -70,12 +69,13 @@
             <androidx.appcompat.widget.AppCompatEditText
                 android:id="@+id/editID"
                 android:layout_width="match_parent"
+                android:onTextChanged="@{(text, start, before, count) -> loginViewModel.onIDTextChanged(text)}"
+                android:text="@={loginViewModel.editID}"
                 android:layout_height="wrap_content"
                 android:background="@null"
                 android:textSize="12dp"
                 tools:ignore="SpUsage" />
         </com.google.android.material.textfield.TextInputLayout>
-
         <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/editPWLayout"
                 android:layout_width="match_parent"
@@ -92,6 +92,8 @@
                 android:layout_height="wrap_content">
             <androidx.appcompat.widget.AppCompatEditText
                 android:id="@+id/editPW"
+                android:onTextChanged="@{(text, start, before, count) -> loginViewModel.onPWTextChanged(text)}"
+                android:text="@={loginViewModel.editPW}"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@null"
@@ -105,7 +107,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="80dp"
             android:background="@drawable/login_btn_state"
-            android:enabled="false"
+            android:enabled="@{loginViewModel.btnEnableLogin ? true : false}"
             android:onClick="@{()->loginViewModel.login()}"
             android:text="@string/login"
             android:textColor="@android:color/white"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -13,43 +13,34 @@
     android:focusableInTouchMode="true">
 
     <ImageView
-        android:id="@+id/imgAttendanceOutside"
-        android:layout_width="211dp"
-        android:layout_height="211dp"
-        android:layout_marginBottom="28dp"
-        android:background="@drawable/attendance_img_input_outside"
+        android:id="@+id/imgAttendanceInput"
+        android:layout_width="wrap_content"
         app:layout_constraintBottom_toTopOf="@+id/tvExplanation"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        tools:ignore="ContentDescription" />
-
-    <ImageView
-        android:id="@+id/imgAttendanceInner"
-        android:layout_width="183dp"
-        android:layout_height="183dp"
-        android:background="@drawable/attendance_img_input_inner"
-        app:layout_constraintBottom_toBottomOf="@+id/imgAttendanceOutside"
-        app:layout_constraintLeft_toLeftOf="@+id/imgAttendanceOutside"
-        app:layout_constraintRight_toRightOf="@+id/imgAttendanceOutside"
-        app:layout_constraintTop_toTopOf="@+id/imgAttendanceOutside"
-        tools:ignore="ContentDescription" />
+        android:layout_marginBottom="28dp"
+        android:layout_height="wrap_content"
+        android:background="@drawable/attendance_img" />
 
     <EditText
-        android:layout_width="90dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="35dp"
+        android:layout_marginTop="25dp"
         android:backgroundTint="@android:color/white"
-        android:gravity="center"
         android:inputType="number"
         android:maxLength="2"
+        android:layout_marginBottom="68dp"
+        android:maxLines="1"
+        android:minEms="1"
+        android:textColor="@android:color/white"
+        android:textCursorDrawable="@android:color/white"
         android:textColorHighlight="@android:color/white"
         android:textSize="84dp"
+        app:layout_constraintBottom_toBottomOf="@+id/imgAttendanceInput"
         android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/imgAttendanceInner"
-        app:layout_constraintLeft_toLeftOf="@+id/imgAttendanceInner"
-        app:layout_constraintRight_toRightOf="@+id/imgAttendanceInner"
-        app:layout_constraintTop_toTopOf="@+id/imgAttendanceInner"
-        app:layout_constraintVertical_bias="0"
+        app:layout_constraintLeft_toLeftOf="@+id/imgAttendanceInput"
+        app:layout_constraintRight_toRightOf="@+id/imgAttendanceInput"
+        app:layout_constraintTop_toTopOf="@+id/imgAttendanceInput"
         tools:ignore="Autofill,LabelFor,SpUsage" />
 
     <TextView

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import javax.inject.Singleton`
`13`	`13`	`ViewModelModule::class,`
`14`	`14`	`ActivityBindingModule::class,`
`15`	`15`	`AppModule::class,`
	`16`	`+ DataSource::class,`
`16`	`17`	`RepositoryModule::class]`
`17`	`18`	`)`
`18`	`19`	`interface DDDComponent {`