From 11bee2e07183d39efe86112d2253686225d548fa Mon Sep 17 00:00:00 2001
From: Philippe Auriach
Date: Wed, 9 Aug 2017 15:28:03 +0200
Subject: [PATCH 1/2] ability to have return a drawable for dialog / users
---
.../stfalcon/chatkit/commons/ImageLoader.java | 3 ++-
.../chatkit/commons/models/IDialog.java | 4 ++++
.../chatkit/commons/models/IUser.java | 8 +++++++
.../chatkit/dialogs/DialogsListAdapter.java | 24 ++++++++++++-------
.../features/demo/DemoDialogsActivity.java | 8 +++++--
5 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/commons/ImageLoader.java b/chatkit/src/main/java/com/stfalcon/chatkit/commons/ImageLoader.java
index 4d795854..402b48f8 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/commons/ImageLoader.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/commons/ImageLoader.java
@@ -16,6 +16,7 @@
package com.stfalcon.chatkit.commons;
+import android.graphics.drawable.Drawable;
import android.widget.ImageView;
/**
@@ -23,6 +24,6 @@
*/
public interface ImageLoader {
- void loadImage(ImageView imageView, String url);
+ void loadImage(ImageView imageView, Drawable drawable, String url);
}
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/commons/models/IDialog.java b/chatkit/src/main/java/com/stfalcon/chatkit/commons/models/IDialog.java
index 661c76e8..cf6deaa7 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/commons/models/IDialog.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/commons/models/IDialog.java
@@ -16,6 +16,8 @@
package com.stfalcon.chatkit.commons.models;
+import android.graphics.drawable.Drawable;
+
import java.util.List;
/**
@@ -26,6 +28,8 @@ public interface IDialog {
String getId();
+ Drawable getDialogPhotoDrawable();
+
String getDialogPhoto();
String getDialogName();
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/commons/models/IUser.java b/chatkit/src/main/java/com/stfalcon/chatkit/commons/models/IUser.java
index d51c2081..cff1ff94 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/commons/models/IUser.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/commons/models/IUser.java
@@ -16,6 +16,8 @@
package com.stfalcon.chatkit.commons.models;
+import android.graphics.drawable.Drawable;
+
/**
* For implementing by real user model
*/
@@ -35,6 +37,12 @@ public interface IUser {
* */
String getName();
+ /**
+ *
+ * @return the user's avatar drawable
+ */
+ Drawable getAvatarDrawable();
+
/**
* Returns the user's avatar image url
*
diff --git a/chatkit/src/main/java/com/stfalcon/chatkit/dialogs/DialogsListAdapter.java b/chatkit/src/main/java/com/stfalcon/chatkit/dialogs/DialogsListAdapter.java
index 9638ff7e..7659fbb0 100644
--- a/chatkit/src/main/java/com/stfalcon/chatkit/dialogs/DialogsListAdapter.java
+++ b/chatkit/src/main/java/com/stfalcon/chatkit/dialogs/DialogsListAdapter.java
@@ -32,6 +32,7 @@
import com.stfalcon.chatkit.commons.ViewHolder;
import com.stfalcon.chatkit.commons.models.IDialog;
import com.stfalcon.chatkit.commons.models.IMessage;
+import com.stfalcon.chatkit.commons.models.IUser;
import com.stfalcon.chatkit.utils.DateFormatter;
import java.lang.reflect.Constructor;
@@ -297,6 +298,13 @@ public void sort(Comparator