From 1fd426c09d6cc97d7bb75bc82078e41ad01a995b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= <joserebelo@outlook.com>
Date: Wed, 18 Sep 2024 20:48:01 +0100
Subject: [PATCH] VO2 Max: Cleanup duplicated strings

---
 .../activities/charts/ActivityChartsActivity.java          | 2 +-
 .../gadgetbridge/activities/charts/VO2MaxFragment.java     | 2 +-
 .../activities/dashboard/DashboardVO2MaxAnyWidget.java     | 2 +-
 app/src/main/res/layout/fragment_vo2max.xml                | 4 ++--
 app/src/main/res/values/arrays.xml                         | 4 ++--
 app/src/main/res/values/strings.xml                        | 7 ++-----
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityChartsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityChartsActivity.java
index fff96e34e..4c5eccf7d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityChartsActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityChartsActivity.java
@@ -213,7 +213,7 @@ public class ActivityChartsActivity extends AbstractChartsActivity {
                 case "bodyenergy":
                     return getString(R.string.body_energy);
                 case "vo2max":
-                    return getString(R.string.vo2max);
+                    return getString(R.string.menuitem_vo2_max);
                 case "stress":
                     return getString(R.string.menuitem_stress);
                 case "pai":
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/VO2MaxFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/VO2MaxFragment.java
index 3242762ef..0b2330113 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/VO2MaxFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/VO2MaxFragment.java
@@ -106,7 +106,7 @@ public class VO2MaxFragment extends AbstractChartFragment<VO2MaxFragment.VO2MaxD
 
     @Override
     public String getTitle() {
-        return getString(R.string.vo2max);
+        return getString(R.string.menuitem_vo2_max);
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardVO2MaxAnyWidget.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardVO2MaxAnyWidget.java
index af98d1bcb..2f1c19abd 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardVO2MaxAnyWidget.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardVO2MaxAnyWidget.java
@@ -10,7 +10,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.Vo2MaxSample;
 public class DashboardVO2MaxAnyWidget extends AbstractDashboardVO2MaxWidget {
 
     public DashboardVO2MaxAnyWidget() {
-        super(R.string.vo2max, "vo2max");
+        super(R.string.menuitem_vo2_max, "vo2max");
     }
 
     public static DashboardVO2MaxAnyWidget newInstance(final DashboardFragment.DashboardData dashboardData) {
diff --git a/app/src/main/res/layout/fragment_vo2max.xml b/app/src/main/res/layout/fragment_vo2max.xml
index e8925e336..f08b98e8f 100644
--- a/app/src/main/res/layout/fragment_vo2max.xml
+++ b/app/src/main/res/layout/fragment_vo2max.xml
@@ -56,7 +56,7 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/vo2max_running_gauge_value"
                     android:layout_centerHorizontal="true"
-                    android:text="@string/running" />
+                    android:text="@string/activity_type_running" />
 
             </RelativeLayout>
             <RelativeLayout
@@ -92,7 +92,7 @@
                     android:layout_height="wrap_content"
                     android:layout_below="@+id/vo2max_cycling_gauge_value"
                     android:layout_centerHorizontal="true"
-                    android:text="@string/cycling" />
+                    android:text="@string/title_cycling" />
 
             </RelativeLayout>
 
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 595edaa03..fe625da62 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -3041,7 +3041,7 @@
         <item>@string/weekstepschart_steps_a_week_or_month</item>
         <item>@string/pref_header_hrv_status</item>
         <item>@string/body_energy</item>
-        <item>@string/vo2max</item>
+        <item>@string/menuitem_vo2_max</item>
         <item>@string/menuitem_stress</item>
         <item>@string/menuitem_pai</item>
         <item>@string/stats_title</item>
@@ -4181,7 +4181,7 @@
         <item>@string/menuitem_stress_segmented</item>
         <item>@string/menuitem_stress_breakdown</item>
         <item>@string/hrv</item>
-        <item>@string/vo2max</item>
+        <item>@string/menuitem_vo2_max</item>
         <item>@string/vo2max_running</item>
         <item>@string/vo2max_cycling</item>
     </string-array>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 76b65957d..c8a42363c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1623,8 +1623,6 @@
     <string name="hrv_status_unit">%1$d ms</string>
     <string name="hrv_status_baseline">%1$d-%2$d ms</string>
     <string name="hrv_status_baseline_label">Baseline</string>
-    <string name="running">Running</string>
-    <string name="cycling">Cycling</string>
     <string name="bpm_value_unit">%1$d bpm</string>
     <string name="steps_distance_unit">%1$,.2f km</string>
     <string name="body_energy_gained">Gained</string>
@@ -2532,9 +2530,8 @@
     <string name="pref_header_spo2">Blood Oxygen</string>
     <string name="pref_header_hrv_status">HRV Status</string>
     <string name="body_energy">Body Energy</string>
-    <string name="vo2max">VO2 Max</string>
-    <string name="vo2max_running">VO2 Max (Running)</string>
-    <string name="vo2max_cycling">VO2 Max (Cycling)</string>
+    <string name="vo2max_running">Running VO₂ Max</string>
+    <string name="vo2max_cycling">Cycling VO₂ Max</string>
     <string name="thirty_days_timeline">30 Days Timeline</string>
     <string name="pref_header_sony_ambient_sound_control">Ambient Sound Control</string>
     <string name="pref_header_sony_sound_control">Sound Control</string>