From 26cc089979843f47a091138c14016d1e2ff8b065 Mon Sep 17 00:00:00 2001
From: christianrowlands <christian.rowlands@gmail.com>
Date: Mon, 6 May 2024 09:31:56 -0400
Subject: [PATCH] Reorder the network types on the cellular screen, and
 colorize the override network

---
 .../res/layout/fragment_network_details.xml   | 46 +++++++++----------
 networksurvey/src/main/res/values/styles.xml  |  3 +-
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/networksurvey/src/main/res/layout/fragment_network_details.xml b/networksurvey/src/main/res/layout/fragment_network_details.xml
index f8552f22..76db434a 100644
--- a/networksurvey/src/main/res/layout/fragment_network_details.xml
+++ b/networksurvey/src/main/res/layout/fragment_network_details.xml
@@ -82,28 +82,28 @@
                         android:orientation="vertical">
 
                         <androidx.constraintlayout.widget.ConstraintLayout
-                            android:id="@+id/data_network_group"
+                            android:id="@+id/voice_network_group"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent">
 
                             <TextView
-                                android:id="@+id/current_data_network"
+                                android:id="@+id/current_voice_network"
                                 style="@style/CellularTitleText"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:gravity="center"
-                                app:layout_constraintTop_toTopOf="@id/data_network_group"
-                                app:layout_constraintBottom_toTopOf="@id/current_data_network_label"
+                                app:layout_constraintTop_toTopOf="@id/voice_network_group"
+                                app:layout_constraintBottom_toTopOf="@id/current_voice_network_label"
                                 android:text="" />
 
                             <TextView
-                                android:id="@+id/current_data_network_label"
+                                android:id="@+id/current_voice_network_label"
                                 style="@style/SmallLabelText"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:gravity="center"
-                                android:text="@string/data_network_label"
-                                app:layout_constraintBottom_toBottomOf="@id/data_network_group" />
+                                android:text="@string/voice_network_label"
+                                app:layout_constraintBottom_toBottomOf="@id/voice_network_group" />
 
                         </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -116,28 +116,28 @@
                         android:orientation="vertical">
 
                         <androidx.constraintlayout.widget.ConstraintLayout
-                            android:id="@+id/override_network_group"
+                            android:id="@+id/data_network_group"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent">
 
                             <TextView
-                                android:id="@+id/current_override_network"
-                                style="@style/SingleLineTitleText"
+                                android:id="@+id/current_data_network"
+                                style="@style/CellularTitleText"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:gravity="center"
-                                app:layout_constraintTop_toTopOf="@id/override_network_group"
-                                app:layout_constraintBottom_toTopOf="@id/current_override_network_label"
+                                app:layout_constraintTop_toTopOf="@id/data_network_group"
+                                app:layout_constraintBottom_toTopOf="@id/current_data_network_label"
                                 android:text="" />
 
                             <TextView
-                                android:id="@+id/current_override_network_label"
+                                android:id="@+id/current_data_network_label"
                                 style="@style/SmallLabelText"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:gravity="center"
-                                android:text="@string/override_network_label"
-                                app:layout_constraintBottom_toBottomOf="@id/override_network_group" />
+                                android:text="@string/data_network_label"
+                                app:layout_constraintBottom_toBottomOf="@id/data_network_group" />
 
                         </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -150,28 +150,28 @@
                         android:orientation="vertical">
 
                         <androidx.constraintlayout.widget.ConstraintLayout
-                            android:id="@+id/voice_network_group"
+                            android:id="@+id/override_network_group"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent">
 
                             <TextView
-                                android:id="@+id/current_voice_network"
-                                style="@style/CellularTitleText"
+                                android:id="@+id/current_override_network"
+                                style="@style/CellularOverrideTitleText"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:gravity="center"
-                                app:layout_constraintTop_toTopOf="@id/voice_network_group"
-                                app:layout_constraintBottom_toTopOf="@id/current_voice_network_label"
+                                app:layout_constraintTop_toTopOf="@id/override_network_group"
+                                app:layout_constraintBottom_toTopOf="@id/current_override_network_label"
                                 android:text="" />
 
                             <TextView
-                                android:id="@+id/current_voice_network_label"
+                                android:id="@+id/current_override_network_label"
                                 style="@style/SmallLabelText"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:gravity="center"
-                                android:text="@string/voice_network_label"
-                                app:layout_constraintBottom_toBottomOf="@id/voice_network_group" />
+                                android:text="@string/override_network_label"
+                                app:layout_constraintBottom_toBottomOf="@id/override_network_group" />
 
                         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/networksurvey/src/main/res/values/styles.xml b/networksurvey/src/main/res/values/styles.xml
index 756cae28..4d068cd7 100644
--- a/networksurvey/src/main/res/values/styles.xml
+++ b/networksurvey/src/main/res/values/styles.xml
@@ -37,12 +37,13 @@
         <item name="android:textColor">@color/colorAccent</item>
     </style>
 
-    <style name="SingleLineTitleText" parent="CellularTitleText">
+    <style name="CellularOverrideTitleText" parent="CellularTitleText">
         <item name="android:maxLines">1</item>
         <item name="android:autoSizeMaxTextSize">22sp</item>
         <item name="android:autoSizeMinTextSize">8sp</item>
         <item name="android:autoSizeTextType">uniform</item>
         <item name="android:autoSizeStepGranularity">2sp</item>
+        <item name="android:textColor">@color/rssi_orange</item>
     </style>
 
     <style name="TitleText" parent="TextAppearance.AppCompat">