From 2e43a5c0a6176911f0ab86b3c55dd57845b45f30 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Fri, 13 Apr 2018 23:33:56 +0200
Subject: more theme working

---
 src/main/res/drawable/date_bubble.xml               |  4 ++--
 src/main/res/drawable/message_border.xml            |  2 +-
 .../res/drawable/message_bubble_received_light.xml  | 21 +++++++++++++++++++++
 .../drawable/message_bubble_received_lightred.xml   | 21 ---------------------
 .../drawable/message_bubble_received_warning.xml    | 21 +++++++++++++++++++++
 .../res/drawable/message_bubble_received_white.xml  | 21 ---------------------
 src/main/res/drawable/message_bubble_sent_blue.xml  | 21 +++++++++++++++++++++
 src/main/res/drawable/message_bubble_sent_light.xml | 21 +++++++++++++++++++++
 .../res/drawable/message_bubble_sent_lightblue.xml  | 21 ---------------------
 src/main/res/drawable/message_bubble_sent_white.xml | 21 ---------------------
 src/main/res/drawable/rounded_rectangle_primary.xml |  2 +-
 11 files changed, 88 insertions(+), 88 deletions(-)
 create mode 100644 src/main/res/drawable/message_bubble_received_light.xml
 delete mode 100644 src/main/res/drawable/message_bubble_received_lightred.xml
 create mode 100644 src/main/res/drawable/message_bubble_received_warning.xml
 delete mode 100644 src/main/res/drawable/message_bubble_received_white.xml
 create mode 100644 src/main/res/drawable/message_bubble_sent_blue.xml
 create mode 100644 src/main/res/drawable/message_bubble_sent_light.xml
 delete mode 100644 src/main/res/drawable/message_bubble_sent_lightblue.xml
 delete mode 100644 src/main/res/drawable/message_bubble_sent_white.xml

(limited to 'src/main/res/drawable')

diff --git a/src/main/res/drawable/date_bubble.xml b/src/main/res/drawable/date_bubble.xml
index 3edf349e9..1669d5a02 100644
--- a/src/main/res/drawable/date_bubble.xml
+++ b/src/main/res/drawable/date_bubble.xml
@@ -13,9 +13,9 @@
         android:top="6dp" />
     <stroke
         android:width="1dp"
-        android:color="@color/grey500">
+        android:color="?attr/color_border">
     </stroke>
     <solid
-        android:color="@color/lightgreen">
+        android:color="?attr/color_bubble_date">
     </solid>
 </shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_border.xml b/src/main/res/drawable/message_border.xml
index 83eef8eb8..6b3180944 100644
--- a/src/main/res/drawable/message_border.xml
+++ b/src/main/res/drawable/message_border.xml
@@ -10,6 +10,6 @@
         android:right="1.5dp"
         android:top="1.5dp" />
 
-    <solid android:color="@color/grey500" />
+    <solid android:color="?attr/color_border" />
 
 </shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_received_light.xml b/src/main/res/drawable/message_bubble_received_light.xml
new file mode 100644
index 000000000..5cb1ac4db
--- /dev/null
+++ b/src/main/res/drawable/message_bubble_received_light.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners
+        android:topLeftRadius="0dp"
+        android:topRightRadius="5dp"
+        android:bottomRightRadius="5dp"
+        android:bottomLeftRadius="5dp">
+    </corners>
+    <padding
+        android:bottom="2dp"
+        android:left="6dp"
+        android:right="6dp"
+        android:top="2dp" />
+    <stroke
+        android:width="1dp"
+        android:color="?attr/color_border">
+    </stroke>
+    <solid
+        android:color="?attr/color_bubble_light">
+    </solid>
+</shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_received_lightred.xml b/src/main/res/drawable/message_bubble_received_lightred.xml
deleted file mode 100644
index b3bf6d451..000000000
--- a/src/main/res/drawable/message_bubble_received_lightred.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners
-        android:topLeftRadius="0dp"
-        android:topRightRadius="5dp"
-        android:bottomRightRadius="5dp"
-        android:bottomLeftRadius="5dp">
-    </corners>
-    <padding
-        android:bottom="4dp"
-        android:left="6dp"
-        android:right="6dp"
-        android:top="4dp" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/grey500">
-    </stroke>
-    <solid
-        android:color="@color/lightred">
-    </solid>
-</shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_received_warning.xml b/src/main/res/drawable/message_bubble_received_warning.xml
new file mode 100644
index 000000000..22959c88a
--- /dev/null
+++ b/src/main/res/drawable/message_bubble_received_warning.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners
+        android:topLeftRadius="0dp"
+        android:topRightRadius="5dp"
+        android:bottomRightRadius="5dp"
+        android:bottomLeftRadius="5dp">
+    </corners>
+    <padding
+        android:bottom="4dp"
+        android:left="6dp"
+        android:right="6dp"
+        android:top="4dp" />
+    <stroke
+        android:width="1dp"
+        android:color="?attr/color_border">
+    </stroke>
+    <solid
+        android:color="?attr/color_bubble_warning">
+    </solid>
+</shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_received_white.xml b/src/main/res/drawable/message_bubble_received_white.xml
deleted file mode 100644
index 32e146460..000000000
--- a/src/main/res/drawable/message_bubble_received_white.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners
-        android:topLeftRadius="0dp"
-        android:topRightRadius="5dp"
-        android:bottomRightRadius="5dp"
-        android:bottomLeftRadius="5dp">
-    </corners>
-    <padding
-        android:bottom="2dp"
-        android:left="6dp"
-        android:right="6dp"
-        android:top="2dp" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/grey500">
-    </stroke>
-    <solid
-        android:color="@color/lightwhite">
-    </solid>
-</shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_sent_blue.xml b/src/main/res/drawable/message_bubble_sent_blue.xml
new file mode 100644
index 000000000..2613296c6
--- /dev/null
+++ b/src/main/res/drawable/message_bubble_sent_blue.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners
+        android:topLeftRadius="5dp"
+        android:topRightRadius="5dp"
+        android:bottomRightRadius="0dp"
+        android:bottomLeftRadius="5dp">
+    </corners>
+    <padding
+        android:bottom="4dp"
+        android:left="6dp"
+        android:right="6dp"
+        android:top="4dp" />
+    <stroke
+        android:width="1dp"
+        android:color="?attr/color_border">
+    </stroke>
+    <solid
+        android:color="?attr/color_bubble_blue">
+    </solid>
+</shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_sent_light.xml b/src/main/res/drawable/message_bubble_sent_light.xml
new file mode 100644
index 000000000..a66321a19
--- /dev/null
+++ b/src/main/res/drawable/message_bubble_sent_light.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners
+        android:topLeftRadius="5dp"
+        android:topRightRadius="5dp"
+        android:bottomRightRadius="0dp"
+        android:bottomLeftRadius="5dp">
+    </corners>
+    <padding
+        android:bottom="2dp"
+        android:left="6dp"
+        android:right="6dp"
+        android:top="2dp" />
+    <stroke
+        android:width="1dp"
+        android:color="?attr/color_border">
+    </stroke>
+    <solid
+        android:color="?attr/color_bubble_light">
+    </solid>
+</shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_sent_lightblue.xml b/src/main/res/drawable/message_bubble_sent_lightblue.xml
deleted file mode 100644
index 1ee3ad0c8..000000000
--- a/src/main/res/drawable/message_bubble_sent_lightblue.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners
-        android:topLeftRadius="5dp"
-        android:topRightRadius="5dp"
-        android:bottomRightRadius="0dp"
-        android:bottomLeftRadius="5dp">
-    </corners>
-    <padding
-        android:bottom="4dp"
-        android:left="6dp"
-        android:right="6dp"
-        android:top="4dp" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/grey500">
-    </stroke>
-    <solid
-        android:color="@color/lightblue">
-    </solid>
-</shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_sent_white.xml b/src/main/res/drawable/message_bubble_sent_white.xml
deleted file mode 100644
index 73d080cf1..000000000
--- a/src/main/res/drawable/message_bubble_sent_white.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners
-        android:topLeftRadius="5dp"
-        android:topRightRadius="5dp"
-        android:bottomRightRadius="0dp"
-        android:bottomLeftRadius="5dp">
-    </corners>
-    <padding
-        android:bottom="2dp"
-        android:left="6dp"
-        android:right="6dp"
-        android:top="2dp" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/grey500">
-    </stroke>
-    <solid
-        android:color="@color/lightwhite">
-    </solid>
-</shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/rounded_rectangle_primary.xml b/src/main/res/drawable/rounded_rectangle_primary.xml
index 3a32aa8e5..8ea2b0b5c 100644
--- a/src/main/res/drawable/rounded_rectangle_primary.xml
+++ b/src/main/res/drawable/rounded_rectangle_primary.xml
@@ -8,7 +8,7 @@
             android:left="2dp"
             android:right="2dp"
             android:top="2dp" />
-        <solid android:color="@color/primary" />
+        <solid android:color="?attr/colorAccent" />
         <corners android:radius="6dp" />
     </shape>
 </item>
-- 
cgit v1.2.3