Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 21:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix username link settings navigation.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-11-08 15:34:02 -05:00
committed by Cody Henthorne
parent 7ff0b7aa3c
commit 96aec401b9
4 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/components/settings/app/usernamelinks/main/UsernameLinkShareScreen.kt
View File

@@ -90,7 +90,7 @@ fun UsernameLinkShareScreen(
ButtonBar(
onShareClicked = onShareBadge,
onColorClicked = { navController.safeNavigate(R.id.action_usernameLinkSettingsFragment_to_usernameLinkQrColorPickerFragment) }
onColorClicked = { navController.safeNavigate(UsernameLinkSettingsFragmentDirections.actionUsernameLinkSettingsFragmentToUsernameLinkQrColorPickerFragment()) }
)
LinkRow(

21
app/src/main/res/navigation/app_settings.xml
View File

@@ -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>

9
app/src/main/res/navigation/edit_profile.xml
View File

@@ -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"

29
app/src/main/res/navigation/username_link_settings.xml Normal file
View File

@@ -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>