aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorMartin/Geno <geno+dev@fireorbit.de>2018-09-12 18:51:13 +0200
committerMartin/Geno <geno+dev@fireorbit.de>2018-09-14 10:39:55 +0200
commit1816092e68584b5794303578b6af6d621ffc58d4 (patch)
treea567224eb7eb238b6318c70c2cd8c82b2c741e93 /src/main
parent5a53f19406f23dd7000eca156ee486e92e94f072 (diff)
design: bubbles more curvier, avatar higher radius and no border
Diffstat (limited to 'src/main')
-rw-r--r--src/main/res/drawable/date_bubble.xml6
-rw-r--r--src/main/res/drawable/date_bubble_dark.xml6
-rw-r--r--src/main/res/drawable/message_bubble_received_light.xml48
-rw-r--r--src/main/res/drawable/message_bubble_received_light_dark.xml48
-rw-r--r--src/main/res/drawable/message_bubble_received_warning.xml48
-rw-r--r--src/main/res/drawable/message_bubble_received_warning_dark.xml48
-rw-r--r--src/main/res/drawable/message_bubble_sent_blue.xml49
-rw-r--r--src/main/res/drawable/message_bubble_sent_blue_dark.xml48
-rw-r--r--src/main/res/layout/account_row.xml2
-rw-r--r--src/main/res/layout/activity_edit_account.xml2
-rw-r--r--src/main/res/layout/activity_muc_details.xml4
-rw-r--r--src/main/res/layout/activity_publish_profile_picture.xml2
-rw-r--r--src/main/res/layout/contact.xml2
-rw-r--r--src/main/res/layout/conversation_list_row.xml2
-rw-r--r--src/main/res/layout/message_content.xml2
-rw-r--r--src/main/res/layout/message_received.xml4
-rw-r--r--src/main/res/layout/message_sent.xml4
-rw-r--r--src/main/res/layout/message_status.xml2
-rw-r--r--src/main/res/values/dimens.xml2
19 files changed, 174 insertions, 155 deletions
diff --git a/src/main/res/drawable/date_bubble.xml b/src/main/res/drawable/date_bubble.xml
index 3edf349e9..0ea7b0761 100644
--- a/src/main/res/drawable/date_bubble.xml
+++ b/src/main/res/drawable/date_bubble.xml
@@ -11,11 +11,7 @@
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> \ No newline at end of file
+</shape>
diff --git a/src/main/res/drawable/date_bubble_dark.xml b/src/main/res/drawable/date_bubble_dark.xml
index 345c315c1..64f5c1515 100644
--- a/src/main/res/drawable/date_bubble_dark.xml
+++ b/src/main/res/drawable/date_bubble_dark.xml
@@ -11,11 +11,7 @@
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> \ No newline at end of file
+</shape>
diff --git a/src/main/res/drawable/message_bubble_received_light.xml b/src/main/res/drawable/message_bubble_received_light.xml
index 32e146460..6619984b3 100644
--- a/src/main/res/drawable/message_bubble_received_light.xml
+++ b/src/main/res/drawable/message_bubble_received_light.xml
@@ -1,21 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
-<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
+<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>
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 8f9132566..9514bc757 100644
--- a/src/main/res/drawable/message_bubble_received_light_dark.xml
+++ b/src/main/res/drawable/message_bubble_received_light_dark.xml
@@ -1,21 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
-<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
+<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>
diff --git a/src/main/res/drawable/message_bubble_received_warning.xml b/src/main/res/drawable/message_bubble_received_warning.xml
index b3bf6d451..ae3222a9e 100644
--- a/src/main/res/drawable/message_bubble_received_warning.xml
+++ b/src/main/res/drawable/message_bubble_received_warning.xml
@@ -1,21 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
-<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
+<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>
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 5867f67ce..9f8aa779e 100644
--- a/src/main/res/drawable/message_bubble_received_warning_dark.xml
+++ b/src/main/res/drawable/message_bubble_received_warning_dark.xml
@@ -1,21 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
-<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
+<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>
diff --git a/src/main/res/drawable/message_bubble_sent_blue.xml b/src/main/res/drawable/message_bubble_sent_blue.xml
index 1ee3ad0c8..8e519ff6b 100644
--- a/src/main/res/drawable/message_bubble_sent_blue.xml
+++ b/src/main/res/drawable/message_bubble_sent_blue.xml
@@ -1,21 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
-<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
+<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>
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 d9853bf74..e6f3c88c1 100644
--- a/src/main/res/drawable/message_bubble_sent_blue_dark.xml
+++ b/src/main/res/drawable/message_bubble_sent_blue_dark.xml
@@ -1,21 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
-<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
+<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>
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index e56ca6a95..9b638172a 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -15,8 +15,6 @@
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 74c15d780..02d03b941 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -53,8 +53,6 @@
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 2a450f964..2958e3efe 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -155,8 +155,6 @@
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>
@@ -311,8 +309,6 @@
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 eebfa76a6..90dde5b01 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -43,8 +43,6 @@
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 0218e299b..f5bd1506b 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -13,8 +13,6 @@
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 b00be5a4b..5fce5c1f2 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -24,8 +24,6 @@
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 044f8c64d..296944565 100644
--- a/src/main/res/layout/message_content.xml
+++ b/src/main/res/layout/message_content.xml
@@ -13,8 +13,6 @@
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 2c6fd044a..f8b5fce95 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -16,8 +16,6 @@
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
@@ -25,7 +23,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
- android:layout_marginLeft="4dp"
+ android:layout_marginLeft="-7dp"
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 2526e4dd2..188e466d5 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -23,8 +23,6 @@
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
@@ -39,7 +37,7 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="4dp"
- android:layout_marginRight="4dp"
+ android:layout_marginRight="-7dp"
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 d42637175..bd731cbe4 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -29,8 +29,6 @@
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 50f955c89..7f0f561b1 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -25,5 +25,5 @@
<dimen name="background_image_opacity">0.12</dimen>
- <dimen name="rounded_image_border">5dp</dimen>
+ <dimen name="rounded_image_border">8dp</dimen>
</resources>