import android.database.Cursor;
import android.os.AsyncTask;
import android.os.Bundle;
-import android.support.design.widget.BaseTransientBottomBar;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.widget.Toolbar;
import android.text.Editable;
import android.text.InputType;
import android.text.TextWatcher;
-import android.util.Log;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.Menu;
import android.widget.TextView;
import android.widget.Toast;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.BaseTransientBottomBar;
+import com.google.android.material.snackbar.Snackbar;
+
+import net.ktnx.mobileledger.App;
import net.ktnx.mobileledger.BuildConfig;
import net.ktnx.mobileledger.R;
import net.ktnx.mobileledger.async.DescriptionSelectedCallback;
-import net.ktnx.mobileledger.async.SaveTransactionTask;
+import net.ktnx.mobileledger.async.SendTransactionTask;
import net.ktnx.mobileledger.async.TaskCallback;
import net.ktnx.mobileledger.model.Data;
import net.ktnx.mobileledger.model.LedgerTransaction;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
-import java.util.List;
import java.util.Locale;
import java.util.Objects;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.DialogFragment;
+
+import static net.ktnx.mobileledger.utils.Logger.debug;
+
/*
* TODO: nicer progress while transaction is submitted
* TODO: reports
* TODO: get rid of the custom session/cookie and auth code?
* (the last problem with the POST was the missing content-length header)
- * TODO: nicer swiping removal with visual feedback
* */
-public class NewTransactionActivity extends CrashReportingActivity
+public class NewTransactionActivity extends ProfileThemedActivity
implements TaskCallback, DescriptionSelectedCallback {
- private static SaveTransactionTask saver;
+ private static SendTransactionTask saver;
private TableLayout table;
private ProgressBar progress;
private FloatingActionButton fab;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+
setContentView(R.layout.activity_new_transaction);
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
- toolbar.setSubtitle(Data.profile.get().getName());
+ toolbar.setSubtitle(mProfile.getName());
tvDate = findViewById(R.id.new_transaction_date);
tvDate.setOnFocusChangeListener((v, hasFocus) -> {
});
tvDescription = findViewById(R.id.new_transaction_description);
MLDB.hookAutocompletionAdapter(this, tvDescription, MLDB.DESCRIPTION_HISTORY_TABLE,
- "description", false, findViewById(R.id.new_transaction_acc_1), this);
+ "description", false, findViewById(R.id.new_transaction_acc_1), this, mProfile);
hookTextChangeListener(tvDescription);
progress = findViewById(R.id.save_transaction_progress);
TextView tvAmount = (TextView) row.getChildAt(1);
hookSwipeListener(row);
MLDB.hookAutocompletionAdapter(this, tvAccountName, MLDB.ACCOUNTS_TABLE, "name", true,
- tvAmount, null);
+ tvAmount, null, mProfile);
hookTextChangeListener(tvAccountName);
hookTextChangeListener(tvAmount);
-// Log.d("swipe", "hooked to row "+i);
+// debug("swipe", "hooked to row "+i);
}
}
+ @Override
+ protected void initProfile() {
+ String profileUUID = getIntent().getStringExtra("profile_uuid");
+ if (profileUUID != null) {
+ mProfile = Data.getProfile(profileUUID);
+ if (mProfile == null) finish();
+ }
+ else super.initProfile();
+ }
@Override
public void finish() {
super.finish();
progress.setVisibility(View.VISIBLE);
try {
- saver = new SaveTransactionTask(this);
+ saver = new SendTransactionTask(this, mProfile);
String dateString = tvDate.getText().toString();
Date date;
if (dateString.isEmpty()) date = new Date();
else date = Globals.parseLedgerDate(dateString);
- LedgerTransaction tr = new LedgerTransaction(date, tvDescription.getText().toString());
+ LedgerTransaction tr = new LedgerTransaction(null, date, tvDescription.getText().toString(), mProfile);
TableLayout table = findViewById(R.id.new_transaction_accounts_table);
+ LedgerTransactionAccount emptyAmountAccount = null;
+ float emptyAmountAccountBalance = 0;
for (int i = 0; i < table.getChildCount(); i++) {
TableRow row = (TableRow) table.getChildAt(i);
String acc = ((TextView) row.getChildAt(0)).getText().toString();
+ if (acc.isEmpty()) continue;
+
String amt = ((TextView) row.getChildAt(1)).getText().toString();
- LedgerTransactionAccount item =
- amt.length() > 0 ? new LedgerTransactionAccount(acc, Float.parseFloat(amt))
- : new LedgerTransactionAccount(acc);
+ LedgerTransactionAccount item;
+ if (amt.length() > 0) {
+ final float amount = Float.parseFloat(amt);
+ item = new LedgerTransactionAccount(acc, amount);
+ emptyAmountAccountBalance += amount;
+ }
+ else {
+ item = new LedgerTransactionAccount(acc);
+ emptyAmountAccount = item;
+ }
tr.addAccount(item);
}
+
+ if (emptyAmountAccount != null)
+ emptyAmountAccount.setAmount(-emptyAmountAccountBalance);
saver.execute(tr);
}
catch (ParseException e) {
- Log.d("new-transaction", "Parse error", e);
+ debug("new-transaction", "Parse error", e);
Toast.makeText(this, getResources().getString(R.string.error_invalid_date),
Toast.LENGTH_LONG).show();
tvDate.requestFocus();
if (fab != null) fab.setEnabled(true);
}
catch (Exception e) {
- Log.d("new-transaction", "Unknown error", e);
+ debug("new-transaction", "Unknown error", e);
progress.setVisibility(View.GONE);
toggleAllEditing(true);
}
private void hookSwipeListener(final TableRow row) {
row.getChildAt(0).setOnTouchListener(new OnSwipeTouchListener(this) {
- public void onSwipeLeft() {
-// Log.d("swipe", "LEFT" + row.getId());
+ private void onSwipeAside() {
if (table.getChildCount() > 2) {
TableRow prev_row = (TableRow) table.getChildAt(table.indexOfChild(row) - 1);
TableRow next_row = (TableRow) table.getChildAt(table.indexOfChild(row) + 1);
Snackbar.LENGTH_LONG).setAction("Action", null).show();
}
}
+ public void onSwipeLeft() {
+ onSwipeAside();
+ }
+ public void onSwipeRight() {
+ onSwipeAside();
+ }
// @Override
// public boolean performClick(View view, MotionEvent m) {
// return true;
});
}
- public boolean simulateCrash(MenuItem item) {
- Log.d("crash", "Will crash intentionally");
+ public void simulateCrash(MenuItem item) {
+ debug("crash", "Will crash intentionally");
new AsyncCrasher().execute();
- return true;
}
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
@Override
public void afterTextChanged(Editable s) {
-// Log.d("input", "text changed");
+// debug("input", "text changed");
check_transaction_submittable();
}
});
if (focus) acc.requestFocus();
hookSwipeListener(row);
- MLDB.hookAutocompletionAdapter(this, acc, MLDB.ACCOUNTS_TABLE, "name", true, amt, null);
+ MLDB.hookAutocompletionAdapter(this, acc, MLDB.ACCOUNTS_TABLE, "name", true, amt, null,
+ mProfile);
hookTextChangeListener(acc);
hookTextChangeListener(amt);
doAddAccountRow(false);
}
- Log.d("submittable", String.format("accounts=%d, accounts_with_values=%s, " +
+ debug("submittable", String.format("accounts=%d, accounts_with_values=%s, " +
"amounts_with_accounts=%d, amounts=%d, running_total=%1.2f, " +
"single_empty_with_acc=%s", accounts,
accounts_with_values, amounts_with_accounts, amounts, running_total,
@Override
public void done(String error) {
progress.setVisibility(View.INVISIBLE);
- Log.d("visuals", "hiding progress");
+ debug("visuals", "hiding progress");
if (error == null) resetForm();
else Snackbar.make(findViewById(R.id.new_transaction_accounts_table), error,
}
@Override
public void descriptionSelected(String description) {
- Log.d("descr selected", description);
+ debug("descr selected", description);
if (!inputStateIsInitial()) return;
- try (Cursor c = MLDB.getReadableDatabase().rawQuery(
- "select profile, id from transactions where description=? order by date desc " +
- "limit 1", new String[]{description}))
- {
+ String accFilter = mProfile.getPreferredAccountsFilter();
+
+ ArrayList<String> params = new ArrayList<>();
+ StringBuilder sb = new StringBuilder(
+ "select t.profile, t.id from transactions t where t.description=?");
+ params.add(description);
+
+ if (accFilter != null) {
+ sb.append(" AND EXISTS (").append("SELECT 1 FROM transaction_accounts ta ")
+ .append("WHERE ta.profile = t.profile").append(" AND ta.transaction_id = t.id")
+ .append(" AND UPPER(ta.account_name) LIKE '%'||?||'%')");
+ params.add(accFilter.toUpperCase());
+ }
+
+ sb.append(" ORDER BY date desc limit 1");
+
+ final String sql = sb.toString();
+ debug("descr", sql);
+ debug("descr", params.toString());
+
+ try (Cursor c = App.getDatabase().rawQuery(sql, params.toArray(new String[]{}))) {
if (!c.moveToNext()) return;
String profileUUID = c.getString(0);
int transactionId = c.getInt(1);
- List<MobileLedgerProfile> profiles = Data.profiles.getList();
- MobileLedgerProfile profile = null;
- for (int i = 0; i < profiles.size(); i++) {
- MobileLedgerProfile p = profiles.get(i);
- if (p.getUuid().equals(profileUUID)) {
- profile = p;
- break;
- }
- }
+ LedgerTransaction tr;
+ MobileLedgerProfile profile = Data.getProfile(profileUUID);
if (profile == null) throw new RuntimeException(String.format(
"Unable to find profile %s, which is supposed to contain " +
"transaction %d with description %s", profileUUID, transactionId, description));
- LedgerTransaction tr = profile.loadTransaction(transactionId);
- int i = 0;
+ tr = profile.loadTransaction(transactionId);
table = findViewById(R.id.new_transaction_accounts_table);
ArrayList<LedgerTransactionAccount> accounts = tr.getAccounts();
TableRow firstNegative = null;
int negativeCount = 0;
- for (i = 0; i < accounts.size(); i++) {
+ for (int i = 0; i < accounts.size(); i++) {
LedgerTransactionAccount acc = accounts.get(i);
TableRow row = (TableRow) table.getChildAt(i);
if (row == null) row = doAddAccountRow(false);
return true;
}
- private class AsyncCrasher extends AsyncTask<Void, Void, Void>{
+ private class AsyncCrasher extends AsyncTask<Void, Void, Void> {
@Override
protected Void doInBackground(Void... voids) {
throw new RuntimeException("Simulated crash");
projects / mobile-ledger.git / blobdiff