/*
- * Copyright © 2019 Damyan Ivanov.
+ * Copyright © 2020 Damyan Ivanov.
* 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
import android.annotation.SuppressLint;
import android.app.Activity;
import android.database.Cursor;
+import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.RecyclerView;
-import net.ktnx.mobileledger.App;
+import com.google.android.material.snackbar.Snackbar;
+
import net.ktnx.mobileledger.BuildConfig;
import net.ktnx.mobileledger.R;
import net.ktnx.mobileledger.async.DescriptionSelectedCallback;
class NewTransactionItemsAdapter extends RecyclerView.Adapter<NewTransactionItemHolder>
implements DescriptionSelectedCallback {
- NewTransactionModel model;
+ private final NewTransactionModel model;
private MobileLedgerProfile mProfile;
- private ItemTouchHelper touchHelper;
+ private final ItemTouchHelper touchHelper;
private RecyclerView recyclerView;
private int checkHoldCounter = 0;
NewTransactionItemsAdapter(NewTransactionModel viewModel, MobileLedgerProfile profile) {
public void setProfile(MobileLedgerProfile profile) {
mProfile = profile;
}
- int addRow() {
+ private int addRow() {
return addRow(null);
}
- int addRow(String commodity) {
+ private int addRow(String commodity) {
final int newAccountCount = model.addAccount(new LedgerTransactionAccount("", commodity));
Logger.debug("new-transaction",
String.format(Locale.US, "invoking notifyItemInserted(%d)", newAccountCount));
public int getItemCount() {
return model.getAccountCount() + 2;
}
- boolean accountListIsEmpty() {
+ private boolean accountListIsEmpty() {
for (int i = 0; i < model.getAccountCount(); i++) {
LedgerTransactionAccount acc = model.getAccount(i);
if (!acc.getAccountName()
this.recyclerView = null;
}
public void descriptionSelected(String description) {
- debug("descr selected", description);
+ debug("description selected", description);
if (!accountListIsEmpty())
return;
ArrayList<String> params = new ArrayList<>();
StringBuilder sb = new StringBuilder("select t.profile, t.id from transactions t");
- if (!Misc.isEmptyOrNull(accFilter)) {
+ if (!TextUtils.isEmpty(accFilter)) {
sb.append(" JOIN transaction_accounts ta")
.append(" ON ta.profile = t.profile")
.append(" AND ta.transaction_id = t.id");
sb.append(" WHERE t.description=?");
params.add(description);
- if (!Misc.isEmptyOrNull(accFilter)) {
+ if (!TextUtils.isEmpty(accFilter)) {
sb.append(" AND ta.account_name LIKE '%'||?||'%'");
params.add(accFilter);
}
- sb.append(" ORDER BY t.date DESC LIMIT 1");
+ sb.append(" ORDER BY t.year desc, t.month desc, t.day desc LIMIT 1");
final String sql = sb.toString();
- debug("descr", sql);
- debug("descr", params.toString());
+ debug("description", sql);
+ debug("description", params.toString());
Activity activity = (Activity) recyclerView.getContext();
// FIXME: handle exceptions?
}
@Override
public void onNoRows() {
- if (Misc.isEmptyOrNull(accFilter))
+ if (TextUtils.isEmpty(accFilter))
return;
- debug("descr", "Trying transaction search without preferred account filter");
+ debug("description", "Trying transaction search without preferred account filter");
final String broaderSql =
"select t.profile, t.id from transactions t where t.description=?" +
- " ORDER BY date desc LIMIT 1";
+ " ORDER BY year desc, month desc, day desc LIMIT 1";
params.remove(1);
- debug("descr", broaderSql);
- debug("descr", description);
+ debug("description", broaderSql);
+ debug("description", description);
+
+ activity.runOnUiThread(
+ () -> Snackbar.make(recyclerView, R.string.ignoring_preferred_account,
+ Snackbar.LENGTH_LONG)
+ .show());
MLDB.queryInBackground(broaderSql, new String[]{description},
new MLDB.CallbackHelper() {
profileUUID, transactionId));
tr = profile.loadTransaction(transactionId);
- ArrayList<LedgerTransactionAccount> accounts = tr.getAccounts();
+ List<LedgerTransactionAccount> accounts = tr.getAccounts();
NewTransactionModel.Item firstNegative = null;
NewTransactionModel.Item firstPositive = null;
int singleNegativeIndex = -1;
// TODO perhaps do only one notification about the whole range (notifyDatasetChanged)?
}
}
- public void reset() {
+ void reset() {
int presentItemCount = model.getAccountCount();
model.reset();
notifyItemChanged(0); // header changed
if (presentItemCount > 2)
notifyItemRangeRemoved(3, presentItemCount - 2); // all the rest are gone
}
- public void updateFocusedItem(int position) {
+ void updateFocusedItem(int position) {
model.updateFocusedItem(position);
}
- public void noteFocusIsOnAccount(int position) {
+ void noteFocusIsOnAccount(int position) {
model.noteFocusChanged(position, NewTransactionModel.FocusedElement.Account);
}
- public void noteFocusIsOnAmount(int position) {
+ void noteFocusIsOnAmount(int position) {
model.noteFocusChanged(position, NewTransactionModel.FocusedElement.Amount);
}
- public void noteFocusIsOnComment(int position) {
+ void noteFocusIsOnComment(int position) {
model.noteFocusChanged(position, NewTransactionModel.FocusedElement.Comment);
}
+ void noteFocusIsOnTransactionComment(int position) {
+ model.noteFocusChanged(position, NewTransactionModel.FocusedElement.TransactionComment);
+ }
+ public void noteFocusIsOnDescription(int pos) {
+ model.noteFocusChanged(pos, NewTransactionModel.FocusedElement.Description);
+ }
private void holdSubmittableChecks() {
checkHoldCounter++;
}
itemsWithAccountForCurrency.add(currName, item);
}
- if (acc.isAmountSet()) {
+ if (!acc.isAmountValid()) {
+ Logger.debug("submittable",
+ String.format("Not submittable: row %d has an invalid amount", i + 1));
+ submittable = false;
+ }
+ else if (acc.isAmountSet()) {
itemsWithAmountForCurrency.add(currName, item);
balance.add(currName, acc.getAmount());
}
model.isSubmittable.setValue(false);
}
}
- private class BalanceForCurrency {
- private HashMap<String, Float> hashMap = new HashMap<>();
+
+ private static class BalanceForCurrency {
+ private final HashMap<String, Float> hashMap = new HashMap<>();
float get(String currencyName) {
Float f = hashMap.get(currencyName);
if (f == null) {
}
}
- private class ItemsForCurrency {
- private HashMap<String, List<NewTransactionModel.Item>> hashMap = new HashMap<>();
+ private static class ItemsForCurrency {
+ private final HashMap<String, List<NewTransactionModel.Item>> hashMap = new HashMap<>();
@NonNull
List<NewTransactionModel.Item> getList(@Nullable String currencyName) {
List<NewTransactionModel.Item> list = hashMap.get(currencyName);
projects / mobile-ledger.git / blobdiff