Merge branch 'master' into dev

app/src/main/res/layout/mediasend_fragment.xml

@@ -95,7 +95,6 @@
 
                     <org.thoughtcrime.securesms.components.ComposeText
                         style="@style/Widget.Session.EditText.Compose"
-                        android:textColor="?android:textColorPrimary"
                         android:id="@+id/mediasend_compose_text"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"

app/src/main/res/values/styles.xml

@@ -154,6 +154,7 @@
     <style name="Widget.Session.EditText.Compose" parent="@style/Signal.Text.Body">
         <item name="android:padding">2dp</item>
         <item name="android:background">@null</item>
+        <item name="android:textColor">@color/white</item>
         <item name="android:maxLines">4</item>
         <item name="android:maxLength">65536</item>
         <item name="android:capitalize">sentences</item>

app/src/main/res/values/themes.xml

@@ -385,7 +385,7 @@
         <item name="scroll_to_bottom_button_background">@color/classic_dark_1</item>
         <item name="scroll_to_bottom_button_border">@color/classic_dark_3</item>
         <item name="conversation_unread_count_indicator_background">@color/classic_dark_4</item>
-        <item name="message_selected">@color/classic_dark_3</item>
+        <item name="message_selected">@color/classic_dark_1</item>
     </style>
 
     <style name="Classic.Light">
@@ -469,7 +469,7 @@
         <item name="scroll_to_bottom_button_background">@color/classic_light_4</item>
         <item name="scroll_to_bottom_button_border">@color/classic_light_2</item>
         <item name="conversation_unread_count_indicator_background">@color/classic_dark_4</item>
-        <item name="message_selected">@color/classic_light_3</item>
+        <item name="message_selected">@color/classic_light_5</item>
 
     </style>
 
@@ -636,7 +636,7 @@
         <item name="conversation_pinned_background_color">?colorCellBackground</item>
         <item name="conversation_unread_background_color">@color/ocean_light_5</item>
         <item name="conversation_pinned_icon_color">?android:textColorPrimary</item>
-        <item name="message_selected">@color/ocean_light_3</item>
+        <item name="message_selected">@color/ocean_light_5</item>
     </style>
 
 </resources>