초기 스플래시 화면 gif 적용 및 ddd dialog img settings

Author: mkw8263

app/build.gradle

@@ -77,4 +77,8 @@ dependencies {
 
     // dataBinding kotlin option
     kapt "androidx.databinding:databinding-compiler:3.3.0"
+
+    // Glide
+    implementation 'com.github.bumptech.glide:glide:4.8.0'
+    kapt 'com.github.bumptech.glide:compiler:4.8.0'
 }

app/src/main/AndroidManifest.xml

@@ -24,7 +24,7 @@
                 android:screenOrientation="portrait"/>
         <activity
                 android:name=".ui.SplashActivity"
-                android:theme="@style/AppTheme"
+                android:theme="@style/SplashTheme"
                 android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/ddd/attendance/check/common/DDDDialog.kt

@@ -9,6 +9,7 @@ import android.util.DisplayMetrics
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import com.ddd.attendance.check.R
+import com.ddd.attendance.check.vm.MainViewModel
 import kotlinx.android.synthetic.main.dialog_ddd.*
 
 
@@ -21,14 +22,22 @@ class DDDDialog(context: Context, private val data: Pair<UserType, String>) : Di
 
         setInitView()
         setBackGround()
-
+        setDialogMarkImg(data.second)
         tvMessage.text = data.second
         btnOK.setOnClickListener {
             dddDialogEventListener.onClick(this)
             dismiss()
         }
     }
 
+    private fun setDialogMarkImg(message: String) {
+        val background = ContextCompat.getDrawable(
+            context,
+            if (message == MainViewModel.MSG_ATTENDANCE_START) R.drawable.check_icon else R.drawable.exclamation
+        )
+        imgMark.background = background
+    }
+
     private fun setInitView() {
         val metrics = DisplayMetrics()
         window?.windowManager?.defaultDisplay?.getMetrics(metrics)

app/src/main/java/com/ddd/attendance/check/ui/SplashActivity.kt

@@ -5,11 +5,15 @@ import android.os.Bundle
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelProviders
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.request.RequestOptions
 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 kotlinx.android.synthetic.main.activity_splash.*
 import javax.inject.Inject
 
 class SplashActivity : DDDActivity<ActivitySplashBinding, SplashViewModel>() {
@@ -24,6 +28,10 @@ class SplashActivity : DDDActivity<ActivitySplashBinding, SplashViewModel>() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setDataBinding()
+
+        Glide.with(this).asGif().load(R.drawable.splash)
+            .apply(RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.RESOURCE)).into(imgBackground)
+
         viewModel.checkUser()
 
         viewModel.startLoginActivity.observe(this, Observer {

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

@@ -61,6 +61,22 @@ class MainViewModel @Inject constructor(
         _btnEnableLogin.postValue(true)
     }
 
+    private fun attendanceStartUI(attendanceStart: Attendance?) {
+        attendanceStart?.let { result ->
+            if (result.status == NetworkHelper.SUCCESS) {
+                _isAttendanceNumber.postValue(result.number)
+                _isAttendanceStart.postValue(true)
+            }
+        }
+        showDDDDialog(MSG_ATTENDANCE_START)
+    }
+
+    private fun attendanceEndUI() {
+        _isAttendanceNumber.postValue(EMPTY_NUMBER)
+        _isAttendanceStart.postValue(false)
+        showDDDDialog(MSG_ATTENDANCE_END)
+    }
+
     fun attendance() {
         GlobalScope.launch {
             try {
@@ -87,22 +103,6 @@ class MainViewModel @Inject constructor(
         else _showToastError.postValue(response.body()?.message)
     }
 
-    private fun attendanceStartUI(attendanceStart: Attendance?) {
-        attendanceStart?.let { result ->
-            if (result.status == NetworkHelper.SUCCESS) {
-                _isAttendanceNumber.postValue(result.number)
-                _isAttendanceStart.postValue(true)
-            }
-        }
-        showDDDDialog(MSG_ATTENDANCE_START)
-    }
-
-    private fun attendanceEndUI() {
-        _isAttendanceNumber.postValue(0)
-        _isAttendanceStart.postValue(false)
-        showDDDDialog(MSG_ATTENDANCE_END)
-    }
-
     private fun attendanceCheck() {
 
     }
@@ -114,5 +114,6 @@ class MainViewModel @Inject constructor(
     companion object {
         const val MSG_ATTENDANCE_START = "출석체크가 시작되었습니다."
         const val MSG_ATTENDANCE_END = "출석체크가 종료되었습니다."
+        const val EMPTY_NUMBER = 0
     }
 }

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

@@ -32,6 +32,6 @@ class SplashViewModel @Inject constructor(private val userRepository: UserReposi
     }
 
     companion object {
-        const val DELAY_TIME: Long = 2000
+        const val DELAY_TIME: Long = 900
     }
 }