Skip to content
Snippets Groups Projects
Commit 1e7f7077 authored by Taras's avatar Taras
Browse files

Merge branch 'develop' into main

parents 5fcbdb7e 393c1134
No related branches found
No related tags found
No related merge requests found
...@@ -27,7 +27,7 @@ body: ...@@ -27,7 +27,7 @@ body:
Expected result, screenshots, screen recording, logs Expected result, screenshots, screen recording, logs
validations: validations:
required: true required: true
- type: input - type: input
id: version id: version
attributes: attributes:
label: Application version label: Application version
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
app:destination="@id/reAuthStagesDialogFragment" /> app:destination="@id/reAuthStagesDialogFragment" />
<action <action
android:id="@+id/to_shareProfileDialogFragment" android:id="@+id/to_shareProfileDialogFragment"
app:destination="@id/shareRoomDialogFragment"> app:destination="@id/share_room_nav_graph">
<argument <argument
android:name="roomId" android:name="roomId"
...@@ -53,22 +53,7 @@ ...@@ -53,22 +53,7 @@
android:label="ChangePasswordDialogFragment" android:label="ChangePasswordDialogFragment"
tools:layout="@layout/dialog_fragment_change_password" /> tools:layout="@layout/dialog_fragment_change_password" />
<dialog <include app:graph="@navigation/share_room_nav_graph" />
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 <dialog
android:id="@+id/pushNotificationsSettingsDialogFragment" android:id="@+id/pushNotificationsSettingsDialogFragment"
......
<?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
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<action <action
android:id="@+id/to_shareRoom" android:id="@+id/to_shareRoom"
app:destination="@id/shareRoomDialogFragment"> app:destination="@id/share_room_nav_graph">
<argument <argument
android:name="roomId" android:name="roomId"
...@@ -152,22 +152,6 @@ ...@@ -152,22 +152,6 @@
</dialog> </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 <dialog
android:id="@+id/updateGroupDialogFragment" android:id="@+id/updateGroupDialogFragment"
android:name="org.futo.circles.core.room.update.group.UpdateGroupDialogFragment" android:name="org.futo.circles.core.room.update.group.UpdateGroupDialogFragment"
...@@ -261,4 +245,7 @@ ...@@ -261,4 +245,7 @@
app:nullable="false" /> app:nullable="false" />
</dialog> </dialog>
<include app:graph="@navigation/share_room_nav_graph" />
</navigation> </navigation>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment