X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionItemsAdapter.java;h=2cf972f89ed597df5bba2bce282381f4976b1bfb;hb=7ae5407090d9ffe2026775ba9e569014f879b54d;hp=b676747142d1ba59d4e1dcb9b110168a5a512395;hpb=42e05789cec666cfa13bbc7b8608f3092d806a71;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemsAdapter.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemsAdapter.java index b6767471..2cf972f8 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemsAdapter.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemsAdapter.java @@ -21,11 +21,13 @@ import android.database.Cursor; import android.view.LayoutInflater; import android.view.ViewGroup; import android.widget.LinearLayout; -import android.widget.TableRow; import androidx.annotation.NonNull; +import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.RecyclerView; +import com.google.android.material.snackbar.Snackbar; + import net.ktnx.mobileledger.App; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.async.DescriptionSelectedCallback; @@ -44,6 +46,8 @@ class NewTransactionItemsAdapter extends RecyclerView.Adapter 0) { + flags |= makeFlag(ItemTouchHelper.ACTION_STATE_DRAG, + ItemTouchHelper.UP | ItemTouchHelper.DOWN); + + 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) { + + model.swapItems(viewHolder.getAdapterPosition(), target.getAdapterPosition()); + notifyItemMoved(viewHolder.getAdapterPosition(), target.getAdapterPosition()); + return true; + } + @Override + public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) { + if (viewModel.getAccountCount() == 2) + Snackbar.make(recyclerView, 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); + notifyItemRemoved(pos); + viewModel.sendCountNotifications(); // needed after items re-arrangement + viewModel.checkTransactionSubmittable(adapter); + } + } + }); } public void setProfile(MobileLedgerProfile profile) { mProfile = profile; @@ -73,13 +141,17 @@ class NewTransactionItemsAdapter extends RecyclerView.Adapter accounts = tr.getAccounts(); - TableRow firstNegative = null; + NewTransactionModel.Item firstNegative = null; + boolean singleNegative = false; int negativeCount = 0; for (int i = 0; i < accounts.size(); i++) { LedgerTransactionAccount acc = accounts.get(i); NewTransactionModel.Item item; - if (model.getAccountCount() < i) { + if (model.getAccountCount() < i + 1) { model.addAccount(acc); notifyItemInserted(i + 1); } @@ -149,22 +240,39 @@ class NewTransactionItemsAdapter extends RecyclerView.Adapter 2) notifyItemRangeRemoved(3, presentItemCount - 2); // all the rest are gone } + public void updateFocusedItem(int position) { + model.updateFocusedItem(position); + } + public void noteFocusIsOnAccount(int position) { + model.noteFocusChanged(position, NewTransactionModel.FocusedElement.Account); + } + public void noteFocusIsOnAmount(int position) { + model.noteFocusChanged(position, NewTransactionModel.FocusedElement.Amount); + } + public void noteFocusIsOnComment(int position) { + model.noteFocusChanged(position, NewTransactionModel.FocusedElement.Comment); + } }