From 627bf033c3487ab4416083e8e5ad4d3fb894f164 Mon Sep 17 00:00:00 2001
From: Arjan Schrijver <a_gadgetbridge@anymore.nl>
Date: Sat, 6 Mar 2021 20:42:16 +0100
Subject: [PATCH] Fossil Hybrid HR: Fix up/back navigation and add titles

---
 app/src/main/AndroidManifest.xml              | 39 ++++++++++++++-----
 .../devices/qhybrid/HRConfigActivity.java     |  3 --
 app/src/main/res/values/strings.xml           |  6 +++
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 034fa4cfb..692658903 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -69,11 +69,11 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/GadgetbridgeTheme">
-        <activity android:name=".devices.qhybrid.WidgetSettingsActivity" />
         <activity
             android:name=".activities.ControlCenterv2"
             android:label="@string/title_activity_controlcenter"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/SplashTheme"
+            android:launchMode="singleTop">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
 
@@ -481,7 +481,8 @@
             android:parentActivityName=".activities.ControlCenterv2" />
         <activity
             android:name=".activities.devicesettings.DeviceSettingsActivity"
-            android:label="@string/title_activity_device_specific_settings" />
+            android:label="@string/title_activity_device_specific_settings"
+            android:parentActivityName=".activities.ControlCenterv2" />
         <activity
             android:name=".activities.AlarmDetails"
             android:label="@string/title_activity_alarm_details"
@@ -577,22 +578,40 @@
 
         <activity
             android:name=".devices.qhybrid.ConfigActivity"
-            android:exported="true" />
+            android:label="@string/qhybrid_title_watchface_apps"
+            android:exported="true"
+            android:parentActivityName=".activities.ControlCenterv2" />
         <activity
             android:name=".devices.qhybrid.QHybridAppChoserActivity"
-            android:exported="true" />
+            android:label="@string/qhybrid_title_apps"
+            android:exported="true"
+            android:parentActivityName=".devices.qhybrid.ConfigActivity" />
         <activity
             android:name=".devices.qhybrid.HRConfigActivity"
-            android:exported="true" />
+            android:label="@string/qhybrid_title_watchface_apps"
+            android:exported="true"
+            android:parentActivityName=".activities.ControlCenterv2" />
+        <activity android:name=".devices.qhybrid.WidgetSettingsActivity"
+            android:label="@string/add_widget"
+            android:parentActivityName=".devices.qhybrid.HRConfigActivity" />
         <activity
             android:name=".devices.qhybrid.ImageEditActivity"
-            android:exported="true" />
+            android:label="@string/qhybrid_title_background_image"
+            android:exported="true"
+            android:parentActivityName=".devices.qhybrid.HRConfigActivity" />
         <activity
             android:name=".devices.qhybrid.FileManagementActivity"
-            android:exported="true" />
+            android:label="@string/qhybrid_title_file_management"
+            android:exported="true"
+            android:parentActivityName=".devices.qhybrid.HRConfigActivity"/>
         <activity
             android:name=".devices.qhybrid.AppsManagementActivity"
-            android:exported="true" />
-        <activity android:name=".devices.qhybrid.CalibrationActivity" />
+            android:label="@string/qhybrid_title_apps_management"
+            android:exported="true"
+            android:parentActivityName=".devices.qhybrid.HRConfigActivity" />
+        <activity
+            android:name=".devices.qhybrid.CalibrationActivity"
+            android:label="@string/qhybrid_title_calibration"
+            android:parentActivityName=".devices.qhybrid.HRConfigActivity" />
     </application>
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HRConfigActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HRConfigActivity.java
index 0862b5ade..67cdd3b8a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HRConfigActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HRConfigActivity.java
@@ -421,13 +421,10 @@ public class HRConfigActivity extends AbstractGBActivity implements View.OnClick
                     .setTitle("create action")
                     .show();
         } else if(v.getId() == R.id.qhybrid_file_management_trigger) {
-            finish();
             startActivity(new Intent(getApplicationContext(), FileManagementActivity.class));
         } else if(v.getId() == R.id.qhybrid_apps_management_trigger) {
-            finish();
             startActivity(new Intent(getApplicationContext(), AppsManagementActivity.class));
         } else if(v.getId() == R.id.calibration_trigger) {
-            finish();
             startActivity(new Intent(getApplicationContext(), CalibrationActivity.class));
         }
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 67ded089e..585c3f55b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1146,4 +1146,10 @@
     <string name="fossil_hr_synced_activity_data">Synchronised activity data</string>
     <string name="fossil_hr_unavailable_unauthed">Not available in unauthenticated mode</string>
     <string name="fossil_hr_auth_failed">Authentication failed, limited functionality</string>
+    <string name="qhybrid_title_watchface_apps">Watchface and apps</string>
+    <string name="qhybrid_title_apps">Apps</string>
+    <string name="qhybrid_title_background_image">Background image</string>
+    <string name="qhybrid_title_file_management">File management</string>
+    <string name="qhybrid_title_apps_management">Apps management</string>
+    <string name="qhybrid_title_calibration">Calibration</string>
 </resources>
\ No newline at end of file