code simplified.

Author: syslogic

mobile/src/androidTest/java/io/syslogic/socketio/MainActivityTest.java

@@ -5,7 +5,6 @@
 import androidx.test.espresso.action.ViewActions;
 import androidx.test.espresso.matcher.ViewMatchers;
 
-import io.syslogic.socketio.activity.MainActivity;
 import io.syslogic.socketio.base.BaseActivityTest;
 import io.syslogic.socketio.fragment.ChatFragment;
 

mobile/src/androidTest/java/io/syslogic/socketio/base/BaseActivityTest.java

@@ -19,7 +19,7 @@
 
 import java.lang.ref.WeakReference;
 
-import io.syslogic.socketio.activity.MainActivity;
+import io.syslogic.socketio.MainActivity;
 
 /**
  * Abstract {@link TestCase} for {@link MainActivity}.

mobile/src/main/AndroidManifest.xml

@@ -17,7 +17,7 @@
         tools:ignore="AllowBackup">
 
         <activity
-            android:name=".activity.MainActivity"
+            android:name=".MainActivity"
             android:exported="true">
 
             <intent-filter>

mobile/src/main/java/io/syslogic/socketio/activity/MainActivity.java renamed to mobile/src/main/java/io/syslogic/socketio/MainActivity.java

@@ -1,4 +1,4 @@
-package io.syslogic.socketio.activity;
+package io.syslogic.socketio;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -20,7 +20,6 @@
 import io.socket.client.IO;
 import io.socket.client.Socket;
 
-import io.syslogic.socketio.R;
 import io.syslogic.socketio.databinding.FragmentNavHostBinding;
 import io.syslogic.socketio.fragment.BaseFragment;
 import io.syslogic.socketio.menu.ChatMenuProvider;

mobile/src/main/java/io/syslogic/socketio/recyclerview/MessageAdapter.java renamed to mobile/src/main/java/io/syslogic/socketio/adapter/MessageAdapter.java

@@ -1,4 +1,4 @@
-package io.syslogic.socketio.recyclerview;
+package io.syslogic.socketio.adapter;
 
 import static io.syslogic.socketio.model.ChatMessage.TYPE_ACTION;
 import static io.syslogic.socketio.model.ChatMessage.TYPE_LOG;
@@ -22,15 +22,19 @@
  * @author Martin Zeitler
  */
 public class MessageAdapter extends RecyclerView.Adapter<MessageAdapter.ViewHolder> {
-    private final ArrayList<ChatMessage> mItems;
+    private ArrayList<ChatMessage> mItems = new ArrayList<>();
 
     public MessageAdapter(@NonNull ArrayList<ChatMessage> items) {
         this.mItems = items;
     }
 
+    public MessageAdapter() {
+
+    }
+
     @Override
     public int getItemCount() {
-        return mItems.size();
+        return this.mItems.size();
     }
 
     @Override
@@ -59,7 +63,20 @@ public void onBindViewHolder(@NonNull ViewHolder viewHolder, int position) {
     }
 
     private ChatMessage getItem(int position) {
-        return mItems.get(position);
+        return this.mItems.get(position);
+    }
+
+    public void addItem(ChatMessage item) {
+        this.mItems.add(item);
+        this.notifyItemInserted(this.getItemCount() - 1);
+    }
+    public void removeItem(int position) {
+        this.mItems.remove(position);
+        this.notifyItemRemoved(position);
+    }
+
+    public ChatMessage getItemAt(int position) {
+        return this.mItems.get(position);
     }
 
     public static class ViewHolder extends RecyclerView.ViewHolder {

mobile/src/main/java/io/syslogic/socketio/recyclerview/SocketAdapter.java renamed to mobile/src/main/java/io/syslogic/socketio/adapter/SocketAdapter.java

@@ -1,4 +1,4 @@
-package io.syslogic.socketio.recyclerview;
+package io.syslogic.socketio.adapter;
 
 // import static io.syslogic.socketio.model.ChatUser.TYPE_DEFAULT;
 import static io.syslogic.socketio.model.ClientSocket.TYPE_OPERATOR;

mobile/src/main/java/io/syslogic/socketio/dialog/BaseDialogFragment.java

@@ -15,7 +15,7 @@
 import java.util.ArrayList;
 
 import io.socket.client.Socket;
-import io.syslogic.socketio.activity.MainActivity;
+import io.syslogic.socketio.MainActivity;
 import io.syslogic.socketio.model.ClientSocket;
 
 /**

mobile/src/main/java/io/syslogic/socketio/dialog/SocketsDialogFragment.java

@@ -22,7 +22,7 @@
 import io.syslogic.socketio.Constants;
 import io.syslogic.socketio.databinding.DialogSocketsBinding;
 import io.syslogic.socketio.model.ClientSocket;
-import io.syslogic.socketio.recyclerview.SocketAdapter;
+import io.syslogic.socketio.adapter.SocketAdapter;
 
 /**
  * Sockets {@link BaseDialogFragment}

mobile/src/main/java/io/syslogic/socketio/fragment/BaseFragment.java

@@ -23,7 +23,7 @@
 
 import io.syslogic.socketio.Constants;
 import io.syslogic.socketio.R;
-import io.syslogic.socketio.activity.MainActivity;
+import io.syslogic.socketio.MainActivity;
 import io.syslogic.socketio.model.ClientSocket;
 
 /**

mobile/src/main/java/io/syslogic/socketio/fragment/ChatFragment.java

@@ -1,6 +1,5 @@
 package io.syslogic.socketio.fragment;
 
-import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -20,19 +19,18 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.ArrayList;
 import java.util.Objects;
 
 import io.socket.client.Socket;
 import io.socket.emitter.Emitter;
 
 import io.syslogic.socketio.Constants;
 import io.syslogic.socketio.R;
-import io.syslogic.socketio.activity.MainActivity;
+import io.syslogic.socketio.MainActivity;
 import io.syslogic.socketio.databinding.FragmentChatBinding;
 import io.syslogic.socketio.model.ChatMessage;
 import io.syslogic.socketio.model.ChatRoom;
-import io.syslogic.socketio.recyclerview.MessageAdapter;
+import io.syslogic.socketio.adapter.MessageAdapter;
 
 /**
  * Chat {@link BaseFragment}
@@ -41,8 +39,6 @@
 public class ChatFragment extends BaseFragment implements FragmentResultListener {
     private static final String LOG_TAG = ChatFragment.class.getSimpleName();
     private FragmentChatBinding mDataBinding = null;
-    private final ArrayList<ChatMessage> mItems = new ArrayList<>();
-    private MessageAdapter mAdapter;
     private static final int TYPING_TIMER_DURATION = 600;
     private final Handler mTypingHandler = new Handler(Looper.getMainLooper());
     private boolean mTyping = false;
@@ -84,12 +80,6 @@ public void onDestroy() {
         super.onDestroy();
     }
 
-    @Override
-    public void onAttach(@NonNull Context context) {
-        super.onAttach(context);
-        this.mAdapter = new MessageAdapter(this.mItems);
-    }
-
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         this.setDataBinding(inflater, container);
@@ -98,7 +88,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
         }
 
         this.mDataBinding.recyclerviewMessages.setLayoutManager(new LinearLayoutManager(requireContext()));
-        this.mDataBinding.recyclerviewMessages.setAdapter(this.mAdapter);
+        this.mDataBinding.recyclerviewMessages.setAdapter(new MessageAdapter());
 
         this.mDataBinding.buttonSend.setOnClickListener(view -> {
             attemptSend();
@@ -161,11 +151,14 @@ private void addUserCount(int numUsers) {
     }
 
     private void addItem(ChatMessage item) {
-        this.mItems.add(item);
-        mAdapter.notifyItemInserted(this.mItems.size() - 1);
+        getRecyclerViewAdapter().addItem(item);
         scrollToBottom();
     }
 
+    private MessageAdapter getRecyclerViewAdapter() {
+        return ((MessageAdapter) this.mDataBinding.recyclerviewMessages.getAdapter());
+    }
+
     private void addLog(String message) {
         addItem(new ChatMessage.Builder(ChatMessage.TYPE_LOG).setMessage(message).build());
     }
@@ -182,11 +175,11 @@ private void addTyping(String username) {
     }
 
     private void removeTyping(String username) {
-        for (int i = this.mItems.size() - 1; i >= 0; i--) {
-            ChatMessage message = this.mItems.get(i);
+        MessageAdapter adapter = getRecyclerViewAdapter();
+        for (int i = adapter.getItemCount() - 1; i >= 0; i--) {
+            ChatMessage message = adapter.getItemAt(i);
             if (message.getType() == ChatMessage.TYPE_ACTION && message.getUsername().equals(username)) {
-                this.mItems.remove(i);
-                mAdapter.notifyItemRemoved(i);
+                adapter.removeItem(i);
             }
         }
     }
@@ -219,7 +212,8 @@ public void leaveRoom(@NonNull MainActivity activity) {
     }
 
     private void scrollToBottom() {
-        this.mDataBinding.recyclerviewMessages.scrollToPosition(mAdapter.getItemCount() - 1);
+        this.mDataBinding.recyclerviewMessages
+                .scrollToPosition(getRecyclerViewAdapter().getItemCount() - 1);
     }
 
     private final Emitter.Listener onChatMessage = args -> requireActivity().runOnUiThread(() -> {

mobile/src/main/java/io/syslogic/socketio/fragment/LoginFragment.java

@@ -25,7 +25,7 @@
 
 import io.syslogic.socketio.Constants;
 import io.syslogic.socketio.R;
-import io.syslogic.socketio.activity.MainActivity;
+import io.syslogic.socketio.MainActivity;
 import io.syslogic.socketio.databinding.FragmentLoginBinding;
 import io.syslogic.socketio.model.ClientSocket;
 

mobile/src/main/java/io/syslogic/socketio/menu/ChatMenuProvider.java

@@ -10,8 +10,7 @@
 import java.lang.ref.WeakReference;
 
 import io.syslogic.socketio.R;
-import io.syslogic.socketio.activity.MainActivity;
-import io.syslogic.socketio.fragment.BaseFragment;
+import io.syslogic.socketio.MainActivity;
 
 /**
  * Chat {@link MenuProvider}

mobile/src/main/res/menu/menu_chat.xml

@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="io.syslogic.socketio.activity.MainActivity">
+    tools:context="io.syslogic.socketio.MainActivity">
 
     <item
         android:id="@+id/menu_menu_action_sockets"