Cleanup to use RequestCodes in Feed

csv
Laurent 6 years ago
parent c677934e0a
commit 1319d98b15
  1. 2
      app/src/main/java/net/pokeranalytics/android/ui/activity/components/Codes.kt
  2. 12
      app/src/main/java/net/pokeranalytics/android/ui/fragment/FeedFragment.kt

@ -2,6 +2,8 @@ package net.pokeranalytics.android.ui.activity.components
enum class RequestCode(var value: Int) { enum class RequestCode(var value: Int) {
DEFAULT(1), DEFAULT(1),
FEED_MENU(100),
FEED_TRANSACTION_DETAILS(101),
BANKROLL_DETAILS(700), BANKROLL_DETAILS(700),
BANKROLL_CREATE(701), BANKROLL_CREATE(701),
BANKROLL_EDIT(702), BANKROLL_EDIT(702),

@ -45,15 +45,13 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
companion object { companion object {
const val REQUEST_CODE_MENU = 100
const val REQUEST_CODE_TRANSACTION_DETAILS = 101
fun newInstance(): FeedFragment { fun newInstance(): FeedFragment {
val fragment = FeedFragment() val fragment = FeedFragment()
val bundle = Bundle() val bundle = Bundle()
fragment.arguments = bundle fragment.arguments = bundle
return fragment return fragment
} }
} }
private lateinit var feedSessionAdapter: FeedSessionRowRepresentableAdapter private lateinit var feedSessionAdapter: FeedSessionRowRepresentableAdapter
@ -121,13 +119,13 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data) super.onActivityResult(requestCode, resultCode, data)
if (requestCode == REQUEST_CODE_MENU && resultCode == RESULT_OK && data != null) { if (requestCode == RequestCode.FEED_MENU.value && resultCode == RESULT_OK && data != null) {
when (data.getIntExtra(NewDataMenuActivity.IntentKey.CHOICE.keyName, -1)) { when (data.getIntExtra(NewDataMenuActivity.IntentKey.CHOICE.keyName, -1)) {
0 -> createNewSession(false) 0 -> createNewSession(false)
1 -> createNewSession(true) 1 -> createNewSession(true)
2 -> createNewTransaction() 2 -> createNewTransaction()
} }
} else if (requestCode == REQUEST_CODE_TRANSACTION_DETAILS && resultCode == RESULT_OK && data != null) { } else if (requestCode == RequestCode.FEED_TRANSACTION_DETAILS.value && resultCode == RESULT_OK && data != null) {
if (data.getStringExtra(DataListActivity.IntentKey.ITEM_DELETED.keyName) != null) { if (data.getStringExtra(DataListActivity.IntentKey.ITEM_DELETED.keyName) != null) {
deleteSelectedTransaction() deleteSelectedTransaction()
} }
@ -158,7 +156,7 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
this, this,
LiveData.TRANSACTION, LiveData.TRANSACTION,
row.id, row.id,
REQUEST_CODE_TRANSACTION_DETAILS RequestCode.FEED_TRANSACTION_DETAILS.value
) )
} }
} }
@ -195,7 +193,7 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
activity?.let { activity?.let {
val options = ActivityOptionsCompat.makeSceneTransitionAnimation(it) val options = ActivityOptionsCompat.makeSceneTransitionAnimation(it)
val intent = Intent(requireContext(), NewDataMenuActivity::class.java) val intent = Intent(requireContext(), NewDataMenuActivity::class.java)
startActivityForResult(intent, REQUEST_CODE_MENU, options.toBundle()) startActivityForResult(intent, RequestCode.FEED_MENU.value, options.toBundle())
} }
} }

Loading…
Cancel
Save