Commit 4a10e876 authored by akwizgran's avatar akwizgran

Merge branch '1389-notice-shadows' into 'master'

Fix notice shadows

Closes #1389

See merge request !939
parents 86684e22 fad0057c
...@@ -5,11 +5,6 @@ ...@@ -5,11 +5,6 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/message_bubble_margin"
android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
android:layout_marginLeft="@dimen/message_bubble_margin_tail"
android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
android:layout_marginStart="@dimen/message_bubble_margin_tail"
android:layout_marginTop="@dimen/message_bubble_margin" android:layout_marginTop="@dimen/message_bubble_margin"
android:orientation="vertical"> android:orientation="vertical">
...@@ -18,6 +13,10 @@ ...@@ -18,6 +13,10 @@
style="@style/TextMessage" style="@style/TextMessage"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
android:layout_marginLeft="@dimen/message_bubble_margin_tail"
android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
android:layout_marginStart="@dimen/message_bubble_margin_tail"
android:background="@drawable/msg_in_top" android:background="@drawable/msg_in_top"
android:elevation="@dimen/message_bubble_elevation" android:elevation="@dimen/message_bubble_elevation"
tools:text="Short message"/> tools:text="Short message"/>
...@@ -26,6 +25,11 @@ ...@@ -26,6 +25,11 @@
android:id="@+id/layout" android:id="@+id/layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/message_bubble_margin"
android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
android:layout_marginLeft="@dimen/message_bubble_margin_tail"
android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
android:layout_marginStart="@dimen/message_bubble_margin_tail"
android:background="@drawable/notice_in_bottom" android:background="@drawable/notice_in_bottom"
android:elevation="@dimen/message_bubble_elevation"> android:elevation="@dimen/message_bubble_elevation">
......
...@@ -5,11 +5,6 @@ ...@@ -5,11 +5,6 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/message_bubble_margin"
android:layout_marginEnd="@dimen/message_bubble_margin_tail"
android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
android:layout_marginRight="@dimen/message_bubble_margin_tail"
android:layout_marginStart="@dimen/message_bubble_margin_non_tail"
android:layout_marginTop="@dimen/message_bubble_margin" android:layout_marginTop="@dimen/message_bubble_margin"
android:orientation="vertical"> android:orientation="vertical">
...@@ -18,6 +13,10 @@ ...@@ -18,6 +13,10 @@
style="@style/TextMessage" style="@style/TextMessage"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/message_bubble_margin_tail"
android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
android:layout_marginRight="@dimen/message_bubble_margin_tail"
android:layout_marginStart="@dimen/message_bubble_margin_non_tail"
android:background="@drawable/msg_out_top" android:background="@drawable/msg_out_top"
android:elevation="@dimen/message_bubble_elevation" android:elevation="@dimen/message_bubble_elevation"
android:textColor="@color/briar_text_primary_inverse" android:textColor="@color/briar_text_primary_inverse"
...@@ -27,6 +26,11 @@ ...@@ -27,6 +26,11 @@
android:id="@+id/layout" android:id="@+id/layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/message_bubble_margin"
android:layout_marginEnd="@dimen/message_bubble_margin_tail"
android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
android:layout_marginRight="@dimen/message_bubble_margin_tail"
android:layout_marginStart="@dimen/message_bubble_margin_non_tail"
android:background="@drawable/notice_out_bottom" android:background="@drawable/notice_out_bottom"
android:elevation="@dimen/message_bubble_elevation"> android:elevation="@dimen/message_bubble_elevation">
......
...@@ -5,11 +5,6 @@ ...@@ -5,11 +5,6 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/message_bubble_margin"
android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
android:layout_marginLeft="@dimen/message_bubble_margin_tail"
android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
android:layout_marginStart="@dimen/message_bubble_margin_tail"
android:layout_marginTop="@dimen/message_bubble_margin" android:layout_marginTop="@dimen/message_bubble_margin"
android:orientation="vertical"> android:orientation="vertical">
...@@ -18,6 +13,10 @@ ...@@ -18,6 +13,10 @@
style="@style/TextMessage" style="@style/TextMessage"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
android:layout_marginLeft="@dimen/message_bubble_margin_tail"
android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
android:layout_marginStart="@dimen/message_bubble_margin_tail"
android:background="@drawable/msg_in_top" android:background="@drawable/msg_in_top"
android:elevation="@dimen/message_bubble_elevation" android:elevation="@dimen/message_bubble_elevation"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
...@@ -27,6 +26,11 @@ ...@@ -27,6 +26,11 @@
android:id="@+id/layout" android:id="@+id/layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/message_bubble_margin"
android:layout_marginEnd="@dimen/message_bubble_margin_non_tail"
android:layout_marginLeft="@dimen/message_bubble_margin_tail"
android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
android:layout_marginStart="@dimen/message_bubble_margin_tail"
android:background="@drawable/notice_in_bottom" android:background="@drawable/notice_in_bottom"
android:elevation="@dimen/message_bubble_elevation"> android:elevation="@dimen/message_bubble_elevation">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment