Merge branch 'dev'

Author: mkw8263

app/src/main/AndroidManifest.xml

@@ -7,7 +7,7 @@
     <application
             android:name=".DDDApplication"
             android:allowBackup="false"
-            android:icon="@mipmap/ic_launcher"
+            android:icon="@drawable/icon"
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_launcher_round"
             android:supportsRtl="true"
@@ -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>

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

@@ -0,0 +1,38 @@
+package com.ddd.attendance.check.common
+
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.util.DisplayMetrics
+import android.view.ViewGroup
+import kotlinx.android.synthetic.main.dialog_ddd.*
+
+
+class DDDDialog(context: Context) : Dialog(context) {
+    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)
+
+        btnOK.setOnClickListener {
+            dddDialogEventListener.onClick(this)
+            dismiss()
+        }
+    }
+
+    fun setDialogListener(dddDialogEventListener: DDDDialogEventListener): DDDDialog {
+        this.dddDialogEventListener = dddDialogEventListener
+        return this
+    }
+
+    interface DDDDialogEventListener {
+        fun onClick(dialog: Dialog)
+    }
+}

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)
+    }
+}

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()
+    }
+}

app/src/main/java/com/ddd/attendance/check/data/login/LoginRepository.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

app/src/main/java/com/ddd/attendance/check/data/login/source/LoginLocalDataSource.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()
+    }
+}

…ta/login/source/LoginRemoteDataSource.kt …ta/source/login/LoginRemoteDataSource.ktapp/src/main/java/com/ddd/attendance/check/data/login/source/LoginRemoteDataSource.kt renamed to app/src/main/java/com/ddd/attendance/check/data/source/login/LoginRemoteDataSource.kt app/src/main/java/com/ddd/attendance/check/data/login/source/LoginRemoteDataSource.kt renamed to app/src/main/java/com/ddd/attendance/check/data/source/login/LoginRemoteDataSource.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/data/source/user/UserLocalDataSource.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
+
 }