From cd28ad4c07aad9bf3c60d69d5ff12816c8bec254 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Thu, 27 Aug 2020 15:51:28 +0200
Subject: [PATCH] Remove dead code (QrCode animation)

---
 .../app/features/debug/DebugMenuActivity.kt   |  2 +-
 .../app/core/ui/views/QrCodeImageView.kt      | 50 ++-----------------
 .../VerificationChooseMethodController.kt     |  1 -
 .../BottomSheetVerificationQrCodeItem.kt      |  5 +-
 4 files changed, 5 insertions(+), 53 deletions(-)

diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
index 855333d96b..5590e19c10 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt
@@ -68,7 +68,7 @@ class DebugMenuActivity : VectorBaseActivity() {
     }
 
     private fun renderQrCode(text: String) {
-        debug_qr_code.setData(text, true)
+        debug_qr_code.setData(text)
     }
 
     @OnClick(R.id.debug_test_text_view_link)
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/QrCodeImageView.kt b/vector/src/main/java/im/vector/app/core/ui/views/QrCodeImageView.kt
index 11e319ab78..f4b371bc52 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/QrCodeImageView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/QrCodeImageView.kt
@@ -18,28 +18,23 @@ package im.vector.app.core.ui.views
 
 import android.content.Context
 import android.graphics.Color
-import android.graphics.drawable.AnimationDrawable
-import android.graphics.drawable.BitmapDrawable
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatImageView
 import im.vector.app.core.qrcode.toBitMatrix
 import im.vector.app.core.qrcode.toBitmap
-import kotlin.random.Random
 
 class QrCodeImageView @JvmOverloads constructor(
         context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
 ) : AppCompatImageView(context, attrs, defStyleAttr) {
 
     private var data: String? = null
-    private var animate = false
 
     init {
         setBackgroundColor(Color.WHITE)
     }
 
-    fun setData(data: String, animate: Boolean) {
+    fun setData(data: String) {
         this.data = data
-        this.animate = animate
 
         render()
     }
@@ -53,47 +48,8 @@ class QrCodeImageView @JvmOverloads constructor(
         data
                 ?.takeIf { height > 0 }
                 ?.let {
-                    if (animate) {
-                        // NOT SUPPORTED YET val anim = createAnimation(it)
-                        // NOT SUPPORTED YET setImageDrawable(anim)
-                        // NOT SUPPORTED YET anim.start()
-                        // NOT SUPPORTED YET setImageDrawable(BitmapDrawable(resources, it.toBitMatrix(height).toBitmap()))
-                        val bitmap = it.toBitMatrix(height).toBitmap()
-                        post { setImageBitmap(bitmap) }
-                    } else {
-                        val bitmap = it.toBitMatrix(height).toBitmap()
-                        post { setImageBitmap(bitmap) }
-                    }
+                    val bitmap = it.toBitMatrix(height).toBitmap()
+                    post { setImageBitmap(bitmap) }
                 }
     }
-
-    private fun createAnimation(data: String): AnimationDrawable {
-        val finalQr = data.toBitMatrix(height)
-
-        val list = mutableListOf(finalQr)
-
-        val random = Random(System.currentTimeMillis())
-        val repeatTime = 8
-        repeat(repeatTime) { index ->
-            val alteredQr = finalQr.clone()
-            for (x in 0 until alteredQr.width) {
-                for (y in 0 until alteredQr.height) {
-                    if (random.nextInt(repeatTime - index) == 0) {
-                        // Pb is that it does not toggle a whole black square, but only a pixel
-                        alteredQr.unset(x, y)
-                    }
-                }
-            }
-            list.add(alteredQr)
-        }
-
-        val animDrawable = AnimationDrawable()
-
-        list.asReversed()
-                .forEach {
-                    animDrawable.addFrame(BitmapDrawable(resources, it.toBitmap()), 150)
-                }
-
-        return animDrawable
-    }
 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt
index 953b20cb0c..0406a63bc6 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/choose/VerificationChooseMethodController.kt
@@ -53,7 +53,6 @@ class VerificationChooseMethodController @Inject constructor(
                 bottomSheetVerificationQrCodeItem {
                     id("qr")
                     data(state.qrCodeText)
-                    animate(false)
                 }
 
                 dividerItem {
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt
index 8d78c1c9d6..41c92fa76f 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/epoxy/BottomSheetVerificationQrCodeItem.kt
@@ -32,12 +32,9 @@ abstract class BottomSheetVerificationQrCodeItem : VectorEpoxyModel<BottomSheetV
     @EpoxyAttribute
     lateinit var data: String
 
-    @EpoxyAttribute
-    var animate = false
-
     override fun bind(holder: Holder) {
         super.bind(holder)
-        holder.qsrCodeImage.setData(data, animate)
+        holder.qsrCodeImage.setData(data)
     }
 
     class Holder : VectorEpoxyHolder() {