From 0b7e4c09f496a03ff6803b383c096120bb9162cf Mon Sep 17 00:00:00 2001 From: tobiasKaminsky Date: Mon, 12 Oct 2020 16:14:52 +0200 Subject: [PATCH] streamline colors Signed-off-by: tobiasKaminsky --- .../com/nextcloud/talk/activities/BaseActivity.kt | 2 +- .../messages/MagicIncomingTextMessageViewHolder.kt | 6 +++--- .../MagicOutcomingTextMessageViewHolder.kt | 10 +++++----- .../messages/MagicSystemMessageViewHolder.java | 7 +++++-- app/src/main/res/drawable/accent_circle.xml | 2 +- app/src/main/res/layout/controller_chat.xml | 4 ++-- .../res/layout/controller_conversations_rv.xml | 1 + .../res/layout/controller_server_selection.xml | 6 ++++-- .../layout/item_custom_incoming_text_message.xml | 2 +- app/src/main/res/layout/item_system_message.xml | 2 +- .../rv_item_conversation_with_last_message.xml | 4 ++-- app/src/main/res/layout/rv_item_mention.xml | 2 +- app/src/main/res/values-night/colors.xml | 10 +++------- app/src/main/res/values/colors.xml | 14 +++----------- app/src/main/res/values/styles.xml | 6 +++--- app/src/main/res/xml/chip_others.xml | 2 +- app/src/main/res/xml/chip_you.xml | 2 +- 17 files changed, 38 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt index 006adc33d..f55f66caa 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt @@ -108,7 +108,7 @@ open class BaseActivity : AppCompatActivity() { LovelyStandardDialog(this) .setTopColorRes(R.color.nc_darkRed) .setNegativeButtonColorRes(R.color.nc_darkRed) - .setPositiveButtonColorRes(R.color.colorPrimaryDark) + .setPositiveButtonColorRes(R.color.colorPrimary) .setIcon(R.drawable.ic_security_white_24dp) .setTitle(R.string.nc_certificate_dialog_title) .setMessage(dialogText) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt index 72b39267e..11301ffcf 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt @@ -247,14 +247,14 @@ class MagicIncomingTextMessageViewHolder(incomingView: View) : MessageHolders ?: context!!.getText(R.string.nc_nick_guest) quotedMessage?.text = parentChatMessage.text - quotedUserName?.setTextColor(context!!.resources.getColor(R.color.colorPrimary)) + quotedUserName?.setTextColor(context!!.resources.getColor(R.color.textColorMaxContrast)) quotedMessageTime?.text = DateFormatter.format(parentChatMessage.createdAt, DateFormatter.Template.TIME) quotedMessageTime?.setTextColor(context!!.resources.getColor(R.color.warm_grey_four)) - quoteColoredView?.setBackgroundResource(R.color.colorPrimary) + quoteColoredView?.setBackgroundResource(R.color.textColorMaxContrast) quotedChatMessageView?.visibility = View.VISIBLE } ?: run { quotedChatMessageView?.visibility = View.GONE } } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt index 27266ffe3..08f77b2c1 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt @@ -133,16 +133,16 @@ class MagicOutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessage val resources = sharedApplication!!.resources if (message.isGrouped) { val bubbleDrawable = getMessageSelector( - resources.getColor(R.color.bg_message_list_outcoming_bubble), + resources.getColor(R.color.colorPrimary), resources.getColor(R.color.transparent), - resources.getColor(R.color.bg_message_list_outcoming_bubble), + resources.getColor(R.color.colorPrimary), R.drawable.shape_grouped_outcoming_message) ViewCompat.setBackground(bubble, bubbleDrawable) } else { val bubbleDrawable = getMessageSelector( - resources.getColor(R.color.bg_message_list_outcoming_bubble), + resources.getColor(R.color.colorPrimary), resources.getColor(R.color.transparent), - resources.getColor(R.color.bg_message_list_outcoming_bubble), + resources.getColor(R.color.colorPrimary), R.drawable.shape_outcoming_message) ViewCompat.setBackground(bubble, bubbleDrawable) } @@ -187,4 +187,4 @@ class MagicOutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessage ButterKnife.bind(this, itemView) this.realView = itemView } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java index 2e688c841..301a7397d 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java @@ -26,7 +26,7 @@ import android.graphics.drawable.Drawable; import android.text.Spannable; import android.text.SpannableString; import android.view.View; -import androidx.core.view.ViewCompat; + import com.nextcloud.talk.R; import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.models.json.chat.ChatMessage; @@ -35,7 +35,10 @@ import com.nextcloud.talk.utils.preferences.AppPreferences; import com.stfalcon.chatkit.messages.MessageHolders; import java.util.Map; + import javax.inject.Inject; + +import androidx.core.view.ViewCompat; import autodagger.AutoInjector; @AutoInjector(NextcloudTalkApplication.class) @@ -63,7 +66,7 @@ public class MagicSystemMessageViewHolder extends MessageHolders.IncomingTextMes pressedColor = normalColor; - mentionColor = resources.getColor(R.color.nc_author_text); + mentionColor = resources.getColor(R.color.textColorMaxContrast); Drawable bubbleDrawable = DisplayUtils.getMessageSelector(normalColor, resources.getColor(R.color.transparent), pressedColor, diff --git a/app/src/main/res/drawable/accent_circle.xml b/app/src/main/res/drawable/accent_circle.xml index 1a0e70aca..3c6519214 100644 --- a/app/src/main/res/drawable/accent_circle.xml +++ b/app/src/main/res/drawable/accent_circle.xml @@ -22,5 +22,5 @@ + android:color="@color/colorPrimary"/> diff --git a/app/src/main/res/layout/controller_chat.xml b/app/src/main/res/layout/controller_chat.xml index 024ed7f13..3e1c2c86a 100644 --- a/app/src/main/res/layout/controller_chat.xml +++ b/app/src/main/res/layout/controller_chat.xml @@ -108,8 +108,8 @@ app:outcomingBubblePaddingLeft="@dimen/message_bubble_corners_padding" app:outcomingBubblePaddingRight="@dimen/message_bubble_corners_padding" app:outcomingBubblePaddingTop="@dimen/message_bubble_corners_padding" - app:outcomingDefaultBubbleColor="@color/bg_message_list_outcoming_bubble" - app:outcomingDefaultBubblePressedColor="@color/bg_message_list_outcoming_bubble" + app:outcomingDefaultBubbleColor="@color/colorPrimary" + app:outcomingDefaultBubblePressedColor="@color/colorPrimary" app:outcomingDefaultBubbleSelectedColor="@color/transparent" app:outcomingImageTimeTextSize="12sp" app:outcomingTextColor="@color/nc_outcoming_text_default" diff --git a/app/src/main/res/layout/controller_conversations_rv.xml b/app/src/main/res/layout/controller_conversations_rv.xml index 9c0cd7f6c..9397b7948 100644 --- a/app/src/main/res/layout/controller_conversations_rv.xml +++ b/app/src/main/res/layout/controller_conversations_rv.xml @@ -91,6 +91,7 @@ android:layout_gravity="bottom|end" android:backgroundTint="@color/colorPrimary" android:layout_margin="16dp" + app:borderWidth="0dp" app:tint="@color/white" app:srcCompat="@drawable/ic_add_white_24px"/> diff --git a/app/src/main/res/layout/controller_server_selection.xml b/app/src/main/res/layout/controller_server_selection.xml index 11b22d549..7e0822bbc 100644 --- a/app/src/main/res/layout/controller_server_selection.xml +++ b/app/src/main/res/layout/controller_server_selection.xml @@ -65,7 +65,8 @@ android:text="@string/nc_get_from_provider" android:textAlignment="center" android:textAllCaps="true" - android:textColor="@color/nc_light_blue_color" /> + android:alpha="0.5" + android:textColor="@color/textColorOnPrimaryBackground" /> + android:alpha="0.5" + android:textColor="@color/textColorOnPrimaryBackground" /> + android:textColor="@color/textColorMaxContrast" /> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index adbbabf07..e343fa4f7 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -22,23 +22,19 @@ --> - #9FBDCC - + #ffffff #222222 #222222 #D8D8D8 - #65A7CA - #0083C9 - #6F6F6F @android:color/holo_purple #222222 #484848 - #003F62 + #8c8c8c #313031 #15FFFFFF - \ No newline at end of file + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index b40654222..e93c0d118 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -21,8 +21,7 @@ #0082C9 - #006AA3 - #007CC2 + #ffffff #FFFFFF @@ -30,9 +29,7 @@ #37505D - #37505D - @color/warm_grey_two - @color/warm_grey_four + #000000 #FFFFFF #C98879 @@ -41,12 +38,12 @@ #D32F2F #006400 @color/per70white - #7FC0E3 #E8E8E8 #757575 #D5D5D5 #E9FFFFFF #111111 + #767676 #7Fffffff @@ -59,14 +56,9 @@ #FFFFFF @color/white60 - #0083C9 - @color/white #333333 - #EFEFEF - @color/colorPrimary - #65A7CA #46ffffff diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5122e4efe..e40d24ebe 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -24,7 +24,7 @@