Show avatar with username initials.

app/build.gradle

@@ -31,17 +31,18 @@ buildscript {
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
+
     defaultConfig {
         applicationId "chat.rocket.android"
         minSdkVersion 16
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 28
         versionName "1.0.16"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
     }
+
     signingConfigs {
         release {
             storeFile project.rootProject.file('Rocket.jks').getCanonicalFile()
@@ -50,27 +51,32 @@ android {
             keyPassword System.getenv("KEY_PASSWORD")
         }
     }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.release
         }
     }
+
     packagingOptions {
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/NOTICE.txt'
         exclude 'META-INF/rxjava.properties'
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
     lintOptions {
         //avoiding okio error: https://github.com/square/okhttp/issues/896
         lintConfig file("lint.xml")
     }
 }
+
 play {
     jsonFile = file('rocket-chat.json')
     track = "${track}"

app/src/main/java/chat/rocket/android/helper/OkHttpHelper.java

@@ -48,4 +48,4 @@ public static OkHttpClient getClientForWebSocket() {
     }
     return httpClientForWS;
   }
-}
+}

app/src/main/java/chat/rocket/android/renderer/MessageRenderer.kt

@@ -5,9 +5,9 @@ import android.widget.ImageView
 import android.widget.TextView
 import chat.rocket.android.R
 import chat.rocket.android.helper.DateTime
-import chat.rocket.android.helper.RocketChatUserAvatar
 import chat.rocket.android.widget.AbsoluteUrl
 import chat.rocket.android.widget.RocketChatAvatar
+import chat.rocket.android.widget.helper.UserAvatarHelper
 import chat.rocket.android.widget.message.RocketChatMessageAttachmentsLayout
 import chat.rocket.android.widget.message.RocketChatMessageLayout
 import chat.rocket.android.widget.message.RocketChatMessageUrlsLayout
@@ -20,20 +20,19 @@ class MessageRenderer(val message: Message, val autoLoadImage: Boolean) {
      * Show user's avatar image in RocketChatAvatar widget.
      */
     fun showAvatar(rocketChatAvatarWidget: RocketChatAvatar, hostname: String, userNotFoundAvatarImageView: ImageView) {
-        if (message.avatar != null) {
-            // Load user's avatar image from Oauth provider URI.
-            rocketChatAvatarWidget.loadImage(message.avatar)
-        } else {
-            val username: String? = message.user?.username
-            if (username != null) {
-                // Load user's avatar image from Rocket.Chat URI.
-                rocketChatAvatarWidget.loadImage(RocketChatUserAvatar(hostname, username).imageUri)
-                userNotFoundAvatarImageView.visibility = View.GONE
-                rocketChatAvatarWidget.visibility = View.VISIBLE
+        val username: String? = message.user?.username
+        if (username != null) {
+            userNotFoundAvatarImageView.visibility = View.GONE
+            val placeholderDrawable = UserAvatarHelper.getTextDrawable(username, rocketChatAvatarWidget.context)
+            if (message.avatar != null) {
+                // Load user's avatar image from Oauth provider URI.
+                rocketChatAvatarWidget.loadImage(message.avatar, placeholderDrawable)
             } else {
-                rocketChatAvatarWidget.visibility = View.GONE
-                userNotFoundAvatarImageView.visibility = View.VISIBLE
+                rocketChatAvatarWidget.loadImage(UserAvatarHelper.getUri(hostname, username), placeholderDrawable)
             }
+        } else {
+            rocketChatAvatarWidget.visibility = View.GONE
+            userNotFoundAvatarImageView.visibility = View.VISIBLE
         }
     }
 

app/src/main/java/chat/rocket/android/renderer/UserRenderer.kt

@@ -4,8 +4,8 @@ import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
 import chat.rocket.android.R
-import chat.rocket.android.helper.RocketChatUserAvatar
 import chat.rocket.android.widget.RocketChatAvatar
+import chat.rocket.android.widget.helper.UserAvatarHelper
 import chat.rocket.core.models.User
 
 class UserRenderer(val user: User) {
@@ -16,7 +16,7 @@ class UserRenderer(val user: User) {
     fun showAvatar(rocketChatAvatarWidget: RocketChatAvatar, hostname: String) {
         val username: String? = user.username
         if (username != null) {
-            rocketChatAvatarWidget.loadImage(RocketChatUserAvatar(hostname, username).imageUri)
+            rocketChatAvatarWidget.loadImage(UserAvatarHelper.getUri(hostname, username), UserAvatarHelper.getTextDrawable(username, rocketChatAvatarWidget.context))
         } else {
             rocketChatAvatarWidget.visibility = View.GONE
         }

build.gradle

@@ -22,7 +22,7 @@ ext {
     buildToolsVersion = "26.0.0"
     supportLibraryVersion = "25.4.0"
     constraintLayoutVersion = "1.0.2"
-    kotlinVersion = "1.1.3"
+    kotlinVersion = "1.1.3-2"
 }
 
 task clean(type: Delete) {

rocket-chat-android-widgets/build.gradle

@@ -24,12 +24,18 @@ android {
 
         vectorDrawables.useSupportLibrary = true
     }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    sourceSets {
+        test.java.srcDirs += 'src/test/kotlin'
+        androidTest.java.srcDirs += 'src/androidTest/kotlin'
+    }
 }
 
 ext {
@@ -49,6 +55,8 @@ dependencies {
     compile "com.android.support.constraint:constraint-layout:$rootProject.ext.constraintLayoutVersion"
 
     compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$rootProject.ext.kotlinVersion"
+    testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
+    testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
 
     compile 'org.nibor.autolink:autolink:0.6.0'
 

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/RocketChatAvatar.java

@@ -2,6 +2,7 @@
 
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
@@ -11,38 +12,35 @@
 
 public class RocketChatAvatar extends FrameLayout {
 
-  private SimpleDraweeView draweeView;
+  private SimpleDraweeView simpleDraweeViewAvatar;
 
   public RocketChatAvatar(Context context) {
     super(context);
-    initialize(context, null);
+    initialize(context);
   }
 
   public RocketChatAvatar(Context context, AttributeSet attrs) {
     super(context, attrs);
-    initialize(context, attrs);
+    initialize(context);
   }
 
   public RocketChatAvatar(Context context, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
-    initialize(context, attrs);
+    initialize(context);
   }
 
   @TargetApi(Build.VERSION_CODES.LOLLIPOP)
   public RocketChatAvatar(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
     super(context, attrs, defStyleAttr, defStyleRes);
-    initialize(context, attrs);
+    initialize(context);
   }
 
-  private void initialize(Context context, AttributeSet attrs) {
-    LayoutInflater
-        .from(context)
-        .inflate(R.layout.message_avatar, this, true);
-    draweeView = findViewById(R.id.drawee_avatar);
+  private void initialize(Context context) {
+    LayoutInflater.from(context).inflate(R.layout.message_avatar, this, true);
+    simpleDraweeViewAvatar = findViewById(R.id.drawee_avatar);
   }
 
-  public void loadImage(String imageUri) {
-    FrescoHelper
-        .loadImage(draweeView, imageUri);
+  public void loadImage(String imageUri, Drawable placeholderDrawable) {
+    FrescoHelper.INSTANCE.loadImage(simpleDraweeViewAvatar, imageUri, placeholderDrawable);
   }
 }

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/RocketChatWidgets.java

@@ -3,7 +3,6 @@
 import android.content.Context;
 
 import com.facebook.common.logging.FLog;
-import com.facebook.drawee.backends.pipeline.DraweeConfig;
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.imagepipeline.backends.okhttp3.OkHttpImagePipelineConfigFactory;
 import com.facebook.imagepipeline.core.ImagePipelineConfig;
@@ -13,7 +12,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import chat.rocket.android.widget.fresco.CustomImageFormatConfigurator;
 import okhttp3.OkHttpClient;
 
 public class RocketChatWidgets {
@@ -26,15 +24,11 @@ public static void initialize(Context context, OkHttpClient okHttpClient) {
     ImagePipelineConfig imagePipelineConfig = OkHttpImagePipelineConfigFactory
         .newBuilder(context, okHttpClient)
         .setRequestListeners(listeners)
-        .setImageDecoderConfig(CustomImageFormatConfigurator.createImageDecoderConfig())
         .setDownsampleEnabled(true)
         .experiment().setBitmapPrepareToDraw(true)
         .experiment().setPartialImageCachingEnabled(true)
         .build();
 
-    DraweeConfig.Builder draweeConfigBuilder = DraweeConfig.newBuilder();
-    CustomImageFormatConfigurator.addCustomDrawableFactories(draweeConfigBuilder);
-
-    Fresco.initialize(context, imagePipelineConfig, draweeConfigBuilder.build());
+    Fresco.initialize(context, imagePipelineConfig);
   }
 }