From e8873fa98cb11512c4175b91a4cc3cd296ae7d46 Mon Sep 17 00:00:00 2001
From: johan12345 <johan.forstner@gmail.com>
Date: Sat, 2 Jul 2022 23:50:36 +0200
Subject: [PATCH] fix #177: After opening favorites list using shortcut, going
 back to map is not possible

---
 app/build.gradle                              |   5 +
 .../java/net/vonforst/evmap/MapsActivity.kt   |   1 +
 app/src/main/res/navigation/nav_graph.xml     | 110 ++++++++++--------
 app/src/main/res/xml/shortcuts.xml            |   2 +-
 build.gradle                                  |   3 +-
 5 files changed, 68 insertions(+), 53 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ce7318f6..f6b7e5e4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,6 +8,7 @@ apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'androidx.navigation.safeargs.kotlin'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
+apply plugin: 'de.timfreiheit.resourceplaceholders'
 
 android {
     compileSdkVersion 31
@@ -98,6 +99,10 @@ android {
         unitTests.includeAndroidResources true
     }
 
+    resourcePlaceholders {
+        files = ['xml/shortcuts.xml']
+    }
+
     // add API keys from environment variable if not set in apikeys.xml
     applicationVariants.all { variant ->
         ext.env = System.getenv()
diff --git a/app/src/main/java/net/vonforst/evmap/MapsActivity.kt b/app/src/main/java/net/vonforst/evmap/MapsActivity.kt
index be94aa99..7a073816 100644
--- a/app/src/main/java/net/vonforst/evmap/MapsActivity.kt
+++ b/app/src/main/java/net/vonforst/evmap/MapsActivity.kt
@@ -163,6 +163,7 @@ class MapsActivity : AppCompatActivity(),
                     .createPendingIntent()
             } else if (intent.hasExtra(EXTRA_FAVORITES)) {
                 deepLink = navController.createDeepLink()
+                    .setGraph(navGraph)
                     .setDestination(R.id.favs)
                     .createPendingIntent()
             }
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 4a692c51..3ac7c7d7 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -4,50 +4,54 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/nav_graph">
 
-    <fragment
+    <navigation
         android:id="@+id/map"
-        android:name="net.vonforst.evmap.fragment.MapFragment"
-        android:label=""
-        tools:layout="@layout/fragment_map">
-        <action
-            android:id="@+id/action_map_to_filterFragment"
-            app:destination="@id/filter"
-            app:exitAnim="@animator/nav_default_exit_anim"
-            app:enterAnim="@animator/nav_default_enter_anim"
-            app:popEnterAnim="@animator/nav_default_pop_enter_anim"
-            app:popExitAnim="@animator/nav_default_pop_exit_anim" />
-        <action
-            android:id="@+id/action_map_to_filterProfilesFragment"
-            app:destination="@id/filter_profiles"
-            app:exitAnim="@animator/nav_default_exit_anim"
-            app:enterAnim="@animator/nav_default_enter_anim"
-            app:popEnterAnim="@animator/nav_default_pop_enter_anim"
-            app:popExitAnim="@animator/nav_default_pop_exit_anim" />
-        <action
-            android:id="@+id/action_map_to_chargepriceFragment"
-            app:destination="@id/chargeprice" />
-        <action
-            android:id="@+id/action_map_to_opensource_donations"
-            app:destination="@id/opensource_donations" />
-        <argument
-            android:name="locationName"
-            android:defaultValue="@null"
-            app:argType="string"
-            app:nullable="true" />
-        <argument
-            android:name="chargerId"
-            android:defaultValue="0L"
-            app:argType="long" />
-        <argument
-            android:name="latLng"
-            android:defaultValue="@null"
-            app:argType="com.car2go.maps.model.LatLng"
-            app:nullable="true" />
-        <argument
-            android:name="appStart"
-            android:defaultValue="false"
-            app:argType="boolean" />
-    </fragment>
+        app:startDestination="@id/map_frag">
+        <fragment
+            android:id="@+id/map_frag"
+            android:name="net.vonforst.evmap.fragment.MapFragment"
+            android:label=""
+            tools:layout="@layout/fragment_map">
+            <action
+                android:id="@+id/action_map_to_filterFragment"
+                app:destination="@id/filter"
+                app:exitAnim="@animator/nav_default_exit_anim"
+                app:enterAnim="@animator/nav_default_enter_anim"
+                app:popEnterAnim="@animator/nav_default_pop_enter_anim"
+                app:popExitAnim="@animator/nav_default_pop_exit_anim" />
+            <action
+                android:id="@+id/action_map_to_filterProfilesFragment"
+                app:destination="@id/filter_profiles"
+                app:exitAnim="@animator/nav_default_exit_anim"
+                app:enterAnim="@animator/nav_default_enter_anim"
+                app:popEnterAnim="@animator/nav_default_pop_enter_anim"
+                app:popExitAnim="@animator/nav_default_pop_exit_anim" />
+            <action
+                android:id="@+id/action_map_to_chargepriceFragment"
+                app:destination="@id/chargeprice" />
+            <action
+                android:id="@+id/action_map_to_opensource_donations"
+                app:destination="@id/opensource_donations" />
+            <argument
+                android:name="locationName"
+                android:defaultValue="@null"
+                app:argType="string"
+                app:nullable="true" />
+            <argument
+                android:name="chargerId"
+                android:defaultValue="0L"
+                app:argType="long" />
+            <argument
+                android:name="latLng"
+                android:defaultValue="@null"
+                app:argType="com.car2go.maps.model.LatLng"
+                app:nullable="true" />
+            <argument
+                android:name="appStart"
+                android:defaultValue="false"
+                app:argType="boolean" />
+        </fragment>
+    </navigation>
     <fragment
         android:id="@+id/about"
         android:name="net.vonforst.evmap.fragment.preference.AboutFragment"
@@ -85,15 +89,19 @@
         android:name="net.vonforst.evmap.fragment.preference.AndroidAutoSettingsFragment"
         android:label="@string/settings_android_auto"
         tools:layout="@layout/fragment_preference" />
-    <fragment
+    <navigation
         android:id="@+id/favs"
-        android:name="net.vonforst.evmap.fragment.FavoritesFragment"
-        android:label="@string/menu_favs"
-        tools:layout="@layout/fragment_favorites">
-        <action
-            android:id="@+id/action_favs_to_map"
-            app:destination="@id/map" />
-    </fragment>
+        app:startDestination="@id/favs_frag">
+        <fragment
+            android:id="@+id/favs_frag"
+            android:name="net.vonforst.evmap.fragment.FavoritesFragment"
+            android:label="@string/menu_favs"
+            tools:layout="@layout/fragment_favorites">
+            <action
+                android:id="@+id/action_favs_to_map"
+                app:destination="@id/map" />
+        </fragment>
+    </navigation>
     <fragment
         android:id="@+id/filter"
         android:name="net.vonforst.evmap.fragment.FilterFragment"
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
index ee4dde8e..8f6c1e03 100644
--- a/app/src/main/res/xml/shortcuts.xml
+++ b/app/src/main/res/xml/shortcuts.xml
@@ -9,7 +9,7 @@
              (e.g. in the debug version). -->
         <intent
             android:action="android.intent.action.VIEW"
-            android:targetPackage="net.vonforst.evmap"
+            android:targetPackage="${applicationId}"
             android:targetClass="net.vonforst.evmap.MapsActivity">
             <extra
                 android:name="favorites"
diff --git a/build.gradle b/build.gradle
index 9037325e..daa8e34d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
     ext.kotlin_version = '1.6.21'
     ext.about_libs_version = '8.9.4'
-    ext.nav_version = '2.4.2'
+    ext.nav_version = '2.5.0'
     repositories {
         google()
         mavenCentral()
@@ -14,6 +14,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libs_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
+        classpath "de.timfreiheit.resourceplaceholders:placeholders:0.4"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files