/*
* 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 <https://www.gnu.org/licenses/>.
+ * along with MoLe. If not, see <https://www.gnu.org/licenses/>.
*/
package net.ktnx.mobileledger.ui.activity;
import android.annotation.SuppressLint;
+import android.database.Cursor;
+import android.os.AsyncTask;
import android.os.Bundle;
-import android.support.design.widget.BaseTransientBottomBar;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
import android.text.Editable;
import android.text.InputType;
import android.text.TextWatcher;
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.BuildConfig;
import net.ktnx.mobileledger.R;
+import net.ktnx.mobileledger.async.DescriptionSelectedCallback;
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.model.MobileLedgerProfile;
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.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;
+
/*
* 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
- * TODO: setup wizard
- * TODO: update accounts/check settings upon change of backend settings
* */
-public class NewTransactionActivity extends AppCompatActivity implements TaskCallback {
+public class NewTransactionActivity extends ProfileThemedActivity
+ implements TaskCallback, DescriptionSelectedCallback {
private static SaveTransactionTask saver;
private TableLayout table;
private ProgressBar progress;
+ private FloatingActionButton fab;
private TextView tvDate;
private AutoCompleteTextView tvDescription;
- private MenuItem mSave;
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);
});
tvDescription = findViewById(R.id.new_transaction_description);
MLDB.hookAutocompletionAdapter(this, tvDescription, MLDB.DESCRIPTION_HISTORY_TABLE,
- "description", false, findViewById(R.id.new_transaction_acc_1));
+ "description", false, findViewById(R.id.new_transaction_acc_1), this);
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);
TextView tvAmount = (TextView) row.getChildAt(1);
hookSwipeListener(row);
MLDB.hookAutocompletionAdapter(this, tvAccountName, MLDB.ACCOUNTS_TABLE, "name", true,
- tvAmount);
+ tvAmount, null);
hookTextChangeListener(tvAccountName);
hookTextChangeListener(tvAmount);
// Log.d("swipe", "hooked to row "+i);
if (tvDescription.getText().toString().isEmpty()) tvDescription.requestFocus();
}
public void saveTransaction() {
- if (mSave != null) mSave.setVisible(false);
+ if (fab != null) fab.setEnabled(false);
toggleAllEditing(false);
progress.setVisibility(View.VISIBLE);
try {
progress.setVisibility(View.GONE);
toggleAllEditing(true);
- if (mSave != null) mSave.setVisible(true);
+ if (fab != null) fab.setEnabled(true);
}
catch (Exception e) {
Log.d("new-transaction", "Unknown error", e);
progress.setVisibility(View.GONE);
toggleAllEditing(true);
- if (mSave != null) mSave.setVisible(true);
+ if (fab != null) fab.setEnabled(true);
}
}
private void toggleAllEditing(boolean enabled) {
});
}
+ public boolean simulateCrash(MenuItem item) {
+ Log.d("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.
getMenuInflater().inflate(R.menu.new_transaction, menu);
- mSave = menu.findItem(R.id.action_submit_transaction);
- if (mSave == null) throw new AssertionError();
+ if (BuildConfig.DEBUG) {
+ menu.findItem(R.id.action_simulate_crash).setVisible(true);
+ }
check_transaction_submittable();
return true;
});
}
- private void doAddAccountRow(boolean focus) {
+ private TableRow doAddAccountRow(boolean focus) {
final AutoCompleteTextView acc = new AutoCompleteTextView(this);
acc.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT,
TableRow.LayoutParams.WRAP_CONTENT, 9f));
amt.setMinWidth(dp2px(40));
amt.setTextAlignment(EditText.TEXT_ALIGNMENT_VIEW_END);
amt.setImeOptions(EditorInfo.IME_ACTION_DONE);
+ amt.setSelectAllOnFocus(true);
// forward navigation support
final TableRow last_row = (TableRow) table.getChildAt(table.getChildCount() - 1);
if (focus) acc.requestFocus();
hookSwipeListener(row);
- MLDB.hookAutocompletionAdapter(this, acc, MLDB.ACCOUNTS_TABLE, "name", true, amt);
+ MLDB.hookAutocompletionAdapter(this, acc, MLDB.ACCOUNTS_TABLE, "name", true, amt, null);
hookTextChangeListener(acc);
hookTextChangeListener(amt);
+
+ return row;
}
public void addTransactionAccountFromMenu(MenuItem item) {
doAddAccountRow(true);
(amounts_with_accounts == amounts) &&
(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",
}
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();
}
}
((TextView) tr.getChildAt(1)).setText("");
}
}
+ @Override
+ public void descriptionSelected(String description) {
+ Log.d("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}))
+ {
+ 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;
+ }
+ }
+ 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;
+ 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++) {
+ LedgerTransactionAccount acc = accounts.get(i);
+ TableRow row = (TableRow) table.getChildAt(i);
+ if (row == null) row = doAddAccountRow(false);
+
+ ((TextView) row.getChildAt(0)).setText(acc.getAccountName());
+ ((TextView) row.getChildAt(1))
+ .setText(String.format(Locale.US, "%1.2f", acc.getAmount()));
+
+ if (acc.getAmount() < 0.005) {
+ if (firstNegative == null) firstNegative = row;
+ negativeCount++;
+ }
+ }
+
+ if (negativeCount == 1) {
+ ((TextView) firstNegative.getChildAt(1)).setText(null);
+ }
+
+ check_transaction_submittable();
+
+ EditText firstAmount = (EditText) ((TableRow) table.getChildAt(0)).getChildAt(1);
+ String amtString = String.valueOf(firstAmount.getText());
+ firstAmount.requestFocus();
+ firstAmount.setSelection(0, amtString.length());
+ }
+
+ }
+ private boolean inputStateIsInitial() {
+ table = findViewById(R.id.new_transaction_accounts_table);
+
+ if (table.getChildCount() != 2) return false;
+
+ for (int i = 0; i < 2; i++) {
+ TableRow row = (TableRow) table.getChildAt(i);
+ if (((TextView) row.getChildAt(0)).getText().length() > 0) return false;
+ if (((TextView) row.getChildAt(1)).getText().length() > 0) return false;
+ }
+
+ return true;
+ }
+ private class AsyncCrasher extends AsyncTask<Void, Void, Void>{
+ @Override
+ protected Void doInBackground(Void... voids) {
+ throw new RuntimeException("Simulated crash");
+ }
+ }
}
projects / mobile-ledger.git / blobdiff