Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 20:29:52 +01:00
Code Issues Projects Releases Wiki Activity

[android] Allow pending contacts to be removed at any time

Browse Source
This commit is contained in:
Torsten Grote
2019-05-16 12:54:42 -03:00
parent 37d0b61d7b
commit 299ad07222
4 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
briar-android/src/main/res/layout/list_item_pending_contact.xml
View File

@@ -24,6 +24,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/margin_large"
android:layout_marginLeft="@dimen/margin_large"
android:layout_marginRight="@dimen/margin_large"
android:layout_marginStart="@dimen/margin_large"
android:layout_marginTop="@dimen/margin_large"
android:textColor="?android:attr/textColorPrimary"
@@ -43,12 +44,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="8dp"
android:text="@string/adding_contact_failed"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toStartOf="@+id/time"
app:layout_constraintEnd_toStartOf="@+id/removeButton"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/name"
app:layout_constraintTop_toBottomOf="@+id/name"
@@ -73,12 +72,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/groups_remove"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@+id/time"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/status"
tools:visibility="visible"/>
app:layout_constraintTop_toBottomOf="@+id/time"/>
<View
android:id="@+id/divider"

2
briar-android/src/main/res/values/strings.xml
View File

@@ -197,6 +197,8 @@
<string name="connecting">Connecting…</string>
<string name="adding_contact">Adding contact…</string>
<string name="adding_contact_failed">Adding contact has failed</string>
<string name="dialog_title_remove_pending_contact">Confirm Removal</string>
<string name="dialog_message_remove_pending_contact">This contact is still being added. If you remove it now, it will not be added.</string>
<string name="own_link_error">Enter your contact\'s link, not your own</string>
<string name="nickname_missing">Please enter a nickname</string>
<string name="invalid_link">Invalid link</string>