5 files changed, 14 insertions, 2 deletions
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 6cb9893ea..655f80230 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -7,7 +7,7 @@
     <attr name="TextSizeSubhead" format="dimension" />
     <attr name="TextSizeBody1" format="dimension" />
     <attr name="TextSizeBody2" format="dimension" />
-    <attr name="TextSizeDisplay2" format="dimension"/>
+    <attr name="TextSizeDisplay2" format="dimension" />
     <attr name="TextSizeInput" format="dimension" />
     <attr name="TextSeparation" format="dimension" />
     <attr name="TextSizeBody" format="dimension" />
@@ -20,7 +20,9 @@
     <attr name="color_background_secondary" format="reference|color" />
     <attr name="color_background_primary" format="reference|color" />
     <attr name="color_warning" format="reference|color" />
-    <attr name="EmojiColor" format="reference|color"/>
+    <attr name="EmojiColor" format="reference|color" />
+
+    <attr name="activity_background_search" format="reference" />
 
     <attr name="ic_send_cancel_offline" format="reference" />
     <attr name="ic_send_location_offline" format="reference" />
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index ffb542fc1..c573107f1 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -12,6 +12,7 @@
     <color name="white">#ffe2e7f1</color>
     <color name="white12">#1fffffff</color>
     <color name="white70">#b2e2e7f1</color>
+    <color name="white87">#deffffff</color>
     <color name="grey50">#fafafa</color>
     <color name="grey200">#ffeeeeee</color>
     <color name="grey300">#ffe0e0e0</color>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 876bf8f75..515e440c1 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -781,4 +781,6 @@
     <string name="create_shortcut">Create Shortcut</string>
     <string name="not_encrypted_for_this_device">Message was not encrypted for this device.</string>
     <string name="no_microphone_permission">Conversations needs access to the microphone</string>
+    <string name="title_activity_search">Search</string>
+    <string name="search_messages">Search messages</string>
 </resources>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 3c6edba4f..11430e064 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -36,6 +36,7 @@
         <item name="android:textColorHint">@color/white70</item>
         <item name="android:background">@android:color/transparent</item>
         <item name="android:textSize">18sp</item>
+        <item name="android:textCursorDrawable">@drawable/white_cursor</item>
     </style>
 
     <style name="Widget.Conversations.CheckBox" parent="Widget.AppCompat.CompoundButton.CheckBox">
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 2860b5c59..fec28b976 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -13,6 +13,9 @@
         <item name="color_background_primary">@color/grey50</item>
         <item name="color_background_secondary">@color/grey200</item>
         <item name="color_warning">@color/red_a700</item>
+
+        <item name="activity_background_search">@drawable/search_background_light</item>
+
         <item name="EmojiColor">@color/realblack</item>
 
         <item name="color_bubble_light">@color/lightwhite</item>
@@ -128,6 +131,9 @@
         <item name="color_background_primary">@color/grey900</item>
         <item name="color_background_secondary">@color/realblack</item>
         <item name="color_warning">@color/red_a700</item>
+
+        <item name="activity_background_search">@drawable/search_background_dark</item>
+
         <item name="EmojiColor">@color/realwhite</item>
 
         <item name="color_bubble_light">@color/darkwhite</item>