From 3e9c04711f9c7c58c172ea92879efbdd18954564 Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Mon, 6 Feb 2023 20:33:40 +0000
Subject: [PATCH] Tidied up default strings for main activity when server not
 running.

---
 app/src/main/AndroidManifest.xml |  2 +-
 app/src/main/res/layout/main.xml | 42 +++++++++++++-------------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b12d2c1..5266c93 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="uk.org.openseizuredetector"
     android:versionCode="115"
-    android:versionName="4.1.3b">
+    android:versionName="4.1.3c">
     <!-- android:allowBackup="false" -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index 81253c9..7e6fbfd 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -8,24 +8,16 @@
         android:id="@+id/versionTv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Android OpenSeizureDetector Version x.xx" />
+        android:text="@string/app_name" />
 
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:id="@+id/statusLayout"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
-        <!--<TextView
-            android:id="@+id/serverStatusTv"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0.5"
-            android:gravity="center"
-            android:text="textView1" />
--->
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:orientation="horizontal">
@@ -36,13 +28,13 @@
                 android:layout_height="match_parent"
                 android:text="---" />
 
-            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:padding="10dp"
                 android:orientation="vertical">
 
-                <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:orientation="horizontal">
@@ -60,7 +52,7 @@
                         android:text="---" />
                 </LinearLayout>
 
-                <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:orientation="horizontal">
@@ -92,16 +84,16 @@
             android:layout_height="match_parent"
             android:layout_weight="0.5"
             android:gravity="center"
-            android:text="textView2" />
+            android:text="---" />
     </LinearLayout>
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
         android:id="@+id/watchStatusLl"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="0.5"
@@ -112,18 +104,18 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:text="pebTimeTv" />
+                android:text="---" />
 
             <TextView
                 android:id="@+id/alarmTv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:text="alarmTv"
+                android:text="---"
                 android:textSize="32sp" />
         </LinearLayout>
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="0.5"
@@ -133,19 +125,19 @@
                 android:id="@+id/pebbleTv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="pebbleTv" />
+                android:text="---" />
 
             <TextView
                 android:id="@+id/appTv"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="appTv" />
+                android:text="---" />
 
             <TextView
                 android:id="@+id/battTv"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:text="battTv" />
+                android:text="---" />
         </LinearLayout>
     </LinearLayout>
 
@@ -159,7 +151,7 @@
         android:id="@+id/powerTv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Power" />
+        android:text="---" />
 
     <ProgressBar
         android:id="@+id/powerProgressBar"
@@ -172,7 +164,7 @@
         android:id="@+id/spectrumTv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Spectal Range" />
+        android:text="---" />
 
     <ProgressBar
         android:id="@+id/spectrumProgressBar"