Merge branch 'develop' into feature/home_rework

vector/src/main/res/values/attrs.xml

@@ -4,6 +4,7 @@
     <declare-styleable name="VectorStyles">
 
         <attr name="vctr_bottom_nav_background_color" format="color" />
+        <attr name="vctr_bottom_nav_background_border_color" format="color" />
 
         <!-- waiting view background -->
         <attr name="vctr_waiting_background_color" format="color" />

vector/src/main/res/values/colors_riot.xml

@@ -19,6 +19,7 @@
     <color name="tab_rooms">@color/accent_color_light</color>
     <color name="tab_rooms_secondary">#5EA584</color>
     <color name="tab_groups">#a6d0e5</color>
+
     <color name="tab_groups_secondary">#81bddb</color>
 
     <!-- color of the direct chat avatar ring (it's 50% of color accent) -->

vector/src/main/res/values/strings_riotX.xml

@@ -26,10 +26,9 @@
     <string name="last_edited_info_message">Last edited by %s on %s</string>
 
 
+    <string name="malformed_message">Malformed event, cannot display</string>
     <string name="create_new_room">Create New Room</string>
-
     <string name="error_no_network">No network. Please check your Internet connection.</string>
-
     <string name="action_change">"Change"</string>
     <string name="change_room_directory_network">"Change network"</string>
     <string name="please_wait">"Please wait…"</string>

vector/src/main/res/values/theme_black.xml

@@ -27,6 +27,7 @@
         <!-- activities background -->
         <item name="android:windowBackground">@color/riot_primary_background_color_black</item>
         <item name="vctr_bottom_nav_background_color">@color/primary_color_black</item>
+        <item name="vctr_bottom_nav_background_border_color">#FFE9EDF1</item>
 
         <item name="vctr_direct_chat_circle">@drawable/direct_chat_circle_black</item>
     </style>

vector/src/main/res/values/theme_dark.xml

@@ -21,6 +21,7 @@
         <!-- default background color -->
         <item name="android:colorBackground">@color/riot_primary_background_color_dark</item>
         <item name="vctr_bottom_nav_background_color">@color/primary_color_dark</item>
+        <item name="vctr_bottom_nav_background_border_color">#FFE9EDF1</item>
 
         <!-- waiting view background -->
         <item name="vctr_waiting_background_color">#55555555</item>

vector/src/main/res/values/theme_light.xml

@@ -23,6 +23,7 @@
         <!-- default background color -->
         <item name="android:colorBackground">@color/riot_primary_background_color_light</item>
         <item name="vctr_bottom_nav_background_color">#FFF3F8FD</item>
+        <item name="vctr_bottom_nav_background_border_color">#FFE9EDF1</item>
 
         <!-- default button -->
         <item name="android:buttonStyle">@style/Widget.Vector.Button</item>

vector/src/main/res/values/theme_status.xml

@@ -23,6 +23,7 @@
         <item name="android:colorBackground">@color/riot_primary_background_color_status</item>
         <item name="vctr_bottom_nav_background_color">@color/riot_primary_background_color_status
         </item>
+        <item name="vctr_bottom_nav_background_border_color">#FFE9EDF1</item>
 
         <item name="buttonStyle">@style/Widget.Vector.Button</item>