migrated to androidx, latest build versions and added sorting with timestamp

app/build.gradle

@@ -1,13 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "co.intentservice.chatui.sample"
         minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }
@@ -20,9 +19,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    testImplementation 'junit:junit:4.12'
 
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile project(':chat-ui')
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation project(':chat-ui')
 }

app/src/main/java/co/intentservice/chatui/sample/MainActivity.java

@@ -1,7 +1,8 @@
 package co.intentservice.chatui.sample;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.appcompat.app.AppCompatActivity;
 
 import co.intentservice.chatui.ChatView;
 import co.intentservice.chatui.models.ChatMessage;

build.gradle

@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         // NOTE: Do not place your application dependencies here; they belong
@@ -16,6 +17,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 

chat-ui/build.gradle

@@ -13,7 +13,7 @@ ext {
     siteUrl = 'https://github.com/IntentService/android-chat-ui'
     gitUrl = 'https://github.com/IntentService/android-chat-ui'
 
-    libraryVersion = '0.1.3'
+    libraryVersion = '0.1.4'
 
     developerId = 'timigod'
     developerName = 'Timi Ajiboye'
@@ -25,12 +25,11 @@ ext {
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
     }
@@ -42,21 +41,19 @@ android {
     }
 }
 
-ext {
-    supportLibVer = '23.4.0'
-}
+
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile 'junit:junit:4.12'
-    compile 'com.android.support:support-v4:23.0.0'
-    compile "com.android.support:appcompat-v7:${supportLibVer}"
-    compile "com.android.support:cardview-v7:${supportLibVer}"
-    compile "com.android.support:design:${supportLibVer}"
-
-    compile 'pl.tajchert:waitingdots:0.2.0'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestImplementation 'junit:junit:4.12'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0'
+
+    implementation 'pl.tajchert:waitingdots:0.2.0'
 }
 
 
-apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
-apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
+//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
+//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'

chat-ui/src/main/java/co/intentservice/chatui/ChatView.java

@@ -4,8 +4,6 @@
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.CardView;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextUtils;
@@ -22,6 +20,9 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.cardview.widget.CardView;
+import androidx.core.content.ContextCompat;
+
 import java.util.ArrayList;
 
 import co.intentservice.chatui.fab.FloatingActionsMenu;

chat-ui/src/main/java/co/intentservice/chatui/adapters/ChatViewListAdapter.java

@@ -7,6 +7,8 @@
 import android.widget.BaseAdapter;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 
 import co.intentservice.chatui.models.ChatMessage;
 import co.intentservice.chatui.viewholders.MessageViewHolder;
@@ -106,6 +108,12 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
     public void addMessage(ChatMessage message) {
         chatMessages.add(message);
+        Collections.sort(chatMessages, new Comparator<ChatMessage>() {
+            @Override
+            public int compare(ChatMessage chatMessage, ChatMessage t1) {
+                return (int) (chatMessage.getTimestamp()-t1.getTimestamp());
+            }
+        });
         notifyDataSetChanged();
     }
 

chat-ui/src/main/java/co/intentservice/chatui/fab/FloatingActionButton.java

@@ -20,15 +20,16 @@
 import android.graphics.drawable.shapes.OvalShape;
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DimenRes;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.widget.ImageButton;
 import android.widget.TextView;
 
+import androidx.annotation.ColorRes;
+import androidx.annotation.DimenRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 

chat-ui/src/main/java/co/intentservice/chatui/fab/FloatingActionsMenu.java

@@ -14,9 +14,6 @@
 import android.graphics.drawable.LayerDrawable;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.ContextThemeWrapper;
 import android.view.TouchDelegate;
@@ -27,6 +24,10 @@
 import android.view.animation.OvershootInterpolator;
 import android.widget.TextView;
 
+import androidx.annotation.ColorRes;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+
 import co.intentservice.chatui.R;
 
 public class FloatingActionsMenu extends ViewGroup {

chat-ui/src/main/java/co/intentservice/chatui/fab/SendFloatingActionButton.java

@@ -2,10 +2,11 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.ColorRes;
-import android.support.annotation.DrawableRes;
 import android.util.AttributeSet;
 
+import androidx.annotation.ColorRes;
+import androidx.annotation.DrawableRes;
+
 import co.intentservice.chatui.R;
 
 public class SendFloatingActionButton extends FloatingActionButton {

chat-ui/src/main/java/co/intentservice/chatui/fab/TouchDelegateGroup.java

@@ -1,11 +1,12 @@
 package co.intentservice.chatui.fab;
 
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
 import android.view.MotionEvent;
 import android.view.TouchDelegate;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+
 import java.util.ArrayList;
 
 public class TouchDelegateGroup extends TouchDelegate {

chat-ui/src/main/java/co/intentservice/chatui/viewholders/MessageViewHolder.java

@@ -1,9 +1,10 @@
 package co.intentservice.chatui.viewholders;
 
 import android.content.Context;
-import android.support.v4.content.ContextCompat;
 import android.view.View;
 
+import androidx.core.content.ContextCompat;
+
 import co.intentservice.chatui.R;
 import co.intentservice.chatui.views.MessageView;
 

chat-ui/src/main/java/co/intentservice/chatui/views/ItemRecvView.java

@@ -1,13 +1,14 @@
 package co.intentservice.chatui.views;
 
 import android.content.Context;
-import android.support.annotation.ColorInt;
-import android.support.v7.widget.CardView;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
+import androidx.annotation.ColorInt;
+import androidx.cardview.widget.CardView;
+
 import co.intentservice.chatui.R;
 
 /**

chat-ui/src/main/java/co/intentservice/chatui/views/ItemSentView.java

@@ -2,14 +2,15 @@
 
 import android.app.Service;
 import android.content.Context;
-import android.support.annotation.ColorInt;
-import android.support.v7.widget.CardView;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
+import androidx.annotation.ColorInt;
+import androidx.cardview.widget.CardView;
+
 import co.intentservice.chatui.R;
 
 /**

chat-ui/src/main/res/layout/chat_item_dots.xml

@@ -6,7 +6,7 @@
     android:paddingStart="16dp"
     android:paddingLeft="16dp">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="left"
@@ -25,7 +25,7 @@
             dots:autoplay="true"
             dots:period="1000" />
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 
 </FrameLayout>

chat-ui/src/main/res/layout/chat_item_rcv.xml

@@ -10,7 +10,7 @@
     android:paddingEnd="72dp"
     android:paddingRight="72dp">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/bubble"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -49,7 +49,7 @@
                 android:textSize="@dimen/default_message_text_size"
                 tools:text="My name is Timi and I am..." />
 
-            <android.support.v4.widget.Space
+            <Space
                 android:layout_width="match_parent"
                 android:layout_height="4dp" />
 
@@ -65,6 +65,6 @@
 
         </LinearLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 </FrameLayout>

chat-ui/src/main/res/layout/chat_item_sent.xml

@@ -11,7 +11,7 @@
     android:paddingEnd="16dp"
     android:paddingRight="16dp">
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/bubble"
         app:cardCornerRadius="8dp"
         app:cardElevation="4dp"
@@ -51,7 +51,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
 
-            <android.support.v4.widget.Space
+            <Space
                 android:layout_width="match_parent"
                 android:layout_height="4dp" />
 
@@ -66,6 +66,6 @@
 
         </LinearLayout>
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 </FrameLayout>

chat-ui/src/main/res/layout/chat_view.xml

@@ -31,7 +31,7 @@
     </co.intentservice.chatui.fab.FloatingActionsMenu>
 
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/input_frame"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -69,6 +69,6 @@
             android:textColorHint="@color/main_color_gray"
             android:textSize="@dimen/default_input_text_size" />
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 </merge>

gradle.properties

@@ -15,4 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true