MarcoBuster
/
Gadgetbridge
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge
1
0
Fork 0
Code Releases Wiki Activity

Add Amazfit Bip U menu items and remove shortcuts (#2107) 

fix a tab vs. space misalign

add missing menu items for Bip U (and possibly others)

remove shortcut config from Amazfit Bip U settings

add (most) menu items for Amazfit Bip U

Co-authored-by: AluminumTank <joel@beckmeyer.us>
Reviewed-on: https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/2107
Co-Authored-By: TinfoilSubmarine <tinfoilsubmarine@noreply.codeberg.org>
Co-Committed-By: TinfoilSubmarine <tinfoilsubmarine@noreply.codeberg.org>
This commit is contained in:
TinfoilSubmarine 2020-12-05 16:22:09 +01:00 committed by Andreas Shimokawa
parent 480ec40ff2
commit 2f89de6250
6 changed files with 95 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/amazfitbipu/AmazfitBipUCoordinator.java
View File

@ -85,7 +85,7 @@ public class AmazfitBipUCoordinator extends HuamiCoordinator {
@Override
public int[] getSupportedDeviceSpecificSettings(GBDevice device) {
return new int[]{
R.xml.devicesettings_amazfitbips,
R.xml.devicesettings_amazfitbipu,
R.xml.devicesettings_timeformat,
R.xml.devicesettings_wearlocation,
R.xml.devicesettings_custom_emoji_font,

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiMenuType.java
View File

@ -46,8 +46,11 @@ class HuamiMenuType {
put("timer_stopwatch", 0x1b);
put("stress", 0x1c);
put("period", 0x1d);
put("goal", 0x21);
put("sleep", 0x23);
put("spo2", 0x24);
put("breathing",0x33);
put("pomodoro", 0x38);
put("alexa", 0x39);
}};
}
}

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

@ -730,6 +730,67 @@
<item>@string/p_menuitem_settings</item>
</string-array>
<string-array name="pref_bipu_display_items">
<item>@string/menuitem_hr</item>
<item>@string/menuitem_pai</item>
<item>@string/menuitem_goal</item>
<item>@string/menuitem_workout</item>
<item>@string/menuitem_activity</item>
<item>@string/menuitem_sleep</item>
<item>@string/menuitem_weather</item>
<item>@string/menuitem_alarm</item>
<item>@string/menuitem_stress</item>
<item>@string/menuitem_spo2</item>
<item>@string/menuitem_breathing</item>
<item>@string/menuitem_stopwatch</item>
<item>@string/menuitem_timer</item>
<item>@string/menuitem_worldclock</item>
<item>@string/menuitem_pomodoro</item>
<item>@string/menuitem_music</item>
<item>@string/menuitem_cycles</item>
<item>@string/menuitem_settings</item>
<item>@string/menuitem_more</item>
<item>@string/menuitem_findphone</item>
<item>@string/menuitem_takephoto</item>
</string-array>
<string-array name="pref_bipu_display_items_values">
<item>@string/p_menuitem_hr</item>
<item>@string/p_menuitem_pai</item>
<item>@string/p_menuitem_goal</item>
<item>@string/p_menuitem_workout</item>
<item>@string/p_menuitem_activity</item>
<item>@string/p_menuitem_sleep</item>
<item>@string/p_menuitem_weather</item>
<item>@string/p_menuitem_alarm</item>
<item>@string/p_menuitem_stress</item>
<item>@string/p_menuitem_spo2</item>
<item>@string/p_menuitem_breathing</item>
<item>@string/p_menuitem_stopwatch</item>
<item>@string/p_menuitem_timer</item>
<item>@string/p_menuitem_worldclock</item>
<item>@string/p_menuitem_pomodoro</item>
<item>@string/p_menuitem_music</item>
<item>@string/p_menuitem_cycles</item>
<item>@string/p_menuitem_settings</item>
<item>@string/p_menuitem_more</item>
<item>@string/p_menuitem_findphone</item>
<item>@string/p_menuitem_takephoto</item>
</string-array>
<string-array name="pref_bipu_display_items_default">
<item>@string/p_menuitem_hr</item>
<item>@string/p_menuitem_pai</item>
<item>@string/p_menuitem_workout</item>
<item>@string/p_menuitem_weather</item>
<item>@string/p_menuitem_alarm</item>
<item>@string/p_menuitem_timer</item>
<item>@string/p_menuitem_music</item>
<item>@string/p_menuitem_settings</item>
<item>@string/p_menuitem_more</item>
<item>@string/p_menuitem_worldclock</item>
</string-array>
<string-array name="pref_bips_shortcuts">
<item>@string/menuitem_status</item>
<item>@string/menuitem_alipay</item>
@ -1245,4 +1306,4 @@
</string-array>
</resources>
</resources>

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

@ -853,6 +853,9 @@
<string name="menuitem_alexa">Alexa</string>
<string name="menuitem_dnd">DND</string>
<string name="menuitem_stopwatch">Stopwatch</string>
<string name="menuitem_goal">Activity Goal</string>
<string name="menuitem_sleep">Sleep</string>
<string name="menuitem_pomodoro">Pomodoro Tracker</string>
<string name="watch9_time_minutes">Minutes:</string>
<string name="watch9_time_hours">Hours:</string>
<string name="watch9_time_seconds">Seconds:</string>
@ -1093,4 +1096,4 @@
<item quantity="many">%d hours</item>
<item quantity="other">%d hours</item>
</plurals>
</resources>
</resources>

3
app/src/main/res/values/values.xml
View File

@ -47,6 +47,9 @@
<item name="p_menuitem_takephoto" type="string">takephoto</item>
<item name="p_menuitem_alexa" type="string">alexa</item>
<item name="p_menuitem_timer_stopwatch" type="string">timer_stopwatch</item>
<item name="p_menuitem_goal" type="string">goal</item>
<item name="p_menuitem_sleep" type="string">sleep</item>
<item name="p_menuitem_pomodoro" type="string">pomodoro</item>
<item name="p_off" type="string">off</item>
<item name="p_on" type="string">on</item>

21
app/src/main/res/xml/devicesettings_amazfitbipu.xml Normal file
View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<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_bipu_display_items_default"
android:dialogTitle="@string/mi2_prefs_display_items"
android:entries="@array/pref_bipu_display_items"
android:entryValues="@array/pref_bipu_display_items_values"
android:key="display_items_sortable"
android:persistent="true"
android:summary="@string/mi2_prefs_display_items_summary"
android:title="@string/mi2_prefs_display_items" />
<ListPreference
android:icon="@drawable/ic_language"
android:defaultValue="auto"
android:entries="@array/pref_amazfitbip_language"
android:entryValues="@array/pref_amazfitbip_language_values"
android:key="language"
android:summary="%s"
android:title="@string/pref_title_language" />
</androidx.preference.PreferenceScreen>