X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionFragment.java;h=21d6394080991ad598f81f6e7adc279235f273aa;hb=0ef53a968c083b3c4d054eed72febf3610538dc2;hp=05b272e8a6d4f27a9577dac5b526c1ce27f83e6d;hpb=90a2528c5da0a524701fade91d1a2a45e0fccdc5;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionFragment.java index 05b272e8..21d63940 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionFragment.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionFragment.java @@ -1,5 +1,5 @@ /* - * Copyright © 2020 Damyan Ivanov. + * Copyright © 2021 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 @@ -17,7 +17,10 @@ package net.ktnx.mobileledger.ui.activity; +import android.app.Activity; import android.content.Context; +import android.content.Intent; +import android.content.res.Resources; import android.os.Bundle; import android.renderscript.RSInvalidStateException; import android.view.LayoutInflater; @@ -28,8 +31,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ProgressBar; +import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContract; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.lifecycle.ViewModelProvider; @@ -40,6 +46,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.snackbar.Snackbar; import net.ktnx.mobileledger.R; +import net.ktnx.mobileledger.json.API; import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.LedgerTransaction; import net.ktnx.mobileledger.model.LedgerTransactionAccount; @@ -50,6 +57,9 @@ import net.ktnx.mobileledger.utils.SimpleDate; import org.jetbrains.annotations.NotNull; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + /** * A simple {@link Fragment} subclass. * Activities that contain this fragment must implement the @@ -58,11 +68,26 @@ import org.jetbrains.annotations.NotNull; */ // TODO: offer to undo account remove-on-swipe -// TODO: transaction-level comment public class NewTransactionFragment extends Fragment { private NewTransactionItemsAdapter listAdapter; private NewTransactionModel viewModel; + final ActivityResultLauncher scanQrLauncher = + registerForActivityResult(new ActivityResultContract() { + @NonNull + @Override + public Intent createIntent(@NonNull Context context, Void input) { + final Intent intent = new Intent("com.google.zxing.client.android.SCAN"); + intent.putExtra("SCAN_MODE", "QR_CODE_MODE"); + return intent; + } + @Override + public String parseResult(int resultCode, @Nullable Intent intent) { + if (resultCode == Activity.RESULT_CANCELED) + return null; + return intent.getStringExtra("SCAN_RESULT"); + } + }, this::onQrScanned); private FloatingActionButton fab; private OnNewTransactionFragmentInteractionListener mListener; private MobileLedgerProfile mProfile; @@ -70,12 +95,66 @@ public class NewTransactionFragment extends Fragment { // Required empty public constructor setHasOptionsMenu(true); } + private void onQrScanned(String text) { + Logger.debug("qr", String.format("Got QR scan result [%s]", text)); + Pattern p = + Pattern.compile("^(\\d+)\\*(\\d+)\\*(\\d+)-(\\d+)-(\\d+)\\*([:\\d]+)\\*([\\d.]+)$"); + Matcher m = p.matcher(text); + if (m.matches()) { + float amount = Float.parseFloat(m.group(7)); + viewModel.setDate( + new SimpleDate(Integer.parseInt(m.group(3)), Integer.parseInt(m.group(4)), + Integer.parseInt(m.group(5)))); + + if (viewModel.accountsInInitialState()) { + { + NewTransactionModel.Item firstItem = viewModel.getItem(1); + if (firstItem == null) { + viewModel.addAccount(new LedgerTransactionAccount("разход:пазар")); + listAdapter.notifyItemInserted(viewModel.items.size() - 1); + } + else { + firstItem.setAccountName("разход:пазар"); + firstItem.getAccount() + .resetAmount(); + listAdapter.notifyItemChanged(1); + } + } + { + NewTransactionModel.Item secondItem = viewModel.getItem(2); + if (secondItem == null) { + viewModel.addAccount( + new LedgerTransactionAccount("актив:кеш:дам", -amount, null, null)); + listAdapter.notifyItemInserted(viewModel.items.size() - 1); + } + else { + secondItem.setAccountName("актив:кеш:дам"); + secondItem.getAccount() + .setAmount(-amount); + listAdapter.notifyItemChanged(2); + } + } + } + else { + viewModel.addAccount(new LedgerTransactionAccount("разход:пазар")); + viewModel.addAccount( + new LedgerTransactionAccount("актив:кеш:дам", -amount, null, null)); + listAdapter.notifyItemRangeInserted(viewModel.items.size() - 1, 2); + } + + listAdapter.checkTransactionSubmittable(); + } + } @Override public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); final FragmentActivity activity = getActivity(); inflater.inflate(R.menu.new_transaction_fragment, menu); + + menu.findItem(R.id.scan_qr) + .setOnMenuItemClickListener(this::onScanQrAction); + menu.findItem(R.id.action_reset_new_transaction_activity) .setOnMenuItemClickListener(item -> { listAdapter.reset(); @@ -98,6 +177,16 @@ public class NewTransactionFragment extends Fragment { if (activity != null) viewModel.showComments.observe(activity, toggleCommentsItem::setChecked); } + private boolean onScanQrAction(MenuItem item) { + try { + scanQrLauncher.launch(null); + } + catch (Exception e) { + Logger.debug("qr", "Error launching QR scanner", e); + } + + return true; + } @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -106,8 +195,8 @@ public class NewTransactionFragment extends Fragment { } @Override - public void onActivityCreated(@Nullable Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); + public void onViewCreated(@NotNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); FragmentActivity activity = getActivity(); if (activity == null) throw new RSInvalidStateException( @@ -152,8 +241,34 @@ public class NewTransactionFragment extends Fragment { String error = args.getString("error"); if (error != null) { Logger.debug("new-trans-f", String.format("Got error: %s", error)); - Snackbar.make(list, error, Snackbar.LENGTH_LONG) - .show(); + + Context context = getContext(); + if (context != null) { + AlertDialog.Builder builder = new AlertDialog.Builder(context); + final Resources resources = context.getResources(); + final StringBuilder message = new StringBuilder(); + message.append(resources.getString(R.string.err_json_send_error_head)); + message.append("\n\n"); + message.append(error); + if (mProfile.getApiVersion() + .equals(API.auto)) + message.append( + resources.getString(R.string.err_json_send_error_unsupported)); + else { + message.append(resources.getString(R.string.err_json_send_error_tail)); + builder.setPositiveButton(R.string.btn_profile_options, (dialog, which) -> { + Logger.debug("error", "will start profile editor"); + MobileLedgerProfile.startEditProfileActivity(context, mProfile); + }); + } + builder.setMessage(message); + builder.create() + .show(); + } + else { + Snackbar.make(list, error, Snackbar.LENGTH_LONG) + .show(); + } keep = true; } }