From d87d5cfac213acbc63a215e04213d7fe31addfca Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Mon, 2 Oct 2023 16:16:22 +0300
Subject: [PATCH] Fix shareRoomDialogFragment args
---
.../res/navigation/settings_nav_graph.xml | 19 ++-------------
.../res/navigation/share_room_nav_graph.xml | 23 +++++++++++++++++++
.../navigation/timeline_options_nav_graph.xml | 21 ++++-------------
3 files changed, 29 insertions(+), 34 deletions(-)
create mode 100644 core/src/main/res/navigation/share_room_nav_graph.xml
diff --git a/app/src/main/res/navigation/settings_nav_graph.xml b/app/src/main/res/navigation/settings_nav_graph.xml
index f4e9516a4..429c40be5 100644
--- a/app/src/main/res/navigation/settings_nav_graph.xml
+++ b/app/src/main/res/navigation/settings_nav_graph.xml
@@ -24,7 +24,7 @@
app:destination="@id/reAuthStagesDialogFragment" />
<action
android:id="@+id/to_shareProfileDialogFragment"
- app:destination="@id/shareRoomDialogFragment">
+ app:destination="@id/share_room_nav_graph">
<argument
android:name="roomId"
@@ -53,22 +53,7 @@
android:label="ChangePasswordDialogFragment"
tools:layout="@layout/dialog_fragment_change_password" />
- <dialog
- android:id="@+id/shareRoomDialogFragment"
- android:name="org.futo.circles.core.room.share.ShareRoomDialogFragment"
- tools:layout="@layout/dialog_fragment_share_room">
-
- <argument
- android:name="roomId"
- app:argType="string"
- app:nullable="false" />
-
- <argument
- android:name="isProfile"
- app:argType="boolean"
- app:nullable="false" />
-
- </dialog>
+ <include app:graph="@navigation/share_room_nav_graph" />
<dialog
android:id="@+id/pushNotificationsSettingsDialogFragment"
diff --git a/core/src/main/res/navigation/share_room_nav_graph.xml b/core/src/main/res/navigation/share_room_nav_graph.xml
new file mode 100644
index 000000000..102368b12
--- /dev/null
+++ b/core/src/main/res/navigation/share_room_nav_graph.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/share_room_nav_graph"
+ app:startDestination="@id/shareRoomDialogFragment">
+ <dialog
+ android:id="@+id/shareRoomDialogFragment"
+ android:name="org.futo.circles.core.room.share.ShareRoomDialogFragment"
+ tools:layout="@layout/dialog_fragment_share_room">
+
+ <argument
+ android:name="roomId"
+ app:argType="string"
+ app:nullable="false" />
+
+ <argument
+ android:name="isProfile"
+ app:argType="boolean"
+ app:nullable="false" />
+
+ </dialog>
+</navigation>
\ No newline at end of file
diff --git a/core/src/main/res/navigation/timeline_options_nav_graph.xml b/core/src/main/res/navigation/timeline_options_nav_graph.xml
index be057a07d..c38d7ef08 100644
--- a/core/src/main/res/navigation/timeline_options_nav_graph.xml
+++ b/core/src/main/res/navigation/timeline_options_nav_graph.xml
@@ -21,7 +21,7 @@
<action
android:id="@+id/to_shareRoom"
- app:destination="@id/shareRoomDialogFragment">
+ app:destination="@id/share_room_nav_graph">
<argument
android:name="roomId"
@@ -152,22 +152,6 @@
</dialog>
- <dialog
- android:id="@+id/shareRoomDialogFragment"
- android:name="org.futo.circles.core.room.share.ShareRoomDialogFragment"
- tools:layout="@layout/dialog_fragment_share_room">
-
- <argument
- android:name="roomId"
- app:argType="string"
- app:nullable="false" />
-
- <argument
- android:name="isProfile"
- app:argType="boolean"
- app:nullable="false" />
-
- </dialog>
<dialog
android:id="@+id/updateGroupDialogFragment"
android:name="org.futo.circles.core.room.update.group.UpdateGroupDialogFragment"
@@ -261,4 +245,7 @@
app:nullable="false" />
</dialog>
+
+ <include app:graph="@navigation/share_room_nav_graph" />
+
</navigation>
--
GitLab