Fixes a bug where the replayer was disabled

bs
Laurent 5 years ago
parent 280865da43
commit b568ac6487
  1. 8
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryActivity.kt
  2. 7
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt

@ -30,7 +30,7 @@ class HandHistoryActivity : BaseActivity() {
ATTACHED("attached") ATTACHED("attached")
} }
private var fragment: Fragment? = null private var currentFragment: Fragment? = null
companion object { companion object {
@ -97,7 +97,7 @@ class HandHistoryActivity : BaseActivity() {
val fragment = HandHistoryFragment.newInstance(handHistoryId, sessionId, attached) val fragment = HandHistoryFragment.newInstance(handHistoryId, sessionId, attached)
showFragment(fragment, R.id.container) showFragment(fragment, R.id.container)
this.fragment = fragment this.currentFragment = fragment
} }
fun showReplayer(handHistoryId: String) { fun showReplayer(handHistoryId: String) {
@ -106,12 +106,12 @@ class HandHistoryActivity : BaseActivity() {
val fragment = ReplayerFragment.newInstance(handHistoryId) val fragment = ReplayerFragment.newInstance(handHistoryId)
showFragment(fragment, R.id.container) showFragment(fragment, R.id.container)
this.fragment = fragment this.currentFragment = fragment
} }
override fun onBackPressed() { override fun onBackPressed() {
val shouldShowDataLossWarning = ((this.fragment as? HandHistoryFragment)?.isEditing == true) val shouldShowDataLossWarning = ((this.currentFragment as? HandHistoryFragment)?.isEditing == true)
if (shouldShowDataLossWarning) { if (shouldShowDataLossWarning) {

@ -214,12 +214,9 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
val iconResId = if (this.model.isEdited) R.drawable.ic_check else R.drawable.ic_edit val iconResId = if (this.model.isEdited) R.drawable.ic_check else R.drawable.ic_edit
this.menu?.let { menu -> this.menu?.let { menu ->
menu.findItem(R.id.edit_save)?.let { menu.findItem(R.id.edit_save).setIcon(iconResId)
// it.setTitle(titleResId)
it.setIcon(iconResId)
}
this.replayerItem = menu.findItem(R.id.replayer) this.replayerItem = menu.findItem(R.id.replayer)
this.replayerItem?.isEnabled = this.model.handHistory.isManaged this.replayerItem?.isEnabled = !this.model.isEdited
// Timber.d("this.replayerItem = ${this.replayerItem}") // Timber.d("this.replayerItem = ${this.replayerItem}")
} }
} }

Loading…
Cancel
Save