Merge pull request #1084 from RocketChat/new/color-attachment-again

[NEW] ColorAttachment (need a better name)

app/src/main/AndroidManifest.xml

@@ -17,10 +17,11 @@
     <application
         android:name=".app.RocketChatApplication"
         android:allowBackup="true"
+        android:fullBackupContent="@xml/backup_config"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:networkSecurityConfig="@xml/network_security_config">
+        android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true">
 
         <activity

app/src/main/java/chat/rocket/android/chatroom/adapter/ChatRoomAdapter.kt

@@ -57,6 +57,10 @@ class ChatRoomAdapter(
                 val view = parent.inflate(R.layout.item_author_attachment)
                 AuthorAttachmentViewHolder(view, actionsListener, reactionListener)
             }
+            BaseViewModel.ViewType.COLOR_ATTACHMENT -> {
+                val view = parent.inflate(R.layout.item_color_attachment)
+                ColorAttachmentViewHolder(view, actionsListener, reactionListener)
+            }
             else -> {
                 throw InvalidParameterException("TODO - implement for ${viewType.toViewType()}")
             }
@@ -97,6 +101,7 @@ class ChatRoomAdapter(
             is UrlPreviewViewHolder -> holder.bind(dataSet[position] as UrlPreviewViewModel)
             is MessageAttachmentViewHolder -> holder.bind(dataSet[position] as MessageAttachmentViewModel)
             is AuthorAttachmentViewHolder -> holder.bind(dataSet[position] as AuthorAttachmentViewModel)
+            is ColorAttachmentViewHolder -> holder.bind(dataSet[position] as ColorAttachmentViewModel)
         }
     }
 

app/src/main/java/chat/rocket/android/chatroom/adapter/ColorAttachmentViewHolder.kt

+package chat.rocket.android.chatroom.adapter
+
+import android.graphics.drawable.Drawable
+import android.support.v4.content.ContextCompat
+import android.text.method.LinkMovementMethod
+import android.view.View
+import chat.rocket.android.R
+import chat.rocket.android.chatroom.viewmodel.ColorAttachmentViewModel
+import chat.rocket.android.widget.emoji.EmojiReactionListener
+import kotlinx.android.synthetic.main.item_color_attachment.view.*
+
+
+class ColorAttachmentViewHolder(itemView: View,
+                                listener: BaseViewHolder.ActionsListener,
+                                reactionListener: EmojiReactionListener? = null)
+    : BaseViewHolder<ColorAttachmentViewModel>(itemView, listener, reactionListener) {
+
+    val drawable: Drawable? = ContextCompat.getDrawable(itemView.context,
+            R.drawable.quote_vertical_bar)
+
+    init {
+        with(itemView) {
+            setupActionMenu(attachment_text)
+            setupActionMenu(color_attachment_container)
+            attachment_text.movementMethod = LinkMovementMethod()
+        }
+    }
+
+    override fun bindViews(data: ColorAttachmentViewModel) {
+        with(itemView) {
+            drawable?.let {
+                quote_bar.background = drawable.mutate().apply { setTint(data.color) }
+                attachment_text.text = data.text
+            }
+        }
+    }
+
+}
\ No newline at end of file

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

@@ -22,7 +22,8 @@ interface BaseViewModel<out T> {
         VIDEO_ATTACHMENT(4),
         AUDIO_ATTACHMENT(5),
         MESSAGE_ATTACHMENT(6),
-        AUTHOR_ATTACHMENT(7)
+        AUTHOR_ATTACHMENT(7),
+        COLOR_ATTACHMENT(8)
     }
 }
 

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

+package chat.rocket.android.chatroom.viewmodel
+
+import chat.rocket.android.R
+import chat.rocket.core.model.Message
+import chat.rocket.core.model.attachment.ColorAttachment
+
+data class ColorAttachmentViewModel(
+    override val attachmentUrl: String,
+    val id: Long,
+    val color: Int,
+    val text: CharSequence,
+    override val message: Message,
+    override val rawData: ColorAttachment,
+    override val messageId: String,
+    override var reactions: List<ReactionViewModel>,
+    override var nextDownStreamMessage: BaseViewModel<*>? = null,
+    override var preview: Message? = null,
+    override var isTemporary: Boolean = false
+) : BaseAttachmentViewModel<ColorAttachment> {
+    override val viewType: Int
+        get() = BaseViewModel.ViewType.COLOR_ATTACHMENT.viewType
+    override val layoutId: Int
+        get() = R.layout.item_color_attachment
+}
\ No newline at end of file

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

@@ -5,6 +5,7 @@ import android.content.Context
 import android.graphics.Color
 import android.graphics.Typeface
 import android.support.v4.content.ContextCompat
+import android.text.Html
 import android.text.SpannableStringBuilder
 import android.text.style.ForegroundColorSpan
 import android.text.style.StyleSpan
@@ -106,10 +107,23 @@ class ViewModelMapper @Inject constructor(private val context: Context,
             is FileAttachment -> mapFileAttachment(message, attachment)
             is MessageAttachment -> mapMessageAttachment(message, attachment)
             is AuthorAttachment -> mapAuthorAttachment(message, attachment)
+            is ColorAttachment -> mapColorAttachment(message, attachment)
             else -> null
         }
     }
 
+    private suspend fun mapColorAttachment(message: Message, attachment: ColorAttachment): BaseViewModel<*>? {
+        return with(attachment) {
+            val content = stripMessageQuotes(message)
+            val id = attachmentId(message, attachment)
+
+            ColorAttachmentViewModel(attachmentUrl = url, id = id, color = color.color,
+                    text = text, message = message, rawData = attachment,
+                    messageId = message.id, reactions = getReactions(message),
+                    preview = message.copy(message = content.message))
+        }
+    }
+
     private suspend fun mapAuthorAttachment(message: Message, attachment: AuthorAttachment): AuthorAttachmentViewModel {
         return with(attachment) {
             val content = stripMessageQuotes(message)

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

@@ -16,6 +16,7 @@ import chat.rocket.android.authentication.infraestructure.SharedPreferencesMulti
 import chat.rocket.android.authentication.infraestructure.SharedPreferencesTokenRepository
 import chat.rocket.android.chatroom.service.MessageService
 import chat.rocket.android.dagger.qualifier.ForFresco
+import chat.rocket.android.dagger.qualifier.ForMessages
 import chat.rocket.android.helper.FrescoAuthInterceptor
 import chat.rocket.android.helper.MessageParser
 import chat.rocket.android.infrastructure.LocalRepository
@@ -73,7 +74,7 @@ class AppModule {
     @Provides
     @Singleton
     fun provideRocketChatDatabase(context: Application): RocketChatDatabase {
-        return Room.databaseBuilder(context, RocketChatDatabase::class.java, "rocketchat-db").build()
+        return Room.databaseBuilder(context.applicationContext, RocketChatDatabase::class.java, "rocketchat-db").build()
     }
 
     @Provides
@@ -168,9 +169,14 @@ class AppModule {
     }
 
     @Provides
-    fun provideSharedPreferences(context: Application): SharedPreferences {
-        return context.getSharedPreferences("rocket.chat", Context.MODE_PRIVATE)
-    }
+    fun provideSharedPreferences(context: Application) =
+        context.getSharedPreferences("rocket.chat", Context.MODE_PRIVATE)
+
+
+    @Provides
+    @ForMessages
+    fun provideMessagesSharedPreferences(context: Application) =
+            context.getSharedPreferences("messages", Context.MODE_PRIVATE)
 
     @Provides
     @Singleton
@@ -225,8 +231,10 @@ class AppModule {
 
     @Provides
     @Singleton
-    fun provideMessageRepository(context: Application, moshi: Moshi, currentServerInteractor: GetCurrentServerInteractor): MessagesRepository {
-        val preferences = context.getSharedPreferences("messages", Context.MODE_PRIVATE)
+    fun provideMessageRepository(context: Application,
+                                 @ForMessages preferences: SharedPreferences,
+                                 moshi: Moshi,
+                                 currentServerInteractor: GetCurrentServerInteractor): MessagesRepository {
         return SharedPreferencesMessagesRepository(preferences, moshi, currentServerInteractor)
     }
 

app/src/main/java/chat/rocket/android/dagger/qualifier/ForMessages.kt

+package chat.rocket.android.dagger.qualifier
+
+import javax.inject.Qualifier
+
+/**
+ * Created by luciofm on 4/14/18.
+ */
+
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+annotation class ForMessages
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/color_attachment_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    android:paddingBottom="@dimen/message_item_top_and_bottom_padding"
+    android:paddingEnd="@dimen/screen_edge_left_and_right_padding"
+    android:paddingStart="@dimen/screen_edge_left_and_right_padding"
+    android:paddingTop="@dimen/message_item_top_and_bottom_padding">
+
+    <View
+        android:id="@+id/quote_bar"
+        android:layout_width="4dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="56dp"
+        android:background="@drawable/quote_vertical_bar"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/recycler_view_reactions"/>
+
+    <TextView
+        android:id="@+id/attachment_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+        android:autoLink="web"
+        app:layout_constraintStart_toEndOf="@id/quote_bar"
+        app:layout_constraintEnd_toEndOf="parent"
+        tools:text="#5571 - User profile from SSO must not have password change option" />
+
+    <include
+        layout="@layout/layout_reactions"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="@id/quote_bar"
+        app:layout_constraintTop_toBottomOf="@id/attachment_text" />
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file

app/src/main/res/xml/backup_config.xml

+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content xmlns:tools="http://schemas.android.com/tools">
+    <include domain="sharedpref" path="."/>
+    <exclude domain="sharedpref" path="messages.xml"
+        tools:ignore="FullBackupContent" />
+    <exclude domain="file" path="instant-run"
+        tools:ignore="FullBackupContent" />
+</full-backup-content>