X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FNewTransactionItemsAdapter.java;h=6844b6ce3d743f471db420ec7d1723dd33f1cd26;hb=7a908a83d216844fd20dc318cd532dabdeb337bb;hp=91c6d311dfe2afe98f2cda88690c0fe5a51eaa2a;hpb=d4e592c5aed998f3b3e5afcf2150fb051aaf3e6f;p=mobile-ledger-staging.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 91c6d311..6844b6ce 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,7 +21,6 @@ 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.RecyclerView;
@@ -78,15 +77,15 @@ class NewTransactionItemsAdapter extends RecyclerView.Adapter<NewTransactionItem
     @Override
     public void onBindViewHolder(@NonNull NewTransactionItemHolder holder, int position) {
         Logger.debug("bind", String.format(Locale.US, "Binding item at position %d", position));
-        holder.setData(model.getItem(position));
-        Logger.debug("bind", String.format(Locale.US, "Bound item at position %d", position));
+        NewTransactionModel.Item item = model.getItem(position);
+        holder.setData(item);
+        Logger.debug("bind", String.format(Locale.US, "Bound %s item at position %d", item.getType()
+                                                                                          .toString(),
+                position));
     }
     @Override
     public int getItemCount() {
-        final int itemCount = model.getAccountCount() + 2;
-        Logger.debug("new-transaction",
-                String.format(Locale.US, "getItemCount() returning %d", itemCount));
-        return itemCount;
+        return model.getAccountCount() + 2;
     }
     boolean accountListIsEmpty() {
         for (int i = 0; i < model.getAccountCount(); i++) {
@@ -139,12 +138,13 @@ class NewTransactionItemsAdapter extends RecyclerView.Adapter<NewTransactionItem
 
             tr = profile.loadTransaction(transactionId);
             ArrayList<LedgerTransactionAccount> 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);
                 }
@@ -152,12 +152,28 @@ class NewTransactionItemsAdapter extends RecyclerView.Adapter<NewTransactionItem
 
                 item.getAccount()
                     .setAccountName(acc.getAccountName());
-                if (acc.isAmountSet()) item.getAccount()
-                                           .setAmount(acc.getAmount());
-                else item.getAccount()
-                         .resetAmount();
+                if (acc.isAmountSet()) {
+                    item.getAccount()
+                        .setAmount(acc.getAmount());
+                    if (acc.getAmount() < 0) {
+                        if (firstNegative == null) {
+                            firstNegative = item;
+                            singleNegative = true;
+                        }
+                        else
+                            singleNegative = false;
+                    }
+                }
+                else
+                    item.getAccount()
+                        .resetAmount();
                 notifyItemChanged(i + 1);
             }
+
+            if (singleNegative) {
+                firstNegative.getAccount()
+                             .resetAmount();
+            }
         }
         model.checkTransactionSubmittable(this);
         model.setFocusedItem(1);