Merge pull request #746 from filipedelimabrito/improvement/svg-in-favor-of-text-drawable

[FIX] SVG rendering improvements

app/build.gradle

@@ -92,21 +92,15 @@ dependencies {
     implementation libraries.kotshiApi
 
     implementation libraries.frescoImageViewer
-
     implementation libraries.androidSvg
 
-    implementation libraries.aVLoadingIndicatorView
-
-    implementation libraries.textDrawable
-
     implementation libraries.markwon
-
     implementation libraries.markwonImageLoader
 
-    implementation libraries.moshiLazyAdapters
-
     implementation libraries.sheetMenu
 
+    implementation libraries.aVLoadingIndicatorView
+
     implementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
         transitive = true
     }

app/src/main/java/chat/rocket/android/app/DrawableHelper.kt

 import android.content.Context
-import android.graphics.Typeface
 import android.graphics.drawable.Drawable
 import android.support.v4.content.ContextCompat
 import android.support.v4.graphics.drawable.DrawableCompat
 import android.widget.EditText
 import android.widget.TextView
 import chat.rocket.android.R
-import chat.rocket.android.helper.TextHelper
-import com.amulyakhare.textdrawable.TextDrawable
 
 object DrawableHelper {
-    private val AVATAR_BACKGROUND_HEXADECIMAL_COLORS = intArrayOf(
-            0xFFF44336.toInt(), 0xFFE91E63.toInt(), 0xFF9C27B0.toInt(), 0xFF673AB7.toInt(), 0xFF3F51B5.toInt(),
-            0xFF2196F3.toInt(), 0xFF03A9F4.toInt(), 0xFF00BCD4.toInt(), 0xFF009688.toInt(), 0xFF4CAF50.toInt(),
-            0xFF8BC34A.toInt(), 0xFFCDDC39.toInt(), 0xFFFFC107.toInt(), 0xFFFF9800.toInt(), 0xFFFF5722.toInt(),
-            0xFF795548.toInt(), 0xFF9E9E9E.toInt(), 0xFF607D8B.toInt())
+
     /**
      * Returns a Drawable from its ID.
      *
@@ -123,29 +116,4 @@ object DrawableHelper {
         }
         return userStatusDrawable
     }
-
-    /**
-     * Returns a drawable with the first character from a string.
-     *
-     * @param string The string to get its first character and to get the avatar background color.
-     * @return A drawable with the string first character.
-     */
-    fun getTextDrawable(string: String): Drawable {
-        return TextDrawable.builder()
-                .beginConfig()
-                .useFont(Typeface.SANS_SERIF)
-                .endConfig()
-                .buildRoundRect(TextHelper.getFirstCharacter(string), getAvatarBackgroundColor(string), 4)
-    }
-
-    /**
-     * Returns a background color to be rendered on the avatar.
-     *
-     * @param string Gets the background color based on the provided string.
-     * @return A hexadecimal color.
-     * @see (Rocket.Chat/server/startup/avatar.js)
-     */
-    private fun getAvatarBackgroundColor(string: String): Int {
-        return AVATAR_BACKGROUND_HEXADECIMAL_COLORS[string.length % AVATAR_BACKGROUND_HEXADECIMAL_COLORS.size]
-    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/app/utils/SvgDecoder.kt

@@ -23,8 +23,8 @@ import com.facebook.imagepipeline.image.QualityInfo
 object SvgDecoder {
     val svgFormat = ImageFormat("SVG_FORMAT", "svg")
     // We do not include the closing ">" since there can be additional information.
-    private val headerTag = "<?xml"
-    private val possibleHeaderTags = arrayOf(ImageFormatCheckerUtils.asciiBytes("<svg"))
+    private val headerTag = "<svg"
+    private val possibleHeaderTags = arrayOf(ImageFormatCheckerUtils.asciiBytes("<?xml"))
 
     /**
      * Custom SVG format checker that verifies that the header of the file corresponds to our [SvgDecoder.headerTag] or [SvgDecoder.possibleHeaderTags].

app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt

@@ -86,7 +86,7 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
                 ex.message?.let {
                     view.showMessage(it)
                 }.ifNull {
-                    view.showGenericErrorMessage()
+                   view.showGenericErrorMessage()
                 }
                 view.enableMessageInput()
             }

app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsAdapter.kt

@@ -39,7 +39,7 @@ class ChatRoomsAdapter(private val context: Context,
     inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
 
         fun bind(chatRoom: ChatRoom) = with(itemView) {
-            bindAvatar(chatRoom, layout_avatar, image_avatar, image_room_avatar)
+            bindAvatar(chatRoom, image_avatar)
             bindName(chatRoom, text_chat_name)
             bindLastMessageDateTime(chatRoom, text_last_message_date_time)
             bindLastMessage(chatRoom, text_last_message)
@@ -48,17 +48,8 @@ class ChatRoomsAdapter(private val context: Context,
             setOnClickListener { listener(chatRoom) }
         }
 
-        private fun bindAvatar(chatRoom: ChatRoom, avatarLayout: View, drawee: SimpleDraweeView, imageView: ImageView) {
-            val chatRoomName = chatRoom.name
-            if (chatRoom.type is RoomType.DirectMessage) {
-                drawee.setImageURI(UrlHelper.getAvatarUrl(chatRoom.client.url, chatRoomName))
-                imageView.setVisible(false)
-                avatarLayout.setVisible(true)
-            } else {
-                imageView.setImageDrawable(DrawableHelper.getTextDrawable(chatRoomName))
-                avatarLayout.setVisible(false)
-                imageView.setVisible(true)
-            }
+        private fun bindAvatar(chatRoom: ChatRoom, drawee: SimpleDraweeView) {
+            drawee.setImageURI(UrlHelper.getAvatarUrl(chatRoom.client.url, chatRoom.name))
         }
 
         private fun bindName(chatRoom: ChatRoom, textView: TextView) {

app/src/main/res/layout/avatar.xml

@@ -9,6 +9,6 @@
         android:id="@+id/image_avatar"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        app:roundedCornerRadius="2dp" />
+        app:roundedCornerRadius="3dp" />
 
 </LinearLayout>
\ No newline at end of file

app/src/main/res/layout/item_chat.xml

@@ -9,33 +9,15 @@
     android:layout_marginStart="@dimen/screen_edge_left_and_right_margins"
     android:layout_marginTop="12dp">
 
-    <android.support.constraint.ConstraintLayout
-        android:id="@+id/avatar_container"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <include
+        android:id="@+id/layout_avatar"
+        layout="@layout/avatar"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toLeftOf="@+id/middle_container"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <include
-            android:id="@+id/layout_avatar"
-            layout="@layout/avatar"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:visibility="gone" />
-
-        <!-- We need to build the avatar with initials since the server returns a SVG file with a pre defined 50x50 pixel.
-            TODO: check to scale the SVG file on the app and remove the view bellow (or make the server to return a jpg file.
-            SVG scaling with fresco is impossible: http://frescolib.org/docs/resizing.html
-         -->
-        <ImageView
-            android:id="@+id/image_room_avatar"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:visibility="gone"
-            tools:ignore="contentDescription" />
-    </android.support.constraint.ConstraintLayout>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <android.support.constraint.ConstraintLayout
         android:id="@+id/middle_container"
@@ -43,7 +25,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
-        app:layout_constraintLeft_toRightOf="@+id/avatar_container"
+        app:layout_constraintLeft_toRightOf="@+id/layout_avatar"
         app:layout_constraintRight_toLeftOf="@+id/right_container">
 
         <TextView

build.gradle

@@ -13,7 +13,7 @@ buildscript {
         classpath "com.android.tools.build:gradle:3.0.1"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
-        classpath 'com.google.gms:google-services:3.1.2'
+        classpath 'com.google.gms:google-services:3.2.0'
         classpath 'io.fabric.tools:gradle:1.+'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -27,7 +27,6 @@ allprojects {
         jcenter()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven { url "https://jitpack.io" }
-        maven { url "http://dl.bintray.com/amulyakhare/maven" } // For TextDrawable.
     }
 
     apply from: rootProject.file('dependencies.gradle')

dependencies.gradle

@@ -25,12 +25,10 @@ ext {
         fresco                 : '1.7.1',
         kotshi                 : '0.3.0',
         frescoImageViewer      : '0.5.0',
-        androidSvg             : '1.2.1',
-        aVLoadingIndicatorView : '2.1.3',
+        androidSvg             : 'master-SNAPSHOT',
         markwon                : '1.0.3',
-        textDrawable           : '1.0.2', // Remove this library after https://github.com/RocketChat/Rocket.Chat/pull/9492 is merged
-        moshiLazyAdapters      : '2.1', // Even declared on the SDK we need to add this library here because java.lang.NoClassDefFoundError: Failed resolution of: Lcom/serjltt/moshi/adapters/FallbackEnum;
         sheetMenu              : '1.3.3',
+        aVLoadingIndicatorView : '2.1.3',
 
         // For testing
         junit                  : '4.12',
@@ -84,20 +82,15 @@ ext {
         kotshiCompiler         : "se.ansman.kotshi:compiler:${versions.kotshi}",
 
         frescoImageViewer      : "com.github.stfalcon:frescoimageviewer:${versions.frescoImageViewer}",
-
-        androidSvg             : "com.caverock:androidsvg:${versions.androidSvg}",
-
-        aVLoadingIndicatorView : "com.wang.avi:library:${versions.aVLoadingIndicatorView}",
-
-        textDrawable           : "com.github.rocketchat:textdrawable:${versions.textDrawable}",
+        androidSvg             : "com.github.BigBadaboom:androidsvg:${versions.androidSvg}",
 
         markwon                : "ru.noties:markwon:${versions.markwon}",
         markwonImageLoader     : "ru.noties:markwon-image-loader:${versions.markwon}",
 
-        moshiLazyAdapters      : "com.serjltt.moshi:moshi-lazy-adapters:${versions.moshiLazyAdapters}",
-
         sheetMenu              : "com.github.whalemare:sheetmenu:${versions.sheetMenu}",
 
+        aVLoadingIndicatorView : "com.wang.avi:library:${versions.aVLoadingIndicatorView}",
+
         // For testing
         junit         : "junit:junit:$versions.junit",
         expressoCore  : "com.android.support.test.espresso:espresso-core:${versions.expresso}",