MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-27 19:15:50 +01:00
Code Releases Wiki Activity

VO2 Max: Cleanup duplicated strings

Browse Source
This commit is contained in:
José Rebelo 2024-09-18 20:48:01 +01:00
parent f2227bb083
commit 1fd426c09d
6 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/ActivityChartsActivity.java
View File

@ -213,7 +213,7 @@ public class ActivityChartsActivity extends AbstractChartsActivity {
case "bodyenergy": case "bodyenergy":
return getString(R.string.body_energy); return getString(R.string.body_energy);
case "vo2max": case "vo2max":
return getString(R.string.vo2max); return getString(R.string.menuitem_vo2_max);
case "stress": case "stress":
return getString(R.string.menuitem_stress); return getString(R.string.menuitem_stress);
case "pai": case "pai":

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/VO2MaxFragment.java
View File

@ -106,7 +106,7 @@ public class VO2MaxFragment extends AbstractChartFragment<VO2MaxFragment.VO2MaxD
@Override @Override
public String getTitle() { public String getTitle() {
return getString(R.string.vo2max); return getString(R.string.menuitem_vo2_max);
} }
@Override @Override

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/DashboardVO2MaxAnyWidget.java
View File

@ -10,7 +10,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.Vo2MaxSample;
public class DashboardVO2MaxAnyWidget extends AbstractDashboardVO2MaxWidget { public class DashboardVO2MaxAnyWidget extends AbstractDashboardVO2MaxWidget {
public DashboardVO2MaxAnyWidget() { public DashboardVO2MaxAnyWidget() {
super(R.string.vo2max, "vo2max"); super(R.string.menuitem_vo2_max, "vo2max");
} }
public static DashboardVO2MaxAnyWidget newInstance(final DashboardFragment.DashboardData dashboardData) { public static DashboardVO2MaxAnyWidget newInstance(final DashboardFragment.DashboardData dashboardData) {

4
app/src/main/res/layout/fragment_vo2max.xml
View File

@ -56,7 +56,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/vo2max_running_gauge_value" android:layout_below="@+id/vo2max_running_gauge_value"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:text="@string/running" /> android:text="@string/activity_type_running" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
@ -92,7 +92,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/vo2max_cycling_gauge_value" android:layout_below="@+id/vo2max_cycling_gauge_value"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:text="@string/cycling" /> android:text="@string/title_cycling" />
</RelativeLayout> </RelativeLayout>

4
app/src/main/res/values/arrays.xml
View File

@ -3041,7 +3041,7 @@
<item>@string/weekstepschart_steps_a_week_or_month</item> <item>@string/weekstepschart_steps_a_week_or_month</item>
<item>@string/pref_header_hrv_status</item> <item>@string/pref_header_hrv_status</item>
<item>@string/body_energy</item> <item>@string/body_energy</item>
<item>@string/vo2max</item> <item>@string/menuitem_vo2_max</item>
<item>@string/menuitem_stress</item> <item>@string/menuitem_stress</item>
<item>@string/menuitem_pai</item> <item>@string/menuitem_pai</item>
<item>@string/stats_title</item> <item>@string/stats_title</item>
@ -4181,7 +4181,7 @@
<item>@string/menuitem_stress_segmented</item> <item>@string/menuitem_stress_segmented</item>
<item>@string/menuitem_stress_breakdown</item> <item>@string/menuitem_stress_breakdown</item>
<item>@string/hrv</item> <item>@string/hrv</item>
<item>@string/vo2max</item> <item>@string/menuitem_vo2_max</item>
<item>@string/vo2max_running</item> <item>@string/vo2max_running</item>
<item>@string/vo2max_cycling</item> <item>@string/vo2max_cycling</item>
</string-array> </string-array>

7
app/src/main/res/values/strings.xml
View File

@ -1623,8 +1623,6 @@
<string name="hrv_status_unit">%1$d ms</string> <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">%1$d-%2$d ms</string>
<string name="hrv_status_baseline_label">Baseline</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="bpm_value_unit">%1$d bpm</string>
<string name="steps_distance_unit">%1$,.2f km</string> <string name="steps_distance_unit">%1$,.2f km</string>
<string name="body_energy_gained">Gained</string> <string name="body_energy_gained">Gained</string>
@ -2532,9 +2530,8 @@
<string name="pref_header_spo2">Blood Oxygen</string> <string name="pref_header_spo2">Blood Oxygen</string>
<string name="pref_header_hrv_status">HRV Status</string> <string name="pref_header_hrv_status">HRV Status</string>
<string name="body_energy">Body Energy</string> <string name="body_energy">Body Energy</string>
<string name="vo2max">VO2 Max</string> <string name="vo2max_running">Running VO₂ Max</string>
<string name="vo2max_running">VO2 Max (Running)</string> <string name="vo2max_cycling">Cycling VO₂ Max</string>
<string name="vo2max_cycling">VO2 Max (Cycling)</string>
<string name="thirty_days_timeline">30 Days Timeline</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_ambient_sound_control">Ambient Sound Control</string>
<string name="pref_header_sony_sound_control">Sound Control</string> <string name="pref_header_sony_sound_control">Sound Control</string>