From 7aeb0dd2ef5b763220767e007844df3a963f901a Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Sat, 23 Dec 2023 22:04:56 +0100
Subject: [PATCH] Fossil/Skagen Hybrids: Update navigationApp to 1.1

Changes:
- Support locking (keep visible and let hands display time)
- Support merge navigation instruction
- Support wrist flick gesture to move hands
- Support GB-configurable foreground and vibration behaviour
---
 .../main/assets/fossil_hr/navigationApp.wapp  | Bin 39486 -> 42490 bytes
 .../devices/qhybrid/QHybridConstants.java     |   2 +-
 .../fossil_hr/FossilHRWatchAdapter.java       |   3 +++
 .../main/res/drawable/baseline_merge_24.xml   |   8 +++++++
 .../devicesettings_fossilhybridhr_all_fw.xml  |  21 ++++++++++++++++++
 external/fossil-hr-gbapps                     |   2 +-
 6 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/baseline_merge_24.xml

diff --git a/app/src/main/assets/fossil_hr/navigationApp.wapp b/app/src/main/assets/fossil_hr/navigationApp.wapp
index 6c48401d25a187a7e14b700182c8032c49ab05ba..d581a7f5eea97e21bcd67f1842d1a4525174fac3 100644
GIT binary patch
delta 4634
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
IsrJA87ghC{1ONa4

delta 1775
zcmZ{k&2QYs8ODDz9FqGX?~3wTT4|+~Wtrhhs^o;Oc4Ms__#@J?w&SXf)3{$y6kBEu
z*svk#Tpbsv5u^eUz}2ajW_#!%!RF!|lAu9A0|nR?$tB1iu$LgY_fQl=%7t5?1PIP>
zX5M+8=Y8JypMRB~d?fvU9W&6+(g8@34%6o*aIOsBy$7{}>|Hs4m4p2YWBcp5{dIf)
zX8DD$N|&!+|5^3$+~XYR7<xW|U<L(Z?D+mWlY5?mo&wv1o(Z-E0}FaK#5oA_5a*#=
zfNl}uA@E9I4}<5x-}M~=&I|aRfX@^(Ou&LaS#UlFl|YKhWWzizs;X*Ks#c{EkPj#X
zTq*_(RdZE4kVk^CQcx`i<HNy(6Vyh6$)mwkC8!?@rbkzGJPq8GQd-u306EYdi5`g)
zqv27oD-Z)=1?*7>$D+^0eBG-;w+e%C@M;j&z?+0{61=IXDE($Q1$G_cIt-?vGXuR7
z(3yq7Ec8x7*9F^yP6N7g;LS%n^0y=U=wKc?3(#GFcp)kq^*#N&_XAiElBa7~BGfbO
zky77eFTz<G;?w`L9{$gICV?S@v@9JzUIa}pMY;rYLRJE01ei~wKO0U8?b#m9q_Y(L
z&8XL(KdQ-fm%u&+TFv-WR8%L@E#8aJeG$T!AbtrvA3CR@`@`sp^3&j2id5Yt2$!RG
zReedT6fgfbFFWHcgkhTcavSJ2A#O(BsQHQK@n~Un3NuX6v{}FQ{IWNnEqN`NLsSAo
z2BvztRzM(9W%310qt}AL%i0{^ozb))JOjNm(IeB}(_02B&_t}(GG8fWR;yn7kk6r8
zv_pDlGi7wh&N;AOfmpxjaM}i0G1%u1?Q$Msnc1c(&Cr^$o6=sq<4iSWF3dYaO`@xo
zv$x)q=4NRo-<0Jh<+q$#lfugI$D2o-T-$J-h<uxohOzX8@N|@;PQGna7C#l^`q;6V
zp#>#bE;mL$G#smKj6F#$lux-xT_bsob#MW~i!itd0q_ubjFwJD-&%8f+VZ-P+d}$%
zzrWNs+87P7_{AESS<;kJwyksAxs>s1N)?)p-8QVn)VDI-mtHD0h|}rZmeTS(dllkU
z=&fZ**P3Z<c)x_F*vmT4VYktBr#nyFfk6P?Wr(jp_!{)CLAVa~b?Cef-5U_U0p6Ps
z-UR#S(E9~+e+AwKcyDDj+t~#B?X0`SZ$sx6G-S(a*nepltvzeb&V69C^2>$gVr%G@
zQ)+YMNjCjzDE*dv+*Mz=Yrb?lzTpPGa)0ET?q%O{ulTlm)z7)F`FZ!6UvPiy7u|J#
z$o+|b#J%p9+}HiGd&3{TlfNO}Ov*~Ukqj%bo;XTeNk)`dOZJW`aUrQFaW*-oL@OCp
z!cWGOSWK!)G?H;8W|Ije>PbzB@nlkoN;0KHIjJjANT!uAljEw*Ov`GBN-%pO1$^?h
z=@hb&Pz|?wGEgt{jjX}s($rWWZCjVXXj+K6>Yp|BS9Ft)9u$J;^TO4BtN5|8Ji-0D
zw{PFu+SvK^gYDgohud2_I~&_u_qH~7whHX*K6tpXd-wj<c9EUk&F$T6(myEwUPPCi
nmHvCqZ%X~|kAGe3-+lGYFXgoA|Kkre6@B@~SylY$!n^+lUT7m`

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConstants.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConstants.java
index 24189411d..14a457a97 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConstants.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/QHybridConstants.java
@@ -39,7 +39,7 @@ public final class QHybridConstants {
             put("weatherApp", "3.11");
             put("wellnessApp", "3.16");
             put("AlexaApp", "3.11");
-            put("navigationApp", "1.0");
+            put("navigationApp", "1.1");
         }
     };
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java
index 858dc08d6..5bafe005c 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java
@@ -2082,6 +2082,7 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
     }
 
     public void onSetNavigationInfo(NavigationInfoSpec navigationInfoSpec) {
+        SharedPreferences prefs = getDeviceSpecificPreferences();
         String installedAppsJson = getDeviceSupport().getDevice().getDeviceInfo("INSTALLED_APPS").getDetails();
         if (installedAppsJson == null || !installedAppsJson.contains("navigationApp")) {
             if (!notifiedAboutMissingNavigationApp) {
@@ -2106,6 +2107,8 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
                                             .put("eta", navigationInfoSpec.ETA)
                                             .put("instruction", navigationInfoSpec.instruction)
                                             .put("nextAction", navigationInfoSpec.nextAction)
+                                            .put("autoFg", prefs.getBoolean("fossil_hr_nav_auto_foreground", true))
+                                            .put("vibrate", prefs.getBoolean("fossil_hr_nav_vibrate", true))
                                     )
                             )
                     );
diff --git a/app/src/main/res/drawable/baseline_merge_24.xml b/app/src/main/res/drawable/baseline_merge_24.xml
new file mode 100644
index 000000000..29fb1bfa7
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_merge_24.xml
@@ -0,0 +1,8 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#7E7E7E"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path android:fillColor="#000000" android:pathData="M6.41,21L5,19.59l4.83,-4.83c0.75,-0.75 1.17,-1.77 1.17,-2.83v-5.1L9.41,8.41L8,7l4,-4l4,4l-1.41,1.41L13,6.83v5.1c0,1.06 0.42,2.08 1.17,2.83L19,19.59L17.59,21L12,15.41L6.41,21z"/>
+</vector>
diff --git a/app/src/main/res/xml/devicesettings_fossilhybridhr_all_fw.xml b/app/src/main/res/xml/devicesettings_fossilhybridhr_all_fw.xml
index c05326e6c..5ba429610 100644
--- a/app/src/main/res/xml/devicesettings_fossilhybridhr_all_fw.xml
+++ b/app/src/main/res/xml/devicesettings_fossilhybridhr_all_fw.xml
@@ -131,4 +131,25 @@
             android:targetClass="nodomain.freeyourgadget.gadgetbridge.devices.qhybrid.CalibrationActivity" />
     </Preference>
 
+    <PreferenceScreen
+        android:icon="@drawable/baseline_merge_24"
+        android:title="Navigation instructions"
+        android:summary="Configure on-watch navigation app behavior"
+        android:key="navigation_app_config">
+
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="fossil_hr_nav_auto_foreground"
+            android:title="Come to foreground"
+            android:summary="Whether the navigation app should automatically come to the foreground when it receives a navigation instruction"
+            android:icon="@drawable/ic_info"/>
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="fossil_hr_nav_vibrate"
+            android:title="Vibrate on new instruction"
+            android:summary="Whether the watch should vibrate on every new or changed navigation instruction (only when the app is in the foreground)"
+            android:icon="@drawable/ic_action_find_lost_device"/>
+
+    </PreferenceScreen>
+
 </androidx.preference.PreferenceScreen>
diff --git a/external/fossil-hr-gbapps b/external/fossil-hr-gbapps
index 1675b3898..3c9007742 160000
--- a/external/fossil-hr-gbapps
+++ b/external/fossil-hr-gbapps
@@ -1 +1 @@
-Subproject commit 1675b38983b78ac306b0ee860806b754230d9f55
+Subproject commit 3c900774207d9dd904886433d672d22d5bd0dea4