more theme working

7 files changed, 12 insertions, 12 deletions

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_white.xml b/src/main/res/drawable/message_bubble_received_light.xml
index 32e146460..5cb1ac4db 100644
--- a/src/main/res/drawable/message_bubble_received_white.xml
+++ b/src/main/res/drawable/message_bubble_received_light.xml
@@ -13,9 +13,9 @@
         android:top="2dp" />
     <stroke
         android:width="1dp"
-        android:color="@color/grey500">
+        android:color="?attr/color_border">
     </stroke>
     <solid
-        android:color="@color/lightwhite">
+        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_warning.xml
index b3bf6d451..22959c88a 100644
--- a/src/main/res/drawable/message_bubble_received_lightred.xml
+++ b/src/main/res/drawable/message_bubble_received_warning.xml
@@ -13,9 +13,9 @@
         android:top="4dp" />
     <stroke
         android:width="1dp"
-        android:color="@color/grey500">
+        android:color="?attr/color_border">
     </stroke>
     <solid
-        android:color="@color/lightred">
+        android:color="?attr/color_bubble_warning">
     </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_blue.xml
index 1ee3ad0c8..2613296c6 100644
--- a/src/main/res/drawable/message_bubble_sent_lightblue.xml
+++ b/src/main/res/drawable/message_bubble_sent_blue.xml
@@ -13,9 +13,9 @@
         android:top="4dp" />
     <stroke
         android:width="1dp"
-        android:color="@color/grey500">
+        android:color="?attr/color_border">
     </stroke>
     <solid
-        android:color="@color/lightblue">
+        android:color="?attr/color_bubble_blue">
     </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_light.xml
index 73d080cf1..a66321a19 100644
--- a/src/main/res/drawable/message_bubble_sent_white.xml
+++ b/src/main/res/drawable/message_bubble_sent_light.xml
@@ -13,9 +13,9 @@
         android:top="2dp" />
     <stroke
         android:width="1dp"
-        android:color="@color/grey500">
+        android:color="?attr/color_border">
     </stroke>
     <solid
-        android:color="@color/lightwhite">
+        android:color="?attr/color_bubble_light">
     </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>