From f279512c575d315b9ed73bfb56e5e7fb75d53f2f Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Wed, 26 Dec 2018 19:40:56 -0600 Subject: [PATCH] Enable the transaction direction filter, the user can apply the filter and see all transactions or just the sent or received. --- .../fragments/FilterOptionsDialog.kt | 12 ++++++------ .../fragments/TransactionsFragment.kt | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/FilterOptionsDialog.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/FilterOptionsDialog.kt index a384a25..d7c3b94 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/FilterOptionsDialog.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/FilterOptionsDialog.kt @@ -282,12 +282,12 @@ class FilterOptionsDialog : DialogFragment() { // } private fun validateFields() { - val filterTransactionsDirection = 0 //when { -// rbTransactionAll.isChecked -> 0 -// rbTransactionSent.isChecked -> 1 -// rbTransactionReceived.isChecked -> 2 -// else -> { 0 } -// } + val filterTransactionsDirection = when { + rbTransactionAll.isChecked -> 0 + rbTransactionSent.isChecked -> 1 + rbTransactionReceived.isChecked -> 2 + else -> { 0 } + } val filterDateRangeAll = cbDateRange.isChecked diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/TransactionsFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/TransactionsFragment.kt index 8527710..817f4ec 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/TransactionsFragment.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/TransactionsFragment.kt @@ -147,11 +147,11 @@ class TransactionsFragment : Fragment(), FilterOptionsDialog.OnFilterOptionsSele for (transferDetail in transfersDetails) { // Filter by transfer direction if (transferDetail.direction) { // Transfer sent - if (filterTransactionsDirection == 2) + if (filterTransactionsDirection == 1) // Looking for received transfers only continue } else { // Transfer received - if (filterTransactionsDirection == 1) + if (filterTransactionsDirection == 2) // Looking for sent transactions only continue }