From 995c476467197c6ddea3a2866958b0738fb45658 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Mon, 22 Jun 2020 16:37:41 +0200
Subject: [PATCH] Fixes color issue + cleanup

---
 .../handhistory/HandHistoryActivity.kt        | 46 +------------------
 .../handhistory/replayer/ReplayerAnimator.kt  |  1 +
 .../handhistory/replayer/TableDrawer.kt       |  6 ++-
 .../android/util/video/MMediaMuxer.kt         |  4 +-
 4 files changed, 8 insertions(+), 49 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryActivity.kt
index 1bcafff3..dddfac7b 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryActivity.kt
@@ -162,7 +162,7 @@ class HandHistoryActivity : BaseActivity() {
 		TableDrawer.configurePaints(this, animator)
 
 		val muxer = MMediaMuxer()
-		muxer.Init(this, width.toInt(), height.toInt(), "hhVideo", "YES!")
+		muxer.Init(null, width.toInt(), height.toInt(), "hhVideo", "YES!")
 
 		animator.frames(this) { bitmap, count ->
 
@@ -179,50 +179,6 @@ class HandHistoryActivity : BaseActivity() {
 		val path = muxer.GetPath()
 		Timber.d("**** Video path = $path")
 
-//		Timber.d("**** Start video test")
-//
-//		val width = 480
-//		val height = 480
-//
-//		val bitmap = Bitmap.createBitmap(480, 480, Bitmap.Config.ARGB_8888)
-//		val canvas = Canvas(bitmap)
-//
-//		val paint = Paint()
-//		paint.isAntiAlias = true
-//		paint.style = Paint.Style.STROKE
-//		paint.strokeWidth = 20.0.toFloat()
-//		paint.color = requireContext().getColor(R.color.blue)
-//
-//		canvas.drawRect(Rect(0,0, width, height), paint)
-//
-//		bitmap.let {
-//
-//			val muxer = MMediaMuxer()
-//
-//			Timber.d("width = ${it.width}, height = ${it.height}")
-//
-//			val width = (it.width / 2) * 2
-//			val height= (it.height / 2) * 2
-//
-//			muxer.Init(requireActivity(), width, height, "hhVideo", "YES!")
-//
-//			Timber.d("**** Adds frames")
-//			for (i in 0..50) {
-//
-//				try {
-//					val byteArray = it.toByteArray()
-//					muxer.AddFrame(byteArray)
-//				} catch (e: Exception) {
-//					Timber.e("error = ${e.message}")
-//				}
-//			}
-//			Timber.d("**** Create video")
-//			muxer.CreateVideo()
-//
-//			val path = muxer.GetPath()
-//			Timber.d("**** Video path = $path")
-//		}
-
 	}
 
 	private fun gifExport() {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerAnimator.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerAnimator.kt
index 5b6932bc..945823b5 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerAnimator.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerAnimator.kt
@@ -141,6 +141,7 @@ class ReplayerAnimator(var handHistory: HandHistory, var export: Boolean) {
 
 	init {
 		loadHandHistory(this.handHistory)
+		TableDrawer.clearColors()
 	}
 
 	private fun loadHandHistory(handHistory: HandHistory) {
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/TableDrawer.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/TableDrawer.kt
index b93e7057..88fd598b 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/TableDrawer.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/TableDrawer.kt
@@ -30,9 +30,11 @@ class TableDrawer(bitmap: Bitmap) : Canvas(bitmap) {
 
 		private val colorsByAmount = hashMapOf<Double, ChipColor>()
 
-		fun configurePaints(context: Context, animator: ReplayerAnimator) {
-
+		fun clearColors() {
 			this.colorsByAmount.clear()
+		}
+
+		fun configurePaints(context: Context, animator: ReplayerAnimator) {
 
 			backgroundPaint.color = context.getColor(backgroundColor)
 
diff --git a/app/src/main/java/net/pokeranalytics/android/util/video/MMediaMuxer.kt b/app/src/main/java/net/pokeranalytics/android/util/video/MMediaMuxer.kt
index 3e33c609..2ca2990d 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/video/MMediaMuxer.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/video/MMediaMuxer.kt
@@ -106,7 +106,7 @@ class MMediaMuxer {
 	}
 
 	fun ShowProgressBar() {
-		_activity!!.runOnUiThread {
+		_activity?.runOnUiThread {
 			pd = ProgressDialog(_activity)
 			pd!!.setTitle(_title)
 			pd!!.setCancelable(false)
@@ -117,7 +117,7 @@ class MMediaMuxer {
 	}
 
 	fun HideProgressBar() {
-		Thread(Runnable { _activity!!.runOnUiThread { pd!!.dismiss() } }).start()
+		Thread(Runnable { _activity?.runOnUiThread { pd!!.dismiss() } }).start()
 	}
 
 	private fun bufferEncoder() {