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

Show open button in private conversation after accepting invitations

Browse Source
This commit is contained in:
Torsten Grote
2016-12-13 10:28:25 -02:00
parent d63d15329c
commit 2ef9b8f4b6
23 changed files with 180 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
briar-android/src/main/res/layout/list_item_conversation_request.xml
View File

@@ -43,7 +43,7 @@
android:layout_height="wrap_content"
android:layout_alignEnd="@+id/text"
android:layout_alignRight="@+id/text"
android:layout_below="@+id/declineButton"
android:layout_below="@+id/acceptButton"
android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
android:textColor="@color/private_message_date"
android:textSize="@dimen/text_size_tiny"
@@ -57,6 +57,7 @@
android:layout_alignEnd="@+id/text"
android:layout_alignRight="@+id/text"
android:layout_below="@+id/text"
android:layout_marginBottom="-10dp"
android:text="@string/accept"/>
<Button
@@ -64,8 +65,8 @@
style="@style/BriarButtonFlat.Negative"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/text"
android:layout_marginBottom="-15dp"
android:layout_alignBottom="@+id/acceptButton"
android:layout_alignTop="@+id/acceptButton"
android:layout_toLeftOf="@+id/acceptButton"
android:layout_toStartOf="@+id/acceptButton"
android:text="@string/decline"/>

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

@@ -77,6 +77,7 @@
<string name="offline">Offline</string>
<string name="send">Send</string>
<string name="allow">Allow</string>
<string name="open">Open</string>
<string name="no_data">No data</string>
<string name="ellipsis">…</string>
<string name="text_too_long">The entered text is too long</string>
@@ -182,8 +183,8 @@
<!-- Private Group Invitations -->
<string name="groups_invitations_title">Group Invitations</string>
<string name="groups_invitations_invitation_sent">You have invited %1$s to join the group "%2$s".</string>
<string name="groups_invitations_invitation_received">%1$s has invited you to join the group "%2$s".</string>
<string name="groups_invitations_invitation_sent">You have invited %1$s to join the group \"%2$s\".</string>
<string name="groups_invitations_invitation_received">%1$s has invited you to join the group \"%2$s\".</string>
<string name="groups_invitations_joined">Joined group</string>
<string name="groups_invitations_declined">Group invitation declined</string>
<plurals name="groups_invitations_open">

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

@@ -37,13 +37,11 @@
<style name="BriarButtonFlat.Negative" parent="Widget.AppCompat.Button.Borderless">
<item name="android:textColor">@color/briar_button_negative</item>
<item name="android:textSize">@dimen/text_size_medium</item>
<item name="android:padding">@dimen/margin_large</item>
</style>
<style name="BriarButtonFlat.Positive" parent="Widget.AppCompat.Button.Borderless">
<item name="android:textColor">@color/briar_button_positive</item>
<item name="android:textSize">@dimen/text_size_medium</item>
<item name="android:padding">@dimen/margin_large</item>
</style>
<style name="BriarButtonFlat.Positive.Tiny" parent="BriarButtonFlat.Positive">