From 88ebaba62f38aaa40295e15145d6fa432cab1380 Mon Sep 17 00:00:00 2001 From: Laurent Date: Fri, 28 Feb 2020 17:23:20 +0100 Subject: [PATCH] Adds Tag for Player button + stuff --- .../android/ui/fragment/FeedFragment.kt | 45 ----------------- .../modules/handhistory/HandHistoryAdapter.kt | 2 + .../handhistory/HandHistoryFragment.kt | 49 +++++++++++++++++++ .../handhistory/model/PlayerSetupRow.kt | 1 + 4 files changed, 52 insertions(+), 45 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt index 09b86dd1..9182c98a 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt @@ -463,51 +463,6 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { HandHistoryActivity.newInstance(this) - -// 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") -// } - } /** diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt index 21e4765d..a2a459f4 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryAdapter.kt @@ -465,6 +465,8 @@ class HandHistoryAdapter( init { + itemView.ps_player_button.tag = PlayerSetupRow.Tag.PLAYER.ordinal + setOnClickListener(itemView.ps_player_button) itemView.stack_edit_text.tag = PlayerSetupRow.Tag.STACK.ordinal diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt index 91014016..1a643e14 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt @@ -119,6 +119,8 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL val row = this.model.rowRepresentableForPosition(it.index) as HandHistoryRow +// row.performActionForTag(it.tag) + row.keyboardForTag(it.tag)?.let { keyboard -> when (keyboard) { @@ -549,6 +551,9 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL this.findNextActionToEdit(0) } + /*** + * Shows a popup with the various export options + */ private fun exportHand() { val builder: AlertDialog.Builder = AlertDialog.Builder(context) @@ -572,6 +577,50 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL private fun videoExport() { +// 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/model/PlayerSetupRow.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/PlayerSetupRow.kt index a6a0c61e..73dd1f0f 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/PlayerSetupRow.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/model/PlayerSetupRow.kt @@ -24,6 +24,7 @@ class PlayerSetupRow(var hero: Boolean = false, } enum class Tag { + PLAYER, POSITION, HAND, STACK