From c97b9875bd293672f1888a70faaf725538693d6b Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 24 Feb 2021 19:03:52 -0800
Subject: [PATCH] cleanup: make TableLayout include less

Scroller is allowed only one child and I guess I wanted the TableLayout
to suffice, but having unrelated stuff in it sucked. So wrap it in a
LinearLayout and move the unrelated stuff out.
---
 .../android/xw4/DictBrowseDelegate.java       |   3 +-
 .../app/src/main/res/layout/dict_browser.xml  | 126 +++++++++---------
 2 files changed, 66 insertions(+), 63 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java
index 48970a3b6..635e68aa4 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java
@@ -39,6 +39,7 @@ import android.widget.FrameLayout;
 import android.widget.ListView;
 import android.widget.SectionIndexer;
 import android.widget.Spinner;
+import android.widget.TableLayout;
 import android.widget.TextView;
 
 import java.util.ArrayList;
@@ -523,7 +524,7 @@ public class DictBrowseDelegate extends DelegateBase
 
     private void findTableRows()
     {
-        ViewGroup table = (ViewGroup)findViewById( R.id.config );
+        TableLayout table = (TableLayout)findViewById( R.id.table );
         int count = table.getChildCount();
         int nFound = 0;
         for ( int ii = 0; ii < count && nFound < m_rows.length; ++ii ) {
diff --git a/xwords4/android/app/src/main/res/layout/dict_browser.xml b/xwords4/android/app/src/main/res/layout/dict_browser.xml
index 3b0193181..fb96b6e0d 100644
--- a/xwords4/android/app/src/main/res/layout/dict_browser.xml
+++ b/xwords4/android/app/src/main/res/layout/dict_browser.xml
@@ -45,64 +45,69 @@
                 android:paddingLeft="8dp"
                 android:paddingRight="8dp"
                 >
-      <TableLayout android:id="@+id/config"
-                   android:orientation="vertical"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:background="#FF1F1F1F"
-                   android:visibility="gone"
-                   >
-        <TableRow
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            >
-          <TextView style="@style/pat_table_label"
-                    android:visibility="invisible"
-                    />
-          <EditText style="@style/pat_table_edit"
-                    android:visibility="invisible"
-                    />
-          <TextView android:layout_width="wrap_content"
+      <LinearLayout android:id="@+id/config"
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/pat_col_anyorder"
-                    />
-        </TableRow>
-        <org.eehouse.android.xw4.PatTableRow
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            >
-          <TextView style="@style/pat_table_label"
-                    android:text="@string/pat_starts_with"
-                    />
-          <EditText style="@style/pat_table_edit"
-                    />
-          <CheckBox style="@style/pat_table_check"
-                    />
-        </org.eehouse.android.xw4.PatTableRow>
-        <org.eehouse.android.xw4.PatTableRow
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            >
-          <TextView style="@style/pat_table_label"
-                    android:text="@string/pat_contains"
-                    />
-          <EditText style="@style/pat_table_edit"
-                    />
-          <CheckBox style="@style/pat_table_check"
-                    />
-        </org.eehouse.android.xw4.PatTableRow>
-        <org.eehouse.android.xw4.PatTableRow
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            >
-          <TextView style="@style/pat_table_label"
-                    android:text="@string/pat_ends_with"
-                    />
-          <EditText style="@style/pat_table_edit"
-                    />
-          <CheckBox style="@style/pat_table_check"
-                    />
-        </org.eehouse.android.xw4.PatTableRow>
+                    android:background="#FF1F1F1F"
+                    android:visibility="gone"
+                    >
+        <TableLayout android:id="@+id/table"
+                     android:layout_width="match_parent"
+                     android:layout_height="wrap_content"
+                     >
+          <TableRow
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              >
+            <TextView style="@style/pat_table_label"
+                      android:visibility="invisible"
+                      />
+            <EditText style="@style/pat_table_edit"
+                      android:visibility="invisible"
+                      />
+            <TextView android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:text="@string/pat_col_anyorder"
+                      />
+          </TableRow>
+          <org.eehouse.android.xw4.PatTableRow
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              >
+            <TextView style="@style/pat_table_label"
+                      android:text="@string/pat_starts_with"
+                      />
+            <EditText style="@style/pat_table_edit"
+                      />
+            <CheckBox style="@style/pat_table_check"
+                      />
+          </org.eehouse.android.xw4.PatTableRow>
+          <org.eehouse.android.xw4.PatTableRow
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              >
+            <TextView style="@style/pat_table_label"
+                      android:text="@string/pat_contains"
+                      />
+            <EditText style="@style/pat_table_edit"
+                      />
+            <CheckBox style="@style/pat_table_check"
+                      />
+          </org.eehouse.android.xw4.PatTableRow>
+          <org.eehouse.android.xw4.PatTableRow
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              >
+            <TextView style="@style/pat_table_label"
+                      android:text="@string/pat_ends_with"
+                      />
+            <EditText style="@style/pat_table_edit"
+                      />
+            <CheckBox style="@style/pat_table_check"
+                      />
+          </org.eehouse.android.xw4.PatTableRow>
+        </TableLayout>
         <LinearLayout android:layout_height="wrap_content"
                       android:layout_width="wrap_content"
                       android:orientation="horizontal"
@@ -111,10 +116,7 @@
                   android:layout_height="wrap_content"
                   android:layout_width="wrap_content"
                   android:text="@string/button_addBlank"
-                  android:layout_span="1"
                   android:enabled="false"
-                  android:minHeight="0dp"
-                  android:minWidth="0dp"
                   />
         </LinearLayout>
         <LinearLayout android:layout_height="wrap_content"
@@ -154,12 +156,12 @@
         </LinearLayout>
         <Button android:id="@+id/button_useconfig"
                 android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:text="@string/button_useconfig"
                 android:layout_gravity="center_horizontal"
                 android:layout_span="2"
                 />
-      </TableLayout>
+      </LinearLayout>
     </ScrollView>
   </LinearLayout>