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 43470af1..b15ff03a 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 @@ -224,7 +224,7 @@ class ReplayerAnimator(var handHistory: HandHistory, var export: Boolean) { private var tableHPadding = 0f private var tableVPadding = 0f - val showVillainHands: Boolean = true +// var showVillainHands: Boolean = true var potTextPoint = TextPoint(0f, 0f, 0f) var totalPotTextPoint = TextPoint(0f, 0f, 0f) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerFragment.kt index b6dfd907..bcd25440 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/replayer/ReplayerFragment.kt @@ -4,6 +4,8 @@ import android.os.Bundle import android.os.Handler import android.os.Looper import android.view.* +import android.widget.PopupWindow +import android.widget.Switch import androidx.lifecycle.ViewModelProviders import io.realm.Sort import kotlinx.android.synthetic.main.fragment_replayer.* @@ -12,6 +14,7 @@ import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.model.realm.handhistory.HandHistory import net.pokeranalytics.android.ui.fragment.components.RealmFragment import net.pokeranalytics.android.ui.modules.handhistory.HandHistoryActivity +import net.pokeranalytics.android.util.Preferences import net.pokeranalytics.android.util.extensions.findById class ReplayerFragment : RealmFragment() { @@ -101,6 +104,9 @@ class ReplayerFragment : RealmFragment() { this.speed.setOnClickListener { changeSpeed() } + this.settings.setOnClickListener { + openSettings() + } updateSpeedButtonText() } @@ -217,4 +223,39 @@ class ReplayerFragment : RealmFragment() { updateSpeedButtonText() } + private fun openSettings() { + +// val builder = AlertDialog.Builder(requireContext()) + + // Get the layout inflater + val inflater = requireActivity().layoutInflater + + // Inflate and set the layout for the dialog + // Pass null as the parent view because its going in the dialog layout + val view = inflater.inflate(R.layout.view_replayer_settings, null) + val switch = view.findViewById(R.id.show_villain_cards) + + switch.text = requireContext().getString(R.string.show_villain_cards) + switch.isChecked = Preferences.getShowVillainCards(requireContext()) + switch.setOnCheckedChangeListener { _, isChecked -> + Preferences.setShowVillainCards(isChecked, requireContext()) + this.replayer.refresh() + } + + val popupWindow = PopupWindow(requireContext()) + popupWindow.contentView = view + popupWindow.isFocusable = true + popupWindow.showAsDropDown(this.settings, 0, -300) + + + +// builder.setView(view).setNegativeButton(R.string.ok) { dialog, _ -> +// dialog.cancel() +// } +// +// val dialog = builder.create() +// dialog.show() + + } + } \ No newline at end of file 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 fbfbec80..b8fe6980 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 @@ -9,6 +9,7 @@ import net.pokeranalytics.android.model.handhistory.Position import net.pokeranalytics.android.model.handhistory.Street import net.pokeranalytics.android.model.realm.handhistory.Card import net.pokeranalytics.android.ui.modules.handhistory.model.ComputedAction +import net.pokeranalytics.android.util.Preferences import net.pokeranalytics.android.util.RANDOM_PLAYER import net.pokeranalytics.android.util.extensions.formatted @@ -244,7 +245,8 @@ class TableDrawer { val isHero = (animator.handHistory.heroIndex == playerIndex) cardRects.forEachIndexed { j, cardRect -> - if (j < cards?.size ?: 0 && (animator.showVillainHands || isHero)) { // show card + val showVillainHands = Preferences.getShowVillainCards(context) + if (j < cards?.size ?: 0 && (showVillainHands || isHero)) { // show card val card = cards?.get(j)!! // tested line before drawCard(card, cardRect, canvas, context) } else { // show hidden cards diff --git a/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt b/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt index 5fa4ec6a..35672131 100644 --- a/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt +++ b/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt @@ -32,7 +32,8 @@ class Preferences { PATCH_TRANSACTION_TYPES_NAMES("patchTransactionTypesNames"), PATCH_BLINDS_FORMAT("patchBlindFormat"), SHOW_STOP_NOTIFICATIONS("showStopNotifications"), - ADD_NEW_TRANSACTION_TYPES("addNewTransactionTypes") + ADD_NEW_TRANSACTION_TYPES("addNewTransactionTypes"), + SHOW_VILLAIN_CARDS("showVillainCards") } enum class FeedMessage { @@ -113,6 +114,14 @@ class Preferences { return preferences.getBoolean(key.identifier, defaultValue ?: false) } + fun setShowVillainCards(show: Boolean, context: Context) { + setBoolean(Keys.SHOW_VILLAIN_CARDS, show, context) + } + + fun getShowVillainCards(context: Context): Boolean { + return getBoolean(Keys.SHOW_VILLAIN_CARDS, context, true) + } + fun setCurrencyCode(currencyCode: String, context: Context) { setString(Keys.CURRENCY_CODE, currencyCode, context) UserDefaults.setCurrencyValues(context) diff --git a/app/src/main/res/drawable-xxhdpi/back_disclosure.png b/app/src/main/res/drawable-xxhdpi/back_disclosure.png deleted file mode 100644 index 368c3346..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/back_disclosure.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/big_export.png b/app/src/main/res/drawable-xxhdpi/big_export.png deleted file mode 100644 index f37c80b4..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/big_export.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/blog_black.png b/app/src/main/res/drawable-xxhdpi/blog_black.png deleted file mode 100644 index 89c7f776..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/blog_black.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/bottom_disclosure.png b/app/src/main/res/drawable-xxhdpi/bottom_disclosure.png deleted file mode 100644 index a73a421c..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/bottom_disclosure.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/cross.png b/app/src/main/res/drawable-xxhdpi/cross.png deleted file mode 100644 index 1a13a7bd..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/cross.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/disclosure.png b/app/src/main/res/drawable-xxhdpi/disclosure.png deleted file mode 100644 index 4daf21b6..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/disclosure.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/facebook_black.png b/app/src/main/res/drawable-xxhdpi/facebook_black.png deleted file mode 100644 index 2a1238c9..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/facebook_black.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/fullscreen.png b/app/src/main/res/drawable-xxhdpi/fullscreen.png deleted file mode 100644 index d4e74d16..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/fullscreen.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/icon_poker_chip.png b/app/src/main/res/drawable-xxhdpi/icon_poker_chip.png deleted file mode 100644 index 61739ae2..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/icon_poker_chip.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/insta_black.png b/app/src/main/res/drawable-xxhdpi/insta_black.png deleted file mode 100644 index 0599fbce..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/insta_black.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/logo_pa.png b/app/src/main/res/drawable-xxhdpi/logo_pa.png deleted file mode 100644 index 68f45519..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/logo_pa.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/pause.png b/app/src/main/res/drawable-xxhdpi/pause.png deleted file mode 100644 index d32085d6..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/pause.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_allin.png b/app/src/main/res/drawable-xxhdpi/picto_allin.png deleted file mode 100644 index 8564b1c3..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_allin.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_arrow_down.png b/app/src/main/res/drawable-xxhdpi/picto_arrow_down.png deleted file mode 100644 index 6f62df10..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_arrow_down.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_arrow_raise.png b/app/src/main/res/drawable-xxhdpi/picto_arrow_raise.png deleted file mode 100644 index aa39fac6..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_arrow_raise.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_arrow_right.png b/app/src/main/res/drawable-xxhdpi/picto_arrow_right.png deleted file mode 100644 index bfba8786..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_arrow_right.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_arrow_up.png b/app/src/main/res/drawable-xxhdpi/picto_arrow_up.png deleted file mode 100644 index 7ce8e484..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_arrow_up.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_bankroll.png b/app/src/main/res/drawable-xxhdpi/picto_bankroll.png deleted file mode 100644 index 2c3dae8c..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_bankroll.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_call_allin.png b/app/src/main/res/drawable-xxhdpi/picto_call_allin.png deleted file mode 100644 index bbe4bcd8..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_call_allin.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_cards.png b/app/src/main/res/drawable-xxhdpi/picto_cards.png deleted file mode 100644 index 496a79ee..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_cards.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_check.png b/app/src/main/res/drawable-xxhdpi/picto_check.png deleted file mode 100644 index 8a3b0162..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_check.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_engrenage.png b/app/src/main/res/drawable-xxhdpi/picto_engrenage.png deleted file mode 100644 index 7f7ac774..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_engrenage.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_gear_selected.png b/app/src/main/res/drawable-xxhdpi/picto_gear_selected.png deleted file mode 100644 index f985b0e3..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_gear_selected.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_m.png b/app/src/main/res/drawable-xxhdpi/picto_m.png deleted file mode 100644 index a23f001e..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_m.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_reports.png b/app/src/main/res/drawable-xxhdpi/picto_reports.png deleted file mode 100644 index 1a023a37..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_reports.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_reports_selected.png b/app/src/main/res/drawable-xxhdpi/picto_reports_selected.png deleted file mode 100644 index f537bd00..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_reports_selected.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_stars.png b/app/src/main/res/drawable-xxhdpi/picto_stars.png deleted file mode 100644 index 32c5c66e..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_stars.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_stars_selected.png b/app/src/main/res/drawable-xxhdpi/picto_stars_selected.png deleted file mode 100644 index 545463ee..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_stars_selected.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_stats.png b/app/src/main/res/drawable-xxhdpi/picto_stats.png deleted file mode 100644 index 45d7cfc0..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_stats.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_table.png b/app/src/main/res/drawable-xxhdpi/picto_table.png deleted file mode 100644 index 7d3f6cda..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_table.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_user.png b/app/src/main/res/drawable-xxhdpi/picto_user.png deleted file mode 100644 index 09fba699..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_user.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/picto_user_empty.png b/app/src/main/res/drawable-xxhdpi/picto_user_empty.png deleted file mode 100644 index efb87cff..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/picto_user_empty.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/pro_subscriber.png b/app/src/main/res/drawable-xxhdpi/pro_subscriber.png deleted file mode 100644 index b4dcb76f..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/pro_subscriber.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/star_pro.png b/app/src/main/res/drawable-xxhdpi/star_pro.png deleted file mode 100644 index 5e86c173..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/star_pro.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/star_semipro.png b/app/src/main/res/drawable-xxhdpi/star_semipro.png deleted file mode 100644 index c44d11ba..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/star_semipro.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/tab_calendar.png b/app/src/main/res/drawable-xxhdpi/tab_calendar.png deleted file mode 100644 index 36c2d425..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/tab_calendar.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/three_lines.png b/app/src/main/res/drawable-xxhdpi/three_lines.png deleted file mode 100644 index 2627e33b..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/three_lines.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/top_disclosure.png b/app/src/main/res/drawable-xxhdpi/top_disclosure.png deleted file mode 100644 index 2465d028..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/top_disclosure.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/twitter_black.png b/app/src/main/res/drawable-xxhdpi/twitter_black.png deleted file mode 100644 index b261c9f0..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/twitter_black.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml new file mode 100644 index 00000000..0e97038d --- /dev/null +++ b/app/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/fragment_replayer.xml b/app/src/main/res/layout/fragment_replayer.xml index a2efda8b..ac529691 100644 --- a/app/src/main/res/layout/fragment_replayer.xml +++ b/app/src/main/res/layout/fragment_replayer.xml @@ -108,6 +108,15 @@ android:layout_marginStart="2dp" android:layout_marginEnd="2dp"/> + + diff --git a/app/src/main/res/layout/view_replayer_settings.xml b/app/src/main/res/layout/view_replayer_settings.xml new file mode 100644 index 00000000..545d0af3 --- /dev/null +++ b/app/src/main/res/layout/view_replayer_settings.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5d02b3da..855ffb6e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -804,5 +804,6 @@ Your video has been generated at the following path Open file with We\'ll send you a notification when your file is available. Expect approximately one minute! + Show villain cards diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index ed2e4464..a6470c57 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -324,17 +324,14 @@ @null @android:color/transparent @android:color/transparent - -