Merge branch 'Wanztwurst-darkTheme' fixes #529

1 files changed, 7 insertions, 8 deletions

diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index db92c05f..6a621287 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -2,8 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/grey200" >
+    android:layout_height="match_parent">
 
     <ListView
         android:id="@+id/messages_view"
@@ -12,7 +11,7 @@
         android:layout_above="@+id/snackbar"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:background="@color/grey200"
+        android:background="?attr/color_background_secondary"
         android:divider="@null"
         android:dividerHeight="0dp"
         android:listSelector="@android:color/transparent"
@@ -27,7 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:background="@color/grey50" >
+        android:background="?attr/color_background_primary" >
 
         <eu.siacs.conversations.ui.EditMessage
             android:id="@+id/textinput"
@@ -35,7 +34,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentLeft="true"
             android:layout_toLeftOf="@+id/textSendButton"
-            android:background="@color/grey50"
+            android:background="?attr/color_background_primary"
             android:ems="10"
             android:imeOptions="flagNoExtractUi|actionSend"
             android:inputType="textShortMessage|textMultiLine|textCapSentences"
@@ -45,7 +44,7 @@
             android:paddingLeft="8dp"
             android:paddingRight="8dp"
             android:paddingTop="12dp"
-            android:textColor="@color/black87" >
+            android:textColor="?attr/color_text_primary" >
 
             <requestFocus />
         </eu.siacs.conversations.ui.EditMessage>
@@ -56,8 +55,8 @@
             android:layout_height="48dp"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
-            android:background="?android:selectableItemBackground"
-            android:src="@drawable/ic_send_text_offline" />
+            android:background="?attr/color_background_primary"
+            android:src="?attr/ic_send_text_offline" />
     </RelativeLayout>
 
     <RelativeLayout