diff --git a/src/cheogram/res/values/themes.xml b/src/cheogram/res/values/themes.xml index cdd7ad24954aa885d4b2631136f636b18b4b9b17..be1f6c87d221f31340dde504273b1da3ebd6de0e 100644 --- a/src/cheogram/res/values/themes.xml +++ b/src/cheogram/res/values/themes.xml @@ -7,6 +7,12 @@ #1E0036 @style/ThemeOverlay.AppCompat.Light + ?colorPrimary + ?color_background_primary + #00CCCCCC + #FFCCCCCC + #DDCCCCCC + @color/grey50 @color/grey200 @color/grey300 @@ -62,11 +68,8 @@ @drawable/ic_call_black54_24dp @drawable/ic_videocam_black54_24dp - - @drawable/message_bubble_received_white - @drawable/message_bubble_sent - + @drawable/message_bubble_received @@ -155,6 +158,12 @@ @style/ThemeOverlay.AppCompat.Dark @color/black + ?colorPrimary + ?color_background_primary + #00424242 + #FF424242 + #DD424242 + @color/grey800 @color/grey900 @color/grey700 @@ -218,14 +227,6 @@ @drawable/ic_attach_photo_white @drawable/ic_attach_record_white - - @drawable/message_bubble_received_grey - - @drawable/message_bubble_sent_grey - - @drawable/message_bubble_received_dark - - @color/perpy @color/green900 @@ -309,19 +310,17 @@ #1E0036 @color/yeller + ?colorPrimary + ?color_background_primary + #00000000 + #FF000000 + #DD000000 + #0E0020 @color/black #1E0036 @color/black26 - - @drawable/message_bubble_received_grey - - @drawable/message_bubble_sent_grey - - @drawable/message_bubble_received_obsidian - - #1E0036 diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 5994f820fd6458781c6e7da8800f26c1bab12f26..3c2254e51574e21c66c3a510b91aed0ce380dc81 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -5,6 +5,7 @@ import android.app.Activity; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; +import android.graphics.PorterDuff; import android.graphics.Typeface; import android.net.Uri; import android.preference.PreferenceManager; @@ -65,6 +66,7 @@ import eu.siacs.conversations.ui.text.QuoteSpan; import eu.siacs.conversations.ui.util.AvatarWorkerTask; import eu.siacs.conversations.ui.util.MyLinkify; import eu.siacs.conversations.ui.util.QuoteHelper; +import eu.siacs.conversations.ui.util.StyledAttributes; import eu.siacs.conversations.ui.util.ViewUtil; import eu.siacs.conversations.ui.widget.ClickableMovementMethod; import eu.siacs.conversations.utils.CryptoHelper; @@ -850,16 +852,14 @@ public class MessageAdapter extends ArrayAdapter { } if (isInValidSession) { - int bubble; if (!mUseGreenBackground) { - bubble = activity.getThemeResource(R.attr.message_bubble_received_monochrome, R.drawable.message_bubble_received_white); - } else { - bubble = activity.getThemeResource(R.attr.message_bubble_received_green, R.drawable.message_bubble_received); + viewHolder.message_box.getBackground().setColorFilter( + StyledAttributes.getColor(activity, mUseGreenBackground ? R.attr.message_bubble_received_bg : R.attr.color_background_primary), + PorterDuff.Mode.SRC_ATOP + ); } - viewHolder.message_box.setBackgroundResource(bubble); viewHolder.encryption.setVisibility(View.GONE); } else { - viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_warning); viewHolder.encryption.setVisibility(View.VISIBLE); if (omemoEncryption && !message.isTrusted()) { viewHolder.encryption.setText(R.string.not_trusted); diff --git a/src/main/res/drawable-hdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-hdpi/message_bubble_received_dark.9.png deleted file mode 100644 index cddd1947fa4530d02f79f16b3186f499d09300d7..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-hdpi/message_bubble_received_dark.9.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png deleted file mode 100644 index acba47c98fa54e003fe10f7696bd8792f30551ad..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png deleted file mode 100644 index 8bdfcc79c8353a572f1c21f34166d80ff78b9c4f..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png deleted file mode 100644 index ed8c0273ecd5b94c2672744a98dfff5033284b3d..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/message_bubble_sent.9.png b/src/main/res/drawable-hdpi/message_bubble_sent.9.png deleted file mode 100644 index 487a8f79a9494f0eca563305ba6e4ab6e10aa54d..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-hdpi/message_bubble_sent.9.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png deleted file mode 100644 index a0e998c002e6f5747c762d3105459c5700d88252..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/message_bubble_received.9.png b/src/main/res/drawable-mdpi/message_bubble_received.9.png deleted file mode 100644 index bdf3e6c0040498b49440aaee38f308f383edb608..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-mdpi/message_bubble_received.9.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-mdpi/message_bubble_received_dark.9.png deleted file mode 100644 index 187ad2be551aa29a2aba62aec932ecd4228de156..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-mdpi/message_bubble_received_dark.9.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png deleted file mode 100644 index 3e5e62c5e7dc4d3912829e807ab5cb1df43c84a7..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/message_bubble_received_obsidian.9.png b/src/main/res/drawable-mdpi/message_bubble_received_obsidian.9.png deleted file mode 100644 index 7bf1c9609008de68a6a36ff206a7b0f230de22b3..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-mdpi/message_bubble_received_obsidian.9.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png deleted file mode 100644 index 66862dbe5b5b782569d79a95451fd38ba7048a05..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png deleted file mode 100644 index e8d69cc3f0cf669edb73b6389ef87f07093b997e..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/message_bubble_sent.9.png b/src/main/res/drawable-mdpi/message_bubble_sent.9.png deleted file mode 100644 index f7c63c8f77a6323e91f798f9a57d1659fbf4e6f9..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-mdpi/message_bubble_sent.9.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png deleted file mode 100644 index e1a0bfe646c8d047f84dd72500a4a41a3cb2e42f..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/message_bubble_received.9.png b/src/main/res/drawable-xhdpi/message_bubble_received.9.png deleted file mode 100644 index d68c8e6e1845c25bb7b4bf952f8bf1325345e26b..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xhdpi/message_bubble_received.9.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png deleted file mode 100644 index d68c8e6e1845c25bb7b4bf952f8bf1325345e26b..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png deleted file mode 100644 index 2acae4964611e408b465f820f4dcf672bb541b1b..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_obsidian.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_obsidian.9.png deleted file mode 100644 index 4a6feb60b28d9c23ebaf57dc1384bd87ae43c65c..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_obsidian.9.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png deleted file mode 100644 index 9b46f4656a69739e32e7de6c0fd1df11fd42ba78..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png deleted file mode 100644 index a735ad8749c6fc03c82f38b897d7268e86a29553..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png deleted file mode 100644 index aa7a6d1fdf38309a2abea4a64539977e90ca0119..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png deleted file mode 100644 index 85dd6223ca5c0018abbc39ce0b8d64f788fc8f08..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png deleted file mode 100644 index ac330755b09cdcc324a3a2bcf601dd5693f14292..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png deleted file mode 100644 index 08c64ad9351e2323f1ece5e7f98addf782026358..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png deleted file mode 100644 index 348b7de5c22142d8a92ffd88d2778095cd8bff36..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_obsidian.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_obsidian.9.png deleted file mode 100644 index cdaf34dae255308c7a2cf740bd7e2509fffbe08f..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_obsidian.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png deleted file mode 100644 index 2ff0fbaf203644a01c713b3199dd55c75dc6c4ae..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png deleted file mode 100644 index 59925addb0e91bbedcd3f811fbd66110eb35ea85..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png deleted file mode 100644 index 17f85b64bb665ac7e851876ff0edbd188f770d60..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png deleted file mode 100644 index 585dcacc713df36ce976b2150468c64425b4ef40..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png deleted file mode 100644 index 3c6d430297f7a65ca530d9684ea1d0937378c95f..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png deleted file mode 100644 index 27dc6ba879c252337fbe63efb23248b3249226ff..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png deleted file mode 100644 index 3d0dd4734fd9b320d9e4ba622149f55ff8091dc6..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_obsidian.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_obsidian.9.png deleted file mode 100644 index 26f4b8ac4d989b337c5bae3071f0b07c4bf4beae..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_obsidian.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png deleted file mode 100644 index 0885149b352de1dcd2ef5bb1b36a370f5207bb0b..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png deleted file mode 100644 index 25511916aefa1f1b59c7d45c913a881ba5b83306..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png deleted file mode 100644 index 2f3049fadf56560dbece216968ba4ce558872c1e..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png deleted file mode 100644 index 7939893ace76d49e124e1af849491cf9ac9ddd90..0000000000000000000000000000000000000000 Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png and /dev/null differ diff --git a/src/main/res/drawable/ic_message_bubble_received.xml b/src/main/res/drawable/ic_message_bubble_received.xml new file mode 100644 index 0000000000000000000000000000000000000000..348a194b441f747526cba5a672e1154622505450 --- /dev/null +++ b/src/main/res/drawable/ic_message_bubble_received.xml @@ -0,0 +1,17 @@ + + + + diff --git a/src/main/res/drawable/message_bubble_received.xml b/src/main/res/drawable/message_bubble_received.xml new file mode 100644 index 0000000000000000000000000000000000000000..6207f4a30a340ac54f03919fb65689183978d315 --- /dev/null +++ b/src/main/res/drawable/message_bubble_received.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/res/drawable/message_bubble_sent.xml b/src/main/res/drawable/message_bubble_sent.xml new file mode 100644 index 0000000000000000000000000000000000000000..6048f0a1d87c46288b25566de490145e30a7cdb1 --- /dev/null +++ b/src/main/res/drawable/message_bubble_sent.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index 795af12d803b570fec7812c2e9b60fa51ad77ba7..2227fbd36a7ec52d3b06a330b6e9ea9e320b76d2 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -1,13 +1,14 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:clipToPadding="false" + android:paddingBottom="3dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="3dp"> + android:elevation="3dp" + android:background="?attr/message_bubble_received" + android:longClickable="true" + android:minHeight="53dp"> + layout="@layout/message_content" /> + android:gravity="center_vertical" + android:textAppearance="@style/TextAppearance.Conversations.Caption.OnDark.Bold" + android:visibility="gone" /> + android:gravity="center_vertical" + android:textAppearance="@style/TextAppearance.Conversations.Caption.OnDark.Bold" /> + android:gravity="center_vertical" + android:text="@string/sending" + android:textAppearance="@style/TextAppearance.Conversations.Caption" /> diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index 1e669efe1820371cd43dbe3ae0a87b68d91fab68..ca6b2e6bb2355a7dcebaeb3fa4a0368a59548531 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -4,6 +4,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" + android:clipToPadding="false" android:paddingLeft="8dp" android:paddingTop="3dp" android:paddingRight="8dp" @@ -38,9 +39,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_marginLeft="-4dp" + android:layout_marginRight="0dp" + android:paddingRight="20dp" android:layout_toLeftOf="@+id/message_photo_box" - android:background="?attr/message_bubble_sent" + android:translationY="-2dp" + android:elevation="3dp" + android:background="@drawable/message_bubble_sent" android:longClickable="true" android:minHeight="53dp"> @@ -64,15 +68,15 @@ + android:gravity="center_vertical" + android:textAppearance="@style/TextAppearance.Conversations.Caption.OnDark.Bold" + android:visibility="gone" /> - - + + + + + + + @@ -128,4 +133,4 @@ - \ No newline at end of file + diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 9e757a626a71fc85142c00b818712efadf31e7bc..72153fa6f7db8e432d6114eedc6d13bd5a9fd01a 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -63,7 +63,7 @@ @drawable/ic_videocam_black54_24dp - @drawable/message_bubble_received_white + @drawable/message_bubble_received @drawable/message_bubble_sent @@ -219,11 +219,11 @@ @drawable/ic_attach_record_white - @drawable/message_bubble_received_grey + @drawable/message_bubble_received - @drawable/message_bubble_sent_grey + @drawable/message_bubble_sent - @drawable/message_bubble_received_dark + @drawable/message_bubble_received @color/green900_desaturated