login response type 추가및 progress bar 처리 완료

Author: mkw8263

app/src/main/java/com/ddd/attendance/check/db/entity/User.kt

@@ -9,6 +9,7 @@ class User(
     @PrimaryKey val id: Int,
     @ColumnInfo(name = "name") val name: String,
     @ColumnInfo(name = "account") val account: String,
+    @ColumnInfo(name = "type") val type: Int,
     @ColumnInfo(name = "accessToken") val accessToken: String,
     @ColumnInfo(name = "refreshToken") val refreshToken: String
 )

app/src/main/java/com/ddd/attendance/check/model/LoginReponse.kt

@@ -11,5 +11,6 @@ data class LoginResponse(
 data class User(
     val account: String,
     val id: Int,
-    val name: String
+    val name: String,
+    val type: Int
 )

app/src/main/java/com/ddd/attendance/check/vm/LoginViewModel.kt

@@ -2,7 +2,6 @@ package com.ddd.attendance.check.vm
 
 import androidx.databinding.ObservableField
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import com.ddd.attendance.check.common.NetworkHelper
 import com.ddd.attendance.check.common.NetworkHelper.SUCCESS
@@ -19,13 +18,14 @@ 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 _progressbar = SingleLiveEvent<Boolean>()
+    private val _error = SingleLiveEvent<String>()
+    private val _btnEnableLogin = SingleLiveEvent<Boolean>()
     private val _startActivity = SingleLiveEvent<Class<MainActivity>>()
 
     val editID = ObservableField<String>()
     val editPW = ObservableField<String>()
+    val progressbar: LiveData<Boolean> get() = _progressbar
     val btnEnableLogin: LiveData<Boolean> get() = _btnEnableLogin
     val error: LiveData<String> get() = _error
     val startActivity: LiveData<Class<MainActivity>> get() = _startActivity
@@ -45,8 +45,10 @@ class LoginViewModel @Inject constructor(
     }
 
     fun login() {
+        _progressbar.value = true
         GlobalScope.launch {
             try {
+                _progressbar.postValue(false)
                 val response = loginRepository.login(editID.get() ?: EMPTY_ID, editPW.get()
                         ?: EMPTY_PW)
                 response.body()?.let { result ->
@@ -56,6 +58,7 @@ class LoginViewModel @Inject constructor(
                                 result.user.id,
                                 result.user.name,
                                 result.user.account,
+                                result.user.type,
                                 result.accessToken,
                                 result.refreshToken
                             )
@@ -66,6 +69,7 @@ class LoginViewModel @Inject constructor(
                     }
                 }
             } catch (throwable: Throwable) {
+                _progressbar.postValue(false)
                 _error.postValue(NetworkHelper.ERROR_MSG)
             }
         }

app/src/main/res/layout/activity_login.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:app="http://schemas.android.com/apk/res-auto">
     <data>
+        <import type="android.view.View"/>
         <variable name="loginViewModel" type="com.ddd.attendance.check.vm.LoginViewModel"/>
     </data>
 
@@ -13,7 +14,14 @@
             android:paddingStart="35dp"
             android:paddingEnd="35dp"
             tools:context=".ui.LoginActivity">
-
+        <ProgressBar
+                android:visibility="@{loginViewModel.progressbar? View.VISIBLE : View.GONE}"
+                android:layout_width="wrap_content"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                android:layout_height="wrap_content"/>
         <TextView
             android:id="@+id/tvSpecialTitle"
             android:layout_width="wrap_content"