Merge pull request #4 from gup-abhi/feature/add_labels_vaibhav

Feature/add labels
Shrutipavasiya · Apr 8, 2024 · f8dfc9c · f8dfc9c
2 parents a143543 + 4f94a81
commit f8dfc9c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git 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();

diff --git 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"
@@ -126,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
@@ -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>
@@ -542,6 +543,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 -->