transaction list: replace table layout with linear one

works faster, it seems, may be sped up more

diff --git a/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java b/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java
index 57de4c0c0666765367ad3677cf1e81e58087e58b..65ef6db63b7da1fd4d5df2bbfa3b3a9716fa40d3 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java
+++ b/app/src/main/java/net/ktnx/mobileledger/TransactionListAdapter.java
@@ -18,16 +18,16 @@
 package net.ktnx.mobileledger;
 
 import android.content.Context;
 package net.ktnx.mobileledger;
 
 import android.content.Context;

-import android.content.res.Resources;

 import android.database.sqlite.SQLiteDatabase;
 import android.support.annotation.NonNull;
 import android.database.sqlite.SQLiteDatabase;
 import android.support.annotation.NonNull;

+import android.support.constraint.ConstraintLayout;

 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView;

+import android.util.Log;
+import android.view.Gravity;

 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;

-import android.widget.TableLayout;
-import android.widget.TableRow;

 import android.widget.TextView;
 
 import net.ktnx.mobileledger.model.LedgerTransaction;
 import android.widget.TextView;
 
 import net.ktnx.mobileledger.model.LedgerTransaction;


@@ -35,9 +35,10 @@ import net.ktnx.mobileledger.model.LedgerTransactionAccount;
 import net.ktnx.mobileledger.utils.Globals;
 import net.ktnx.mobileledger.utils.MLDB;
 
 import net.ktnx.mobileledger.utils.Globals;
 import net.ktnx.mobileledger.utils.MLDB;
 

-import java.util.Iterator;

 import java.util.List;
 
 import java.util.List;
 

+import static net.ktnx.mobileledger.utils.DimensionUtils.dp2px;
+

 class TransactionListAdapter
         extends RecyclerView.Adapter<TransactionListAdapter.TransactionRowHolder> {
     private List<LedgerTransaction> transactions;
 class TransactionListAdapter
         extends RecyclerView.Adapter<TransactionListAdapter.TransactionRowHolder> {
     private List<LedgerTransaction> transactions;


@@ -52,20 +53,48 @@ class TransactionListAdapter
 
         try (SQLiteDatabase db = MLDB.getReadableDatabase(ctx)) {
             tr.loadData(db);
 
         try (SQLiteDatabase db = MLDB.getReadableDatabase(ctx)) {
             tr.loadData(db);

-

             holder.tvDescription
             holder.tvDescription

-                    .setText(String.format("%s\n%s", tr.getDescription(), tr.getDate()));
-            TableLayout tbl = holder.row.findViewById(R.id.transaction_row_acc_amounts);
-            tbl.removeAllViews();
+                    .setText(String.format("%s\t%s", tr.getDescription(), tr.getDate()));
+
+            int rowIndex = 0;

             for (LedgerTransactionAccount acc : tr.getAccounts()) {
             for (LedgerTransactionAccount acc : tr.getAccounts()) {

-                TableRow row = new TableRow(holder.row.getContext());
-                TextView child = new TextView(ctx);
-                child.setText(acc.getShortAccountName());
-                row.addView(child);
-                child = new TextView(ctx);
-                child.setText(acc.toString());
-                row.addView(child);
-                tbl.addView(row);
+                LinearLayout row = (LinearLayout) holder.tableAccounts.getChildAt(rowIndex++);
+                TextView accName, accAmount;
+                if (row == null) {
+                    row = new LinearLayout(ctx);
+                    row.setLayoutParams(
+                            new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
+                                    LinearLayout.LayoutParams.WRAP_CONTENT));
+                    row.setGravity(Gravity.CENTER_VERTICAL);
+                    row.setOrientation(LinearLayout.HORIZONTAL);
+                    row.setPaddingRelative(dp2px(ctx, 8), 0, dp2px(ctx, 8), 0);
+                    accName = new TextView(ctx);
+                    accName.setLayoutParams(
+                            new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
+                                    LinearLayout.LayoutParams.WRAP_CONTENT, 5f));
+                    accName.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_START);
+                    row.addView(accName);
+                    accAmount = new TextView(ctx);
+                    LinearLayout.LayoutParams llp =
+                            new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
+                                    LinearLayout.LayoutParams.WRAP_CONTENT, 1f);
+                    llp.setMarginEnd(0);
+                    accAmount.setLayoutParams(llp);
+                    accAmount.setTextAlignment(View.TEXT_ALIGNMENT_VIEW_END);
+                    accAmount.setMinWidth(dp2px(ctx, 60));
+                    row.addView(accAmount);
+                    holder.tableAccounts.addView(row);
+                }
+                else {
+                    accName = (TextView) row.getChildAt(0);
+                    accAmount = (TextView) row.getChildAt(1);
+                }
+                accName.setText(acc.getShortAccountName());
+                accAmount.setText(acc.toString());
+            }
+            if (holder.tableAccounts.getChildCount() > rowIndex) {
+                holder.tableAccounts
+                        .removeViews(rowIndex, holder.tableAccounts.getChildCount() - rowIndex);

             }
 
             if (position % 2 == 0) {
             }
 
             if (position % 2 == 0) {


@@ -74,14 +103,13 @@ class TransactionListAdapter
             else {
                 holder.row.setBackgroundColor(Globals.table_row_odd_bg);
             }
             else {
                 holder.row.setBackgroundColor(Globals.table_row_odd_bg);
             }

-
-            holder.row.setTag(R.id.POS, position);

         }
     }
 
     @NonNull
     @Override
     public TransactionRowHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         }
     }
 
     @NonNull
     @Override
     public TransactionRowHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {

+        Log.d("perf", "onCreateViewHolder called");

         View row = LayoutInflater.from(parent.getContext())
                 .inflate(R.layout.transaction_list_row, parent, false);
         return new TransactionRowHolder(row);
         View row = LayoutInflater.from(parent.getContext())
                 .inflate(R.layout.transaction_list_row, parent, false);
         return new TransactionRowHolder(row);


@@ -93,11 +121,11 @@ class TransactionListAdapter
     }
     class TransactionRowHolder extends RecyclerView.ViewHolder {
         TextView tvDescription;
     }
     class TransactionRowHolder extends RecyclerView.ViewHolder {
         TextView tvDescription;

-        TableLayout tableAccounts;
-        LinearLayout row;
+        LinearLayout tableAccounts;
+        ConstraintLayout row;

         public TransactionRowHolder(@NonNull View itemView) {
             super(itemView);
         public TransactionRowHolder(@NonNull View itemView) {
             super(itemView);

-            this.row = (LinearLayout) itemView;
+            this.row = (ConstraintLayout) itemView;

             this.tvDescription = itemView.findViewById(R.id.transaction_row_description);
             this.tableAccounts = itemView.findViewById(R.id.transaction_row_acc_amounts);
         }
             this.tvDescription = itemView.findViewById(R.id.transaction_row_description);
             this.tableAccounts = itemView.findViewById(R.id.transaction_row_acc_amounts);
         }

diff --git a/app/src/main/res/layout/transaction_list_row.xml b/app/src/main/res/layout/transaction_list_row.xml
index a31faad07c48b3b0f86f72e95d7329703585a247..e35c331ba16276b569c3366c962e2c45bc2ae167 100644 (file)
--- a/app/src/main/res/layout/transaction_list_row.xml
+++ b/app/src/main/res/layout/transaction_list_row.xml
@@ -41,39 +41,35 @@
         android:text="Sample description goes here."
         tools:ignore="HardcodedText" />
 
         android:text="Sample description goes here."
         tools:ignore="HardcodedText" />
 

-    <TableLayout
+    <LinearLayout

         android:id="@+id/transaction_row_acc_amounts"
         android:id="@+id/transaction_row_acc_amounts"

-        android:layout_width="0dp"
+        android:layout_width="match_parent"

         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_weight="5"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_weight="5"

-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintStart_toEndOf="@id/transaction_row_description">
-
-        <TableRow>
-
-            <TextView
-                style="@style/account_summary_amounts"
-                android:text="Sample account name"
-                tools:ignore="HardcodedText" />
+        android:orientation="vertical"
+        app:layout_constraintTop_toBottomOf="@id/transaction_row_description">

 
 

-            <TextView
-                style="@style/account_summary_amounts"
-                android:text="123,45\n678,90"
-                tools:ignore="HardcodedText" />
-        </TableRow>
-
-        <TableRow>
+        <LinearLayout
+            android:id="@+id/account_row_account_row"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp">

 
             <TextView
 
             <TextView

-                style="@style/account_summary_amounts"
-                android:text="Sample account name"
+                android:id="@+id/account_row_acc_name"
+                style="@style/account_summary_account_name"
+                android:text="Account name, a really long one. A very very very long one. It may even spawn on more than two lines -- three, four or more."

                 tools:ignore="HardcodedText" />
 
             <TextView
                 tools:ignore="HardcodedText" />
 
             <TextView

+                android:id="@+id/account_row_acc_amounts"

                 style="@style/account_summary_amounts"
                 android:text="123,45\n678,90"
                 tools:ignore="HardcodedText" />
                 style="@style/account_summary_amounts"
                 android:text="123,45\n678,90"
                 tools:ignore="HardcodedText" />

-        </TableRow>
-    </TableLayout>
+        </LinearLayout>
+    </LinearLayout>

 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file