X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fnew_transaction%2FNewTransactionItemsAdapter.java;h=b6b17beaf827add2bbab416da70301dd643e0553;hb=HEAD;hp=3760d70f2cf8e141926f267920e42cb634f4352d;hpb=02ceb0d2ef0eed07c278330e4b9b2af366f5d17f;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionItemsAdapter.java b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionItemsAdapter.java
index 3760d70f..b6b17bea 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionItemsAdapter.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionItemsAdapter.java
@@ -28,7 +28,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import net.ktnx.mobileledger.databinding.NewTransactionAccountRowBinding;
 import net.ktnx.mobileledger.databinding.NewTransactionHeaderRowBinding;
-import net.ktnx.mobileledger.model.MobileLedgerProfile;
+import net.ktnx.mobileledger.db.Profile;
 import net.ktnx.mobileledger.utils.Logger;
 
 import java.util.List;
@@ -61,9 +61,9 @@ class NewTransactionItemsAdapter extends RecyclerView.Adapter<NewTransactionItem
                     return oldItem.equalContents(newItem);
                 }
             });
-    private MobileLedgerProfile mProfile;
+    private Profile mProfile;
     private int checkHoldCounter = 0;
-    NewTransactionItemsAdapter(NewTransactionModel viewModel, MobileLedgerProfile profile) {
+    NewTransactionItemsAdapter(NewTransactionModel viewModel, Profile profile) {
         super();
         setHasStableIds(true);
         model = viewModel;
@@ -81,7 +81,7 @@ class NewTransactionItemsAdapter extends RecyclerView.Adapter<NewTransactionItem
             public boolean canDropOver(@NonNull RecyclerView recyclerView,
                                        @NonNull RecyclerView.ViewHolder current,
                                        @NonNull RecyclerView.ViewHolder target) {
-                final int adapterPosition = target.getAdapterPosition();
+                final int adapterPosition = target.getBindingAdapterPosition();
 
                 // first item is immovable
                 if (adapterPosition == 0)
@@ -94,7 +94,7 @@ class NewTransactionItemsAdapter extends RecyclerView.Adapter<NewTransactionItem
                                         @NonNull RecyclerView.ViewHolder viewHolder) {
                 int flags = makeFlag(ItemTouchHelper.ACTION_STATE_IDLE, ItemTouchHelper.END);
                 // the top (date and description) and the bottom (padding) items are always there
-                final int adapterPosition = viewHolder.getAdapterPosition();
+                final int adapterPosition = viewHolder.getBindingAdapterPosition();
                 if (adapterPosition > 0) {
                     flags |= makeFlag(ItemTouchHelper.ACTION_STATE_DRAG,
                             ItemTouchHelper.UP | ItemTouchHelper.DOWN) |
@@ -109,12 +109,13 @@ class NewTransactionItemsAdapter extends RecyclerView.Adapter<NewTransactionItem
                                   @NonNull RecyclerView.ViewHolder viewHolder,
                                   @NonNull RecyclerView.ViewHolder target) {
 
-                model.moveItem(viewHolder.getAdapterPosition(), target.getAdapterPosition());
+                model.moveItem(viewHolder.getBindingAdapterPosition(),
+                        target.getBindingAdapterPosition());
                 return true;
             }
             @Override
             public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) {
-                int pos = viewHolder.getAdapterPosition();
+                int pos = viewHolder.getBindingAdapterPosition();
                 viewModel.removeItem(pos);
             }
         });
@@ -139,7 +140,7 @@ class NewTransactionItemsAdapter extends RecyclerView.Adapter<NewTransactionItem
                      .get(position)
                      .getId();
     }
-    public void setProfile(MobileLedgerProfile profile) {
+    public void setProfile(Profile profile) {
         mProfile = profile;
     }
     @NonNull