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

Merge branch '354-private-chat-input-field' into 'master'

Browse Source 
synched conversation and forum input

Closes #354

See merge request !219
This commit is contained in:
Torsten Grote
2016-06-21 12:10:35 +00:00
parent 192ee41600 ac8c1c0eee
commit ee0c4c07a7
5 changed files with 11 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
briar-android/res/drawable/round_button.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
A FAB does not work, because even with fabSize="mini" it will be too big due to shadow drawing
on lower API levels
-->
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="oval">
<solid android:color="@color/briar_primary"/>
</shape>
</item>
</selector>

4
briar-android/res/drawable/social_send_now_white.xml
View File

@@ -1,6 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:width="38dp"
android:height="38dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path

30
briar-android/res/layout/activity_conversation.xml
View File

@@ -46,33 +46,9 @@
<View style="@style/Divider.Horizontal"/>
<LinearLayout
<include
layout="@layout/text_input_field"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/button_bar_background"
android:orientation="horizontal"
android:paddingLeft="@dimen/margin_medium"
android:paddingStart="@dimen/margin_medium">
<EditText
android:id="@+id/contentView"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:hint="@string/private_message_hint"
android:inputType="text|textMultiLine|textCapSentences"/>
<ImageButton
android:id="@+id/sendButton"
android:layout_width="38dp"
android:layout_height="38dp"
android:layout_margin="@dimen/margin_small"
android:background="@drawable/round_button"
android:src="@drawable/social_send_now_white"
android:contentDescription="@string/send"
android:elevation="@dimen/margin_tiny"
/>
</LinearLayout>
android:layout_height="wrap_content"/>
</LinearLayout>

5
briar-android/res/layout/text_input_field.xml
View File

@@ -6,6 +6,7 @@
android:layout_height="wrap_content"
android:background="@color/button_bar_background"
android:elevation="@dimen/margin_tiny"
android:gravity="bottom"
android:orientation="horizontal"
android:paddingLeft="@dimen/margin_large"
android:paddingStart="@dimen/margin_large">
@@ -21,8 +22,8 @@
<ImageView
android:id="@+id/btn_send"
android:layout_width="38dp"
android:layout_height="38dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_medium"
android:background="?attr/selectableItemBackground"
android:clickable="true"

7
briar-android/src/org/briarproject/android/contact/ConversationActivity.java
View File

@@ -18,7 +18,6 @@ import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
@@ -108,7 +107,7 @@ public class ConversationActivity extends BriarActivity
private TextView toolbarTitle;
private BriarRecyclerView list;
private EditText content;
private ImageButton sendButton;
private View sendButton;
// Fields that are accessed from background threads must be volatile
@Inject
@@ -169,8 +168,8 @@ public class ConversationActivity extends BriarActivity
list.setAdapter(adapter);
list.setEmptyText(getString(R.string.no_private_messages));
content = (EditText) findViewById(R.id.contentView);
sendButton = (ImageButton) findViewById(R.id.sendButton);
content = (EditText) findViewById(R.id.input_text);
sendButton = findViewById(R.id.btn_send);
if (sendButton != null) {
// Enabled after loading the conversation
sendButton.setEnabled(false);