Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-03 23:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add Device to Device Transfer UI.

Browse Source
This commit is contained in:
Cody Henthorne
2021-03-11 13:27:25 -05:00
committed by Greyson Parrelli
parent 6f8be3260c
commit 75aab4c031
75 changed files with 3494 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
app/src/main/res/navigation/old_device_transfer.xml Normal file
View File

@@ -0,0 +1,68 @@
<?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/old_device_transfer"
app:startDestination="@id/oldDeviceTransferInstructions">
<fragment
android:id="@+id/oldDeviceTransferInstructions"
android:name="org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferInstructionsFragment"
tools:layout="@layout/old_device_transfer_instructions_fragment">
<action
android:id="@+id/action_oldDeviceTransferInstructions_to_oldDeviceTransferSetup"
app:destination="@id/oldDeviceTransferSetup"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
app:popExitAnim="@anim/nav_default_pop_exit_anim" />
</fragment>
<fragment
android:id="@+id/oldDeviceTransferSetup"
android:name="org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferSetupFragment"
tools:layout="@layout/device_transfer_setup_fragment">
<action
android:id="@+id/action_oldDeviceTransferSetup_to_oldDeviceTransfer"
app:destination="@id/oldDeviceTransfer"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
app:popExitAnim="@anim/nav_default_pop_exit_anim"
app:popUpTo="@id/oldDeviceTransferInstructions" />
</fragment>
<fragment
android:id="@+id/oldDeviceTransfer"
android:name="org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferFragment"
tools:layout="@layout/device_transfer_fragment">
<action
android:id="@+id/action_oldDeviceTransfer_to_oldDeviceTransferComplete"
app:destination="@id/oldDeviceTransferComplete"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
app:popExitAnim="@anim/nav_default_pop_exit_anim"
app:popUpTo="@id/oldDeviceTransferInstructions"
app:popUpToInclusive="true" />
</fragment>
<fragment
android:id="@+id/oldDeviceTransferComplete"
android:name="org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferCompleteFragment"
tools:layout="@layout/old_device_transfer_complete_fragment" />
<action
android:id="@+id/action_directly_to_oldDeviceTransferInstructions"
app:destination="@id/oldDeviceTransferInstructions"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
app:popExitAnim="@anim/nav_default_pop_exit_anim"
app:popUpTo="@id/oldDeviceTransferInstructions"
app:popUpToInclusive="true" />
</navigation>

137
app/src/main/res/navigation/registration.xml
View File

@@ -28,8 +28,16 @@
app:popExitAnim="@anim/nav_default_pop_exit_anim" />
<action
android:id="@+id/action_choose_backup"
app:destination="@id/chooseBackupFragment"
android:id="@+id/action_transfer_or_restore"
app:destination="@id/transferOrRestore"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
app:popExitAnim="@anim/nav_default_pop_exit_anim" />
<action
android:id="@+id/action_welcomeFragment_to_deviceTransferSetup"
app:destination="@id/deviceTransferSetup"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
@@ -203,7 +211,7 @@
android:id="@+id/accountLockedFragment"
android:name="org.thoughtcrime.securesms.registration.fragments.AccountLockedFragment"
android:label="fragment_account_locked"
tools:layout="@layout/account_locked_fragment"/>
tools:layout="@layout/account_locked_fragment" />
<fragment
android:id="@+id/captchaFragment"
@@ -262,10 +270,11 @@
app:popUpTo="@+id/restoreBackupFragment"
app:popUpToInclusive="true" />
<argument app:nullable="true"
app:argType="android.net.Uri"
android:defaultValue="@null"
android:name="uri" />
<argument
android:name="uri"
android:defaultValue="@null"
app:argType="android.net.Uri"
app:nullable="true" />
</fragment>
@@ -281,4 +290,118 @@
android:label="fragment_registration_edit_proxy"
tools:layout="@layout/edit_proxy_fragment" />
<fragment
android:id="@+id/transferOrRestore"
android:name="org.thoughtcrime.securesms.devicetransfer.newdevice.TransferOrRestoreFragment"
tools:layout="@layout/fragment_transfer_restore">
<action
android:id="@+id/action_choose_backup"
app:destination="@id/chooseBackupFragment"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
app:popExitAnim="@anim/nav_default_pop_exit_anim" />
<action
android:id="@+id/action_new_device_transfer_instructions"
app:destination="@id/newDeviceTransferInstructions"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
app:popExitAnim="@anim/nav_default_pop_exit_anim" />
</fragment>
<fragment
android:id="@+id/newDeviceTransferInstructions"
android:name="org.thoughtcrime.securesms.devicetransfer.newdevice.NewDeviceTransferInstructionsFragment"
tools:layout="@layout/new_device_transfer_instructions_fragment">
<action
android:id="@+id/action_device_transfer_setup"
app:destination="@id/deviceTransferSetup"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
app:popExitAnim="@anim/nav_default_pop_exit_anim" />
</fragment>
<fragment
android:id="@+id/deviceTransferSetup"
android:name="org.thoughtcrime.securesms.devicetransfer.newdevice.NewDeviceTransferSetupFragment"
tools:layout="@layout/device_transfer_setup_fragment">
<action
android:id="@+id/action_new_device_transfer"
app:destination="@id/newDeviceTransfer"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
app:popExitAnim="@anim/nav_default_pop_exit_anim" />
<action
android:id="@+id/action_deviceTransferSetup_to_transferOrRestore"
app:destination="@id/transferOrRestore"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
app:popExitAnim="@anim/nav_default_pop_exit_anim"
app:popUpTo="@id/transferOrRestore"
app:popUpToInclusive="true" />
</fragment>
<fragment
android:id="@+id/newDeviceTransfer"
android:name="org.thoughtcrime.securesms.devicetransfer.newdevice.NewDeviceTransferFragment"
tools:layout="@layout/device_transfer_fragment">
<action
android:id="@+id/action_newDeviceTransfer_to_newDeviceTransferInstructions"
app:destination="@id/newDeviceTransferInstructions"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
app:popExitAnim="@anim/nav_default_pop_exit_anim"
app:popUpTo="@id/newDeviceTransferInstructions"
app:popUpToInclusive="true" />
<action
android:id="@+id/action_newDeviceTransfer_to_newDeviceTransferComplete"
app:destination="@id/newDeviceTransferComplete"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
app:popExitAnim="@anim/nav_default_pop_exit_anim"
app:popUpTo="@id/welcomeFragment" />
</fragment>
<fragment
android:id="@+id/newDeviceTransferComplete"
android:name="org.thoughtcrime.securesms.devicetransfer.newdevice.NewDeviceTransferCompleteFragment"
tools:layout="@layout/new_device_transfer_complete_fragment">
<action
android:id="@+id/action_newDeviceTransferComplete_to_enterPhoneNumberFragment"
app:destination="@id/enterPhoneNumberFragment"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
app:popExitAnim="@anim/nav_default_pop_exit_anim" />
</fragment>
<action
android:id="@+id/action_restart_to_welcomeFragment"
app:destination="@id/welcomeFragment"
app:enterAnim="@anim/nav_default_enter_anim"
app:exitAnim="@anim/nav_default_exit_anim"
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
app:popExitAnim="@anim/nav_default_pop_exit_anim"
app:popUpTo="@id/welcomeFragment"
app:popUpToInclusive="true" />
</navigation>