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

Add UnreadMessageButton to threaded conversations

Browse Source
This commit is contained in:
Torsten Grote
2016-12-22 17:04:59 -02:00
parent 279f4d668a
commit b4c669243b
11 changed files with 211 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
briar-android/src/main/res/drawable/list_item_thread_background.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@color/forum_cell_highlight"
android:state_activated="true"/>
<item
android:drawable="@color/window_background"/>
</selector>

6
briar-android/src/main/res/layout/activity_threaded_conversation.xml
View File

@@ -10,7 +10,7 @@
<include layout="@layout/toolbar"/>
<android.support.design.widget.CoordinatorLayout
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
@@ -27,7 +27,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|right"
app:layout_anchorGravity="top|right"
app:direction="up"/>
<org.briarproject.briar.android.view.UnreadMessageButton
@@ -35,10 +34,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
app:layout_anchorGravity="bottom|right"
app:direction="down"/>
</android.support.design.widget.CoordinatorLayout>
</FrameLayout>
<org.briarproject.briar.android.view.TextInputView
android:id="@+id/text_input_container"

5
briar-android/src/main/res/layout/list_item_thread.xml
View File

@@ -6,6 +6,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/list_item_thread_background"
android:baselineAligned="false"
android:orientation="horizontal">
@@ -113,6 +114,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/author"
android:layout_alignParentRight="true"
android:layout_toLeftOf="@+id/chevron"
android:text="@string/btn_reply"
android:textSize="@dimen/text_size_tiny"/>
@@ -127,7 +129,8 @@
android:clickable="true"
android:padding="@dimen/margin_medium"
android:scaleType="center"
android:src="@drawable/selector_chevron"/>
android:src="@drawable/selector_chevron"
android:visibility="gone"/>
<View
android:id="@+id/top_divider"

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

@@ -164,7 +164,6 @@
<string name="groups_invitation_sent">Group invitation has been sent</string>
<string name="groups_compose_message">Compose Message</string>
<string name="groups_message_sent">Message sent</string>
<string name="groups_message_received">Message received</string>
<string name="groups_member_list">Member List</string>
<string name="groups_invite_members">Invite Members</string>
<string name="groups_member_created_you">You created the group</string>
@@ -218,7 +217,6 @@
</plurals>
<string name="forum_compose_post">New Forum Post</string>
<string name="forum_new_entry_posted">Forum entry posted</string>
<string name="forum_new_entry_received">New forum entry</string>
<string name="forum_new_message_hint">New Entry</string>
<string name="forum_message_reply_hint">New Reply</string>
<string name="btn_reply">Reply</string>