delete some "magic"

= rename some "Magic*" classes

+ implement reactions for it

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>

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<ChatMessage>(itemView, payload) {
 
     private val binding: ItemCustomIncomingTextMessageBinding = ItemCustomIncomingTextMessageBinding.bind(itemView)

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<ChatMessage>(itemView) {
+class OutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessageViewHolder<ChatMessage>(itemView) {
     private val binding: ItemCustomOutcomingTextMessageBinding = ItemCustomOutcomingTextMessageBinding.bind(itemView)
     private val realView: View = itemView
 

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<ChatMessage> {
+public class SystemMessageViewHolder extends MessageHolders.IncomingTextMessageViewHolder<ChatMessage> {
 
     @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);

app/src/main/java/com/nextcloud/talk/adapters/messages/TalkMessagesListAdapter.java

@@ -49,10 +49,10 @@ public class TalkMessagesListAdapter<M extends IMessage> extends MessagesListAda
     public void onBindViewHolder(ViewHolder holder, int position) {
         super.onBindViewHolder(holder, position);
 
-        if (holder instanceof MagicIncomingTextMessageViewHolder) {
+        if (holder instanceof IncomingTextMessageViewHolder) {
-            ((MagicIncomingTextMessageViewHolder) holder).assignCommonMessageInterface(chatController);
+            ((IncomingTextMessageViewHolder) holder).assignCommonMessageInterface(chatController);
-        } else if (holder instanceof MagicOutcomingTextMessageViewHolder) {
+        } else if (holder instanceof OutcomingTextMessageViewHolder) {
-            ((MagicOutcomingTextMessageViewHolder) holder).assignCommonMessageInterface(chatController);
+            ((OutcomingTextMessageViewHolder) holder).assignCommonMessageInterface(chatController);
 
         } else if (holder instanceof IncomingLocationMessageViewHolder) {
             ((IncomingLocationMessageViewHolder) holder).assignCommonMessageInterface(chatController);

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<ChatMessage> {
+public class UnreadNoticeMessageViewHolder extends MessageHolders.SystemMessageViewHolder<ChatMessage> {
 
-    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);
     }
 

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
             )