From 1319d98b15c83b4b3a18d641903c742a5d74c92b Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 20 Jun 2019 16:45:01 +0200 Subject: [PATCH] Cleanup to use RequestCodes in Feed --- .../android/ui/activity/components/Codes.kt | 2 ++ .../android/ui/fragment/FeedFragment.kt | 12 +++++------- 2 files changed, 7 insertions(+), 7 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 db99aed0..a6dfb446 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 @@ -2,6 +2,8 @@ package net.pokeranalytics.android.ui.activity.components enum class RequestCode(var value: Int) { DEFAULT(1), + FEED_MENU(100), + FEED_TRANSACTION_DETAILS(101), BANKROLL_DETAILS(700), BANKROLL_CREATE(701), BANKROLL_EDIT(702), 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 80fa9e50..3e4e68b4 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 @@ -45,15 +45,13 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { companion object { - const val REQUEST_CODE_MENU = 100 - const val REQUEST_CODE_TRANSACTION_DETAILS = 101 - fun newInstance(): FeedFragment { val fragment = FeedFragment() val bundle = Bundle() fragment.arguments = bundle return fragment } + } private lateinit var feedSessionAdapter: FeedSessionRowRepresentableAdapter @@ -121,13 +119,13 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { 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)) { 0 -> createNewSession(false) 1 -> createNewSession(true) 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) { deleteSelectedTransaction() } @@ -158,7 +156,7 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { this, LiveData.TRANSACTION, row.id, - REQUEST_CODE_TRANSACTION_DETAILS + RequestCode.FEED_TRANSACTION_DETAILS.value ) } } @@ -195,7 +193,7 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate { activity?.let { val options = ActivityOptionsCompat.makeSceneTransitionAnimation(it) val intent = Intent(requireContext(), NewDataMenuActivity::class.java) - startActivityForResult(intent, REQUEST_CODE_MENU, options.toBundle()) + startActivityForResult(intent, RequestCode.FEED_MENU.value, options.toBundle()) } }