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.FloatingActionButton;
-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.ui.DatePickerFragment;
import net.ktnx.mobileledger.ui.OnSwipeTouchListener;
import net.ktnx.mobileledger.utils.Globals;
+import net.ktnx.mobileledger.utils.LockHolder;
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
* */
-public class NewTransactionActivity extends AppCompatActivity
+public class NewTransactionActivity extends ProfileThemedActivity
implements TaskCallback, DescriptionSelectedCallback {
private static SaveTransactionTask saver;
private TableLayout table;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+
setContentView(R.layout.activity_new_transaction);
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
}
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");
+ 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);
+ if (BuildConfig.DEBUG) {
+ menu.findItem(R.id.action_simulate_crash).setVisible(true);
+ }
check_transaction_submittable();
return true;
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);
Log.d("descr selected", description);
if (!inputStateIsInitial()) return;
- try (Cursor c = MLDB.getReadableDatabase().rawQuery(
+ try (Cursor c = MLDB.getDatabase().rawQuery(
"select profile, id from transactions where description=? order by date desc " +
"limit 1", new String[]{description}))
{
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;
+ try (LockHolder lh = Data.profiles.lockForReading()) {
+ MobileLedgerProfile profile = null;
+ for (int i = 0; i < Data.profiles.size(); i++) {
+ MobileLedgerProfile p = Data.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));
+ 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);
+ 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);
((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();
- ((TableRow) table.getChildAt(table.getChildCount() - 1)).getChildAt(0).requestFocus();
+ EditText firstAmount = (EditText) ((TableRow) table.getChildAt(0)).getChildAt(1);
+ String amtString = String.valueOf(firstAmount.getText());
+ firstAmount.requestFocus();
+ firstAmount.setSelection(0, amtString.length());
}
}
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