aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout/fragment_conversation.xml
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2015-08-11 17:35:53 +0200
committerlookshe <github@lookshe.org>2015-08-11 17:35:53 +0200
commit8fd688ca96005152be754eeba1be72c7c0aab9ad (patch)
treec4d2e3dfe7250a6794aaa3fa9816ad3da70a813e /src/main/res/layout/fragment_conversation.xml
parent553f41a2dbc068a8a43f613e088713cd3ec7680e (diff)
Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1
Diffstat (limited to '')
-rw-r--r--src/main/res/layout/fragment_conversation.xml16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index b343781b..3fd80aa2 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/secondarybackground" >
+ android:background="@color/grey200" >
<ListView
android:id="@+id/messages_view"
@@ -12,7 +12,7 @@
android:layout_above="@+id/snackbar"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
- android:background="@color/secondarybackground"
+ android:background="@color/grey200"
android:divider="@null"
android:dividerHeight="0dp"
android:listSelector="@android:color/transparent"
@@ -27,7 +27,7 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
- android:background="@color/primarybackground" >
+ android:background="@color/grey50" >
<eu.siacs.conversations.ui.EditMessage
android:id="@+id/textinput"
@@ -35,7 +35,7 @@
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/textSendButton"
android:layout_toRightOf="@+id/emoji_btn"
- android:background="@color/primarybackground"
+ android:background="@color/grey50"
android:ems="10"
android:imeOptions="flagNoExtractUi|actionSend"
android:inputType="textShortMessage|textMultiLine|textCapSentences"
@@ -45,7 +45,7 @@
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="12dp"
- android:textColor="@color/primarytext" >
+ android:textColor="@color/black87" >
<requestFocus />
</eu.siacs.conversations.ui.EditMessage>
@@ -57,7 +57,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="?android:selectableItemBackground"
- android:src="@drawable/ic_action_send_now_offline" />
+ android:src="@drawable/ic_send_text_offline" />
<ImageView
android:layout_width="48dp"
@@ -89,7 +89,7 @@
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/snackbar_action"
android:paddingLeft="24dp"
- android:textColor="@color/ondarktext"
+ android:textColor="@color/white"
android:textSize="?attr/TextSizeBody" />
<TextView
@@ -103,7 +103,7 @@
android:paddingRight="24dp"
android:paddingTop="16dp"
android:textAllCaps="true"
- android:textColor="@color/ondarktext"
+ android:textColor="@color/white"
android:textSize="?attr/TextSizeBody"
android:textStyle="bold" />
</RelativeLayout>