From 3be297c0d3b86f2f5f54e4f69f8d2fe2a054225d Mon Sep 17 00:00:00 2001
From: dankito <git@dankito.net>
Date: Sun, 27 Sep 2020 00:32:18 +0200
Subject: [PATCH] Implemented showing fetch all transactions view at top and by
 clicking on 'x' button showing it at bottom (TODO on Android: show at bottom)

---
 .../banking/ui/android/home/HomeFragment.kt   |  39 +++-
 .../src/main/res/layout/fragment_home.xml     |  73 +++++++-
 .../src/main/res/values/dimens.xml            |   2 +
 .../dialogs/AccountTransactionsDialog.swift   | 166 +++++++++++-------
 4 files changed, 200 insertions(+), 80 deletions(-)

diff --git a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/home/HomeFragment.kt b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/home/HomeFragment.kt
index 76d83f52..f026c736 100644
--- a/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/home/HomeFragment.kt
+++ b/ui/BankingAndroidApp/src/main/java/net/dankito/banking/ui/android/home/HomeFragment.kt
@@ -52,6 +52,8 @@ class HomeFragment : Fragment() {
 
     private var accountsForWhichNotAllTransactionsHaveBeenFetched = listOf<TypedBankAccount>()
 
+    private var showTopFetchAllTransactionsView = true // TODO: read from db
+
 
     private val transactionAdapter: AccountTransactionAdapter
 
@@ -92,10 +94,18 @@ class HomeFragment : Fragment() {
 
         registerForContextMenu(rcyvwAccountTransactions) // this is actually bad, splits code as context menu is created in AccountTransactionAdapter
 
-        rootView.btnFetchAllTransactions.setOnClickListener {
+        rootView.btnTopFetchAllTransactions.setOnClickListener {
             fetchAllTransactions()
         }
 
+        rootView.btnBottomFetchAllTransactions.setOnClickListener {
+            fetchAllTransactions()
+        }
+
+        rootView.btnHideTopFetchAllTransactionsView.setOnClickListener {
+            hideTopFetchAllTransactionsView()
+        }
+
         rootView.btnRetrieveTransactions.setOnClickListener { fetchTransactions() }
         rootView.btnAddAccount.setOnClickListener { presenter.showAddAccountDialog() }
 
@@ -286,16 +296,31 @@ class HomeFragment : Fragment() {
 
     private fun setFetchAllTransactionsView() {
         accountsForWhichNotAllTransactionsHaveBeenFetched = presenter.selectedAccountsForWhichNotAllTransactionsHaveBeenFetched
+        val showFetchAllTransactionsView = accountsForWhichNotAllTransactionsHaveBeenFetched.isNotEmpty()
+                || presenter.selectedAccountsTransactionRetrievalState == TransactionsRetrievalState.RetrievedTransactions
 
-        val hideFetchAllTransactionsView = accountsForWhichNotAllTransactionsHaveBeenFetched.isEmpty()
-                || presenter.selectedAccountsTransactionRetrievalState != TransactionsRetrievalState.RetrievedTransactions
-
-        if (hideFetchAllTransactionsView) {
-            lytFetchAllTransactions.visibility = View.GONE
+        if (showFetchAllTransactionsView && showTopFetchAllTransactionsView) {
+            lytTopFetchAllTransactions.visibility = View.VISIBLE
         }
         else {
-            lytFetchAllTransactions.visibility = View.VISIBLE
+            lytTopFetchAllTransactions.visibility = View.GONE
         }
+
+        if (showFetchAllTransactionsView && showTopFetchAllTransactionsView == false) {
+            // TODO: implement CoordinatorLayout to show lytBottomFetchAllTransactions below rcyvwAccountTransactions
+//            lytBottomFetchAllTransactions.visibility = View.VISIBLE
+        }
+        else {
+            lytBottomFetchAllTransactions.visibility = View.GONE
+        }
+    }
+
+    private fun hideTopFetchAllTransactionsView() {
+        // TODO: persist
+
+        showTopFetchAllTransactionsView = false
+
+        setFetchAllTransactionsView()
     }
 
 
diff --git a/ui/BankingAndroidApp/src/main/res/layout/fragment_home.xml b/ui/BankingAndroidApp/src/main/res/layout/fragment_home.xml
index 0192a21d..c2763ad8 100644
--- a/ui/BankingAndroidApp/src/main/res/layout/fragment_home.xml
+++ b/ui/BankingAndroidApp/src/main/res/layout/fragment_home.xml
@@ -57,9 +57,17 @@
 
             </RelativeLayout>
 
-            <LinearLayout
-                android:orientation="vertical"
-                android:id="@+id/lytFetchAllTransactions"
+            <View
+                android:id="@+id/summaryAndTransactionsListDivider"
+                android:layout_width="match_parent"
+                android:layout_height="2dp"
+                android:paddingLeft="-12dp"
+                android:paddingRight="-12dp"
+                android:background="@color/formSectionDivideColor"
+                />
+
+            <RelativeLayout
+                android:id="@+id/lytTopFetchAllTransactions"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/fragment_account_transaction_fetch_all_transactions_layout_height"
                 android:gravity="center"
@@ -67,18 +75,41 @@
                 >
 
                 <Button
-                    android:id="@+id/btnFetchAllTransactions"
+                    android:id="@+id/btnTopFetchAllTransactions"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/fragment_account_transaction_fetch_all_transactions_button_height"
-                    android:gravity="center_horizontal"
-                    android:textAlignment="center"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentBottom="true"
+                    android:layout_toLeftOf="@+id/btnHideTopFetchAllTransactionsView"
+                    android:layout_toStartOf="@+id/btnHideTopFetchAllTransactionsView"
+                    android:gravity="center"
+                    android:textAlignment="gravity"
                     style="?android:attr/buttonBarButtonStyle"
                     android:textAllCaps="false"
                     android:textColor="@color/linkColor"
                     android:text="@string/fragment_home_fetch_all_account_transactions"
                     />
 
-            </LinearLayout>
+                <ImageButton
+                    android:id="@+id/btnHideTopFetchAllTransactionsView"
+                    android:layout_width="@dimen/fragment_account_transaction_hide_fetch_all_transactions_button_height_and_width"
+                    android:layout_height="@dimen/fragment_account_transaction_hide_fetch_all_transactions_button_height_and_width"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginLeft="@dimen/fragment_account_transaction_hide_fetch_all_transactions_button_margin_start_and_end"
+                    android:layout_marginStart="@dimen/fragment_account_transaction_hide_fetch_all_transactions_button_margin_start_and_end"
+                    android:layout_marginRight="@dimen/fragment_account_transaction_hide_fetch_all_transactions_button_margin_start_and_end"
+                    android:layout_marginEnd="@dimen/fragment_account_transaction_hide_fetch_all_transactions_button_margin_start_and_end"
+                    android:background="@null"
+                    android:tint="#000000"
+                    app:srcCompat="@drawable/ic_baseline_close_24"
+                    />
+
+            </RelativeLayout>
 
         </LinearLayout>
 
@@ -95,6 +126,34 @@
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             />
 
+
+        <!-- TODO: add CoordinatorLayout to show lytBottomFetchAllTransactions below rcyvwAccountTransactions -->
+        <LinearLayout
+            android:orientation="vertical"
+            android:id="@+id/lytBottomFetchAllTransactions"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/fragment_account_transaction_fetch_all_transactions_layout_height"
+            android:layout_alignParentBottom="true"
+            android:gravity="center"
+            android:background="@color/formSectionDivideColor"
+            android:visibility="gone"
+            >
+
+            <Button
+                android:id="@+id/btnBottomFetchAllTransactions"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/fragment_account_transaction_fetch_all_transactions_button_height"
+                android:gravity="center"
+                android:textAlignment="gravity"
+                style="?android:attr/buttonBarButtonStyle"
+                android:textAllCaps="false"
+                android:textColor="@color/linkColor"
+                android:text="@string/fragment_home_fetch_all_account_transactions"
+                />
+
+        </LinearLayout>
+
+
         <LinearLayout
             android:orientation="vertical"
             android:id="@+id/lytNoTransactionsFetched"
diff --git a/ui/BankingAndroidApp/src/main/res/values/dimens.xml b/ui/BankingAndroidApp/src/main/res/values/dimens.xml
index f1a4c161..4237410d 100644
--- a/ui/BankingAndroidApp/src/main/res/values/dimens.xml
+++ b/ui/BankingAndroidApp/src/main/res/values/dimens.xml
@@ -31,6 +31,8 @@
     <dimen name="fragment_account_transaction_add_account_button_height">40dp</dimen>
     <dimen name="fragment_account_transaction_fetch_all_transactions_layout_height">48dp</dimen>
     <dimen name="fragment_account_transaction_fetch_all_transactions_button_height">40dp</dimen>
+    <dimen name="fragment_account_transaction_hide_fetch_all_transactions_button_height_and_width">30dp</dimen>
+    <dimen name="fragment_account_transaction_hide_fetch_all_transactions_button_margin_start_and_end">2dp</dimen>
 
     <dimen name="list_item_account_transaction_height">74dp</dimen>
     <dimen name="list_item_account_transaction_padding">0dp</dimen>
diff --git a/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/AccountTransactionsDialog.swift b/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/AccountTransactionsDialog.swift
index a477892f..dcac9ef3 100644
--- a/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/AccountTransactionsDialog.swift
+++ b/ui/BankingiOSApp/BankingiOSApp/ui/dialogs/AccountTransactionsDialog.swift
@@ -4,33 +4,37 @@ import BankingUiSwift
 
 struct AccountTransactionsDialog: View {
     
+    static private let HideTopFetchAllTransactionsViewButtonWidth: CGFloat = 34
+    
     static private let RetrievedTransactionsPeriodDateFormat = DateFormatter()
-    
-    
+
+
     private let title: String
-    
+
     private let showBankIcons: Bool
-    
-    
+
+
     @State private var showTransactionsList = true
-    
+
     @State private var noTransactionsFetchedMessage: LocalizedStringKey = ""
-    
+
     @State private var showFetchTransactionsButton = true
-    
+
     @State private var showFetchAllTransactionsView: Bool = false
     
+    @State private var showFetchAllTransactionsViewAtTop: Bool = true
+
     @State private var accountsForWhichNotAllTransactionsHaveBeenFetched: [IBankAccount] = []
-    
-    
+
+
     @State private var filteredTransactions: [IAccountTransaction] = []
-    
+
     @State private var balanceOfAllTransactions: CommonBigDecimal = CommonBigDecimal(decimal: "0")
-    
+
     @State private var balanceOfFilteredTransactions: CommonBigDecimal = CommonBigDecimal(decimal: "0")
     
     @State private var searchText = ""
-    
+
     private var searchTextBinding: Binding<String> {
         Binding<String>(
             get: { self.searchText },
@@ -39,11 +43,11 @@ struct AccountTransactionsDialog: View {
                 self.filterTransactions($0)
         })
     }
-    
-    
+
+
     @State private var errorMessage: Message? = nil
-    
-    
+
+
     @Inject private var presenter: BankingPresenterSwift
 
 
@@ -52,28 +56,28 @@ struct AccountTransactionsDialog: View {
 
         presenter.selectedAllAccounts()
     }
-    
+
     init(bank: IBankData) {
         self.init(bank.displayName, false)
-        
+
         presenter.selectedBank(bank: bank)
     }
-    
+
     init(account: IBankAccount) {
         self.init(account.displayName, false)
 
         presenter.selectedAccount(account: account)
     }
-    
+
     fileprivate init(_ title: String, _ showBankIcons: Bool) {
         self.title = title
-        
+
         self.showBankIcons = showBankIcons
-        
+
         Self.RetrievedTransactionsPeriodDateFormat.dateStyle = .medium
     }
-    
-    
+
+
     var body: some View {
         VStack {
             Form {
@@ -90,17 +94,18 @@ struct AccountTransactionsDialog: View {
                     }
                 }
 
-                if showFetchAllTransactionsView {
-                    SectionWithoutBackground {
-                        HStack(alignment: .center) {
-                            Spacer()
+                if showFetchAllTransactionsView && showFetchAllTransactionsViewAtTop {
+                    HStack(alignment: .center) {
 
-                            fetchAllTransactionsButton
+                        fetchAllTransactionsButton
+                            .padding(.horizontal, 0)
 
-                            Spacer()
-                        }
-                        .padding(.horizontal, 6)
                     }
+                    .padding(.horizontal, 0)
+                    .padding(.trailing, Self.HideTopFetchAllTransactionsViewButtonWidth)
+                    .frame(maxWidth: .infinity, minHeight: 44, maxHeight: .infinity) // has to have at least a height of 44 (iOS 14; iOS 13: 40), otherwise a white line at bottom gets displayed
+                    .removeSectionBackground()
+                    .overlay(hideTopFetchAllTransactionsViewButton, alignment: .trailing)
                 }
 
                 if showTransactionsList {
@@ -109,12 +114,24 @@ struct AccountTransactionsDialog: View {
                             AccountTransactionListItem(transaction, self.showBankIcons)
                         }
                     }
+                    
+                    if showFetchAllTransactionsView && showFetchAllTransactionsViewAtTop == false {
+                        SectionWithoutBackground {
+                            HStack {
+                                Spacer()
+                                
+                                fetchAllTransactionsButton
+                            
+                                Spacer()
+                            }
+                        }
+                    }
                 }
                 else {
                     VStack(alignment: .center) {
                         Text(noTransactionsFetchedMessage)
                             .multilineTextAlignment(.center)
-                        
+
                         if showFetchTransactionsButton {
                             Button("Fetch transactions") { self.fetchTransactions() }
                                 .padding(.top, 6)
@@ -131,44 +148,65 @@ struct AccountTransactionsDialog: View {
         .showNavigationBarTitle(LocalizedStringKey(title))
         .navigationBarItems(trailing: UpdateButton { _, executingDone in self.updateTransactions(executingDone) })
     }
-    
-    
+
+
     private func setInitialValues() {
         self.balanceOfAllTransactions = self.presenter.balanceOfSelectedAccounts
-        
+
         self.filterTransactions("")
-        
+
         setTransactionsView()
     }
-    
+
     private func setTransactionsView() {
         let transactionsRetrievalState = presenter.selectedAccountsTransactionRetrievalState
         let haveTransactionsForSelectedAccountsBeenRetrieved = transactionsRetrievalState == .retrievedtransactions
-        
+
         self.accountsForWhichNotAllTransactionsHaveBeenFetched = presenter.selectedAccountsForWhichNotAllTransactionsHaveBeenFetched
-        self.showFetchAllTransactionsView = shouldShowFetchAllTransactionsView && haveTransactionsForSelectedAccountsBeenRetrieved
-        
-        
+        self.showFetchAllTransactionsView = accountsForWhichNotAllTransactionsHaveBeenFetched.isNotEmpty && haveTransactionsForSelectedAccountsBeenRetrieved
+        //self.showFetchAllTransactionsViewAtTop = true // TODO: read from database
+
+
         self.showTransactionsList = haveTransactionsForSelectedAccountsBeenRetrieved
-        
+
         self.noTransactionsFetchedMessage = getNoTransactionsFetchedMessage(transactionsRetrievalState)
         self.showFetchTransactionsButton = transactionsRetrievalState != .accountdoesnotsupportfetchingtransactions && transactionsRetrievalState != .accounttypenotsupported
     }
     
-    
-    private var fetchAllTransactionsButton: some View {
-        Button("Fetch all account transactions") {
-             self.fetchAllTransactions(self.accountsForWhichNotAllTransactionsHaveBeenFetched)
+    private func hideTopFetchAllTransactionsView() {
+        // TODO: save that we shouldn't show showFetchAllTransactionsView at top anymore in database
+        for account in accountsForWhichNotAllTransactionsHaveBeenFetched {
+            //UserDefaults.standard.set(true, forKey: Self.DoNotShowFetchAllTransactionsOverlayForUserDefaultsKeyPrefix + account.technicalId)
         }
+        
+        self.showFetchAllTransactionsViewAtTop = false
+    }
+
+
+    private var fetchAllTransactionsButton: some View {
+        Button(action: { self.fetchAllTransactions() } ) {
+            Text("Fetch all account transactions")
+                .multilineTextAlignment(.center)
+        }
+        .foregroundColor(Color.blue)
     }
     
-    
+    private var hideTopFetchAllTransactionsViewButton: some View {
+        // do not set Button's action as then if any of the two buttons get pressed, both actions get executed (bug in iOS). Use .onTapGesture() instead
+        Button("X") { }
+            .onTapGesture {
+                self.hideTopFetchAllTransactionsView()
+            }
+            .frame(width: Self.HideTopFetchAllTransactionsViewButtonWidth, height: 44, alignment: .center)
+    }
+
+
     private func updateTransactions(_ executingDone: @escaping () -> Void) {
         presenter.updateSelectedAccountsTransactionsAsync { response in
             executingDone()
 
             self.balanceOfAllTransactions = self.presenter.balanceOfSelectedAccounts
-            
+
             if response.successful {
                 self.filterTransactions(self.searchText)
             }
@@ -179,7 +217,7 @@ struct AccountTransactionsDialog: View {
             }
         }
     }
-    
+
     private func fetchTransactions() {
         for account in presenter.selectedAccounts {
             if account.haveAllTransactionsBeenRetrieved {
@@ -190,16 +228,16 @@ struct AccountTransactionsDialog: View {
             }
         }
     }
-    
-    private func fetchAllTransactions(_ accounts: [IBankAccount]) {
-        accounts.forEach { account in
+
+    private func fetchAllTransactions() {
+        accountsForWhichNotAllTransactionsHaveBeenFetched.forEach { account in
             presenter.fetchAllAccountTransactionsAsync(account: account, callback: self.handleGetTransactionsResult)
         }
     }
-    
+
     private func handleGetTransactionsResult(_ response: GetTransactionsResponse) {
         setTransactionsView()
-        
+
         if response.successful {
             self.filterTransactions(self.searchText)
         }
@@ -209,7 +247,7 @@ struct AccountTransactionsDialog: View {
             }
         }
     }
-    
+
     private func getNoTransactionsFetchedMessage(_ state: TransactionsRetrievalState) -> LocalizedStringKey {
         if state == .neverretrievedtransactions {
             return "No transactions fetched yet"
@@ -225,29 +263,25 @@ struct AccountTransactionsDialog: View {
             return "Account type not supported by app"
         }
     }
-    
+
     private func mapDate(_ date: CommonDate?) -> String {
         if let date = date?.date {
             return Self.RetrievedTransactionsPeriodDateFormat.string(from: date)
         }
-        
+
         return ""
     }
-    
+
     private func filterTransactions(_ query: String) {
         self.filteredTransactions = presenter.searchSelectedAccountTransactions(query: query).sorted { $0.valueDate.date > $1.valueDate.date }
-        
+
         self.balanceOfFilteredTransactions = query.isBlank ? balanceOfAllTransactions : filteredTransactions.sumAmounts()
     }
-    
+
     private func getAccountThatFailed(_ response: GetTransactionsResponse) -> IBankAccount? {
         return response.retrievedData.first { $0.successfullyRetrievedData == false }?.account
     }
     
-    
-    private var shouldShowFetchAllTransactionsView: Bool {
-        return accountsForWhichNotAllTransactionsHaveBeenFetched.isNotEmpty
-    }
 }