From a351925141193ba9e1130c59d270e83268f23ed9 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Tue, 24 Apr 2018 13:57:31 +0200 Subject: [PATCH] Styling the chat Signed-off-by: Mario Danic --- .../MagicIncomingTextMessageViewHolder.java | 56 ++++++++++++++ .../talk/controllers/ChatController.java | 8 +- app/src/main/res/layout/controller_chat.xml | 10 ++- .../item_custom_incoming_text_message.xml | 76 +++++++++++++++++++ 4 files changed, 148 insertions(+), 2 deletions(-) create mode 100644 app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java create mode 100644 app/src/main/res/layout/item_custom_incoming_text_message.xml 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 new file mode 100644 index 000000000..31ac13c0a --- /dev/null +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java @@ -0,0 +1,56 @@ +/* + * Nextcloud Talk application + * + * @author Mario Danic + * Copyright (C) 2017-2018 Mario Danic + * + * 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 . + */ + +package com.nextcloud.talk.adapters.messages; + +import android.text.TextUtils; +import android.view.View; +import android.widget.TextView; + +import com.nextcloud.talk.R; +import com.nextcloud.talk.models.json.chat.ChatMessage; +import com.stfalcon.chatkit.messages.MessageHolders; + +import butterknife.BindView; +import butterknife.ButterKnife; + +public class MagicIncomingTextMessageViewHolder + extends MessageHolders.IncomingTextMessageViewHolder { + + @BindView(R.id.messageAuthor) + TextView messageAuthor; + + public MagicIncomingTextMessageViewHolder(View itemView) { + super(itemView); + ButterKnife.bind(this, itemView); + } + + + @Override + public void onBind(ChatMessage message) { + super.onBind(message); + String author; + if (TextUtils.isEmpty(author = message.getActorDisplayName())) { + messageAuthor.setText(author); + } else { + messageAuthor.setText(R.string.nc_nick_guest); + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java index 28c54e5f3..eefc0bcbb 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java @@ -36,6 +36,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.resource.bitmap.CircleCrop; import com.bumptech.glide.request.RequestOptions; import com.nextcloud.talk.R; +import com.nextcloud.talk.adapters.messages.MagicIncomingTextMessageViewHolder; import com.nextcloud.talk.api.NcApi; import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.controllers.base.BaseController; @@ -117,7 +118,12 @@ public class ChatController extends BaseController implements MessagesListAdapte if (adapter == null) { adapterWasNull = true; - adapter = new MessagesListAdapter<>(currentUser.getUserId(), new ImageLoader() { + + MessagesListAdapter.HoldersConfig holdersConfig = new MessagesListAdapter.HoldersConfig(); + holdersConfig.setIncoming(MagicIncomingTextMessageViewHolder.class, + R.layout.item_custom_incoming_text_message); + + adapter = new MessagesListAdapter<>(currentUser.getUserId(), holdersConfig, new ImageLoader() { @Override public void loadImage(ImageView imageView, String url) { GlideApp.with(NextcloudTalkApplication.getSharedApplication().getApplicationContext()) diff --git a/app/src/main/res/layout/controller_chat.xml b/app/src/main/res/layout/controller_chat.xml index 9b6dcdba9..8239e3c38 100644 --- a/app/src/main/res/layout/controller_chat.xml +++ b/app/src/main/res/layout/controller_chat.xml @@ -29,8 +29,16 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_above="@+id/input" + app:incomingDefaultBubbleColor="@color/white_two" + app:incomingDefaultBubblePressedColor="@color/white_two" + app:incomingDefaultBubbleSelectedColor="@color/colorPrimaryDark" + app:incomingTextSize="14sp" + app:incomingTimeTextSize="12sp" app:outcomingDefaultBubbleColor="@color/colorPrimary" + app:outcomingDefaultBubblePressedColor="@color/colorPrimary" app:outcomingDefaultBubbleSelectedColor="@color/colorPrimaryDark" + app:outcomingTextSize="14sp" + app:outcomingTimeTextSize="12sp" app:textAutoLink="all"/> + app:inputTextSize="16sp"/> diff --git a/app/src/main/res/layout/item_custom_incoming_text_message.xml b/app/src/main/res/layout/item_custom_incoming_text_message.xml new file mode 100644 index 000000000..6adffbf83 --- /dev/null +++ b/app/src/main/res/layout/item_custom_incoming_text_message.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file