aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-06-03 21:31:06 +0200
committerChristian Schneppe <christian@pix-art.de>2018-06-03 21:45:11 +0200
commit3710d000f56a102519a28b108d31c6fe130ab14b (patch)
tree25e86e64f393e5aadfec59eff2ec812d87fe37d2
parentf1c661246243b7a1627088794067f30b8bdaafae (diff)
optimized some colors and switched back to square avatars
-rw-r--r--src/main/res/drawable/message_border_dark.xml15
-rw-r--r--src/main/res/drawable/message_bubble_received_light.xml2
-rw-r--r--src/main/res/drawable/message_bubble_received_light_dark.xml2
-rw-r--r--src/main/res/drawable/message_bubble_received_warning.xml2
-rw-r--r--src/main/res/drawable/message_bubble_received_warning_dark.xml2
-rw-r--r--src/main/res/drawable/message_bubble_sent_blue.xml2
-rw-r--r--src/main/res/drawable/message_bubble_sent_blue_dark.xml2
-rw-r--r--src/main/res/layout/account_row.xml5
-rw-r--r--src/main/res/layout/activity_contact_details.xml2
-rw-r--r--src/main/res/layout/activity_edit_account.xml5
-rw-r--r--src/main/res/layout/activity_muc_details.xml10
-rw-r--r--src/main/res/layout/activity_publish_profile_picture.xml5
-rw-r--r--src/main/res/layout/contact.xml2
-rw-r--r--src/main/res/layout/conversation_list_row.xml3
-rw-r--r--src/main/res/layout/message_content.xml2
-rw-r--r--src/main/res/layout/message_received.xml2
-rw-r--r--src/main/res/layout/message_sent.xml2
-rw-r--r--src/main/res/layout/message_status.xml2
-rw-r--r--src/main/res/values/attrs.xml2
-rw-r--r--src/main/res/values/dimens.xml2
-rw-r--r--src/main/res/values/themes.xml8
21 files changed, 52 insertions, 27 deletions
diff --git a/src/main/res/drawable/message_border_dark.xml b/src/main/res/drawable/message_border_dark.xml
new file mode 100644
index 000000000..83eef8eb8
--- /dev/null
+++ b/src/main/res/drawable/message_border_dark.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+
+ <corners android:radius="5dp" />
+
+ <padding
+ android:bottom="1.5dp"
+ android:left="1.5dp"
+ android:right="1.5dp"
+ android:top="1.5dp" />
+
+ <solid android:color="@color/grey500" />
+
+</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 32e146460..6e8e95e1d 100644
--- a/src/main/res/drawable/message_bubble_received_light.xml
+++ b/src/main/res/drawable/message_bubble_received_light.xml
@@ -13,7 +13,7 @@
android:top="2dp" />
<stroke
android:width="1dp"
- android:color="@color/grey500">
+ android:color="@color/grey800">
</stroke>
<solid
android:color="@color/lightwhite">
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 b5c38d7e9..edd1e62ce 100644
--- a/src/main/res/drawable/message_bubble_received_light_dark.xml
+++ b/src/main/res/drawable/message_bubble_received_light_dark.xml
@@ -13,7 +13,7 @@
android:top="2dp" />
<stroke
android:width="1dp"
- android:color="@color/grey800">
+ android:color="@color/grey500">
</stroke>
<solid
android:color="@color/darkwhite">
diff --git a/src/main/res/drawable/message_bubble_received_warning.xml b/src/main/res/drawable/message_bubble_received_warning.xml
index b3bf6d451..c3d553a7d 100644
--- a/src/main/res/drawable/message_bubble_received_warning.xml
+++ b/src/main/res/drawable/message_bubble_received_warning.xml
@@ -13,7 +13,7 @@
android:top="4dp" />
<stroke
android:width="1dp"
- android:color="@color/grey500">
+ android:color="@color/grey800">
</stroke>
<solid
android:color="@color/lightred">
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 8681a3d9f..5d8a270ab 100644
--- a/src/main/res/drawable/message_bubble_received_warning_dark.xml
+++ b/src/main/res/drawable/message_bubble_received_warning_dark.xml
@@ -13,7 +13,7 @@
android:top="4dp" />
<stroke
android:width="1dp"
- android:color="@color/grey800">
+ android:color="@color/grey500">
</stroke>
<solid
android:color="@color/darkred">
diff --git a/src/main/res/drawable/message_bubble_sent_blue.xml b/src/main/res/drawable/message_bubble_sent_blue.xml
index 1ee3ad0c8..0f1424d21 100644
--- a/src/main/res/drawable/message_bubble_sent_blue.xml
+++ b/src/main/res/drawable/message_bubble_sent_blue.xml
@@ -13,7 +13,7 @@
android:top="4dp" />
<stroke
android:width="1dp"
- android:color="@color/grey500">
+ android:color="@color/grey800">
</stroke>
<solid
android:color="@color/lightblue">
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 6257e0078..3d1b72042 100644
--- a/src/main/res/drawable/message_bubble_sent_blue_dark.xml
+++ b/src/main/res/drawable/message_bubble_sent_blue_dark.xml
@@ -13,7 +13,7 @@
android:top="4dp" />
<stroke
android:width="1dp"
- android:color="@color/grey800">
+ android:color="@color/grey500">
</stroke>
<solid
android:color="@color/darkblue">
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 6a9dee422..f0b539c6d 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -13,10 +13,11 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentLeft="true"
- android:background="@drawable/message_border"
android:contentDescription="@string/account_image_description"
android:padding="1dp"
- app:riv_corner_radius="24dp" />
+ app:riv_border_color="?attr/message_border"
+ app:riv_border_width="1dp"
+ app:riv_corner_radius="@dimen/rounded_image_border" />
<LinearLayout
android:layout_width="fill_parent"
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 2f8f33f01..f6a2b1069 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -56,7 +56,7 @@
android:layout_below="@+id/contact_display_name"
android:layout_centerHorizontal="true"
android:adjustViewBounds="true"
- android:background="@drawable/message_border"
+ android:background="?attr/message_border"
android:maxHeight="384dp"
android:maxWidth="384dp"
android:padding="1dp"
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 8a77f939a..dcd358201 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -49,12 +49,13 @@
android:layout_centerHorizontal="true"
android:layout_marginBottom="16dp"
android:adjustViewBounds="true"
- android:background="@drawable/message_border"
android:contentDescription="@string/account_image_description"
android:maxHeight="384dp"
android:maxWidth="384dp"
android:padding="1dp"
- app:riv_corner_radius="5dp" />
+ app:riv_border_color="?attr/message_border"
+ app:riv_border_width="1dp"
+ app:riv_corner_radius="@dimen/rounded_image_border" />
<LinearLayout
android:id="@+id/jid_password_box"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 35fe03f16..ac668c70e 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -50,16 +50,18 @@
android:textIsSelectable="false"
android:textStyle="bold" />
- <ImageView
+ <com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/details_muc_avatar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
- android:background="@drawable/message_border"
android:maxHeight="384dp"
android:maxWidth="384dp"
android:padding="1dp"
- android:scaleType="centerCrop" />
+ android:scaleType="centerCrop"
+ app:riv_border_color="?attr/color_border"
+ app:riv_border_width="1dp"
+ app:riv_corner_radius="@dimen/rounded_image_border"/>
<RelativeLayout
android:id="@+id/muc_settings"
@@ -133,7 +135,7 @@
android:padding="1dp"
app:riv_border_color="?attr/color_border"
app:riv_border_width="1dp"
- app:riv_corner_radius="36dp" />
+ app:riv_corner_radius="@dimen/rounded_image_border" />
<LinearLayout
android:layout_width="fill_parent"
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index dd3afeeac..1ede0bea1 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -48,12 +48,13 @@
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:adjustViewBounds="true"
- android:background="@drawable/message_border"
android:contentDescription="@string/account_image_description"
android:maxHeight="384dp"
android:maxWidth="384dp"
android:padding="1dp"
- app:riv_corner_radius="5dp" />
+ app:riv_border_color="?attr/message_border"
+ app:riv_border_width="1dp"
+ app:riv_corner_radius="@dimen/rounded_image_border" />
</LinearLayout>
<TextView
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 47a5a74ad..c2e374356 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -15,7 +15,7 @@
android:layout_alignParentLeft="true"
app:riv_border_color="?attr/color_border"
app:riv_border_width="1dp"
- app:riv_corner_radius="28dp" />
+ app:riv_corner_radius="@dimen/rounded_image_border" />
<LinearLayout
android:layout_width="wrap_content"
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 6acc6a56f..b00be5a4b 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -22,12 +22,11 @@
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_alignParentLeft="true"
- android:background="@drawable/message_border"
android:padding="1dp"
android:scaleType="centerCrop"
app:riv_border_color="?attr/color_border"
app:riv_border_width="1dp"
- app:riv_corner_radius="28dp" />
+ app:riv_corner_radius="@dimen/rounded_image_border" />
<RelativeLayout
android:layout_width="fill_parent"
diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml
index 37f374f65..044f8c64d 100644
--- a/src/main/res/layout/message_content.xml
+++ b/src/main/res/layout/message_content.xml
@@ -15,7 +15,7 @@
android:scaleType="centerCrop"
app:riv_border_color="?attr/color_border"
app:riv_border_width="1dp"
- app:riv_corner_radius="5dp" />
+ app:riv_corner_radius="@dimen/rounded_image_border" />
<de.pixart.messenger.ui.widget.CopyTextView
android:id="@+id/message_body"
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index dbc379aaf..2c6fd044a 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -18,7 +18,7 @@
android:scaleType="fitXY"
app:riv_border_color="?attr/color_border"
app:riv_border_width="1dip"
- app:riv_corner_radius="24dp" />
+ app:riv_corner_radius="@dimen/rounded_image_border" />
<LinearLayout
android:id="@+id/message_box"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 0174a9f57..63ce65b76 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -19,7 +19,7 @@
android:scaleType="fitXY"
app:riv_border_color="?attr/color_border"
app:riv_border_width="1dp"
- app:riv_corner_radius="24dp" />
+ app:riv_corner_radius="@dimen/rounded_image_border" />
<LinearLayout
android:id="@+id/message_box"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index e9c43279f..d42637175 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -31,7 +31,7 @@
android:visibility="gone"
app:riv_border_color="?attr/color_border"
app:riv_border_width="1dp"
- app:riv_corner_radius="16dp" />
+ app:riv_corner_radius="@dimen/rounded_image_border" />
<TextView
android:id="@+id/status_message"
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 264af344f..f72834b9f 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -95,6 +95,8 @@
<attr name="color_border" format="reference|color" />
+ <attr name="message_border" format="reference" />
+
<!-- settings -->
<attr name="ic_settings_ui" format="reference" />
<attr name="ic_settings_notifications" format="reference" />
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 92418a3e9..721cc4f9c 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -20,4 +20,6 @@
<dimen name="scan_dot_size">8dp</dimen>
<dimen name="background_image_opacity">0.12</dimen>
+
+ <dimen name="rounded_image_border">5dp</dimen>
</resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 2b57ae3b6..8c68c25f1 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -27,6 +27,7 @@
<item name="color_bubble_warning">@color/lightred</item>
<item name="color_border">@color/grey800</item>
+ <item name="message_border">@drawable/message_border</item>
<item name="windowActionModeOverlay">true</item>
<item name="android:actionModeBackground">@color/accent</item>
@@ -139,8 +140,8 @@
<item name="colorControlActivated">@color/accent</item>
<item name="text_Color_Main">@color/realwhite</item>
- <item name="color_background_primary">@color/grey900</item>
- <item name="color_background_secondary">@color/realblack</item>
+ <item name="color_background_primary">@color/grey800</item>
+ <item name="color_background_secondary">@color/grey900</item>
<item name="color_warning">@color/red_a700</item>
<item name="TextColorOnline">@color/green500</item>
<item name="TextColorError">@color/red500</item>
@@ -155,7 +156,8 @@
<item name="color_bubble_date">@color/darkgreen</item>
<item name="color_bubble_warning">@color/darkred</item>
- <item name="color_border">@color/grey800</item>
+ <item name="color_border">@color/grey500</item>
+ <item name="message_border">@drawable/message_border_dark</item>
<item name="windowActionModeOverlay">true</item>
<item name="android:actionModeBackground">@color/accent</item>