X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionFragment.java;h=d8271db448c65531f04d830dcbd892cbbe7cb413;hb=db56efb04c4a1c260676e743481b8f67b36e60ed;hp=e9d2e33134aff3fabb19a60d12f47da06656290b;hpb=6272fc07219887c4549f39777adb4ffbf389a9b0;p=mobile-ledger-staging.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 e9d2e331..d8271db4 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 © 2019 Damyan Ivanov. + * Copyright © 2020 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 @@ -18,20 +18,23 @@ package net.ktnx.mobileledger.ui.activity; import android.content.Context; +import android.content.res.Resources; import android.os.Bundle; import android.renderscript.RSInvalidStateException; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; +import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import android.widget.ProgressBar; 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.ViewModelProviders; -import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -39,27 +42,30 @@ 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; import net.ktnx.mobileledger.model.MobileLedgerProfile; import net.ktnx.mobileledger.utils.Logger; import net.ktnx.mobileledger.utils.Misc; +import net.ktnx.mobileledger.utils.SimpleDate; import org.jetbrains.annotations.NotNull; -import java.util.Date; - /** * A simple {@link Fragment} subclass. * Activities that contain this fragment must implement the * {@link OnNewTransactionFragmentInteractionListener} interface * to handle interaction events. */ + +// TODO: offer to undo account remove-on-swipe +// TODO: transaction-level comment + public class NewTransactionFragment extends Fragment { private NewTransactionItemsAdapter listAdapter; private NewTransactionModel viewModel; - private RecyclerView list; private FloatingActionButton fab; private OnNewTransactionFragmentInteractionListener mListener; private MobileLedgerProfile mProfile; @@ -70,12 +76,30 @@ public class NewTransactionFragment extends Fragment { @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.action_reset_new_transaction_activity) .setOnMenuItemClickListener(item -> { listAdapter.reset(); return true; }); + + final MenuItem toggleCurrencyItem = menu.findItem(R.id.toggle_currency); + toggleCurrencyItem.setOnMenuItemClickListener(item -> { + viewModel.toggleCurrencyVisible(); + return true; + }); + if (activity != null) + viewModel.showCurrency.observe(activity, toggleCurrencyItem::setChecked); + + final MenuItem toggleCommentsItem = menu.findItem(R.id.toggle_comments); + toggleCommentsItem.setOnMenuItemClickListener(item -> { + viewModel.toggleShowComments(); + return true; + }); + if (activity != null) + viewModel.showComments.observe(activity, toggleCommentsItem::setChecked); } @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -85,69 +109,32 @@ 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( "getActivity() returned null within onActivityCreated()"); - list = activity.findViewById(R.id.new_transaction_accounts); - viewModel = ViewModelProviders.of(activity) - .get(NewTransactionModel.class); - mProfile = Data.profile.getValue(); + viewModel = new ViewModelProvider(activity).get(NewTransactionModel.class); + viewModel.observeDataProfile(this); + mProfile = Data.getProfile(); listAdapter = new NewTransactionItemsAdapter(viewModel, mProfile); + + RecyclerView list = activity.findViewById(R.id.new_transaction_accounts); list.setAdapter(listAdapter); list.setLayoutManager(new LinearLayoutManager(activity)); - Data.profile.observe(this, profile -> { + + Data.observeProfile(getViewLifecycleOwner(), profile -> { mProfile = profile; listAdapter.setProfile(profile); }); listAdapter.notifyDataSetChanged(); - new ItemTouchHelper(new ItemTouchHelper.Callback() { - @Override - public int getMovementFlags(@NonNull RecyclerView recyclerView, - @NonNull RecyclerView.ViewHolder viewHolder) { - int flags = makeFlag(ItemTouchHelper.ACTION_STATE_IDLE, ItemTouchHelper.END); - // the top item is always there (date and description) - if (viewHolder.getAdapterPosition() > 0) { - if (viewModel.getAccountCount() > 2) { - flags |= makeFlag(ItemTouchHelper.ACTION_STATE_SWIPE, - ItemTouchHelper.START | ItemTouchHelper.END); - } - } - - return flags; - } - @Override - public boolean onMove(@NonNull RecyclerView recyclerView, - @NonNull RecyclerView.ViewHolder viewHolder, - @NonNull RecyclerView.ViewHolder target) { - return false; - } - @Override - public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) { - if (viewModel.getAccountCount() == 2) - Snackbar.make(list, R.string.msg_at_least_two_accounts_are_required, - Snackbar.LENGTH_LONG) - .setAction("Action", null) - .show(); - else { - int pos = viewHolder.getAdapterPosition(); - viewModel.removeItem(pos - 1); - listAdapter.notifyItemRemoved(pos); - viewModel.sendCountNotifications(); // needed after items re-arrangement - viewModel.checkTransactionSubmittable(listAdapter); - } - } - }).attachToRecyclerView(list); - viewModel.isSubmittable() - .observe(this, isSubmittable -> { + .observe(getViewLifecycleOwner(), isSubmittable -> { if (isSubmittable) { if (fab != null) { fab.show(); - fab.setEnabled(true); } } else { @@ -156,7 +143,7 @@ public class NewTransactionFragment extends Fragment { } } }); - viewModel.checkTransactionSubmittable(listAdapter); +// viewModel.checkTransactionSubmittable(listAdapter); fab = activity.findViewById(R.id.fab); fab.setOnClickListener(v -> onFabPressed()); @@ -167,10 +154,35 @@ public class NewTransactionFragment extends Fragment { if (args != null) { String error = args.getString("error"); if (error != null) { - // TODO display error 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; } } @@ -186,6 +198,21 @@ public class NewTransactionFragment extends Fragment { else { viewModel.setFocusedItem(focused); } + + ProgressBar p = activity.findViewById(R.id.progressBar); + viewModel.observeBusyFlag(getViewLifecycleOwner(), isBusy -> { + if (isBusy) { +// Handler h = new Handler(); +// h.postDelayed(() -> { +// if (viewModel.getBusyFlag()) +// p.setVisibility(View.VISIBLE); +// +// }, 10); + p.setVisibility(View.VISIBLE); + } + else + p.setVisibility(View.INVISIBLE); + }); } @Override public void onSaveInstanceState(@NonNull Bundle outState) { @@ -195,17 +222,19 @@ public class NewTransactionFragment extends Fragment { outState.putInt("focused", focusedItem); } private void onFabPressed() { - fab.setEnabled(false); + fab.hide(); Misc.hideSoftKeyboard(this); if (mListener != null) { - Date date = viewModel.getDate(); + SimpleDate date = viewModel.getDate(); LedgerTransaction tr = new LedgerTransaction(null, date, viewModel.getDescription(), mProfile); + tr.setComment(viewModel.getComment()); LedgerTransactionAccount emptyAmountAccount = null; float emptyAmountAccountBalance = 0; for (int i = 0; i < viewModel.getAccountCount(); i++) { - LedgerTransactionAccount acc = viewModel.getAccount(i); + LedgerTransactionAccount acc = + new LedgerTransactionAccount(viewModel.getAccount(i)); if (acc.getAccountName() .trim() .isEmpty())