diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-09-28 22:33:28 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-09-28 22:33:28 +0200 |
commit | 092926db0bdf298bb99b41ab67305c34aa960469 (patch) | |
tree | d81b84c8fef768bb5950decdd76b6d1f98dc4250 /src | |
parent | 68adf4c7e9bf9ca68dd81305accd12b56de38b4c (diff) |
Revert "design: bubbles more curvier, avatar higher radius and no border"
This reverts commit 1816092e68584b5794303578b6af6d621ffc58d4.
This causes render errors on some devices.
Diffstat (limited to 'src')
19 files changed, 155 insertions, 174 deletions
diff --git a/src/main/res/drawable/date_bubble.xml b/src/main/res/drawable/date_bubble.xml index 0ea7b0761..3edf349e9 100644 --- a/src/main/res/drawable/date_bubble.xml +++ b/src/main/res/drawable/date_bubble.xml @@ -11,7 +11,11 @@ android:left="6dp" android:right="6dp" android:top="6dp" /> + <stroke + android:width="1dp" + android:color="@color/grey500"> + </stroke> <solid android:color="@color/lightgreen"> </solid> -</shape> +</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 index 64f5c1515..345c315c1 100644 --- a/src/main/res/drawable/date_bubble_dark.xml +++ b/src/main/res/drawable/date_bubble_dark.xml @@ -11,7 +11,11 @@ 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> +</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 6619984b3..32e146460 100644 --- a/src/main/res/drawable/message_bubble_received_light.xml +++ b/src/main/res/drawable/message_bubble_received_light.xml @@ -1,29 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:gravity="top|left"> - <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="36dp" - android:height="24dp" - android:viewportWidth="36" - android:viewportHeight="24" > - <path - android:fillColor="@color/lightwhite" - android:pathData="m2,0 c6,0 10,6 10,10L18,0z" /> - </vector> - </item> - <item android:left="12dp"> - <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"/> - <padding - android:bottom="2dp" - android:left="18dp" - android:right="6dp" - android:top="2dp" /> - <solid android:color="@color/lightwhite" /> - </shape> - </item> -</layer-list> +<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/grey500"> + </stroke> + <solid + 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 index 9514bc757..8f9132566 100644 --- a/src/main/res/drawable/message_bubble_received_light_dark.xml +++ b/src/main/res/drawable/message_bubble_received_light_dark.xml @@ -1,29 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:gravity="top|left"> - <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="36dp" - android:height="24dp" - android:viewportWidth="36" - android:viewportHeight="24" > - <path - android:fillColor="@color/darkwhite" - android:pathData="m2,0 c6,0 10,6 10,10L18,0z" /> - </vector> - </item> - <item android:left="12dp"> - <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" /> - <padding - android:bottom="2dp" - android:left="18dp" - android:right="6dp" - android:top="2dp" /> - <solid android:color="@color/darkwhite" /> - </shape> - </item> -</layer-list> +<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/grey700"> + </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 ae3222a9e..b3bf6d451 100644 --- a/src/main/res/drawable/message_bubble_received_warning.xml +++ b/src/main/res/drawable/message_bubble_received_warning.xml @@ -1,29 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:gravity="top|left"> - <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="36dp" - android:height="24dp" - android:viewportWidth="36" - android:viewportHeight="24" > - <path - android:fillColor="@color/lightred" - android:pathData="m2,0 c6,0 10,6 10,10L18,0z" /> - </vector> - </item> - <item android:left="12dp"> - <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" /> - <padding - android:bottom="2dp" - android:left="18dp" - android:right="6dp" - android:top="2dp" /> - <solid android:color="@color/lightred" /> - </shape> - </item> -</layer-list> +<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/grey500"> + </stroke> + <solid + 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 index 9f8aa779e..5867f67ce 100644 --- a/src/main/res/drawable/message_bubble_received_warning_dark.xml +++ b/src/main/res/drawable/message_bubble_received_warning_dark.xml @@ -1,29 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:gravity="top|left"> - <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="36dp" - android:height="24dp" - android:viewportWidth="36" - android:viewportHeight="24" > - <path - android:fillColor="@color/darkred" - android:pathData="m2,0 c6,0 10,6 10,10L18,0z" /> - </vector> - </item> - <item android:left="12dp"> - <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" /> - <padding - android:bottom="2dp" - android:left="18dp" - android:right="6dp" - android:top="2dp" /> - <solid android:color="@color/darkred" /> - </shape> - </item> -</layer-list> +<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/grey700"> + </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 8e519ff6b..1ee3ad0c8 100644 --- a/src/main/res/drawable/message_bubble_sent_blue.xml +++ b/src/main/res/drawable/message_bubble_sent_blue.xml @@ -1,30 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:gravity="bottom|right"> - <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="36dp" - android:height="24dp" - android:viewportWidth="36" - android:viewportHeight="24" > - <path - android:fillColor="@color/lightblue" - android:pathData="m 34,24 c-6,0 -10,-6 -10,-10 l -6,12 z" /> - - </vector> - </item> - <item android:right="12dp"> - <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" /> - <padding - android:bottom="2dp" - android:left="6dp" - android:right="18dp" - android:top="2dp" /> - <solid android:color="@color/lightblue" /> - </shape> - </item> -</layer-list> +<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/grey500"> + </stroke> + <solid + 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 index e6f3c88c1..d9853bf74 100644 --- a/src/main/res/drawable/message_bubble_sent_blue_dark.xml +++ b/src/main/res/drawable/message_bubble_sent_blue_dark.xml @@ -1,29 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:gravity="bottom|right"> - <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="36dp" - android:height="24dp" - android:viewportWidth="36" - android:viewportHeight="24" > - <path - android:fillColor="@color/darkblue" - android:pathData="m 34,24 c-6,0 -10,-6 -10,-10 l -6,12 z" /> - </vector> - </item> - <item android:right="12dp"> - <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" /> - <padding - android:bottom="2dp" - android:left="6dp" - android:right="18dp" - android:top="2dp" /> - <solid android:color="@color/darkblue" /> - </shape> - </item> -</layer-list> +<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/grey700"> + </stroke> + <solid + android:color="@color/darkblue"> + </solid> +</shape>
\ No newline at end of file diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml index 9b638172a..e56ca6a95 100644 --- a/src/main/res/layout/account_row.xml +++ b/src/main/res/layout/account_row.xml @@ -15,6 +15,8 @@ android:layout_alignParentLeft="true" android:contentDescription="@string/account_image_description" android:padding="1dp" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> <LinearLayout diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 275a1d894..342d748f0 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -54,6 +54,8 @@ android:maxHeight="384dp" android:maxWidth="384dp" android:padding="1dp" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> <LinearLayout diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index e1ac744ea..c88afab8d 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -157,6 +157,8 @@ android:maxWidth="384dp" android:padding="1dp" android:scaleType="centerCrop" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> </RelativeLayout> @@ -359,6 +361,8 @@ android:layout_alignParentLeft="true" android:layout_alignParentRight="false" android:padding="1dp" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> <LinearLayout diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml index 1db8a159d..3f883f1ba 100644 --- a/src/main/res/layout/activity_publish_profile_picture.xml +++ b/src/main/res/layout/activity_publish_profile_picture.xml @@ -45,6 +45,8 @@ android:maxWidth="384dp" android:padding="1dp" android:scaleType="centerCrop" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> </FrameLayout> diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml index 9635d4c47..ef020f976 100644 --- a/src/main/res/layout/contact.xml +++ b/src/main/res/layout/contact.xml @@ -13,6 +13,8 @@ android:layout_width="56dp" android:layout_height="56dp" android:layout_alignParentLeft="true" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> <LinearLayout diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index cbd884ae2..3e3bef6c9 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -24,6 +24,8 @@ android:layout_alignParentLeft="true" android:padding="1dp" android:scaleType="centerCrop" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> <RelativeLayout diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml index 296944565..044f8c64d 100644 --- a/src/main/res/layout/message_content.xml +++ b/src/main/res/layout/message_content.xml @@ -13,6 +13,8 @@ android:maxHeight="500dp" android:maxWidth="500dp" android:scaleType="centerCrop" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> <de.pixart.messenger.ui.widget.CopyTextView diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index f8b5fce95..2c6fd044a 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -16,6 +16,8 @@ android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:scaleType="fitXY" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dip" app:riv_corner_radius="@dimen/rounded_image_border" /> <LinearLayout @@ -23,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_marginLeft="-7dp" + android:layout_marginLeft="4dp" android:layout_marginRight="4dp" android:layout_toRightOf="@+id/message_photo" android:background="@drawable/message_bubble_received_light" diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index 188e466d5..2526e4dd2 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -23,6 +23,8 @@ android:layout_width="48dp" android:layout_height="48dp" android:scaleType="fitXY" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> <View @@ -37,7 +39,7 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_marginLeft="4dp" - android:layout_marginRight="-7dp" + android:layout_marginRight="4dp" android:layout_toLeftOf="@+id/message_photo_box" android:layout_toStartOf="@+id/message_photo_box" android:background="@drawable/message_bubble_sent_blue" diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml index bd731cbe4..d42637175 100644 --- a/src/main/res/layout/message_status.xml +++ b/src/main/res/layout/message_status.xml @@ -29,6 +29,8 @@ android:padding="0dp" android:scaleType="fitXY" android:visibility="gone" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> <TextView diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index 526eb7d40..0c6ef41fb 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -27,5 +27,5 @@ <dimen name="scan_dot_size">8dp</dimen> <dimen name="background_image_opacity">0.12</dimen> - <dimen name="rounded_image_border">8dp</dimen> + <dimen name="rounded_image_border">5dp</dimen> </resources> |