Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-28 12:44:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update username consistency error handling.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-11-06 14:33:30 -05:00
parent 6cadf93c43
commit 07aa058a46
19 changed files with 209 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/res/layout/edit_profile_fragment.xml
View File

@@ -145,7 +145,7 @@
android:background="?selectableItemBackground"
android:minHeight="72dp"
android:paddingStart="@dimen/dsl_settings_gutter"
android:paddingEnd="@dimen/safety_number_recipient_row_item_gutter"
android:paddingEnd="@dimen/dsl_settings_gutter"
app:layout_constraintTop_toBottomOf="@id/manage_profile_name_container">
<ImageView
@@ -168,9 +168,21 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/manage_profile_username_icon"
app:layout_goneMarginEnd="48dp"
app:layout_constraintEnd_toEndOf="@id/username_error_indicator"
tools:text="\@spiderman" />
<ImageView
android:id="@+id/username_error_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/symbol_error_circle_24"
android:visibility="gone"
tools:visibility="visible"
app:tint="@color/signal_alert_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
@@ -180,7 +192,7 @@
android:background="?selectableItemBackground"
android:minHeight="72dp"
android:paddingStart="@dimen/dsl_settings_gutter"
android:paddingEnd="@dimen/safety_number_recipient_row_item_gutter"
android:paddingEnd="@dimen/dsl_settings_gutter"
app:layout_constraintTop_toBottomOf="@id/manage_profile_username_container">
<ImageView
@@ -204,8 +216,21 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/username_link_icon"
app:layout_constraintEnd_toStartOf="@id/link_error_indicator"
app:layout_goneMarginEnd="48dp" />
<ImageView
android:id="@+id/link_error_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/symbol_error_circle_24"
android:visibility="gone"
tools:visibility="visible"
app:tint="@color/signal_alert_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout

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

@@ -573,6 +573,16 @@
app:popUpTo="@id/app_settings"
app:popUpToInclusive="true" />
<action
android:id="@+id/action_direct_to_usernameLinkSettings"
app:destination="@id/usernameLinkSettingsFragment"
app:enterAnim="@anim/fragment_open_enter"
app:exitAnim="@anim/fragment_open_exit"
app:popEnterAnim="@anim/fragment_close_enter"
app:popExitAnim="@anim/fragment_close_exit"
app:popUpTo="@id/app_settings"
app:popUpToInclusive="true" />
<!-- endregion -->
<!-- Internal Settings -->

3
app/src/main/res/values/ids.xml
View File

@@ -18,7 +18,8 @@
<item name="reminder_action_cds_temporary_error_learn_more" type="id" />
<item name="reminder_action_cds_permanent_error_learn_more" type="id" />
<item name="reminder_action_fix_username" type="id" />
<item name="reminder_action_fix_username_and_link" type="id" />
<item name="reminder_action_fix_username_link" type="id" />
<item name="status_bar_guideline" type="id" />
<item name="navigation_bar_guideline" type="id" />

4
app/src/main/res/values/strings.xml
View File

@@ -1015,7 +1015,9 @@
<!-- UsernameOutOfSyncReminder -->
<!-- Displayed above the conversation list when a user needs to address an issue with their username -->
<string name="UsernameOutOfSyncReminder__something_went_wrong">Something went wrong with your username, it\'s no longer assigned to your account. You can try and set it again or choose a new one.</string>
<string name="UsernameOutOfSyncReminder__username_and_link_corrupt">Something went wrong with your username, it\'s no longer assigned to your account. You can try and set it again or choose a new one.</string>
<!-- Displayed above the conversation list when a user needs to address an issue with their username link -->
<string name="UsernameOutOfSyncReminder__link_corrupt">Something went wrong with your QR code and username link, it’s no longer valid. Create a new link to share with others.</string>
<!-- Action text to navigate user to manually fix the issue with their username -->
<string name="UsernameOutOfSyncReminder__fix_now">Fix now</string>