diff options
author | Mario Danic <mario@lovelyhq.com> | 2019-09-23 15:26:13 +0300 |
---|---|---|
committer | Mario Danic <mario@lovelyhq.com> | 2019-09-26 11:39:07 +0300 |
commit | ecfe91f36fb148bed4e6a1f4251828feb5d9617f (patch) | |
tree | 43513fc06327b607eca95d1bba0a437b2eb2fcea /app/src | |
parent | df7f50ba01b2f48e66458bbdccc92b35ddc81282 (diff) |
Significant improvements to the dark theme
Signed-off-by: Mario Danic <mario@lovelyhq.com>
Diffstat (limited to 'app/src')
20 files changed, 77 insertions, 183 deletions
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java index fc71c46cf..07f0752a1 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.java @@ -61,10 +61,13 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv private Conversation conversation; private UserEntity userEntity; + private Context context; - public ConversationItem(Conversation conversation, UserEntity userEntity) { + public ConversationItem(Conversation conversation, UserEntity userEntity, + Context activityContext) { this.conversation = conversation; this.userEntity = userEntity; + this.context = activityContext; } @Override @@ -97,8 +100,8 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv @Override public void bindViewHolder(FlexibleAdapter<IFlexible> adapter, ConversationItemViewHolder holder, int position, List<Object> payloads) { - Context context = NextcloudTalkApplication.Companion.getSharedApplication().getApplicationContext(); - + Context appContext = + NextcloudTalkApplication.Companion.getSharedApplication().getApplicationContext(); holder.dialogAvatar.setController(null); if (adapter.hasFilter()) { @@ -152,13 +155,13 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv String text; if (conversation.getLastMessage().getMessageType().equals(ChatMessage.MessageType.REGULAR_TEXT_MESSAGE)) { if (conversation.getLastMessage().getActorId().equals(userEntity.getUserId())) { - text = String.format(context.getString(R.string.nc_formatted_message_you), conversation.getLastMessage().getLastMessageDisplayText()); + text = String.format(appContext.getString(R.string.nc_formatted_message_you), + conversation.getLastMessage().getLastMessageDisplayText()); } else { authorDisplayName = !TextUtils.isEmpty(conversation.getLastMessage().getActorDisplayName()) ? conversation.getLastMessage().getActorDisplayName() : - "guests".equals(conversation.getLastMessage().getActorType()) ? - NextcloudTalkApplication.Companion.getSharedApplication().getString(R.string.nc_guest) : ""; - text = String.format(context.getString(R.string.nc_formatted_message), + "guests".equals(conversation.getLastMessage().getActorType()) ? appContext.getString(R.string.nc_guest) : ""; + text = String.format(appContext.getString(R.string.nc_formatted_message), authorDisplayName, conversation.getLastMessage().getLastMessageDisplayText()); } @@ -222,14 +225,12 @@ public class ConversationItem extends AbstractFlexibleItem<ConversationItem.Conv } break; case ROOM_GROUP_CALL: - holder.dialogAvatar.getHierarchy().setImage(new BitmapDrawable(DisplayUtils - .getRoundedBitmapFromVectorDrawableResource(context.getResources(), - R.drawable.ic_people_group_white_24px)), 100, true); + holder.dialogAvatar.getHierarchy().setImage(new BitmapDrawable(DisplayUtils.getRoundedBitmapFromVectorDrawableResource(context.getResources(), R.drawable.ic_people_group_white_24px)), 100, true); break; case ROOM_PUBLIC_CALL: - holder.dialogAvatar.getHierarchy().setImage(new BitmapDrawable(DisplayUtils - .getRoundedBitmapFromVectorDrawableResource(context.getResources(), - R.drawable.ic_link_white_24px)), 100, true); + holder.dialogAvatar.getHierarchy().setImage(new BitmapDrawable(DisplayUtils + .getRoundedBitmapFromVectorDrawableResource(context.getResources(), + R.drawable.ic_link_white_24px)), 100, true); break; default: holder.dialogAvatar.setVisibility(View.GONE); diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java index e6f732901..9855e8dfb 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java @@ -130,10 +130,9 @@ public class MagicIncomingTextMessageViewHolder messageAuthor.setVisibility(View.GONE); } - Resources resources = context.getResources(); - int bg_bubble_color = DisplayUtils.isDarkModeActive(context) ? - resources.getColor(R.color.bg_message_list_incoming_bubble_dark2) : - resources.getColor(R.color.bg_message_list_incoming_bubble); + Resources resources = itemView.getResources(); + + int bg_bubble_color = resources.getColor(R.color.bg_message_list_incoming_bubble); int bubbleResource = R.drawable.shape_incoming_message; @@ -171,7 +170,7 @@ public class MagicIncomingTextMessageViewHolder individualHashMap.get("name"), individualHashMap.get("type"), userUtils.getUserById(message.getActiveUser().getUserId()), - R.xml.chip_accent_background); + R.xml.chip_you); } else { messageString = DisplayUtils.searchAndReplaceWithMentionSpan(messageText.getContext(), @@ -180,7 +179,7 @@ public class MagicIncomingTextMessageViewHolder individualHashMap.get("name"), individualHashMap.get("type"), userUtils.getUserById(message.getActiveUser().getUserId()), - R.xml.chip_incoming_others); + R.xml.chip_others); } } else if (individualHashMap.get("type").equals("file")) { diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java index 386f8ec5c..aa91bfc27 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java @@ -94,25 +94,14 @@ public class MagicOutcomingTextMessageViewHolder extends MessageHolders.Outcomin Map<String, String> individualHashMap = message.getMessageParameters().get(key); if (individualHashMap != null) { if (individualHashMap.get("type").equals("user") || individualHashMap.get("type").equals("guest") || individualHashMap.get("type").equals("call")) { - if (!individualHashMap.get("id").equals(message.getActiveUser().getUserId())) { - messageString = - DisplayUtils.searchAndReplaceWithMentionSpan(messageText.getContext(), - messageString, - individualHashMap.get("id"), - individualHashMap.get("name"), - individualHashMap.get("type"), - userUtils.getUserById(message.getActiveUser().getUserId()), - R.xml.chip_outgoing_others); - } else { - messageString = - DisplayUtils.searchAndReplaceWithMentionSpan(messageText.getContext(), - messageString, - individualHashMap.get("id"), - individualHashMap.get("name"), - individualHashMap.get("type"), - userUtils.getUserById(message.getActiveUser().getUserId()), - R.xml.chip_outgoing_own_mention); - } + messageString = + DisplayUtils.searchAndReplaceWithMentionSpan(messageText.getContext(), + messageString, + individualHashMap.get("id"), + individualHashMap.get("name"), + individualHashMap.get("type"), + userUtils.getUserById(message.getActiveUser().getUserId()), + R.xml.chip_others); } else if (individualHashMap.get("type").equals("file")) { itemView.setOnClickListener(v -> { Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(individualHashMap.get("link"))); @@ -132,14 +121,15 @@ public class MagicOutcomingTextMessageViewHolder extends MessageHolders.Outcomin Resources resources = NextcloudTalkApplication.Companion.getSharedApplication().getResources(); if (message.isGrouped) { - Drawable bubbleDrawable = DisplayUtils.getMessageSelector(resources.getColor(R.color.colorPrimary), + Drawable bubbleDrawable = + DisplayUtils.getMessageSelector(resources.getColor(R.color.bg_message_list_outcoming_bubble), resources.getColor(R.color.transparent), - resources.getColor(R.color.colorPrimary), R.drawable.shape_grouped_outcoming_message); + resources.getColor(R.color.bg_message_list_outcoming_bubble), R.drawable.shape_grouped_outcoming_message); ViewCompat.setBackground(bubble, bubbleDrawable); } else { - Drawable bubbleDrawable = DisplayUtils.getMessageSelector(resources.getColor(R.color.colorPrimary), + Drawable bubbleDrawable = DisplayUtils.getMessageSelector(resources.getColor(R.color.bg_message_list_outcoming_bubble), resources.getColor(R.color.transparent), - resources.getColor(R.color.colorPrimary), R.drawable.shape_outcoming_message); + resources.getColor(R.color.bg_message_list_outcoming_bubble), R.drawable.shape_outcoming_message); ViewCompat.setBackground(bubble, bubbleDrawable); } 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 8865a16b8..0340e6fd7 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 @@ -56,22 +56,14 @@ public class MagicSystemMessageViewHolder extends MessageHolders.IncomingTextMes public void onBind(ChatMessage message) { super.onBind(message); - Resources resources = NextcloudTalkApplication.Companion.getSharedApplication().getResources(); - int normalColor; + Resources resources = itemView.getResources(); + int normalColor = resources.getColor(R.color.bg_message_list_incoming_bubble); int pressedColor; - int mentionYouColor; - int mentionOthersColor; + int mentionColor; + - if(DisplayUtils.isDarkModeActive(context)) { - normalColor = resources.getColor(R.color.bg_system_bubble_dark); - mentionYouColor = resources.getColor(R.color.fg_mention_you_dark); - mentionOthersColor = resources.getColor(R.color.fg_mention_others_dark); - } else { - normalColor = resources.getColor(R.color.white_two); - mentionYouColor = resources.getColor(R.color.fg_mention_you); - mentionOthersColor = resources.getColor(R.color.fg_mention_others); - } pressedColor = normalColor; + mentionColor = resources.getColor(R.color.nc_author_text); Drawable bubbleDrawable = DisplayUtils.getMessageSelector(normalColor, resources.getColor(R.color.transparent), pressedColor, @@ -83,18 +75,8 @@ public class MagicSystemMessageViewHolder extends MessageHolders.IncomingTextMes if (message.getMessageParameters() != null && message.getMessageParameters().size() > 0) { for (String key : message.getMessageParameters().keySet()) { Map<String, String> individualHashMap = message.getMessageParameters().get(key); - int color; if (individualHashMap != null && (individualHashMap.get("type").equals("user") || individualHashMap.get("type").equals("guest") || individualHashMap.get("type").equals("call"))) { - - if (individualHashMap.get("id").equals(message.getActiveUser().getUserId())) { - color = mentionYouColor; - } else { - color = mentionOthersColor; - } - - messageString = - DisplayUtils.searchAndColor(messageString, - "@" + individualHashMap.get("name"), color); + messageString = DisplayUtils.searchAndColor(messageString, "@" + individualHashMap.get("name"), mentionColor); } } } diff --git a/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java b/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java index e431e1eae..8e1d21501 100644 --- a/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java +++ b/app/src/main/java/com/nextcloud/talk/callbacks/MentionAutocompleteCallback.java @@ -67,7 +67,7 @@ public class MentionAutocompleteCallback implements AutocompleteCallback<Mention Spans.MentionChipSpan mentionChipSpan = new Spans.MentionChipSpan(DisplayUtils.getDrawableForMentionChipSpan(context, item.getId(), item.getLabel(), conversationUser, item.getSource(), - R.xml.chip_text_entry, editText), + R.xml.chip_you, editText), BetterImageSpan.ALIGN_CENTER, item.getId(), item.getLabel()); editable.setSpan(mentionChipSpan, start, start + replacementStringBuilder.toString().length(), diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java index cbe252e70..0294787a1 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java @@ -347,8 +347,11 @@ public class ConversationsListController extends BaseController implements Searc for (int i = 0; i < roomsOverall.getOcs().getData().size(); i++) { conversation = roomsOverall.getOcs().getData().get(i); if (shouldUseLastMessageLayout) { - ConversationItem conversationItem = new ConversationItem(conversation, currentUser); - callItems.add(conversationItem); + if (getActivity() != null) { + ConversationItem conversationItem = new ConversationItem(conversation + , currentUser, getActivity()); + callItems.add(conversationItem); + } } else { CallItem callItem = new CallItem(conversation, currentUser); callItems.add(callItem); diff --git a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java index 8bcc9c3f6..6f848c7a9 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.java @@ -61,8 +61,6 @@ import androidx.appcompat.widget.AppCompatDrawableManager; import androidx.core.content.ContextCompat; import androidx.core.graphics.drawable.DrawableCompat; import androidx.emoji.text.EmojiCompat; -import androidx.emoji.text.EmojiSpan; -import androidx.emoji.text.TypefaceEmojiSpan; import com.facebook.common.executors.UiThreadImmediateExecutorService; import com.facebook.common.references.CloseableReference; @@ -85,10 +83,8 @@ import com.nextcloud.talk.R; import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.events.UserMentionClickEvent; import com.nextcloud.talk.models.database.UserEntity; +import com.nextcloud.talk.utils.preferences.AppPreferences; import com.nextcloud.talk.utils.text.Spans; -import com.vanniktech.emoji.EmojiManager; -import com.vanniktech.emoji.EmojiRange; -import com.vanniktech.emoji.EmojiUtils; import org.greenrobot.eventbus.EventBus; @@ -96,7 +92,6 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -266,7 +261,7 @@ public class DisplayUtils { boolean isCall = "call".equals(type) || "calls".equals(type); if (!isCall) { - if (chipResource == R.xml.chip_outgoing_others || chipResource == R.xml.chip_accent_background) { + if (chipResource == R.xml.chip_you) { drawable = R.drawable.mention_chip; } else { drawable = R.drawable.accent_circle; @@ -402,7 +397,11 @@ public class DisplayUtils { return drawable; } - public static boolean isDarkModeActive(Context context) { + public static boolean isDarkModeActive(Context context, AppPreferences prefs) { + if (prefs.getTheme().equals("night_yes")) { + return true; + } + int currentNightMode = context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; switch (currentNightMode) { diff --git a/app/src/main/res/drawable/ic_link_white_24px.xml b/app/src/main/res/drawable/ic_link_white_24px.xml index e98dec99d..44c11a81d 100644 --- a/app/src/main/res/drawable/ic_link_white_24px.xml +++ b/app/src/main/res/drawable/ic_link_white_24px.xml @@ -22,7 +22,7 @@ android:autoMirrored="true" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#D5D5D5" android:fillType="nonZero" + <path android:fillColor="@color/bg_message_list_incoming_bubble" android:fillType="nonZero" android:pathData="M0,0l24,0l0,24l-24,0z" android:strokeColor="#00000000" android:strokeWidth="1"/> <path android:fillColor="#FFFFFF" android:fillType="nonZero" diff --git a/app/src/main/res/drawable/ic_people_group_white_24px.xml b/app/src/main/res/drawable/ic_people_group_white_24px.xml index 9e3d9845b..7b16a39a0 100644 --- a/app/src/main/res/drawable/ic_people_group_white_24px.xml +++ b/app/src/main/res/drawable/ic_people_group_white_24px.xml @@ -22,7 +22,7 @@ android:autoMirrored="true" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#D5D5D5" android:fillType="nonZero" + <path android:fillColor="@color/bg_message_list_incoming_bubble" android:fillType="nonZero" android:pathData="M0,0l24,0l0,24l-24,0z" android:strokeColor="#00000000" android:strokeWidth="1"/> <path android:fillColor="#FFFFFF" android:fillType="nonZero" diff --git a/app/src/main/res/drawable/shape_grouped_incoming_message.xml b/app/src/main/res/drawable/shape_grouped_incoming_message.xml index e8012bcf5..a6ee348b7 100644 --- a/app/src/main/res/drawable/shape_grouped_incoming_message.xml +++ b/app/src/main/res/drawable/shape_grouped_incoming_message.xml @@ -28,6 +28,6 @@ android:bottomLeftRadius="@dimen/message_bubble_corners_radius" android:topRightRadius="@dimen/message_bubble_corners_radius" /> - <solid android:color="@color/bg_default" /> + <solid android:color="@color/bg_message_list_incoming_bubble" /> </shape> diff --git a/app/src/main/res/drawable/shape_incoming_message.xml b/app/src/main/res/drawable/shape_incoming_message.xml index 92559940b..b7b2b8f58 100644 --- a/app/src/main/res/drawable/shape_incoming_message.xml +++ b/app/src/main/res/drawable/shape_incoming_message.xml @@ -28,6 +28,6 @@ android:bottomLeftRadius="@dimen/message_bubble_corners_radius" android:topRightRadius="@dimen/message_bubble_corners_radius" /> - <solid android:color="@color/bg_default" /> + <solid android:color="@color/bg_message_list_incoming_bubble" /> </shape>
\ No newline at end of file diff --git a/app/src/main/res/layout/controller_chat.xml b/app/src/main/res/layout/controller_chat.xml index 007be67ae..a85703c88 100644 --- a/app/src/main/res/layout/controller_chat.xml +++ b/app/src/main/res/layout/controller_chat.xml @@ -66,7 +66,7 @@ app:inputButtonMargin="8dp" app:inputButtonWidth="36dp" app:inputHint="@string/nc_hint_enter_a_message" - app:inputTextColor="@color/fg_default" + app:inputTextColor="@color/nc_incoming_text_default" app:inputTextSize="16sp" app:showAttachmentButton="true" /> diff --git a/app/src/main/res/layout/rv_item_mention.xml b/app/src/main/res/layout/rv_item_mention.xml index 3fc86ebde..55c0221a5 100644 --- a/app/src/main/res/layout/rv_item_mention.xml +++ b/app/src/main/res/layout/rv_item_mention.xml @@ -58,7 +58,7 @@ android:layout_height="wrap_content" android:ellipsize="middle" android:singleLine="true" - android:textColor="@color/nc_incoming_text_default" + android:textColor="@color/nc_author_text" android:textSize="16sp" tools:text="Call item text" /> @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:ellipsize="middle" android:singleLine="true" - android:textColor="@color/warm_grey_four" + android:textColor="@color/nc_incoming_text_default" android:textSize="12sp" tools:text="A week ago" /> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 9dd098c88..adbbabf07 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -25,22 +25,19 @@ <color name="conversation_item_header">#9FBDCC</color> <!--<color name="conversation_item_header">#CFCFCF</color>--> - <color name="fg_default">#eeeeee</color> - - <color name="bg_default">#333333</color> - <color name="bg_alt">#333333</color> + <color name="bg_default">#222222</color> + <color name="bg_alt">#222222</color> <!-- Chat window incoming message text & informational --> - <color name="nc_incoming_text_default">#9FBDCC</color> - <!--<color name="nc_incoming_text_default">#CFCFCF</color>--> - - <color name="nc_incoming_text_mention_you">#C98879</color> - <!--<color name="nc_incoming_text_mention_others">#3a718f</color>--> - <color name="nc_incoming_text_mention_others">@color/nc_darkRed</color> - + <color name="nc_incoming_text_default">#D8D8D8</color> + <color name="nc_author_text">#65A7CA</color> + <color name="nc_chip_mention_you_background">#0083C9</color> + <color name="nc_chip_mention_others_background">#6F6F6F</color> <color name="nc_grey">@android:color/holo_purple</color> <color name="bg_bottom_sheet">#222222</color> - <color name="bg_message_list_incoming_bubble">#444444</color> + <color name="bg_message_list_incoming_bubble">#484848</color> + <color name="bg_message_list_outcoming_bubble">#003F62</color> + <color name="emoji_background">#313031</color> <color name="emoji_divider">#15FFFFFF</color> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index a933d395c..157374e80 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -63,10 +63,15 @@ <color name="bg_default">#FFFFFF</color> <color name="bg_alt">@color/white60</color> - <color name="bg_system_bubble_dark">#444444</color> + <color name="nc_chip_mention_you_background">@color/colorAccent</color> + <color name="nc_chip_mention_others_background">#6F6F6F</color> <color name="bg_dark_mention_chips">#333333</color> - <color name="bg_message_list_incoming_bubble">#EFEFEF</color> - <color name="bg_message_list_incoming_bubble_dark2">#444444</color> + + + <color name="bg_message_list_incoming_bubble">#D5D5D5</color> + <color name="bg_message_list_outcoming_bubble">#003F62</color> + + <color name="nc_author_text">@color/colorPrimary</color> <color name="bg_bottom_sheet">#46ffffff</color> <!-- "Conversation Info" window --> diff --git a/app/src/main/res/xml/chip_incoming_others.xml b/app/src/main/res/xml/chip_others.xml index a7db22890..c7f46b6d8 100644 --- a/app/src/main/res/xml/chip_incoming_others.xml +++ b/app/src/main/res/xml/chip_others.xml @@ -22,7 +22,5 @@ <chip xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:textAppearance="@style/ChipIncomingTextAppearance" - app:chipStrokeColor="@color/colorAccent" - app:chipBackgroundColor="@color/transparent" - app:chipStrokeWidth="1dp" + app:chipBackgroundColor="@color/nc_chip_mention_others_background" app:closeIconEnabled="false" /> diff --git a/app/src/main/res/xml/chip_outgoing_others.xml b/app/src/main/res/xml/chip_outgoing_others.xml deleted file mode 100644 index 56bc98529..000000000 --- a/app/src/main/res/xml/chip_outgoing_others.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Nextcloud Talk application - ~ - ~ @author Mario Danic - ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com> - ~ - ~ This program is free software: you can redistribute it and/or modify - ~ it under the terms of the GNU General Public License as published by - ~ the Free Software Foundation, either version 3 of the License, or - ~ at your option) any later version. - ~ - ~ This program is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ~ GNU General Public License for more details. - ~ - ~ You should have received a copy of the GNU General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. - --> - -<chip xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:textAppearance="@style/ChipOutgoingTextAppearance" - app:chipStrokeColor="@color/bg_default" - app:chipBackgroundColor="@color/transparent" - app:chipStrokeWidth="1dp" - app:closeIconEnabled="false" /> diff --git a/app/src/main/res/xml/chip_outgoing_own_mention.xml b/app/src/main/res/xml/chip_outgoing_own_mention.xml deleted file mode 100644 index 28f7a4e4a..000000000 --- a/app/src/main/res/xml/chip_outgoing_own_mention.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Nextcloud Talk application - ~ - ~ @author Mario Danic - ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com> - ~ - ~ This program is free software: you can redistribute it and/or modify - ~ it under the terms of the GNU General Public License as published by - ~ the Free Software Foundation, either version 3 of the License, or - ~ at your option) any later version. - ~ - ~ This program is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ~ GNU General Public License for more details. - ~ - ~ You should have received a copy of the GNU General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. - --> - -<chip xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:textAppearance="@style/ChipMentionTextAppearance" - app:chipBackgroundColor="@color/bg_default" - app:closeIconEnabled="false" /> diff --git a/app/src/main/res/xml/chip_text_entry.xml b/app/src/main/res/xml/chip_text_entry.xml deleted file mode 100644 index ce12409f3..000000000 --- a/app/src/main/res/xml/chip_text_entry.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Nextcloud Talk application - ~ - ~ @author Mario Danic - ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com> - ~ - ~ This program is free software: you can redistribute it and/or modify - ~ it under the terms of the GNU General Public License as published by - ~ the Free Software Foundation, either version 3 of the License, or - ~ at your option) any later version. - ~ - ~ This program is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ~ GNU General Public License for more details. - ~ - ~ You should have received a copy of the GNU General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. - --> - -<chip xmlns:app="http://schemas.android.com/apk/res-auto" - app:chipStrokeColor="@color/colorAccent" - app:chipStrokeWidth="1dp" - app:chipBackgroundColor="@color/transparent" - app:closeIconEnabled="false" /> diff --git a/app/src/main/res/xml/chip_accent_background.xml b/app/src/main/res/xml/chip_you.xml index 9d595e0ae..4b84184ac 100644 --- a/app/src/main/res/xml/chip_accent_background.xml +++ b/app/src/main/res/xml/chip_you.xml @@ -22,5 +22,5 @@ <chip xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:textAppearance="@style/ChipOutgoingTextAppearance" - app:chipBackgroundColor="@color/colorAccent" + app:chipBackgroundColor="@color/nc_chip_mention_you_background" app:closeIconEnabled="false"/> |