From 99f0beaf3a2850454269a7e7dd904d9a6a2070e2 Mon Sep 17 00:00:00 2001
From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Wed, 2 Oct 2019 02:52:38 +0100
Subject: [PATCH] Tweak main layout for very small devices

---
 .../ctfwstimer/activity/MainActivity.java     |  2 +-
 .../main/res/layout-land/activity_main.xml    |  2 +-
 mobile/src/main/res/layout/activity_main.xml  | 32 +++++++++++++------
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivity.java
index 60caa6c..8689386 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivity.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/MainActivity.java
@@ -92,7 +92,7 @@ public class MainActivity extends CtFwSActivityBase {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        findViewById(R.id.connmeta).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.main_connmeta).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 onclick_connmeta(v);
diff --git a/mobile/src/main/res/layout-land/activity_main.xml b/mobile/src/main/res/layout-land/activity_main.xml
index 38910de..cdb3f32 100644
--- a/mobile/src/main/res/layout-land/activity_main.xml
+++ b/mobile/src/main/res/layout-land/activity_main.xml
@@ -233,7 +233,7 @@
     </LinearLayout>
 
     <LinearLayout
-        android:id="@+id/connmeta"
+        android:id="@+id/main_connmeta"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
diff --git a/mobile/src/main/res/layout/activity_main.xml b/mobile/src/main/res/layout/activity_main.xml
index d308df2..20adce3 100644
--- a/mobile/src/main/res/layout/activity_main.xml
+++ b/mobile/src/main/res/layout/activity_main.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_main"
     android:layout_width="match_parent"
@@ -11,9 +12,12 @@
     tools:context="com.acmetensortoys.ctfwstimer.activity.MainActivity">
 
     <LinearLayout
+        android:id="@+id/main_headers"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <TextView
             android:id="@+id/header_gamestate"
@@ -191,6 +195,17 @@
 
         </TableLayout>
 
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toTopOf="@+id/main_connmeta"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/main_headers">
+
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -200,21 +215,20 @@
         <TextView
             android:id="@+id/msgs"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:ems="10"
             android:gravity="bottom"
             android:inputType="none"
-            android:lines="10"
             android:scrollbars="vertical" />
-
     </LinearLayout>
 
     <TableLayout
-        android:id="@+id/connmeta"
+        android:id="@+id/main_connmeta"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:stretchColumns="1">
+        android:stretchColumns="1"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
 
         <TableRow
             android:layout_width="match_parent"
@@ -253,4 +267,4 @@
 
     </TableLayout>
 
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
-- 
2.50.1