From ebaa9dcfab701117ff6b0e13979ee46b941c4607 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Wed, 25 Apr 2018 22:15:58 +0200 Subject: some theme fixes --- .../pixart/messenger/ui/adapter/MessageAdapter.java | 20 ++++++-------------- src/main/res/layout/activity_contact_details.xml | 1 + src/main/res/layout/contact_key.xml | 4 ++-- src/main/res/layout/message_received.xml | 5 +++-- src/main/res/layout/message_sent.xml | 3 +++ src/main/res/values/colors.xml | 1 + 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java index 707deed2b..1b343aa67 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java @@ -318,7 +318,6 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie break; } if (error && type == SENT) { - viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_Waring); viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_Waring); DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message); if (file.exists()) { @@ -336,14 +335,6 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie viewHolder.resend_button.setText(R.string.send_again); viewHolder.resend_button.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_resend_grey600_48dp, 0, 0, 0); viewHolder.resend_button.setOnClickListener(v -> mConversationFragment.resendMessage(message)); - } else if (!error && type == SENT) { - viewHolder.resend_button.setVisibility(View.GONE); - if (darkBackground) { - viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_OnDark); - } else { - viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption); - } - viewHolder.time.setTextColor(this.getMessageTextColor(darkBackground, false)); } else { if (darkBackground) { viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_OnDark); @@ -352,6 +343,9 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie } viewHolder.time.setTextColor(this.getMessageTextColor(darkBackground, false)); } + if (!error && type == SENT) { + viewHolder.resend_button.setVisibility(View.GONE); + } if (message.getEncryption() == Message.ENCRYPTION_NONE) { viewHolder.indicator.setVisibility(View.GONE); } else { @@ -544,7 +538,7 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie } else { viewHolder.messageBody.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Body1); } - viewHolder.messageBody.setHighlightColor(ContextCompat.getColor(activity, darkBackground ? R.color.grey800 : R.color.grey500)); + viewHolder.messageBody.setHighlightColor(darkBackground ? type == SENT ? ContextCompat.getColor(activity, R.color.black26) : ContextCompat.getColor(activity, R.color.grey800) : ContextCompat.getColor(activity, R.color.grey500)); viewHolder.messageBody.setTypeface(null, Typeface.NORMAL); if (message.getBody() != null) { final String nick = UIHelper.getMessageDisplayName(message); @@ -878,7 +872,7 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie } } - boolean darkBackground = type == SENT && !isInValidSession || activity.isDarkTheme(); + boolean darkBackground = type == RECEIVED && !isInValidSession || activity.isDarkTheme(); if (type == DATE_SEPARATOR) { if (UIHelper.today(message.getTimeSent())) { @@ -1007,9 +1001,7 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie } else { viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_warning); viewHolder.encryption.setVisibility(View.VISIBLE); - if (!darkBackground) { - viewHolder.encryption.setTextColor(activity.getWarningTextColor()); - } + viewHolder.encryption.setTextColor(activity.getWarningTextColor()); if (omemoEncryption && !message.isTrusted()) { viewHolder.encryption.setText(R.string.not_trusted); } else { diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index 93fdffbe9..7c93e5be2 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -33,6 +33,7 @@ diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml index 8e908881c..dec322f68 100644 --- a/src/main/res/layout/contact_key.xml +++ b/src/main/res/layout/contact_key.xml @@ -47,7 +47,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:alpha="?attr/icon_alpha" - android:background="?attr/color_background_secondary" + android:background="?attr/selectableItemBackgroundBorderless" android:padding="@dimen/image_button_padding" android:src="?attr/icon_remove" android:visibility="gone" /> @@ -57,7 +57,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:alpha="?attr/icon_alpha" - android:background="?attr/color_background_secondary" + android:background="?attr/selectableItemBackgroundBorderless" android:padding="@dimen/image_button_padding" android:src="?attr/icon_enable_undecided_device" android:visibility="gone" /> diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index 2460367e5..dbc379aaf 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -65,7 +65,7 @@ android:layout_marginRight="4sp" android:alpha="0.70" android:gravity="center_vertical" - android:src="@drawable/ic_lock_white_18dp" /> + android:src="@drawable/ic_lock_black_18dp" /> + android:src="@drawable/ic_mode_edit_black_18dp" /> @@ -91,6 +92,7 @@ android:layout_height="?attr/TextSizeCaption" android:layout_gravity="center_vertical" android:layout_marginLeft="4sp" + android:alpha="0.54" android:gravity="center_vertical" android:src="@drawable/ic_received_indicator" /> @@ -101,6 +103,7 @@ android:layout_gravity="center_vertical" android:layout_marginLeft="-8sp" android:adjustViewBounds="false" + android:alpha="0.54" android:gravity="center_vertical" android:src="@drawable/ic_read_indicator" /> diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 88b2dafb8..ffb542fc1 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -6,6 +6,7 @@ #ff0091ea #de000309 #8a000309 + #42000000 #1f000000 #ff000000 #ffe2e7f1 -- cgit v1.2.3