X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Ftransaction_list%2FTransactionListViewModel.java;h=7bc1a866f453d35ba5958f70ab1248af995ab607;hb=09e26d2279484b4dfe0de218b05f075362fff4b5;hp=d391b6227b5674019a853609cad9802f72330204;hpb=a6fdfa98f01366db77c1d2774575aee0b3b1b410;p=mobile-ledger-staging.git
diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java
index d391b622..7bc1a866 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java
@@ -1,64 +1,60 @@
/*
* Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
* under the term of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.ui.transaction_list;
-import android.app.Activity;
-import android.arch.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModel;
import android.os.AsyncTask;
-import android.view.View;
-import android.widget.AutoCompleteTextView;
-import net.ktnx.mobileledger.R;
import net.ktnx.mobileledger.async.UpdateTransactionsTask;
import net.ktnx.mobileledger.model.Data;
-import net.ktnx.mobileledger.model.LedgerTransaction;
+import net.ktnx.mobileledger.model.TransactionListItem;
import net.ktnx.mobileledger.utils.ObservableValue;
import java.util.List;
public class TransactionListViewModel extends ViewModel {
public static ObservableValue updating = new ObservableValue<>();
+ public static ObservableValue updateError = new ObservableValue<>();
- public static void scheduleTransactionListReload(Activity act) {
- View filter = act.findViewById(R.id.transaction_list_account_name_filter);
- if (filter == null) return;
- boolean hasFilter = filter.getVisibility() == View.VISIBLE;
- String accFilter = hasFilter ? String.valueOf(
- ((AutoCompleteTextView) act.findViewById(R.id.transaction_filter_account_name))
- .getText()) : null;
- AsyncTask> task = new UTT();
- task.execute(accFilter);
+ public static void scheduleTransactionListReload() {
+ if (Data.profile.get() == null) return;
+
+ String filter = TransactionListFragment.accountFilter.get();
+ AsyncTask task = new UTT();
+ task.execute(filter);
}
- public static LedgerTransaction getTransaction(int position) {
- List transactions = Data.transactions.get();
- if (position >= transactions.size()) return null;
+ public static TransactionListItem getTransactionListItem(int position) {
+ List transactions = Data.transactions.get();
+ if (transactions == null) return null;
+ if (position >= transactions.size() + 1) return null;
+ if (position == transactions.size()) return new TransactionListItem();
return transactions.get(position);
}
public static int getTransactionCount() {
- List transactions = Data.transactions.get();
+ List transactions = Data.transactions.get();
if (transactions == null) return 0;
return transactions.size();
}
private static class UTT extends UpdateTransactionsTask {
@Override
- protected void onPostExecute(List list) {
- super.onPostExecute(list);
- if (list != null) Data.transactions.set(list);
+ protected void onPostExecute(String error) {
+ super.onPostExecute(error);
+ if (error != null) updateError.set(error);
}
}
}