Tidied up new user interface (and fixed problem with re-loading only activity from Android Studio)

app/src/main/res/layout/fragment_common.xml

@@ -2,33 +2,28 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     tools:context=".FragmentOsdBaseClass">
 
-    <!-- TODO: Update blank fragment layout -->
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
-        android:layout_height="253dp"
+        android:layout_height="wrap_content"
         android:orientation="vertical"
         android:background="@color/okBackgroundColor"
         >
 
 
         <TextView
+            android:id="@+id/serverStatusTv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="OpenSeizureDetector Common Components Status"
-            android:textColor="@color/okTextColor"
-            />
+            android:text="---" />
 
         <TextView
-            android:id="@+id/versionTv"
+            android:id="@+id/dataSourceInfoTv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/app_name"
-            android:textColor="@color/okTextColor"
-            />
-
+            android:text="---" />
 
         <LinearLayout
             android:id="@+id/statusLayout"
@@ -36,39 +31,14 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/serverStatusTv"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="---" />
-
-                <TextView
-                    android:id="@+id/alarmTv"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="---"
-                    android:textSize="32sp" />
-
-            </LinearLayout>
 
 
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="10dp">
 
                 <TextView
                     android:id="@+id/algsTv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Algorithms" />
+                    android:text="Algorithms: " />
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -86,12 +56,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="---" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
 
                     <TextView
                         android:id="@+id/hrAlgTv"
@@ -112,10 +76,19 @@
                         android:text=""
                         android:visibility="gone"/>
                         -->
-                </LinearLayout>
+
             </LinearLayout>
         </LinearLayout>
 
+        <TextView
+            android:id="@+id/alarmTv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="---"
+            android:textSize="32sp" />
+
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -144,11 +117,6 @@
                 android:text="@string/ManualAlarmBtnTxt" />
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/fragment_common_tv1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Fragment_System" />
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 

app/src/main/res/layout/fragment_osdalg.xml

@@ -7,7 +7,7 @@
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
-        android:layout_height="253dp"
+        android:layout_height="match_parent"
         android:orientation="vertical"
         android:background="@color/okBackgroundColor">
 
@@ -52,14 +52,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-        <!--This is not displayed because of match_parent height above -->
-        <TextView
-            android:id="@+id/fragment_osdalg_tv1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textColor="@color/okTextColor"
-            android:text="Fragment_OsdAlg" />
-
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 </FrameLayout>

app/src/main/res/layout/fragment_system.xml

@@ -9,7 +9,7 @@
     <!-- TODO: Update blank fragment layout -->
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"
-        android:layout_height="253dp"
+        android:layout_height="match_parent"
         android:orientation="vertical"
         android:id="@+id/fragment_ll">
 

app/src/main/res/values/strings.xml

@@ -565,4 +565,5 @@
     <string name="heart_rate_algorithm">Heart Rate Algorithm</string>
     <string name="heart_rate_history_bpm">"Heart Rate History (bpm): "</string>
     <string name="minutes">minutes</string>
+    <string name="algorithms">"Algorithms: "</string>
 </resources>