X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionActivity.java;h=82fa12d075aedf5ab6ed81174298c86c3c5e9e6b;hp=43c10b273d579049d6fdd5680c9f52774f82d11d;hb=b7f7df30bf96a995f165b3f7e4321655aac0132a;hpb=0bbdc409d82da31324c031f36607510f17d992e6
diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java
index 43c10b27..82fa12d0 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionActivity.java
@@ -1,26 +1,26 @@
/*
- * Copyright © 2018 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * Copyright © 2019 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
* 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.activity;
import android.annotation.SuppressLint;
import android.os.Bundle;
-import android.preference.PreferenceManager;
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.app.AppCompatActivity;
@@ -42,26 +42,28 @@ import android.widget.ProgressBar;
import android.widget.TableLayout;
import android.widget.TableRow;
import android.widget.TextView;
+import android.widget.Toast;
-import net.ktnx.mobileledger.ui.OnSwipeTouchListener;
import net.ktnx.mobileledger.R;
import net.ktnx.mobileledger.async.SaveTransactionTask;
import net.ktnx.mobileledger.async.TaskCallback;
+import net.ktnx.mobileledger.model.Data;
import net.ktnx.mobileledger.model.LedgerTransaction;
import net.ktnx.mobileledger.model.LedgerTransactionAccount;
import net.ktnx.mobileledger.ui.DatePickerFragment;
+import net.ktnx.mobileledger.ui.OnSwipeTouchListener;
+import net.ktnx.mobileledger.utils.Globals;
import net.ktnx.mobileledger.utils.MLDB;
+import java.text.ParseException;
import java.util.Date;
import java.util.Objects;
/*
* TODO: nicer progress while transaction is submitted
- * TODO: latest transactions, maybe with browsing further in the past?
* 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: app icon
* TODO: nicer swiping removal with visual feedback
* TODO: setup wizard
* TODO: update accounts/check settings upon change of backend settings
@@ -71,51 +73,48 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
private static SaveTransactionTask saver;
private TableLayout table;
private ProgressBar progress;
- private TextView text_date;
- private AutoCompleteTextView text_descr;
- private MenuItem mSave;
-
+ private FloatingActionButton fab;
+ private TextView tvDate;
+ private AutoCompleteTextView tvDescription;
+ private static boolean isZero(float f) {
+ return (f < 0.005) && (f > -0.005);
+ }
@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());
- text_date = findViewById(R.id.new_transaction_date);
- text_date.setOnFocusChangeListener(new View.OnFocusChangeListener() {
- @Override
- public void onFocusChange(View v, boolean hasFocus) {
- if (hasFocus) pickTransactionDate(v);
- }
+ tvDate = findViewById(R.id.new_transaction_date);
+ tvDate.setOnFocusChangeListener((v, hasFocus) -> {
+ if (hasFocus) pickTransactionDate(v);
});
- text_descr = findViewById(R.id.new_transaction_description);
- MLDB.hook_autocompletion_adapter(this, text_descr, MLDB.DESCRIPTION_HISTORY_TABLE,
- "description");
- hook_text_change_listener(text_descr);
+ tvDescription = findViewById(R.id.new_transaction_description);
+ MLDB.hookAutocompletionAdapter(this, tvDescription, MLDB.DESCRIPTION_HISTORY_TABLE,
+ "description", false, findViewById(R.id.new_transaction_acc_1));
+ hookTextChangeListener(tvDescription);
progress = findViewById(R.id.save_transaction_progress);
+ fab = findViewById(R.id.fab);
+ fab.setOnClickListener(v -> saveTransaction());
Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
table = findViewById(R.id.new_transaction_accounts_table);
for (int i = 0; i < table.getChildCount(); i++) {
TableRow row = (TableRow) table.getChildAt(i);
- AutoCompleteTextView acc_name_view = (AutoCompleteTextView) row.getChildAt(0);
- TextView amount_view = (TextView) row.getChildAt(1);
- hook_swipe_listener(row);
- MLDB.hook_autocompletion_adapter(this, acc_name_view, MLDB.ACCOUNTS_TABLE, "name");
- hook_text_change_listener(acc_name_view);
- hook_text_change_listener(amount_view);
+ AutoCompleteTextView tvAccountName = (AutoCompleteTextView) row.getChildAt(0);
+ TextView tvAmount = (TextView) row.getChildAt(1);
+ hookSwipeListener(row);
+ MLDB.hookAutocompletionAdapter(this, tvAccountName, MLDB.ACCOUNTS_TABLE, "name", true,
+ tvAmount);
+ hookTextChangeListener(tvAccountName);
+ hookTextChangeListener(tvAmount);
// Log.d("swipe", "hooked to row "+i);
}
}
- @Override
- protected void onStart() {
- super.onStart();
- if (text_descr.getText().toString().isEmpty()) text_descr.requestFocus();
- }
-
@Override
public void finish() {
super.finish();
@@ -131,36 +130,59 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
}
return super.onOptionsItemSelected(item);
}
-
- public void save_transaction() {
- if (mSave != null) mSave.setVisible(false);
- toggle_all_editing(false);
+ @Override
+ protected void onStart() {
+ super.onStart();
+ if (tvDate.getText().toString().isEmpty()) tvDate.requestFocus();
+ }
+ public void saveTransaction() {
+ if (fab != null) fab.setEnabled(false);
+ toggleAllEditing(false);
progress.setVisibility(View.VISIBLE);
+ try {
- saver = new SaveTransactionTask(this);
+ saver = new SaveTransactionTask(this);
- saver.setPref(PreferenceManager.getDefaultSharedPreferences(this));
- String date = text_date.getText().toString();
- if (date.isEmpty()) date = String.valueOf(new Date().getDate());
- LedgerTransaction tr = new LedgerTransaction(date, text_descr.getText().toString());
+ 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());
- TableLayout table = findViewById(R.id.new_transaction_accounts_table);
- for (int i = 0; i < table.getChildCount(); i++) {
- TableRow row = (TableRow) table.getChildAt(i);
- String acc = ((TextView) row.getChildAt(0)).getText().toString();
- String amt = ((TextView) row.getChildAt(1)).getText().toString();
- LedgerTransactionAccount item =
- amt.length() > 0 ? new LedgerTransactionAccount(acc, Float.parseFloat(amt))
- : new LedgerTransactionAccount(acc);
+ TableLayout table = findViewById(R.id.new_transaction_accounts_table);
+ for (int i = 0; i < table.getChildCount(); i++) {
+ TableRow row = (TableRow) table.getChildAt(i);
+ String acc = ((TextView) row.getChildAt(0)).getText().toString();
+ String amt = ((TextView) row.getChildAt(1)).getText().toString();
+ LedgerTransactionAccount item =
+ amt.length() > 0 ? new LedgerTransactionAccount(acc, Float.parseFloat(amt))
+ : new LedgerTransactionAccount(acc);
- tr.addAccount(item);
+ tr.addAccount(item);
+ }
+ saver.execute(tr);
}
- saver.execute(tr);
- }
+ catch (ParseException e) {
+ Log.d("new-transaction", "Parse error", e);
+ Toast.makeText(this, getResources().getString(R.string.error_invalid_date),
+ Toast.LENGTH_LONG).show();
+ tvDate.requestFocus();
+
+ progress.setVisibility(View.GONE);
+ toggleAllEditing(true);
+ if (fab != null) fab.setEnabled(true);
+ }
+ catch (Exception e) {
+ Log.d("new-transaction", "Unknown error", e);
- private void toggle_all_editing(boolean enabled) {
- text_date.setEnabled(enabled);
- text_descr.setEnabled(enabled);
+ progress.setVisibility(View.GONE);
+ toggleAllEditing(true);
+ if (fab != null) fab.setEnabled(true);
+ }
+ }
+ private void toggleAllEditing(boolean enabled) {
+ tvDate.setEnabled(enabled);
+ tvDescription.setEnabled(enabled);
TableLayout table = findViewById(R.id.new_transaction_accounts_table);
for (int i = 0; i < table.getChildCount(); i++) {
TableRow row = (TableRow) table.getChildAt(i);
@@ -169,8 +191,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
}
}
}
-
- private void hook_swipe_listener(final TableRow row) {
+ private void hookSwipeListener(final TableRow row) {
row.getChildAt(0).setOnTouchListener(new OnSwipeTouchListener(this) {
public void onSwipeLeft() {
// Log.d("swipe", "LEFT" + row.getId());
@@ -178,7 +199,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
TableRow prev_row = (TableRow) table.getChildAt(table.indexOfChild(row) - 1);
TableRow next_row = (TableRow) table.getChildAt(table.indexOfChild(row) + 1);
TextView prev_amt =
- (prev_row != null) ? (TextView) prev_row.getChildAt(1) : text_descr;
+ (prev_row != null) ? (TextView) prev_row.getChildAt(1) : tvDescription;
TextView next_acc =
(next_row != null) ? (TextView) next_row.getChildAt(0) : null;
@@ -217,32 +238,9 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
});
}
- private void hook_text_change_listener(final TextView view) {
- view.addTextChangedListener(new TextWatcher() {
- @Override
- public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
- }
-
- @Override
- public void onTextChanged(CharSequence s, int start, int before, int count) {
-
- }
-
- @Override
- public void afterTextChanged(Editable s) {
-// Log.d("input", "text changed");
- check_transaction_submittable();
- }
- });
-
- }
-
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.new_transaction, menu);
- mSave = menu.findItem(R.id.action_submit_transaction);
- if (mSave == null) throw new AssertionError();
check_transaction_submittable();
@@ -258,8 +256,27 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp,
getResources().getDisplayMetrics()));
}
+ private void hookTextChangeListener(final TextView view) {
+ view.addTextChangedListener(new TextWatcher() {
+ @Override
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+ }
+
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
- private void do_add_account_row(boolean focus) {
+ }
+
+ @Override
+ public void afterTextChanged(Editable s) {
+// Log.d("input", "text changed");
+ check_transaction_submittable();
+ }
+ });
+
+ }
+ private void doAddAccountRow(boolean focus) {
final AutoCompleteTextView acc = new AutoCompleteTextView(this);
acc.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT,
TableRow.LayoutParams.WRAP_CONTENT, 9f));
@@ -299,28 +316,20 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
if (focus) acc.requestFocus();
- hook_swipe_listener(row);
- MLDB.hook_autocompletion_adapter(this, acc, MLDB.ACCOUNTS_TABLE, "name");
- hook_text_change_listener(acc);
- hook_text_change_listener(amt);
+ hookSwipeListener(row);
+ MLDB.hookAutocompletionAdapter(this, acc, MLDB.ACCOUNTS_TABLE, "name", true, amt);
+ hookTextChangeListener(acc);
+ hookTextChangeListener(amt);
}
-
public void addTransactionAccountFromMenu(MenuItem item) {
- do_add_account_row(true);
+ doAddAccountRow(true);
}
-
public void resetTransactionFromMenu(MenuItem item) {
- reset_form();
+ resetForm();
}
-
public void saveTransactionFromMenu(MenuItem item) {
- save_transaction();
+ saveTransaction();
}
-
- private boolean is_zero(float f) {
- return (f < 0.005) && (f > -0.005);
- }
-
// rules:
// 1) at least two account names
// 2) each amount must have account name
@@ -382,7 +391,7 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
if ((empty_rows == 0) &&
((table.getChildCount() == accounts) || (table.getChildCount() == amounts)))
{
- do_add_account_row(false);
+ doAddAccountRow(false);
}
Log.d("submittable", String.format("accounts=%d, accounts_with_values=%s, " +
@@ -393,11 +402,16 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
if (have_description && (accounts >= 2) && (accounts_with_values >= (accounts - 1)) &&
(amounts_with_accounts == amounts) &&
- (single_empty_amount && single_empty_amount_has_account || is_zero(running_total)))
+ (single_empty_amount && single_empty_amount_has_account || isZero(running_total)))
{
- if (mSave != null) mSave.setVisible(true);
+ if (fab != null) {
+ fab.show();
+ fab.setEnabled(true);
+ }
+ }
+ else {
+ if (fab != null) fab.hide();
}
- else if (mSave != null) mSave.setVisible(false);
if (single_empty_amount) {
empty_amount.setHint(String.format("%1.2f",
@@ -406,11 +420,11 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
}
catch (NumberFormatException e) {
- if (mSave != null) mSave.setVisible(false);
+ if (fab != null) fab.hide();
}
catch (Exception e) {
e.printStackTrace();
- if (mSave != null) mSave.setVisible(false);
+ if (fab != null) fab.hide();
}
}
@@ -419,19 +433,19 @@ public class NewTransactionActivity extends AppCompatActivity implements TaskCal
progress.setVisibility(View.INVISIBLE);
Log.d("visuals", "hiding progress");
- if (error == null) reset_form();
+ if (error == null) resetForm();
else Snackbar.make(findViewById(R.id.new_transaction_accounts_table), error,
BaseTransientBottomBar.LENGTH_LONG).show();
- toggle_all_editing(true);
+ toggleAllEditing(true);
check_transaction_submittable();
}
- private void reset_form() {
- text_date.setText("");
- text_descr.setText("");
+ private void resetForm() {
+ tvDate.setText("");
+ tvDescription.setText("");
- text_descr.requestFocus();
+ tvDescription.requestFocus();
while (table.getChildCount() > 2) {
table.removeViewAt(2);