package net.ktnx.mobileledger;
+import android.annotation.TargetApi;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.os.Build;
import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
+import android.preference.PreferenceManager;
+import android.provider.FontsContract;
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.util.Log;
+import android.util.TypedValue;
import android.view.Menu;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
import android.widget.AutoCompleteTextView;
import android.widget.EditText;
+import android.widget.FilterQueryProvider;
+import android.widget.ProgressBar;
+import android.widget.SimpleCursorAdapter;
import android.widget.TableLayout;
import android.widget.TableRow;
+import android.widget.TextView;
import java.util.Objects;
-public class NewTransactionActivity extends AppCompatActivity {
+/*
+ * TODO: auto-fill of transaction description
+ * if Android O's implementation won't work, add a custom one
+ * TODO: nicer progress while transaction is submitted
+ * TODO: periodic and manual refresh of available accounts
+ * (now done forcibly each time the main activity is started)
+ * 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: activity with current balance
+ * TODO: setup wizard
+ * TODO: update accounts/check settings upon change of backend settings
+ * */
+
+public class NewTransactionActivity extends AppCompatActivity implements TaskCallback {
private TableLayout table;
+ private ProgressBar progress;
+ private TextView text_date;
+ private TextView text_descr;
+ private static SaveTransactionTask saver;
+ private MenuItem mSave;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_new_transaction);
+ setContentView(R.layout.activity_account_summary);
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
- FloatingActionButton fab = findViewById(R.id.fab);
- fab.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
- .setAction("Action", null).show();
- }
- });
+ text_date = findViewById(R.id.new_transaction_date);
+ text_descr = findViewById(R.id.new_transaction_description);
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ text_descr.setAutofillHints("");
+ }
+
+ progress = findViewById(R.id.save_transaction_progress);
+
Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
table = findViewById(R.id.new_transaction_accounts_table);
for (int i = 0; i < table.getChildCount(); i++) {
- hook_swipe_listener((TableRow)table.getChildAt(i));
+ TableRow row = (TableRow) table.getChildAt(i);
+ TextView acc_name_view = (TextView) row.getChildAt(0);
+ TextView amount_view = (TextView) row.getChildAt(1);
+ hook_swipe_listener(row);
+ hook_autocompletion_adapter(row);
+ hook_text_change_listener(acc_name_view);
+ hook_text_change_listener(amount_view);
// Log.d("swipe", "hooked to row "+i);
}
}
+ public void save_transaction() {
+ mSave.setVisible(false);
+ toggle_all_editing(false);
+ progress.setVisibility(View.VISIBLE);
+
+ saver = new SaveTransactionTask(this);
+
+ saver.setPref(PreferenceManager.getDefaultSharedPreferences(this));
+ LedgerTransaction tr = new LedgerTransaction(text_date.getText().toString(), text_descr.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();
+ LedgerTransactionItem item =
+ amt.length() > 0
+ ? new LedgerTransactionItem( acc, Float.parseFloat(amt))
+ : new LedgerTransactionItem( acc );
+
+ tr.add_item(item);
+ }
+ saver.execute(tr);
+ }
+
+ private void toggle_all_editing(boolean enabled) {
+ TableLayout table = findViewById(R.id.new_transaction_accounts_table);
+ for (int i = 0; i < table.getChildCount(); i++) {
+ TableRow row = (TableRow) table.getChildAt(i);
+ for (int j = 0; j < row.getChildCount(); j++) {
+ row.getChildAt(j).setEnabled(enabled);
+ }
+ }
+ }
+
private void hook_swipe_listener(final TableRow row) {
row.getChildAt(0).setOnTouchListener(new OnSwipeTouchListener(this) {
public void onSwipeLeft() {
});
}
+ 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();
+ }
+ });
+
+ }
+
+ @TargetApi(Build.VERSION_CODES.N)
+ private void hook_autocompletion_adapter(final TableRow row) {
+ String[] from = {"name"};
+ int[] to = {android.R.id.text1};
+ SQLiteDatabase db = MobileLedgerDB.db;
+
+ AutoCompleteTextView acc = (AutoCompleteTextView) row.getChildAt(0);
+ SimpleCursorAdapter adapter = new SimpleCursorAdapter(this, android.R.layout.simple_dropdown_item_1line, null, from, to, 0);
+ adapter.setStringConversionColumn(1);
+
+ FilterQueryProvider provider = new FilterQueryProvider() {
+ @Override
+ public Cursor runQuery(CharSequence constraint) {
+ if (constraint == null) return null;
+
+ String str = constraint.toString().toUpperCase();
+ Log.d("autocompletion", "Looking for "+str);
+ String[] col_names = {FontsContract.Columns._ID, "name"};
+ MatrixCursor c = new MatrixCursor(col_names);
+
+ Cursor matches = db.rawQuery("SELECT name FROM accounts WHERE UPPER(name) LIKE '%'||?||'%' ORDER BY name;", new String[]{str});
+
+ try {
+ int i = 0;
+ while (matches.moveToNext()) {
+ String name = matches.getString(0);
+ Log.d("autocompletion-match", name);
+ c.newRow().add(i++).add(name);
+ }
+ }
+ finally {
+ matches.close();
+ }
+
+ return c;
+
+ }
+ };
+
+ adapter.setFilterQueryProvider(provider);
+
+ acc.setAdapter(adapter);
+ }
+
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);
+ assert mSave != null;
return true;
}
public void pickTransactionDate(View view) {
DialogFragment picker = new DatePickerFragment();
picker.show(getSupportFragmentManager(), "datePicker");
-// Snackbar.make(view, "Date editing not yet ready", Snackbar.LENGTH_LONG)
-// .setAction("Action", null).show();
}
- public void addTransactionAccountFromMenu(MenuItem item) {
+ public int dp2px(float dp) {
+ return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, getResources().getDisplayMetrics()));
+ }
+
+ private void do_add_account_row(boolean focus) {
final AutoCompleteTextView acc = new AutoCompleteTextView(this);
acc.setLayoutParams(new TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT, TableRow.LayoutParams.WRAP_CONTENT, 9f));
acc.setHint(R.string.new_transaction_account_hint);
amt.setHint(R.string.new_transaction_amount_hint);
amt.setWidth(0);
amt.setInputType(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED | InputType.TYPE_NUMBER_FLAG_DECIMAL );
- amt.setMinWidth(64);
+ amt.setMinWidth(dp2px(40));
amt.setTextAlignment(EditText.TEXT_ALIGNMENT_VIEW_END);
final TableRow row = new TableRow(this);
row.addView(amt);
table.addView(row);
- acc.requestFocus();
+ if (focus) acc.requestFocus();
hook_swipe_listener(row);
+ hook_autocompletion_adapter(row);
+ hook_text_change_listener(acc);
+ hook_text_change_listener(amt);
+ }
+
+ public void addTransactionAccountFromMenu(MenuItem item) {
+ do_add_account_row(true);
+ }
+
+ public void saveTransactionFromMenu(MenuItem item) {
+ save_transaction();
+ }
+
+ private void check_transaction_submittable() {
+ TableLayout table = findViewById(R.id.new_transaction_accounts_table);
+ int accounts = 0;
+ int accounts_with_values = 0;
+ int empty_rows = 0;
+ for(int i = 0; i < table.getChildCount(); i++ ) {
+ TableRow row = (TableRow) table.getChildAt(i);
+
+ TextView acc_name_v = (TextView) row.getChildAt(0);
+
+ String acc_name = String.valueOf(acc_name_v.getText());
+ acc_name = acc_name.trim();
+ if (!acc_name.isEmpty()) {
+ accounts++;
+
+ TextView amount_v = (TextView) row.getChildAt(1);
+ String amt = String.valueOf(amount_v.getText());
+
+ if (!amt.isEmpty()) accounts_with_values++;
+ } else empty_rows++;
+ }
+
+ if (accounts_with_values == accounts && empty_rows == 0) {
+ do_add_account_row(false);
+ }
+
+ if ((accounts >= 2) && (accounts_with_values >= (accounts - 1))) {
+ mSave.setVisible(true);
+ } else {
+ mSave.setVisible(false);
+ }
}
+ @Override
+ public void done() {
+ progress.setVisibility(View.INVISIBLE);
+ Log.d("visuals", "hiding progress");
+
+ reset_form();
+ toggle_all_editing(true);
+ }
+
+ private void reset_form() {
+ text_date.setText("");
+ text_descr.setText("");
+ while(table.getChildCount() > 2) {
+ table.removeViewAt(2);
+ }
+ for( int i = 0; i < 2; i++ ) {
+ TableRow tr = (TableRow) table.getChildAt(i);
+ if ( tr == null) break;
+
+ ((TextView)tr.getChildAt(0)).setText("");
+ ((TextView)tr.getChildAt(1)).setText("");
+ }
+
+ text_descr.requestFocus();
+ }
}
projects / mobile-ledger.git / blobdiff