Convert project to androidx and group messages from the same author.

build.gradle

@@ -10,7 +10,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         classpath 'com.novoda:bintray-release:0.8.0'
 
         // NOTE: Do not place your application dependencies here; they belong

chatkit/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.novoda.bintray-release'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     buildToolsVersion "27.0.3"
 
     defaultConfig {
@@ -19,6 +19,7 @@ android {
 }
 
 publish {
+    userOrg = 'egeniq'
     groupId = 'com.github.stfalcon'
     artifactId = 'chatkit'
     publishVersion = '0.3.3'
@@ -36,7 +37,7 @@ ext {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation "com.android.support:appcompat-v7:$supportVersion"
-    implementation "com.android.support:design:$supportVersion"
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'com.google.android.material:material:1.0.0'
     implementation "com.google.android:flexbox:$flexboxVersion"
 }

chatkit/src/main/java/com/stfalcon/chatkit/commons/ImageLoader.java

@@ -16,7 +16,7 @@
 
 package com.stfalcon.chatkit.commons;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.widget.ImageView;
 
 /**

chatkit/src/main/java/com/stfalcon/chatkit/commons/Style.java

@@ -20,11 +20,11 @@
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.AttrRes;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DimenRes;
-import android.support.annotation.DrawableRes;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.AttrRes;
+import androidx.annotation.ColorRes;
+import androidx.annotation.DimenRes;
+import androidx.annotation.DrawableRes;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 

chatkit/src/main/java/com/stfalcon/chatkit/commons/ViewHolder.java

@@ -16,7 +16,7 @@
 
 package com.stfalcon.chatkit.commons;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 /**

chatkit/src/main/java/com/stfalcon/chatkit/commons/models/IMessage.java

@@ -50,4 +50,5 @@ public interface IMessage {
      * @return the message creation date
      */
     Date getCreatedAt();
+
 }

chatkit/src/main/java/com/stfalcon/chatkit/commons/models/MessageContentType.java

@@ -16,7 +16,7 @@
 
 package com.stfalcon.chatkit.commons.models;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import com.stfalcon.chatkit.messages.MessageHolders;
 
 /*

chatkit/src/main/java/com/stfalcon/chatkit/dialogs/DialogsList.java

@@ -17,11 +17,11 @@
 package com.stfalcon.chatkit.dialogs;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SimpleItemAnimator;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SimpleItemAnimator;
 import android.util.AttributeSet;
 
 import com.stfalcon.chatkit.commons.models.IDialog;

chatkit/src/main/java/com/stfalcon/chatkit/dialogs/DialogsListAdapter.java

@@ -18,9 +18,9 @@
 
 import android.graphics.Typeface;
 import android.graphics.drawable.GradientDrawable;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;

chatkit/src/main/java/com/stfalcon/chatkit/messages/MessageHolders.java

@@ -1,8 +1,9 @@
 package com.stfalcon.chatkit.messages;
 
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.v4.view.ViewCompat;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.core.view.ViewCompat;
+
 import android.text.Spannable;
 import android.text.method.LinkMovementMethod;
 import android.util.SparseArray;
@@ -564,6 +565,7 @@ protected ViewHolder getHolder(ViewGroup parent, int viewType, MessagesListStyle
 
     @SuppressWarnings("unchecked")
     protected void bind(final ViewHolder holder, final Object item, boolean isSelected,
+                        boolean isContinuous, boolean isLastItemInGroup,
                         final ImageLoader imageLoader,
                         final View.OnClickListener onMessageClickListener,
                         final View.OnLongClickListener onMessageLongClickListener,
@@ -573,6 +575,8 @@ protected void bind(final ViewHolder holder, final Object item, boolean isSelect
         if (item instanceof IMessage) {
             ((MessageHolders.BaseMessageViewHolder) holder).isSelected = isSelected;
             ((MessageHolders.BaseMessageViewHolder) holder).imageLoader = imageLoader;
+            ((BaseMessageViewHolder) holder).isFirstItemInGroup = isContinuous;
+            ((BaseMessageViewHolder) holder).isLastItemInGroup = isLastItemInGroup;
             holder.itemView.setOnLongClickListener(onMessageLongClickListener);
             holder.itemView.setOnClickListener(onMessageClickListener);
 
@@ -676,6 +680,9 @@ public static abstract class BaseMessageViewHolder<MESSAGE extends IMessage> ext
 
         boolean isSelected;
 
+        boolean isFirstItemInGroup;
+
+        boolean isLastItemInGroup;
         /**
          * For setting custom data to ViewHolder
          */
@@ -705,6 +712,31 @@ public boolean isSelected() {
             return isSelected;
         }
 
+        /**
+         * Returns whether item belongs to the same user
+         *
+         * @return weather item belongs to the same user.
+         */
+        public boolean isFirstItemInGroup() {
+            return isFirstItemInGroup;
+        }
+
+        /**
+         * Returns whether the current item and the next belongs to the same user
+         */
+        public boolean isLastItemInGroup() {
+            return isLastItemInGroup;
+        }
+
+        public List<View> getVisibleViewsForFirstItemInGroup() {
+            return new ArrayList<>();
+        }
+
+        public List<View> getVisibleViewsForLastItemInGroup() {
+            return new ArrayList<>();
+        }
+
+
         /**
          * Returns weather is selection mode enabled
          *
@@ -769,6 +801,26 @@ public void onBind(MESSAGE message) {
             if (text != null) {
                 text.setText(message.getText());
             }
+
+            if (isLastItemInGroup()) {
+                for (View continousView : getVisibleViewsForLastItemInGroup()) {
+                    continousView.setVisibility(View.VISIBLE);
+                }
+            } else {
+                for (View continousView : getVisibleViewsForLastItemInGroup()) {
+                    continousView.setVisibility(View.GONE);
+                }
+            }
+
+            if (isFirstItemInGroup()) {
+                for (View continousView : getVisibleViewsForFirstItemInGroup()) {
+                    continousView.setVisibility(View.VISIBLE);
+                }
+            } else {
+                for (View continousView : getVisibleViewsForFirstItemInGroup()) {
+                    continousView.setVisibility(View.INVISIBLE);
+                }
+            }
         }
 
         @Override
@@ -828,6 +880,26 @@ public void onBind(MESSAGE message) {
             if (text != null) {
                 text.setText(message.getText());
             }
+
+            if (isLastItemInGroup()) {
+                for (View continousView : getVisibleViewsForLastItemInGroup()) {
+                    continousView.setVisibility(View.VISIBLE);
+                }
+            } else {
+                for (View continousView : getVisibleViewsForLastItemInGroup()) {
+                    continousView.setVisibility(View.GONE);
+                }
+            }
+
+            if (isFirstItemInGroup()) {
+                for (View continousView : getVisibleViewsForFirstItemInGroup()) {
+                    continousView.setVisibility(View.VISIBLE);
+                }
+            } else {
+                for (View continousView : getVisibleViewsForFirstItemInGroup()) {
+                    continousView.setVisibility(View.INVISIBLE);
+                }
+            }
         }
 
         @Override

chatkit/src/main/java/com/stfalcon/chatkit/messages/MessageInput.java

@@ -19,8 +19,8 @@
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.Space;
+import androidx.core.view.ViewCompat;
+import androidx.legacy.widget.Space;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.AttributeSet;

chatkit/src/main/java/com/stfalcon/chatkit/messages/MessageInputStyle.java

@@ -20,9 +20,9 @@
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.v4.graphics.drawable.DrawableCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.core.graphics.drawable.DrawableCompat;
 import android.util.AttributeSet;
 
 import com.stfalcon.chatkit.R;

chatkit/src/main/java/com/stfalcon/chatkit/messages/MessagesList.java

@@ -17,11 +17,11 @@
 package com.stfalcon.chatkit.messages;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SimpleItemAnimator;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SimpleItemAnimator;
 import android.util.AttributeSet;
 
 import com.stfalcon.chatkit.commons.models.IMessage;

chatkit/src/main/java/com/stfalcon/chatkit/messages/MessagesListAdapter.java

@@ -19,8 +19,10 @@
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.support.annotation.LayoutRes;
-import android.support.v7.widget.RecyclerView;
+
+import androidx.annotation.LayoutRes;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.text.Spannable;
 import android.text.method.LinkMovementMethod;
 import android.util.SparseArray;
@@ -34,6 +36,7 @@
 import com.stfalcon.chatkit.commons.ImageLoader;
 import com.stfalcon.chatkit.commons.ViewHolder;
 import com.stfalcon.chatkit.commons.models.IMessage;
+import com.stfalcon.chatkit.commons.models.IUser;
 import com.stfalcon.chatkit.utils.DateFormatter;
 
 import java.util.ArrayList;
@@ -103,13 +106,70 @@ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
     @Override
     public void onBindViewHolder(ViewHolder holder, int position) {
         Wrapper wrapper = items.get(position);
-        holders.bind(holder, wrapper.item, wrapper.isSelected, imageLoader,
+        boolean isFirstItemInGroup = true;
+        boolean isLastItemInGroup = true;
+        if (position < items.size() - 1) {
+            isFirstItemInGroup = isFirstItemInGroup(items.get(position), items.get(position + 1));
+        }
+
+        if (position > 0) {
+            isLastItemInGroup = isLastItemInGroup(items.get(position), items.get(position - 1));
+        }
+        holders.bind(holder, wrapper.item, wrapper.isSelected, isFirstItemInGroup, isLastItemInGroup, imageLoader,
                 getMessageClickListener(wrapper),
                 getMessageLongClickListener(wrapper),
                 dateHeadersFormatter,
                 viewClickListenersArray);
     }
 
+    private boolean isFirstItemInGroup(Wrapper currentMsg, Wrapper precedingMsg) {
+        // null check
+        if (currentMsg == null || precedingMsg == null) {
+            return true;
+        }
+
+        IUser currentUser, precedingUser;
+        if (currentMsg.item instanceof IMessage) {
+            currentUser = ((IMessage) currentMsg.item).getUser();
+        } else {
+            return true;
+        }
+        if (precedingMsg.item instanceof IMessage) {
+            precedingUser = ((IMessage) precedingMsg.item).getUser();
+        } else {
+            return true;
+        }
+
+        // If admin message or
+        if (currentUser == null || precedingUser == null) return true;
+        return !(currentUser.getId().equals(precedingUser.getId()));
+    }
+
+    private boolean isLastItemInGroup(Wrapper currentMsg, Wrapper nextMessage) {
+        // null check
+        if (currentMsg == null || nextMessage == null) {
+            return true;
+        }
+
+        IUser currentUser, nextUser;
+        if (currentMsg.item instanceof IMessage) {
+            currentUser = ((IMessage) currentMsg.item).getUser();
+        } else {
+            return true;
+        }
+        if (nextMessage.item instanceof IMessage) {
+            nextUser = ((IMessage) nextMessage.item).getUser();
+        } else {
+            return true;
+        }
+
+        // If admin message or
+        if (currentUser == null || nextUser == null) {
+            return true;
+        }
+        return !currentUser.getId().equals(nextUser.getId());
+    }
+
     @Override
     public int getItemCount() {
         return items.size();
@@ -155,7 +215,11 @@ public void addToStart(MESSAGE message, boolean scroll) {
         }
         Wrapper<MESSAGE> element = new Wrapper<>(message);
         items.add(0, element);
+        boolean isContinuous = isPreviousSameAuthor(message.getUser().getId(), 0);
         notifyItemRangeInserted(0, isNewMessageToday ? 2 : 1);
+        if (isContinuous) {
+            notifyItemChanged(1);
+        }
         if (layoutManager != null && scroll) {
             layoutManager.scrollToPosition(0);
         }