From f327eab7baa2be3b4ebaf00c99a05862183275ec Mon Sep 17 00:00:00 2001 From: Laurent Date: Wed, 12 Jun 2019 10:27:44 +0200 Subject: [PATCH] Put local code into RequestCode --- .../android/ui/activity/components/Codes.kt | 1 + .../android/ui/fragment/BankrollDetailsFragment.kt | 12 +++--------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/components/Codes.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/components/Codes.kt index 23cb64f8..c8ada486 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/activity/components/Codes.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/components/Codes.kt @@ -4,6 +4,7 @@ enum class RequestCode(var value: Int) { DEFAULT(1), BANKROLL_DETAILS(700), BANKROLL_CREATE(701), + BANKROLL_EDIT(702), NEW_SESSION(800), NEW_TRANSACTION(801), NEW_REPORT(802), diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDetailsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDetailsFragment.kt index 05f014f6..533b8c7b 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDetailsFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDetailsFragment.kt @@ -16,6 +16,7 @@ import net.pokeranalytics.android.model.LiveData import net.pokeranalytics.android.model.realm.Bankroll import net.pokeranalytics.android.ui.activity.DataListActivity import net.pokeranalytics.android.ui.activity.EditableDataActivity +import net.pokeranalytics.android.ui.activity.components.RequestCode import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource @@ -29,15 +30,9 @@ class BankrollDetailsFragment : RealmFragment(), StaticRowRepresentableDataSourc companion object { - const val REQUEST_CODE_EDIT = 1000 - - /** - * Create new instance - */ fun newInstance(bankrollReport: BankrollReport): BankrollDetailsFragment { val fragment = BankrollDetailsFragment() fragment.bankrollId = bankrollReport.setup.bankrollId -// fragment.bankrollReport = bankrollReport return fragment } } @@ -47,7 +42,6 @@ class BankrollDetailsFragment : RealmFragment(), StaticRowRepresentableDataSourc private var rows: ArrayList = ArrayList() private lateinit var bankrollAdapter: RowRepresentableAdapter -// private lateinit var bankrollReport: BankrollReport private var bankrollDetailsMenu: Menu? = null @@ -66,7 +60,7 @@ class BankrollDetailsFragment : RealmFragment(), StaticRowRepresentableDataSourc override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) - if (requestCode == REQUEST_CODE_EDIT && resultCode == RESULT_OK) { + if (requestCode == RequestCode.BANKROLL_EDIT.value && resultCode == RESULT_OK) { if (data?.getStringExtra(DataListActivity.IntentKey.ITEM_DELETED.keyName) != null) { activity?.setResult(RESULT_OK, data) activity?.finish() @@ -217,7 +211,7 @@ class BankrollDetailsFragment : RealmFragment(), StaticRowRepresentableDataSourc * Open Bankroll edit activity */ private fun editBankroll() { - EditableDataActivity.newInstanceForResult(this, LiveData.BANKROLL, this.bankrollId, REQUEST_CODE_EDIT) + EditableDataActivity.newInstanceForResult(this, LiveData.BANKROLL, this.bankrollId, RequestCode.BANKROLL_EDIT.value) } } \ No newline at end of file