From 3d50075bf232ded22424907b5881b0306d782f0c Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Wed, 30 Nov 2022 17:28:03 +0100 Subject: [PATCH] delete some "magic" = rename some "Magic*" classes + implement reactions for it Signed-off-by: Marcel Hibbe --- ...er.kt => IncomingTextMessageViewHolder.kt} | 2 +- ...r.kt => OutcomingTextMessageViewHolder.kt} | 2 +- ...lder.java => SystemMessageViewHolder.java} | 4 ++-- .../messages/TalkMessagesListAdapter.java | 8 ++++---- ...ava => UnreadNoticeMessageViewHolder.java} | 6 +++--- .../talk/controllers/ChatController.kt | 20 +++++++++---------- 6 files changed, 21 insertions(+), 21 deletions(-) rename app/src/main/java/com/nextcloud/talk/adapters/messages/{MagicIncomingTextMessageViewHolder.kt => IncomingTextMessageViewHolder.kt} (99%) rename app/src/main/java/com/nextcloud/talk/adapters/messages/{MagicOutcomingTextMessageViewHolder.kt => OutcomingTextMessageViewHolder.kt} (98%) rename app/src/main/java/com/nextcloud/talk/adapters/messages/{MagicSystemMessageViewHolder.java => SystemMessageViewHolder.java} (95%) rename app/src/main/java/com/nextcloud/talk/adapters/messages/{MagicUnreadNoticeMessageViewHolder.java => UnreadNoticeMessageViewHolder.java} (83%) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt similarity index 99% rename from app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt rename to app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt index e578cbb30..81b26b99a 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt @@ -55,7 +55,7 @@ import com.stfalcon.chatkit.messages.MessageHolders import javax.inject.Inject @AutoInjector(NextcloudTalkApplication::class) -class MagicIncomingTextMessageViewHolder(itemView: View, payload: Any) : MessageHolders +class IncomingTextMessageViewHolder(itemView: View, payload: Any) : MessageHolders .IncomingTextMessageViewHolder(itemView, payload) { private val binding: ItemCustomIncomingTextMessageBinding = ItemCustomIncomingTextMessageBinding.bind(itemView) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt similarity index 98% rename from app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt rename to app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt index d35e9a9e0..1b48f6e3f 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt @@ -50,7 +50,7 @@ import com.stfalcon.chatkit.messages.MessageHolders.OutcomingTextMessageViewHold import javax.inject.Inject @AutoInjector(NextcloudTalkApplication::class) -class MagicOutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessageViewHolder(itemView) { +class OutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessageViewHolder(itemView) { private val binding: ItemCustomOutcomingTextMessageBinding = ItemCustomOutcomingTextMessageBinding.bind(itemView) private val realView: View = itemView diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/SystemMessageViewHolder.java similarity index 95% rename from app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java rename to app/src/main/java/com/nextcloud/talk/adapters/messages/SystemMessageViewHolder.java index 1b716c58c..5846f68b8 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/SystemMessageViewHolder.java @@ -45,7 +45,7 @@ import autodagger.AutoInjector; import static com.nextcloud.talk.ui.recyclerview.MessageSwipeCallback.REPLYABLE_VIEW_TAG; @AutoInjector(NextcloudTalkApplication.class) -public class MagicSystemMessageViewHolder extends MessageHolders.IncomingTextMessageViewHolder { +public class SystemMessageViewHolder extends MessageHolders.IncomingTextMessageViewHolder { @Inject AppPreferences appPreferences; @@ -55,7 +55,7 @@ public class MagicSystemMessageViewHolder extends MessageHolders.IncomingTextMes protected ViewGroup background; - public MagicSystemMessageViewHolder(View itemView) { + public SystemMessageViewHolder(View itemView) { super(itemView); NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this); background = itemView.findViewById(R.id.container); diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/TalkMessagesListAdapter.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/TalkMessagesListAdapter.java index f410c671e..fec78dd69 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/TalkMessagesListAdapter.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/TalkMessagesListAdapter.java @@ -49,10 +49,10 @@ public class TalkMessagesListAdapter extends MessagesListAda public void onBindViewHolder(ViewHolder holder, int position) { super.onBindViewHolder(holder, position); - if (holder instanceof MagicIncomingTextMessageViewHolder) { - ((MagicIncomingTextMessageViewHolder) holder).assignCommonMessageInterface(chatController); - } else if (holder instanceof MagicOutcomingTextMessageViewHolder) { - ((MagicOutcomingTextMessageViewHolder) holder).assignCommonMessageInterface(chatController); + if (holder instanceof IncomingTextMessageViewHolder) { + ((IncomingTextMessageViewHolder) holder).assignCommonMessageInterface(chatController); + } else if (holder instanceof OutcomingTextMessageViewHolder) { + ((OutcomingTextMessageViewHolder) holder).assignCommonMessageInterface(chatController); } else if (holder instanceof IncomingLocationMessageViewHolder) { ((IncomingLocationMessageViewHolder) holder).assignCommonMessageInterface(chatController); diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicUnreadNoticeMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/UnreadNoticeMessageViewHolder.java similarity index 83% rename from app/src/main/java/com/nextcloud/talk/adapters/messages/MagicUnreadNoticeMessageViewHolder.java rename to app/src/main/java/com/nextcloud/talk/adapters/messages/UnreadNoticeMessageViewHolder.java index aac615f2c..4bfecde3b 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicUnreadNoticeMessageViewHolder.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/UnreadNoticeMessageViewHolder.java @@ -25,13 +25,13 @@ import android.view.View; import com.nextcloud.talk.models.json.chat.ChatMessage; import com.stfalcon.chatkit.messages.MessageHolders; -public class MagicUnreadNoticeMessageViewHolder extends MessageHolders.SystemMessageViewHolder { +public class UnreadNoticeMessageViewHolder extends MessageHolders.SystemMessageViewHolder { - public MagicUnreadNoticeMessageViewHolder(View itemView) { + public UnreadNoticeMessageViewHolder(View itemView) { super(itemView); } - public MagicUnreadNoticeMessageViewHolder(View itemView, Object payload) { + public UnreadNoticeMessageViewHolder(View itemView, Object payload) { super(itemView, payload); } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt index 6e80094a7..a94d7ca03 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -111,19 +111,19 @@ import com.nextcloud.talk.adapters.messages.IncomingLinkPreviewMessageViewHolder import com.nextcloud.talk.adapters.messages.IncomingLocationMessageViewHolder import com.nextcloud.talk.adapters.messages.IncomingPollMessageViewHolder import com.nextcloud.talk.adapters.messages.IncomingPreviewMessageViewHolder +import com.nextcloud.talk.adapters.messages.IncomingTextMessageViewHolder import com.nextcloud.talk.adapters.messages.IncomingVoiceMessageViewHolder -import com.nextcloud.talk.adapters.messages.MagicIncomingTextMessageViewHolder -import com.nextcloud.talk.adapters.messages.MagicOutcomingTextMessageViewHolder -import com.nextcloud.talk.adapters.messages.MagicSystemMessageViewHolder -import com.nextcloud.talk.adapters.messages.MagicUnreadNoticeMessageViewHolder import com.nextcloud.talk.adapters.messages.MessagePayload import com.nextcloud.talk.adapters.messages.OutcomingLinkPreviewMessageViewHolder import com.nextcloud.talk.adapters.messages.OutcomingLocationMessageViewHolder import com.nextcloud.talk.adapters.messages.OutcomingPollMessageViewHolder import com.nextcloud.talk.adapters.messages.OutcomingPreviewMessageViewHolder +import com.nextcloud.talk.adapters.messages.OutcomingTextMessageViewHolder import com.nextcloud.talk.adapters.messages.OutcomingVoiceMessageViewHolder import com.nextcloud.talk.adapters.messages.PreviewMessageInterface +import com.nextcloud.talk.adapters.messages.SystemMessageViewHolder import com.nextcloud.talk.adapters.messages.TalkMessagesListAdapter +import com.nextcloud.talk.adapters.messages.UnreadNoticeMessageViewHolder import com.nextcloud.talk.adapters.messages.VoiceMessageInterface import com.nextcloud.talk.api.NcApi import com.nextcloud.talk.application.NextcloudTalkApplication @@ -524,12 +524,12 @@ class ChatController(args: Bundle) : MessagePayload(roomToken!!, currentConversation?.isParticipantOwnerOrModerator, profileBottomSheet) messageHolders.setIncomingTextConfig( - MagicIncomingTextMessageViewHolder::class.java, + IncomingTextMessageViewHolder::class.java, R.layout.item_custom_incoming_text_message, payload ) messageHolders.setOutcomingTextConfig( - MagicOutcomingTextMessageViewHolder::class.java, + OutcomingTextMessageViewHolder::class.java, R.layout.item_custom_outcoming_text_message ) @@ -546,18 +546,18 @@ class ChatController(args: Bundle) : messageHolders.registerContentType( CONTENT_TYPE_SYSTEM_MESSAGE, - MagicSystemMessageViewHolder::class.java, + SystemMessageViewHolder::class.java, R.layout.item_system_message, - MagicSystemMessageViewHolder::class.java, + SystemMessageViewHolder::class.java, R.layout.item_system_message, this ) messageHolders.registerContentType( CONTENT_TYPE_UNREAD_NOTICE_MESSAGE, - MagicUnreadNoticeMessageViewHolder::class.java, + UnreadNoticeMessageViewHolder::class.java, R.layout.item_date_header, - MagicUnreadNoticeMessageViewHolder::class.java, + UnreadNoticeMessageViewHolder::class.java, R.layout.item_date_header, this )