Merge branch 'dev'

Author: mkw8263

app/build.gradle

@@ -66,7 +66,7 @@ dependencies {
     // retrofit2
     implementation 'com.squareup.retrofit2:retrofit:2.5.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.12.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.12.1'
     implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
 
     // gson
@@ -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/api/ApiService.kt

@@ -1,5 +1,6 @@
 package com.ddd.attendance.check.api
 
+import com.ddd.attendance.check.model.Attendance
 import com.ddd.attendance.check.model.LoginResponse
 import kotlinx.coroutines.Deferred
 import retrofit2.Response
@@ -12,4 +13,10 @@ interface ApiService {
     @FormUrlEncoded
     @POST("/auth/login")
     fun login(@Field("account") id: String, @Field("password") password: String): Deferred<Response<LoginResponse>>
+
+    @POST("/attends/start")
+    fun attendsStart(): Deferred<Response<Attendance>>
+
+    @POST("/attends/end")
+    fun attendsEnd(): Deferred<Response<Attendance>>
 }

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

@@ -0,0 +1,5 @@
+package com.ddd.attendance.check.common
+
+enum class AttendanceStatus {
+    START, STOP
+}

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

@@ -7,26 +7,51 @@ import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 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.*
 
 
-class DDDDialog(context: Context, userType: UserType) : Dialog(context) {
+class DDDDialog(context: Context, private val data: Pair<UserType, String>) : Dialog(context) {
     private lateinit var dddDialogEventListener: DDDDialogEventListener
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
         setContentView(com.ddd.attendance.check.R.layout.dialog_ddd)
-        val metrics = DisplayMetrics()
-        window?.windowManager?.defaultDisplay?.getMetrics(metrics)
-        val width = (metrics.widthPixels * 0.8).toInt()
-        window?.setLayout(width, ViewGroup.LayoutParams.WRAP_CONTENT)
 
+        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)
+        val width = (metrics.widthPixels * 0.8).toInt()
+        window?.setLayout(width, ViewGroup.LayoutParams.WRAP_CONTENT)
+    }
+
+    private fun setBackGround() {
+        linearDialog.background = ContextCompat.getDrawable(
+            context,
+            if (data.first == UserType.BASIC) R.drawable.dialog_ddd_background else R.drawable.dialog_ddd_background_admin
+        )
+    }
+
     fun setDialogListener(dddDialogEventListener: DDDDialogEventListener): DDDDialog {
         this.dddDialogEventListener = dddDialogEventListener
         return this

app/src/main/java/com/ddd/attendance/check/data/repository/AttendanceRepository.kt

@@ -0,0 +1,18 @@
+package com.ddd.attendance.check.data.repository
+
+import com.ddd.attendance.check.data.Repository
+import com.ddd.attendance.check.data.source.attendance.AttendanceRemoteDataSource
+import com.ddd.attendance.check.model.Attendance
+import retrofit2.Response
+import javax.inject.Inject
+
+class AttendanceRepository @Inject constructor(private val attendanceRemoteDataSource: AttendanceRemoteDataSource) :
+    Repository {
+    suspend fun attendanceStart(): Response<Attendance> {
+        return attendanceRemoteDataSource.attendanceStart()
+    }
+
+    suspend fun attendsEnd(): Response<Attendance> {
+        return attendanceRemoteDataSource.attendsEnd()
+    }
+}

…attendance/check/data/LoginRepository.kt …check/data/repository/LoginRepository.ktapp/src/main/java/com/ddd/attendance/check/data/LoginRepository.kt renamed to app/src/main/java/com/ddd/attendance/check/data/repository/LoginRepository.kt app/src/main/java/com/ddd/attendance/check/data/LoginRepository.kt renamed to app/src/main/java/com/ddd/attendance/check/data/repository/LoginRepository.kt

@@ -1,5 +1,6 @@
-package com.ddd.attendance.check.data
+package com.ddd.attendance.check.data.repository
 
+import com.ddd.attendance.check.data.Repository
 import com.ddd.attendance.check.data.source.login.LoginRemoteDataSource
 import com.ddd.attendance.check.model.LoginResponse
 import retrofit2.Response

…/attendance/check/data/UserRepository.kt …/check/data/repository/UserRepository.ktapp/src/main/java/com/ddd/attendance/check/data/UserRepository.kt renamed to app/src/main/java/com/ddd/attendance/check/data/repository/UserRepository.kt app/src/main/java/com/ddd/attendance/check/data/UserRepository.kt renamed to app/src/main/java/com/ddd/attendance/check/data/repository/UserRepository.kt

@@ -1,10 +1,12 @@
-package com.ddd.attendance.check.data
+package com.ddd.attendance.check.data.repository
 
+import com.ddd.attendance.check.data.Repository
 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 {
+class UserRepository @Inject constructor(private val userLocalDataSource: UserLocalDataSource) :
+    Repository {
     suspend fun saveUsers(user: User) {
         userLocalDataSource.saveUser(user)
     }

app/src/main/java/com/ddd/attendance/check/data/source/attendance/AttendanceLocalDataSource.kt

@@ -0,0 +1,3 @@
+package com.ddd.attendance.check.data.source.attendance
+
+class AttendanceLocalDataSource

app/src/main/java/com/ddd/attendance/check/data/source/attendance/AttendanceRemoteDataSource.kt

@@ -0,0 +1,15 @@
+package com.ddd.attendance.check.data.source.attendance
+
+import com.ddd.attendance.check.api.ApiService
+import com.ddd.attendance.check.model.Attendance
+import retrofit2.Response
+
+class AttendanceRemoteDataSource(private val apiService: ApiService) {
+    suspend fun attendanceStart(): Response<Attendance> {
+        return apiService.attendsStart().await()
+    }
+
+    suspend fun attendsEnd(): Response<Attendance> {
+        return apiService.attendsEnd().await()
+    }
+}