X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fnew_transaction%2FNewTransactionActivity.java;h=ab28ca16d05a2ff43d5d57404692c17a8f021177;hp=413365db4f48e8db860a3e595d738f1da5206de8;hb=346b3c8e74a12b1822239481f807479fa81fc706;hpb=086190fcb88b75bf3df3eeeb6357f15ed1127f4f diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionActivity.java index 413365db..ab28ca16 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionActivity.java @@ -17,43 +17,70 @@ package net.ktnx.mobileledger.ui.new_transaction; +import android.content.Intent; +import android.database.AbstractCursor; +import android.database.Cursor; import android.os.Bundle; +import android.os.ParcelFormatException; +import android.text.TextUtils; import android.util.TypedValue; import android.view.Menu; import android.view.MenuItem; import android.view.View; -import androidx.appcompat.widget.Toolbar; +import androidx.activity.result.ActivityResultLauncher; +import androidx.annotation.NonNull; +import androidx.lifecycle.LiveData; import androidx.lifecycle.ViewModelProvider; import androidx.navigation.NavController; import androidx.navigation.fragment.NavHostFragment; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; +import com.google.android.material.snackbar.Snackbar; + import net.ktnx.mobileledger.BuildConfig; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.async.AsyncCrasher; +import net.ktnx.mobileledger.async.DescriptionSelectedCallback; import net.ktnx.mobileledger.async.SendTransactionTask; import net.ktnx.mobileledger.async.TaskCallback; +import net.ktnx.mobileledger.databinding.ActivityNewTransactionBinding; +import net.ktnx.mobileledger.db.DB; +import net.ktnx.mobileledger.db.TemplateHeader; import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.LedgerTransaction; +import net.ktnx.mobileledger.model.MatchedTemplate; +import net.ktnx.mobileledger.ui.QR; import net.ktnx.mobileledger.ui.activity.ProfileThemedActivity; +import net.ktnx.mobileledger.ui.templates.TemplatesActivity; +import net.ktnx.mobileledger.utils.Logger; +import net.ktnx.mobileledger.utils.MLDB; +import net.ktnx.mobileledger.utils.Misc; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import static net.ktnx.mobileledger.utils.Logger.debug; -public class NewTransactionActivity extends ProfileThemedActivity implements TaskCallback, - NewTransactionFragment.OnNewTransactionFragmentInteractionListener { +public class NewTransactionActivity extends ProfileThemedActivity + implements TaskCallback, NewTransactionFragment.OnNewTransactionFragmentInteractionListener, + QR.QRScanTrigger, QR.QRScanResultReceiver, DescriptionSelectedCallback { private NavController navController; private NewTransactionModel model; + private ActivityResultLauncher qrScanLauncher; + private ActivityNewTransactionBinding b; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.activity_new_transaction); - Toolbar toolbar = findViewById(R.id.toolbar); - setSupportActionBar(toolbar); + b = ActivityNewTransactionBinding.inflate(getLayoutInflater(), null, false); + setContentView(b.getRoot()); + setSupportActionBar(b.toolbar); Data.observeProfile(this, - mobileLedgerProfile -> toolbar.setSubtitle(mobileLedgerProfile.getName())); + mobileLedgerProfile -> b.toolbar.setSubtitle(mobileLedgerProfile.getName())); NavHostFragment navHostFragment = (NavHostFragment) Objects.requireNonNull( getSupportFragmentManager().findFragmentById(R.id.new_transaction_nav)); @@ -63,6 +90,23 @@ public class NewTransactionActivity extends ProfileThemedActivity implements Tas .setDisplayHomeAsUpEnabled(true); model = new ViewModelProvider(this).get(NewTransactionModel.class); + + qrScanLauncher = QR.registerLauncher(this, this); + + model.isSubmittable() + .observe(this, isSubmittable -> { + if (isSubmittable) { + b.fabAdd.show(); + } + else { + b.fabAdd.hide(); + } + }); +// viewModel.checkTransactionSubmittable(listAdapter); + + b.fabAdd.setOnClickListener(v -> onFabPressed()); + + } @Override protected void initProfile() { @@ -95,7 +139,7 @@ public class NewTransactionActivity extends ProfileThemedActivity implements Tas try { SendTransactionTask saver = - new SendTransactionTask(this, mProfile, model.getSimulateSave()); + new SendTransactionTask(this, mProfile, model.getSimulateSaveFlag()); saver.execute(tr); } catch (Exception e) { @@ -121,11 +165,12 @@ public class NewTransactionActivity extends ProfileThemedActivity implements Tas .setVisible(true); } - model.observeSimulateSave(this, state -> { - menu.findItem(R.id.action_simulate_save) - .setChecked(state); - findViewById(R.id.simulationLabel).setVisibility(state ? View.VISIBLE : View.GONE); - }); + model.getSimulateSave() + .observe(this, state -> { + menu.findItem(R.id.action_simulate_save) + .setChecked(state); + b.simulationLabel.setVisibility(state ? View.VISIBLE : View.GONE); + }); return true; } @@ -149,4 +194,229 @@ public class NewTransactionActivity extends ProfileThemedActivity implements Tas model.toggleSimulateSave(); } + @Override + public void triggerQRScan() { + qrScanLauncher.launch(null); + } + private void startNewPatternActivity(String scanned) { + Intent intent = new Intent(this, TemplatesActivity.class); + Bundle args = new Bundle(); + args.putString(TemplatesActivity.ARG_ADD_TEMPLATE, scanned); + startActivity(intent, args); + } + private void alertNoTemplateMatch(String scanned) { + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this); + builder.setCancelable(true) + .setMessage(R.string.no_template_matches) + .setPositiveButton(R.string.add_button, + (dialog, which) -> startNewPatternActivity(scanned)) + .create() + .show(); + } + public void onQRScanResult(String text) { + Logger.debug("qr", String.format("Got QR scan result [%s]", text)); + + if (Misc.emptyIsNull(text) == null) + return; + + LiveData> allTemplates = DB.get() + .getTemplateDAO() + .getTemplates(); + allTemplates.observe(this, templateHeaders -> { + ArrayList matchingFallbackTemplates = new ArrayList<>(); + ArrayList matchingTemplates = new ArrayList<>(); + + for (TemplateHeader ph : templateHeaders) { + String patternSource = ph.getRegularExpression(); + if (Misc.emptyIsNull(patternSource) == null) + continue; + try { + Pattern pattern = Pattern.compile(patternSource); + Matcher matcher = pattern.matcher(text); + if (!matcher.matches()) + continue; + + Logger.debug("pattern", + String.format("Pattern '%s' [%s] matches '%s'", ph.getName(), + patternSource, text)); + if (ph.isFallback()) + matchingFallbackTemplates.add( + new MatchedTemplate(ph, matcher.toMatchResult())); + else + matchingTemplates.add(new MatchedTemplate(ph, matcher.toMatchResult())); + } + catch (ParcelFormatException e) { + // ignored + Logger.debug("pattern", + String.format("Error compiling regular expression '%s'", patternSource), + e); + } + } + + if (matchingTemplates.isEmpty()) + matchingTemplates = matchingFallbackTemplates; + + if (matchingTemplates.isEmpty()) + alertNoTemplateMatch(text); + else if (matchingTemplates.size() == 1) + model.applyTemplate(matchingTemplates.get(0), text); + else + chooseTemplate(matchingTemplates, text); + }); + } + private void chooseTemplate(ArrayList matchingTemplates, String matchedText) { + final String templateNameColumn = "name"; + AbstractCursor cursor = new AbstractCursor() { + @Override + public int getCount() { + return matchingTemplates.size(); + } + @Override + public String[] getColumnNames() { + return new String[]{"_id", templateNameColumn}; + } + @Override + public String getString(int column) { + if (column == 0) + return String.valueOf(getPosition()); + return matchingTemplates.get(getPosition()).templateHead.getName(); + } + @Override + public short getShort(int column) { + if (column == 0) + return (short) getPosition(); + return -1; + } + @Override + public int getInt(int column) { + return getShort(column); + } + @Override + public long getLong(int column) { + return getShort(column); + } + @Override + public float getFloat(int column) { + return getShort(column); + } + @Override + public double getDouble(int column) { + return getShort(column); + } + @Override + public boolean isNull(int column) { + return false; + } + @Override + public int getColumnCount() { + return 2; + } + }; + + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this); + builder.setCancelable(true) + .setTitle(R.string.choose_template_to_apply) + .setIcon(R.drawable.ic_baseline_auto_graph_24) + .setSingleChoiceItems(cursor, -1, templateNameColumn, (dialog, which) -> { + model.applyTemplate(matchingTemplates.get(which), matchedText); + dialog.dismiss(); + }) + .create() + .show(); + } + public void descriptionSelected(String description) { + debug("description selected", description); + if (!model.accountListIsEmpty()) + return; + + String accFilter = mProfile.getPreferredAccountsFilter(); + + ArrayList params = new ArrayList<>(); + StringBuilder sb = new StringBuilder("select t.profile, t.id from transactions t"); + + if (!TextUtils.isEmpty(accFilter)) { + sb.append(" JOIN transaction_accounts ta") + .append(" ON ta.profile = t.profile") + .append(" AND ta.transaction_id = t.id"); + } + + sb.append(" WHERE t.description=?"); + params.add(description); + + if (!TextUtils.isEmpty(accFilter)) { + sb.append(" AND ta.account_name LIKE '%'||?||'%'"); + params.add(accFilter); + } + + sb.append(" ORDER BY t.year desc, t.month desc, t.day desc LIMIT 1"); + + final String sql = sb.toString(); + debug("description", sql); + debug("description", params.toString()); + + // FIXME: handle exceptions? + MLDB.queryInBackground(sql, params.toArray(new String[]{}), new MLDB.CallbackHelper() { + @Override + public void onStart() { + model.incrementBusyCounter(); + } + @Override + public void onDone() { + model.decrementBusyCounter(); + } + @Override + public boolean onRow(@NonNull Cursor cursor) { + final String profileUUID = cursor.getString(0); + final int transactionId = cursor.getInt(1); + runOnUiThread(() -> model.loadTransactionIntoModel(profileUUID, transactionId)); + return false; // limit 1, by the way + } + @Override + public void onNoRows() { + if (TextUtils.isEmpty(accFilter)) + return; + + debug("description", "Trying transaction search without preferred account filter"); + + final String broaderSql = + "select t.profile, t.id from transactions t where t.description=?" + + " ORDER BY year desc, month desc, day desc LIMIT 1"; + params.remove(1); + debug("description", broaderSql); + debug("description", description); + + runOnUiThread(() -> Snackbar.make(b.newTransactionNav, + R.string.ignoring_preferred_account, Snackbar.LENGTH_INDEFINITE) + .show()); + + MLDB.queryInBackground(broaderSql, new String[]{description}, + new MLDB.CallbackHelper() { + @Override + public void onStart() { + model.incrementBusyCounter(); + } + @Override + public boolean onRow(@NonNull Cursor cursor) { + final String profileUUID = cursor.getString(0); + final int transactionId = cursor.getInt(1); + runOnUiThread(() -> model.loadTransactionIntoModel(profileUUID, + transactionId)); + return false; + } + @Override + public void onDone() { + model.decrementBusyCounter(); + } + }); + } + }); + } + private void onFabPressed() { + b.fabAdd.hide(); + Misc.hideSoftKeyboard(this); + + LedgerTransaction tr = model.constructLedgerTransaction(); + + onTransactionSave(tr); + } }