Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 12:49:55 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '869-remove-group-button' into 'master'

Browse Source 
[android] Fix private group status text over remove button

Closes #869

See merge request briar/briar!1047
This commit is contained in:
akwizgran
2019-02-27 11:36:06 +00:00
parent e27885f0c8 f6ef48bf90
commit 16a8ad996a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
briar-android/src/main/res/layout/list_item_group.xml
View File

@@ -82,11 +82,11 @@
android:layout_marginStart="@dimen/listitem_horizontal_margin" android:layout_marginStart="@dimen/listitem_horizontal_margin"
android:layout_marginTop="@dimen/margin_medium" android:layout_marginTop="@dimen/margin_medium"
android:textColor="?android:attr/textColorTertiary" android:textColor="?android:attr/textColorTertiary"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toStartOf="@+id/removeButton"
app:layout_constraintLeft_toRightOf="@+id/avatarView" app:layout_constraintLeft_toRightOf="@+id/avatarView"
app:layout_constraintStart_toEndOf="@+id/avatarView" app:layout_constraintStart_toEndOf="@+id/avatarView"
app:layout_constraintTop_toBottomOf="@+id/messageCountView" app:layout_constraintTop_toBottomOf="@+id/messageCountView"
tools:text="@string/groups_group_is_empty"/> tools:text="This group is empty, but has a long status text"/>
<Button <Button
android:id="@+id/removeButton" android:id="@+id/removeButton"
@@ -94,9 +94,11 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/groups_remove" android:text="@string/groups_remove"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/divider" app:layout_constraintBottom_toBottomOf="@+id/divider"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
tools:visibility="gone"/> app:layout_constraintTop_toTopOf="@+id/statusView"
tools:visibility="visible"/>
<View <View
android:id="@+id/divider" android:id="@+id/divider"