From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Mon, 28 Feb 2022 22:00:42 +0000 (+0000)
Subject: Remove Server URL from main display
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=0fe102be36d2102b1fee2711e43eeffaae3e9967;p=acmetensortoys-ctfws-android

Remove Server URL from main display

Nobody but me cares that much
---

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/main/Activity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/main/Activity.java
index f492e52..c1ae9b7 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/main/Activity.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/main/Activity.java
@@ -34,16 +34,6 @@ public class Activity extends CtFwSActivityBase {
     private final MainService.Observer mSrvObs = new MainService.Observer() {
         @Override
         public void onMqttServerChanged(MainService.LocalBinder b, final String sURL) {
-            mTvSU.post(new Runnable() {
-                @Override
-                public void run() {
-                    if (sURL == null) {
-                        mTvSU.setText(R.string.string_null);
-                    } else {
-                        mTvSU.setText(sURL);
-                    }
-                }
-            });
         }
 
         @Override
@@ -79,7 +69,6 @@ public class Activity extends CtFwSActivityBase {
     private MenuItem mMenuReconn;
 
     private CtFwSDisplay mCdl; // set in onStart
-    private TextView mTvSU; // set in onStart
     private TextView mTvSS; // set in onStart
     private void setServerStateText(@StringRes final int resid, Object... args) {
         final Spanned h = AndroidResourceUtils.htmlFromStrResId(getResources(), resid, args);
@@ -110,7 +99,6 @@ public class Activity extends CtFwSActivityBase {
 
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
 
-        mTvSU = findViewById(R.id.tv_mqtt_server_uri);
         mTvSS = findViewById(R.id.tv_mqtt_state);
 
         mCdl = new CtFwSDisplay(this);
diff --git a/mobile/src/main/res/layout-land/activity_main.xml b/mobile/src/main/res/layout-land/activity_main.xml
index b76f39f..bf7f749 100644
--- a/mobile/src/main/res/layout-land/activity_main.xml
+++ b/mobile/src/main/res/layout-land/activity_main.xml
@@ -239,44 +239,18 @@
         android:layout_alignParentBottom="true"
         android:baselineAligned="false">
 
-        <LinearLayout
+        <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="end"
-                android:text="@string/mqtt_uri_label" />
-
-            <TextView
-                android:id="@+id/tv_mqtt_server_uri"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center" />
-        </LinearLayout>
+            android:gravity="end"
+            android:text="@string/mqtt_state_label" />
 
-        <LinearLayout
-            android:layout_width="wrap_content"
+        <TextView
+            android:id="@+id/tv_mqtt_state"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="end"
-                android:text="@string/mqtt_state_label" />
-
-            <TextView
-                android:id="@+id/tv_mqtt_state"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center" />
-        </LinearLayout>
-
+            android:layout_weight="1"
+            android:gravity="center" />
     </LinearLayout>
 
 </RelativeLayout>
diff --git a/mobile/src/main/res/layout/activity_main.xml b/mobile/src/main/res/layout/activity_main.xml
index f2f2c6b..c29cc18 100644
--- a/mobile/src/main/res/layout/activity_main.xml
+++ b/mobile/src/main/res/layout/activity_main.xml
@@ -222,7 +222,7 @@
             android:scrollbars="vertical" />
     </LinearLayout>
 
-    <TableLayout
+    <LinearLayout
         android:id="@+id/main_connmeta"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -230,41 +230,19 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="end"
-                android:text="@string/mqtt_uri_label" />
-
-            <TextView
-                android:id="@+id/tv_mqtt_server_uri"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center" />
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="end"
-                android:text="@string/mqtt_state_label" />
 
-            <TextView
-                android:id="@+id/tv_mqtt_state"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="end"
+            android:text="@string/mqtt_state_label" />
 
-        </TableRow>
+        <TextView
+            android:id="@+id/tv_mqtt_state"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center" />
 
-    </TableLayout>
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 53d93e3..a29cdfb 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -56,7 +56,6 @@
     <string name="menutext_screenwake">Keep Screen On</string>
     <string name="menutext_search">Search</string>
 
-    <string name="mqtt_uri_label">Server URI:</string>
     <string name="mqtt_state_label">Server State:</string>
     <string name="mqtt_conn">Connected but not subscribed</string>
     <string name="mqtt_disconn">Disconnected (tap to retry now)</string>
@@ -74,8 +73,6 @@
     <string name="preftext_sound_flag">Sound on Flag Capture?</string>
     <string name="preftext_sound_mesg">Sound on Message?</string>
 
-    <string name="string_null">&lt;&lt;null&gt;&gt;</string>
-
     <string name="wait_long">Stun 60</string>
     <string name="wait_short">Stun 10</string>