Merge branch 'markdown-support' into message-actions

app/src/main/java/chat/rocket/android/chatroom/viewmodel/MessageViewModelMapper.kt

@@ -7,7 +7,7 @@ import chat.rocket.core.TokenRepository
 import chat.rocket.core.model.Message
 import chat.rocket.core.model.Value
 import kotlinx.coroutines.experimental.CommonPool
-import kotlinx.coroutines.experimental.launch
+import kotlinx.coroutines.experimental.withContext
 import javax.inject.Inject
 
 class MessageViewModelMapper @Inject constructor(private val context: Context,
@@ -15,8 +15,15 @@ class MessageViewModelMapper @Inject constructor(private val context: Context,
                                                  private val messageParser: MessageParser,
                                                  private val messagesRepository: MessagesRepository) {
 
-    suspend fun mapToViewModel(message: Message, settings: Map<String, Value<Any>>) = launch(CommonPool) {
-        MessageViewModel(this@MessageViewModelMapper.context, tokenRepository.get(), message, settings, messageParser, messagesRepository)
+    suspend fun mapToViewModel(message: Message, settings: Map<String, Value<Any>>): MessageViewModel = withContext(CommonPool) {
+        MessageViewModel(
+                this@MessageViewModelMapper.context,
+                tokenRepository.get(),
+                message,
+                settings,
+                messageParser,
+                messagesRepository
+        )
     }
 
     suspend fun mapToViewModelList(messageList: List<Message>, settings: Map<String, Value<Any>>): List<MessageViewModel> {

app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt

@@ -4,8 +4,8 @@ import android.app.Application
 import android.arch.persistence.room.Room
 import android.content.Context
 import android.content.SharedPreferences
-import android.graphics.Color
 import chat.rocket.android.BuildConfig
+import chat.rocket.android.R
 import chat.rocket.android.app.RocketChatDatabase
 import chat.rocket.android.app.utils.CustomImageFormatConfigurator
 import chat.rocket.android.authentication.infraestructure.MemoryTokenRepository
@@ -206,14 +206,15 @@ class AppModule {
     @Provides
     @Singleton
     fun provideConfiguration(context: Application, client: OkHttpClient): SpannableConfiguration {
+        val res = context.resources
         return SpannableConfiguration.builder(context)
                 .asyncDrawableLoader(AsyncDrawableLoader.builder()
                         .client(client)
                         .executorService(Executors.newCachedThreadPool())
-                        .resources(context.resources)
+                        .resources(res)
                         .build())
                 .theme(SpannableTheme.builder()
-                        .linkColor(Color.BLUE)
+                        .linkColor(res.getColor(R.color.colorAccent))
                         .build())
                 .build()
     }

app/src/main/java/chat/rocket/android/helper/MessageParser.kt

@@ -129,7 +129,7 @@ class MessageParser @Inject constructor(val context: Application, private val co
     }
 
     class QuoteMarginSpan(quoteDrawable: Drawable, private var pad: Int) : LeadingMarginSpan, LineHeightSpan {
-        private var drawable: Drawable = quoteDrawable
+        private val drawable: Drawable = quoteDrawable
 
         override fun getLeadingMargin(first: Boolean): Int {
             return drawable.intrinsicWidth + pad
@@ -150,14 +150,14 @@ class MessageParser @Inject constructor(val context: Application, private val co
         }
 
         override fun chooseHeight(text: CharSequence, start: Int, end: Int,
-                                  istartv: Int, v: Int,
+                                  spanstartv: Int, v: Int,
                                   fm: Paint.FontMetricsInt) {
             if (end == (text as Spanned).getSpanEnd(this)) {
                 val ht = drawable.intrinsicHeight
-                var need = ht - (v + fm.descent - fm.ascent - istartv)
+                var need = ht - (v + fm.descent - fm.ascent - spanstartv)
                 if (need > 0)
                     fm.descent += need
-                need = ht - (v + fm.bottom - fm.top - istartv)
+                need = ht - (v + fm.bottom - fm.top - spanstartv)
                 if (need > 0)
                     fm.bottom += need
             }