From 96aec401b9b2a01ee59288056e9d3ac82d8ffca4 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 8 Nov 2023 15:34:02 -0500
Subject: [PATCH] Fix username link settings navigation.

---
 .../main/UsernameLinkShareScreen.kt           |  2 +-
 app/src/main/res/navigation/app_settings.xml  | 21 ++------------
 app/src/main/res/navigation/edit_profile.xml  |  9 ++----
 .../res/navigation/username_link_settings.xml | 29 +++++++++++++++++++
 4 files changed, 36 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/res/navigation/username_link_settings.xml

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareScreen.kt
index f57a136fc7..c4e27c878e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareScreen.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareScreen.kt
@@ -90,7 +90,7 @@ fun UsernameLinkShareScreen(
 
     ButtonBar(
       onShareClicked = onShareBadge,
-      onColorClicked = { navController.safeNavigate(R.id.action_usernameLinkSettingsFragment_to_usernameLinkQrColorPickerFragment) }
+      onColorClicked = { navController.safeNavigate(UsernameLinkSettingsFragmentDirections.actionUsernameLinkSettingsFragmentToUsernameLinkQrColorPickerFragment()) }
     )
 
     LinkRow(
diff --git a/app/src/main/res/navigation/app_settings.xml b/app/src/main/res/navigation/app_settings.xml
index edf6187e0e..c6e0be6e4b 100644
--- a/app/src/main/res/navigation/app_settings.xml
+++ b/app/src/main/res/navigation/app_settings.xml
@@ -12,7 +12,7 @@
         tools:layout="@layout/dsl_settings_fragment">
         <action
             android:id="@+id/action_appSettingsFragment_to_usernameLinkSettingsFragment"
-            app:destination="@id/usernameLinkSettingsFragment"
+            app:destination="@id/username_link_settings"
             app:enterAnim="@anim/fragment_open_enter"
             app:exitAnim="@anim/fragment_open_exit"
             app:popEnterAnim="@anim/fragment_close_enter"
@@ -575,7 +575,7 @@
 
     <action
         android:id="@+id/action_direct_to_usernameLinkSettings"
-        app:destination="@id/usernameLinkSettingsFragment"
+        app:destination="@id/username_link_settings"
         app:enterAnim="@anim/fragment_open_enter"
         app:exitAnim="@anim/fragment_open_exit"
         app:popEnterAnim="@anim/fragment_close_enter"
@@ -913,23 +913,8 @@
 
     </fragment>
 
-    <fragment
-        android:id="@+id/usernameLinkSettingsFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.usernamelinks.main.UsernameLinkSettingsFragment">
-
-        <action
-            android:id="@+id/action_usernameLinkSettingsFragment_to_usernameLinkQrColorPickerFragment"
-            app:destination="@id/usernameLinkQrColorPickerFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/usernameLinkQrColorPickerFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.usernamelinks.colorpicker.UsernameLinkQrColorPickerFragment" />
 
+    <include app:graph="@navigation/username_link_settings" />
     <include app:graph="@navigation/story_privacy_settings" />
 
 </navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/edit_profile.xml b/app/src/main/res/navigation/edit_profile.xml
index dd42e8cb64..27583b916a 100644
--- a/app/src/main/res/navigation/edit_profile.xml
+++ b/app/src/main/res/navigation/edit_profile.xml
@@ -77,7 +77,7 @@
 
         <action
             android:id="@+id/action_manageProfileFragment_to_usernameLinkFragment"
-            app:destination="@id/usernameLinkFragment"
+            app:destination="@id/username_link_settings"
             app:enterAnim="@anim/fragment_open_enter"
             app:exitAnim="@anim/fragment_open_exit"
             app:popEnterAnim="@anim/fragment_close_enter"
@@ -114,15 +114,12 @@
         android:label="fragment_manage_about"
         tools:layout="@layout/edit_about_fragment" />
 
-    <fragment
-        android:id="@+id/usernameLinkFragment"
-        android:name="org.thoughtcrime.securesms.components.settings.app.usernamelinks.main.UsernameLinkSettingsFragment"
-        android:label="fragment_username_link" />
-
     <include app:graph="@navigation/manage_badges" />
 
     <include app:graph="@navigation/avatar_picker" />
 
+    <include app:graph="@navigation/username_link_settings" />
+
     <dialog
         android:id="@+id/shareUsernameDialog"
         android:name="org.thoughtcrime.securesms.profiles.manage.UsernameShareBottomSheet"
diff --git a/app/src/main/res/navigation/username_link_settings.xml b/app/src/main/res/navigation/username_link_settings.xml
new file mode 100644
index 0000000000..e2154c2b06
--- /dev/null
+++ b/app/src/main/res/navigation/username_link_settings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2023 Signal Messenger, LLC
+  ~ SPDX-License-Identifier: AGPL-3.0-only
+  -->
+
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/username_link_settings"
+    app:startDestination="@id/usernameLinkSettingsFragment">
+
+    <fragment
+        android:id="@+id/usernameLinkSettingsFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.usernamelinks.main.UsernameLinkSettingsFragment">
+
+        <action
+            android:id="@+id/action_usernameLinkSettingsFragment_to_usernameLinkQrColorPickerFragment"
+            app:destination="@id/usernameLinkQrColorPickerFragment"
+            app:enterAnim="@anim/fragment_open_enter"
+            app:exitAnim="@anim/fragment_open_exit"
+            app:popEnterAnim="@anim/fragment_close_enter"
+            app:popExitAnim="@anim/fragment_close_exit" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/usernameLinkQrColorPickerFragment"
+        android:name="org.thoughtcrime.securesms.components.settings.app.usernamelinks.colorpicker.UsernameLinkQrColorPickerFragment" />
+
+</navigation>
\ No newline at end of file