From 24c565d9f1041e10701719c38b3918f9444ff719 Mon Sep 17 00:00:00 2001
From: Vaibhav <vaibhav.sharma17649@gmail.com>
Date: Mon, 8 Apr 2024 16:13:54 -0400
Subject: [PATCH 1/3] Feature/add_label

---
 src/main/res/layout/track_list.xml | 8 ++++++++
 src/main/res/values/strings.xml    | 1 +
 2 files changed, 9 insertions(+)

diff --git a/src/main/res/layout/track_list.xml b/src/main/res/layout/track_list.xml
index 3ed9f6dca..f6a819ba9 100644
--- a/src/main/res/layout/track_list.xml
+++ b/src/main/res/layout/track_list.xml
@@ -118,6 +118,14 @@ limitations under the License.
             app:icon="@drawable/ic_statistics_24dp"
             app:iconTint="?attr/colorOnBackground" />
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/aggregate_stats"
+            android:textColor="@android:color/black"
+            android:textSize="16sp"
+            android:textStyle="bold"/>
+
         <com.google.android.material.button.MaterialButton
             android:id="@+id/sensor_start_button"
             style="@style/Widget.Material3.Button.IconButton"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 0f92dc08a..e9fdb4097 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -542,6 +542,7 @@ limitations under the License.
     <!-- Aggregated Statistics -->
     <string name="aggregated_stats_empty_message">Record your first track to see aggregated statistics</string>
     <string name="aggregated_stats_filter_no_results">There are not activities for the specified filter</string>
+    <string name="aggregate_stats">Aggregate Stats</string>
     <!-- Interval List -->
     <string name="interval_list_empty_message">There are not any interval yet</string>
     <!-- Unit -->

From 3639170aeed5052c41911e50c6a5a3d8f654ffaa Mon Sep 17 00:00:00 2001
From: Rafsan4084 <rafsan4084@gmail.com>
Date: Mon, 8 Apr 2024 16:34:35 -0400
Subject: [PATCH 2/3] feature/add_labels_rafsan

---
 src/main/res/layout/track_list.xml | 8 ++++++++
 src/main/res/values/strings.xml    | 1 +
 2 files changed, 9 insertions(+)

diff --git a/src/main/res/layout/track_list.xml b/src/main/res/layout/track_list.xml
index f6a819ba9..652044877 100644
--- a/src/main/res/layout/track_list.xml
+++ b/src/main/res/layout/track_list.xml
@@ -134,6 +134,14 @@ limitations under the License.
             app:icon="@drawable/ic_gps_off_24dp"
             app:iconTint="?attr/colorOnBackground" />
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/gps_status"
+            android:textColor="@android:color/black"
+            android:textSize="16sp"
+            android:textStyle="bold"/>
+
     </com.google.android.material.bottomappbar.BottomAppBar>
 
 <!--    <com.google.android.material.floatingactionbutton.FloatingActionButton-->
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index cd43f68a3..56d5c0a1f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -248,6 +248,7 @@ limitations under the License.
     <string name="generic_dismiss">Dismiss</string>
     <!-- Gps -->
     <string name="gps_starting">Starting GPS</string>
+    <string name="gps_status">GPS</string>
     <string name="gps_wait_for_better_signal">Waiting for a better GPS signal</string>
     <string name="gps_wait_for_signal">Waiting for GPS signal</string>
     <string name="gps_disabled_msg">GPS disabled</string>

From 4f94a81f0e22fe26f601438fe3b4650e5895f06e Mon Sep 17 00:00:00 2001
From: Rafsan4084 <rafsan4084@gmail.com>
Date: Mon, 8 Apr 2024 16:44:44 -0400
Subject: [PATCH 3/3] Rename fragment local variable because of variable
 shadowing.

---
 .../de/dennisguse/opentracks/settings/SettingsActivity.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
index b17879c2c..ff624df57 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
@@ -78,7 +78,7 @@ protected View getRootView() {
     }
 
     private PreferenceFragmentCompat getPreferenceScreen(String key) {
-        PreferenceFragmentCompat fragment = null;
+        PreferenceFragmentCompat LocalFragment = null;
 
         if (key.equals(getString(R.string.settings_defaults_key))) {
             fragment = new DefaultsSettingsFragment();