From 7e7b0a0f287971742a669da82870d8c676b02c4f Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sat, 19 Jun 2021 10:20:41 +0200
Subject: [PATCH] Amazfit T-Rex Pro: Add barometer to menu items

---
 .../service/devices/huami/HuamiMenuType.java  |  3 +-
 app/src/main/res/values/arrays.xml            | 38 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  1 +
 app/src/main/res/values/values.xml            |  1 +
 .../res/xml/devicesettings_amazfittrexpro.xml |  6 +--
 5 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiMenuType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiMenuType.java
index e934b2ecd..febb81b40 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiMenuType.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiMenuType.java
@@ -58,7 +58,8 @@ class HuamiMenuType {
         put("calories",0x36);
         put("pomodoro", 0x38);
         put("alexa", 0x39);
-        put("temperature", 0x40);
         put("battery", 0x3a);
+        put("temperature", 0x40);
+        put("barometer", 0x41);
     }};
 }
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index e9b4a636d..a0cbdd287 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -932,6 +932,43 @@
         <item>@string/p_menuitem_settings</item>
     </string-array>
 
+
+    <string-array name="pref_trex_pro_display_items">
+        <item>@string/menuitem_status</item>
+        <item>@string/menuitem_pai</item>
+        <item>@string/menuitem_hr</item>
+        <item>@string/menuitem_workout</item>
+        <item>@string/menuitem_activity</item>
+        <item>@string/menuitem_weather</item>
+        <item>@string/menuitem_music</item>
+        <item>@string/menuitem_alarm</item>
+        <item>@string/menuitem_eventreminder</item>
+        <item>@string/menuitem_stopwatch</item>
+        <item>@string/menuitem_timer</item>
+        <item>@string/menuitem_findphone</item>
+        <item>@string/menuitem_compass</item>
+        <item>@string/menuitem_barometer</item>
+        <item>@string/menuitem_settings</item>
+    </string-array>
+
+    <string-array name="pref_trex_pro_display_items_values">
+        <item>@string/p_menuitem_status</item>
+        <item>@string/p_menuitem_pai</item>
+        <item>@string/p_menuitem_hr</item>
+        <item>@string/p_menuitem_workout</item>
+        <item>@string/p_menuitem_activity</item>
+        <item>@string/p_menuitem_weather</item>
+        <item>@string/p_menuitem_music</item>
+        <item>@string/p_menuitem_alarm</item>
+        <item>@string/p_menuitem_eventreminder</item>
+        <item>@string/p_menuitem_stopwatch</item>
+        <item>@string/p_menuitem_timer</item>
+        <item>@string/p_menuitem_findphone</item>
+        <item>@string/p_menuitem_compass</item>
+        <item>@string/p_menuitem_barometer</item>
+        <item>@string/p_menuitem_settings</item>
+    </string-array>
+
     <string-array name="pref_trex_pro_display_items_default">
         <item>@string/p_menuitem_status</item>
         <item>@string/p_menuitem_pai</item>
@@ -946,6 +983,7 @@
         <item>@string/p_menuitem_timer</item>
         <item>@string/p_menuitem_findphone</item>
         <item>@string/p_menuitem_compass</item>
+        <item>@string/p_menuitem_barometer</item>
         <item>@string/p_menuitem_settings</item>
     </string-array>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f8aa872d3..d5e7f0a0a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -911,6 +911,7 @@
     <string name="menuitem_events">Events</string>
     <string name="menuitem_widgets">Widgets</string>
     <string name="menuitem_temperature">Temperature</string>
+    <string name="menuitem_barometer">Barometer</string>
     <string name="watch9_time_minutes">Minutes:</string>
     <string name="watch9_time_hours">Hours:</string>
     <string name="watch9_time_seconds">Seconds:</string>
diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml
index 9296c702a..481f140d3 100644
--- a/app/src/main/res/values/values.xml
+++ b/app/src/main/res/values/values.xml
@@ -53,6 +53,7 @@
     <item name="p_menuitem_events" type="string">events</item>
     <item name="p_menuitem_widgets" type="string">widgets</item>
     <item name="p_menuitem_temperature" type="string">temperature</item>
+    <item name="p_menuitem_barometer" type="string">barometer</item>
 
     <!-- currently used for sounds -->
     <item name="p_menuitem_button" type="string">button</item>
diff --git a/app/src/main/res/xml/devicesettings_amazfittrexpro.xml b/app/src/main/res/xml/devicesettings_amazfittrexpro.xml
index 2e41cefd9..815a8b20a 100644
--- a/app/src/main/res/xml/devicesettings_amazfittrexpro.xml
+++ b/app/src/main/res/xml/devicesettings_amazfittrexpro.xml
@@ -2,10 +2,10 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <com.mobeta.android.dslv.DragSortListPreference
         android:icon="@drawable/ic_widgets"
-        android:defaultValue="@array/pref_trex_display_items_default"
+        android:defaultValue="@array/pref_trex_pro_display_items_default"
         android:dialogTitle="@string/mi2_prefs_display_items"
-        android:entries="@array/pref_trex_display_items"
-        android:entryValues="@array/pref_trex_display_items_values"
+        android:entries="@array/pref_trex_pro_display_items"
+        android:entryValues="@array/pref_trex_pro_display_items_values"
         android:key="display_items_sortable"
         android:persistent="true"
         android:summary="@string/mi2_prefs_display_items_summary"