fix some crashes on Android 4 devices

9 files changed, 93 insertions, 9 deletions

diff --git a/src/main/res/drawable/date_bubble.xml b/src/main/res/drawable/date_bubble.xml
index 1669d5a02..3edf349e9 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="?attr/color_border">
+        android:color="@color/grey500">
     </stroke>
     <solid
-        android:color="?attr/color_bubble_date">
+        android:color="@color/lightgreen">
     </solid>
 </shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/date_bubble_dark.xml b/src/main/res/drawable/date_bubble_dark.xml
new file mode 100644
index 000000000..345c315c1
--- /dev/null
+++ b/src/main/res/drawable/date_bubble_dark.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="5dp"
+        android:bottomLeftRadius="5dp">
+    </corners>
+    <padding
+        android:bottom="6dp"
+        android:left="6dp"
+        android:right="6dp"
+        android:top="6dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/grey800">
+    </stroke>
+    <solid
+        android:color="@color/darkgreen">
+    </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 6b3180944..cee834e98 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="?attr/color_border" />
+    <solid android:color="@color/grey800" />
 
 </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
index 5cb1ac4db..32e146460 100644
--- a/src/main/res/drawable/message_bubble_received_light.xml
+++ b/src/main/res/drawable/message_bubble_received_light.xml
@@ -13,9 +13,9 @@
         android:top="2dp" />
     <stroke
         android:width="1dp"
-        android:color="?attr/color_border">
+        android:color="@color/grey500">
     </stroke>
     <solid
-        android:color="?attr/color_bubble_light">
+        android:color="@color/lightwhite">
     </solid>
 </shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_received_light_dark.xml b/src/main/res/drawable/message_bubble_received_light_dark.xml
new file mode 100644
index 000000000..b5c38d7e9
--- /dev/null
+++ b/src/main/res/drawable/message_bubble_received_light_dark.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="@color/grey800">
+    </stroke>
+    <solid
+        android:color="@color/darkwhite">
+    </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
index 22959c88a..b3bf6d451 100644
--- a/src/main/res/drawable/message_bubble_received_warning.xml
+++ b/src/main/res/drawable/message_bubble_received_warning.xml
@@ -13,9 +13,9 @@
         android:top="4dp" />
     <stroke
         android:width="1dp"
-        android:color="?attr/color_border">
+        android:color="@color/grey500">
     </stroke>
     <solid
-        android:color="?attr/color_bubble_warning">
+        android:color="@color/lightred">
     </solid>
 </shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_received_warning_dark.xml b/src/main/res/drawable/message_bubble_received_warning_dark.xml
new file mode 100644
index 000000000..8681a3d9f
--- /dev/null
+++ b/src/main/res/drawable/message_bubble_received_warning_dark.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="@color/grey800">
+    </stroke>
+    <solid
+        android:color="@color/darkred">
+    </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
index 2613296c6..1ee3ad0c8 100644
--- a/src/main/res/drawable/message_bubble_sent_blue.xml
+++ b/src/main/res/drawable/message_bubble_sent_blue.xml
@@ -13,9 +13,9 @@
         android:top="4dp" />
     <stroke
         android:width="1dp"
-        android:color="?attr/color_border">
+        android:color="@color/grey500">
     </stroke>
     <solid
-        android:color="?attr/color_bubble_blue">
+        android:color="@color/lightblue">
     </solid>
 </shape>
\ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_sent_blue_dark.xml b/src/main/res/drawable/message_bubble_sent_blue_dark.xml
new file mode 100644
index 000000000..6257e0078
--- /dev/null
+++ b/src/main/res/drawable/message_bubble_sent_blue_dark.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="@color/grey800">
+    </stroke>
+    <solid
+        android:color="@color/darkblue">
+    </solid>
+</shape>
\ No newline at end of file