Further changes to SettingsFragment.kt

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

@@ -6,15 +6,51 @@
 
     <TextView
         android:id="@+id/location_title"
+        style="@style/SettingsCategory"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:text="@string/location_title"
-        android:textColor="@color/themeAccent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <ProgressBar
+        android:id="@+id/location_progress"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="6dp"
+        android:layout_marginEnd="8dp"
+        app:layout_constraintBottom_toBottomOf="@+id/location_title"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/location_title"
+        app:layout_constraintTop_toTopOf="@+id/location_title" />
+
+    <TextView
+        android:id="@+id/location_lat"
+        style="@style/SettingsText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dp"
+        android:text="@string/location_lat"
+        app:layout_constraintEnd_toStartOf="@+id/location_lon"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
+        app:layout_constraintStart_toStartOf="@+id/location_title"
+        app:layout_constraintTop_toBottomOf="@+id/location_title" />
+
+    <TextView
+        android:id="@+id/location_lon"
+        style="@style/SettingsText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/location_lon"
+        app:layout_constraintBaseline_toBaselineOf="@+id/location_lat"
+        app:layout_constraintEnd_toEndOf="@+id/location_progress"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/location_lat" />
+
     <Button
         android:id="@+id/location_btn_gps"
         style="@style/AppButton"
@@ -30,7 +66,7 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintHorizontal_chainStyle="spread_inside"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/location_title" />
+        app:layout_constraintTop_toBottomOf="@+id/location_lat" />
 
     <Button
         android:id="@+id/location_btn_qth"

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

@@ -6,11 +6,11 @@
 
     <TextView
         android:id="@+id/other_title"
+        style="@style/SettingsCategory"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
-        android:textSize="16sp"
         android:text="@string/other_title"
         android:textColor="@color/themeAccent"
         app:layout_constraintStart_toStartOf="parent"
@@ -18,40 +18,36 @@
 
     <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/other_switch_utc"
+        style="@style/SettingsText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="4dp"
         android:minHeight="48dp"
-        android:textSize="16sp"
         android:text="@string/other_switch_utc"
-        android:textColor="@color/themeLight"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/other_title"
         app:layout_constraintTop_toBottomOf="@+id/other_title" />
 
     <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/other_switch_sweep"
+        style="@style/SettingsText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:minHeight="48dp"
-        android:textSize="16sp"
         android:text="@string/other_switch_sweep"
-        android:textColor="@color/themeLight"
         app:layout_constraintEnd_toEndOf="@+id/other_switch_utc"
         app:layout_constraintStart_toStartOf="@+id/other_switch_utc"
         app:layout_constraintTop_toBottomOf="@+id/other_switch_utc" />
 
     <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/other_switch_sensors"
+        style="@style/SettingsText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
         android:minHeight="48dp"
-        android:textSize="16sp"
         android:text="@string/other_switch_sensors"
-        android:textColor="@color/themeLight"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@+id/other_switch_utc"
         app:layout_constraintStart_toStartOf="@+id/other_switch_sweep"

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

@@ -6,28 +6,25 @@
 
     <TextView
         android:id="@+id/tracking_title"
+        style="@style/SettingsCategory"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
-        android:textSize="16sp"
         android:text="@string/tracking_title"
-        android:textColor="@color/themeAccent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.appcompat.widget.SwitchCompat
         android:id="@+id/tracking_switch"
+        style="@style/SettingsText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
         android:layout_marginEnd="4dp"
         android:minHeight="48dp"
-        android:textSize="16sp"
         android:text="@string/tracking_switch"
-        android:textColor="@color/themeLight"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/tracking_title"
         app:layout_constraintTop_toBottomOf="@+id/tracking_title" />
 
     <com.google.android.material.textfield.TextInputLayout

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

@@ -6,44 +6,54 @@
 
     <TextView
         android:id="@+id/update_title"
+        style="@style/SettingsCategory"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
-        android:textSize="16sp"
         android:text="@string/update_title"
-        android:textColor="@color/themeAccent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <ProgressBar
+        android:id="@+id/update_progress"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="6dp"
+        android:layout_marginEnd="8dp"
+        app:layout_constraintBottom_toBottomOf="@+id/update_title"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/update_title"
+        app:layout_constraintTop_toTopOf="@+id/update_title" />
+
     <Button
         android:id="@+id/update_btn_web"
         style="@style/AppButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="4dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp"
         android:drawableStart="@drawable/ic_update_web"
         android:text="@string/update_web"
-        app:layout_constraintBaseline_toBaselineOf="@+id/update_btn_file"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/update_btn_file"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintHorizontal_chainStyle="spread_inside"
-        app:layout_constraintStart_toEndOf="@+id/update_btn_file" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/update_title" />
 
     <Button
         android:id="@+id/update_btn_file"
         style="@style/AppButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginTop="4dp"
-        android:layout_marginBottom="4dp"
+        android:layout_marginEnd="4dp"
         android:drawableStart="@drawable/ic_update_file"
         android:text="@string/update_file"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/update_btn_web"
+        app:layout_constraintBaseline_toBaselineOf="@+id/update_btn_web"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/update_title" />
+        app:layout_constraintStart_toEndOf="@+id/update_btn_web" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -6,39 +6,35 @@
 
     <TextView
         android:id="@+id/warranty_title"
+        style="@style/SettingsCategory"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="8dp"
         android:layout_marginTop="8dp"
         android:text="@string/warranty_title"
-        android:textColor="@color/themeAccent"
-        android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/warranty_thanks"
+        style="@style/SettingsText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
         android:layout_marginTop="4dp"
         android:layout_marginEnd="8dp"
         android:text="@string/warranty_thanks"
-        android:textColor="@color/themeLight"
-        android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/warranty_title"
         app:layout_constraintTop_toBottomOf="@+id/warranty_title" />
 
     <TextView
         android:id="@+id/warranty_license"
+        style="@style/SettingsText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
         android:layout_marginBottom="8dp"
         android:text="@string/warranty_license"
-        android:textColor="@color/themeLight"
-        android:textSize="16sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@+id/warranty_thanks"
         app:layout_constraintStart_toStartOf="@+id/warranty_thanks"

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

@@ -49,25 +49,12 @@
 
         </androidx.cardview.widget.CardView>
 
-        <androidx.cardview.widget.CardView
-            android:id="@+id/card_prefs_data"
-            style="@style/SettingsCard"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/card_prefs_info">
-
-            <include
-                android:id="@+id/prefs_data"
-                layout="@layout/card_prefs_update" />
-
-        </androidx.cardview.widget.CardView>
-
         <androidx.cardview.widget.CardView
             android:id="@+id/card_prefs_location"
             style="@style/SettingsCard"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/card_prefs_data">
+            app:layout_constraintTop_toBottomOf="@+id/card_prefs_info">
 
             <include
                 android:id="@+id/prefs_location"
@@ -76,12 +63,25 @@
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
-            android:id="@+id/card_prefs_tracking"
+            android:id="@+id/card_prefs_data"
             style="@style/SettingsCard"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/card_prefs_location">
 
+            <include
+                android:id="@+id/prefs_data"
+                layout="@layout/card_prefs_update" />
+
+        </androidx.cardview.widget.CardView>
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/card_prefs_tracking"
+            style="@style/SettingsCard"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/card_prefs_data">
+
             <include
                 android:id="@+id/prefs_tracking"
                 layout="@layout/card_prefs_tracking" />