fix : scaleImage

Author: mkw8263

buildSrc/src/main/java/Dependencies.kt

@@ -13,8 +13,8 @@ object Modules {
 }
 
 object Releases {
-    val versionCode = 13
-    val versionName = "1.4"
+    val versionCode = 14
+    val versionName = "1.5"
 }
 
 object Versions {

data/src/main/java/com/ddd/data/manager/FirebaseRepositoryImple.kt

@@ -20,6 +20,11 @@ class FirebaseRepositoryImpl @Inject constructor(
     private val db: DatabaseReference,
     private val auth: FirebaseAuth
 ) : FirebaseRepository {
+
+    override fun signOut() {
+        auth.signOut()
+    }
+
     override fun saveUser(email: String, name: String, position: String, isManager: Boolean) {
         db.child(QUERY_USERS)
             .child(auth.currentUser?.uid.orEmpty())
@@ -30,7 +35,7 @@ class FirebaseRepositoryImpl @Inject constructor(
         db.child(QUERY_USERS)
             .child(uuid)
             .child(QUERY_MANAGER)
-            .addListenerForSingleValueEvent(object : ValueEventListener {
+            .addValueEventListener(object : ValueEventListener {
                 override fun onCancelled(error: DatabaseError) {
                     error(DDDException.NotFindDataBaseData(MessageManager.ERROR_NOT_FOUND_FIREBASE_DATABASE_DATA))
                 }
@@ -64,7 +69,7 @@ class FirebaseRepositoryImpl @Inject constructor(
 
     override fun getCurriculum(getItems: (List<DomainEntity.Curriculum>) -> Unit) {
         db.child("curriculum")
-            .addListenerForSingleValueEvent(object : ValueEventListener {
+            .addValueEventListener(object : ValueEventListener {
                 override fun onCancelled(p0: DatabaseError) {}
 
                 override fun onDataChange(data: DataSnapshot) {
@@ -84,8 +89,8 @@ class FirebaseRepositoryImpl @Inject constructor(
 
     override fun getBannerData(getItems: (DomainEntity.Banner) -> Unit) {
         db.child("banner")
-            .addListenerForSingleValueEvent(object : ValueEventListener {
-                override fun onCancelled(p0: DatabaseError) {}
+            .addValueEventListener(object : ValueEventListener {
+                override fun onCancelled(p0: DatabaseError) = Unit
 
                 override fun onDataChange(data: DataSnapshot) {
                     val title = (data.child("title").value as String)

domain/src/main/java/com/ddd/domain/FirebaseRepository.kt

@@ -4,6 +4,7 @@ import com.ddd.common.DDDException
 import com.ddd.domain.entity.DomainEntity
 
 interface FirebaseRepository {
+    fun signOut()
     fun saveUser(email: String, name: String, position: String, isManager: Boolean)
     fun isManager(uuid: String, result: (Boolean) -> Unit, error: (DDDException) -> Unit)
     fun saveAttendance(

domain/src/main/java/com/ddd/domain/LoginUseCase.kt

@@ -1,6 +1,5 @@
 package com.ddd.domain
 
-import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import com.google.firebase.auth.FirebaseAuth
 import kotlinx.coroutines.Dispatchers

domain/src/main/java/com/ddd/domain/LogoutUseCase.kt

@@ -0,0 +1,8 @@
+package com.ddd.domain
+
+import javax.inject.Inject
+
+class LogoutUseCase @Inject constructor(private val repository: FirebaseRepository) {
+
+    operator fun invoke() = repository.signOut()
+}

presentation/build.gradle

@@ -36,4 +36,6 @@ dependencies {
     implementation Libraries.lottie
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
     implementation 'com.firebaseui:firebase-ui-storage:3.3.0'
+
+    implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
 }

presentation/src/main/AndroidManifest.xml

@@ -3,7 +3,8 @@
     package="com.ddd.presentation">
 
     <application>
-        <activity android:name=".ui.manager.ManagerActivity"/>
+        <activity android:name=".ui.main.ImageDetailActivity"></activity>
+        <activity android:name=".ui.manager.ManagerActivity" />
         <activity android:name=".ui.tutorial.TutorialActivity" />
         <activity android:name=".ui.splash.SplashActivity" />
         <activity android:name=".ui.signup.SignUpActivity" />

presentation/src/main/java/com/ddd/presentation/ui/main/ImageDetailActivity.kt

@@ -0,0 +1,35 @@
+package com.ddd.presentation.ui.main
+
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.target.CustomTarget
+import com.bumptech.glide.request.target.SimpleTarget
+import com.bumptech.glide.request.transition.Transition
+import com.davemorrissey.labs.subscaleview.ImageSource
+import com.ddd.presentation.R
+import com.google.firebase.storage.FirebaseStorage
+import kotlinx.android.synthetic.main.activity_image_detail.*
+import kotlinx.android.synthetic.main.activity_main.*
+
+class ImageDetailActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_image_detail)
+
+        val url = FirebaseStorage.getInstance().getReference("banner/banner.png")
+        try {
+            Glide.with(this).asBitmap().load(url).into(object : CustomTarget<Bitmap>() {
+                override fun onLoadCleared(placeholder: Drawable?) = Unit
+
+                override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
+                    img.setImage(ImageSource.bitmap(resource))
+                }
+            })
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+}

presentation/src/main/java/com/ddd/presentation/ui/main/MainActivity.kt

@@ -39,15 +39,18 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         ob(viewModel.liveResult, ::result)
 
         val url = FirebaseStorage.getInstance().getReference("banner/banner.png")
-        try{
+        try {
             Glide.with(this).load(url).into(img_card)
-        }catch (e:Exception){
+        } catch (e: Exception) {
             e.printStackTrace()
         }
     }
 
     fun result(result: MainViewModel.Result) {
         when (result) {
+            is MainViewModel.Result.MoveDetailImage -> {
+                Intent(this, ImageDetailActivity::class.java).let(::startActivity)
+            }
             is MainViewModel.Result.Banner -> {
                 tv_title.text = result.title
                 tv_subtitle.text = result.subTitle

presentation/src/main/java/com/ddd/presentation/ui/main/MainViewModel.kt

@@ -25,6 +25,7 @@ class MainViewModel @Inject constructor(
         data class InitQRCode(val qrcode: Bitmap) : Result()
         data class Curriculum(val items: List<DomainEntity.Curriculum>) : Result()
         data class LoginActivity<T>(val nextActivity: Class<T>) : Result()
+        object MoveDetailImage: Result()
     }
 
     private val _liveResult = MutableLiveData<Result>()
@@ -49,8 +50,7 @@ class MainViewModel @Inject constructor(
         }
     }
 
-    fun tempLogout() {
-        auth.signOut()
+    fun onClickDetailImage(){
+        _liveResult.value = Result.MoveDetailImage
     }
-
 }