Merge pull request #1229 from RocketChat/improvement/honor-layout-when-no-lastmessage

[IMPROVEMENT] Honor layout when no Store_Last_Message is set to false

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

@@ -16,12 +16,9 @@ import chat.rocket.android.R
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.infrastructure.checkIfMyself
 import chat.rocket.android.server.domain.PublicSettings
+import chat.rocket.android.server.domain.showLastMessage
 import chat.rocket.android.server.domain.useRealName
-import chat.rocket.android.util.extensions.avatarUrl
-import chat.rocket.android.util.extensions.content
-import chat.rocket.android.util.extensions.inflate
-import chat.rocket.android.util.extensions.setVisible
-import chat.rocket.android.util.extensions.textContent
+import chat.rocket.android.util.extensions.*
 import chat.rocket.common.model.RoomType
 import chat.rocket.core.model.ChatRoom
 import com.facebook.drawee.view.SimpleDraweeView
@@ -51,24 +48,31 @@ class ChatRoomsAdapter(private val context: Context,
             bindAvatar(chatRoom, image_avatar)
             bindName(chatRoom, text_chat_name)
             bindIcon(chatRoom, image_chat_icon)
-            bindLastMessageDateTime(chatRoom, text_last_message_date_time)
-            bindLastMessage(chatRoom, text_last_message)
+            if (settings.showLastMessage()) {
+                text_last_message.setVisible(true)
+                text_last_message_date_time.setVisible(true)
+                bindLastMessageDateTime(chatRoom, text_last_message_date_time)
+                bindLastMessage(chatRoom, text_last_message)
+            } else {
+                text_last_message.setVisible(false)
+                text_last_message_date_time.setVisible(false)
+            }
             bindUnreadMessages(chatRoom, text_total_unread_messages)
 
             if (chatRoom.alert || chatRoom.unread > 0) {
                 text_chat_name.setTextColor(ContextCompat.getColor(context,
-                        R.color.colorPrimaryText))
+                    R.color.colorPrimaryText))
                 text_last_message_date_time.setTextColor(ContextCompat.getColor(context,
-                        R.color.colorAccent))
+                    R.color.colorAccent))
                 text_last_message.setTextColor(ContextCompat.getColor(context,
-                        android.R.color.primary_text_light))
+                    android.R.color.primary_text_light))
             } else {
                 text_chat_name.setTextColor(ContextCompat.getColor(context,
-                        R.color.colorSecondaryText))
+                    R.color.colorSecondaryText))
                 text_last_message_date_time.setTextColor(ContextCompat.getColor(context,
-                        R.color.colorSecondaryText))
+                    R.color.colorSecondaryText))
                 text_last_message.setTextColor(ContextCompat.getColor(context,
-                        R.color.colorSecondaryText))
+                    R.color.colorSecondaryText))
             }
 
             setOnClickListener { listener(chatRoom) }

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

@@ -23,6 +23,7 @@ import chat.rocket.android.helper.SharedPreferenceHelper
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.SettingsRepository
+import chat.rocket.android.server.domain.showLastMessage
 import chat.rocket.android.util.extensions.*
 import chat.rocket.android.widget.DividerItemDecoration
 import chat.rocket.common.model.RoomType
@@ -240,6 +241,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
             recycler_view.itemAnimator = DefaultItemAnimator()
             // TODO - use a ViewModel Mapper instead of using settings on the adapter
 
+            println(serverInteractor.get() + " -> ${settingsRepository.get(serverInteractor.get()!!).showLastMessage()}")
             val baseAdapter = ChatRoomsAdapter(it,
                     settingsRepository.get(serverInteractor.get()!!), localRepository) {
                 chatRoom -> presenter.loadChatRoom(chatRoom)

app/src/main/java/chat/rocket/android/server/domain/RefreshSettingsInteractor.kt

@@ -25,7 +25,7 @@ class RefreshSettingsInteractor @Inject constructor(
         HIDE_USER_JOIN, HIDE_USER_LEAVE,
         HIDE_TYPE_AU, HIDE_MUTE_UNMUTE, HIDE_TYPE_RU, ALLOW_MESSAGE_DELETING,
         ALLOW_MESSAGE_EDITING, ALLOW_MESSAGE_PINNING, SHOW_DELETED_STATUS, SHOW_EDITED_STATUS,
-        WIDE_TILE_310)
+        WIDE_TILE_310, STORE_LAST_MESSAGE)
 
     suspend fun refresh(server: String) {
         withContext(CommonPool) {

app/src/main/java/chat/rocket/android/server/domain/SettingsRepository.kt

@@ -49,6 +49,7 @@ const val ALLOW_MESSAGE_EDITING = "Message_AllowEditing"
 const val SHOW_DELETED_STATUS = "Message_ShowDeletedStatus"
 const val SHOW_EDITED_STATUS = "Message_ShowEditedStatus"
 const val ALLOW_MESSAGE_PINNING = "Message_AllowPinning"
+const val STORE_LAST_MESSAGE = "Store_Last_Message"
 
 /*
  * Extension functions for Public Settings.
@@ -57,6 +58,7 @@ const val ALLOW_MESSAGE_PINNING = "Message_AllowPinning"
  * ServerPresenter.kt and a extension function to access it
  */
 fun PublicSettings.isLdapAuthenticationEnabled(): Boolean = this[LDAP_ENABLE]?.value == true
+
 fun PublicSettings.isCasAuthenticationEnabled(): Boolean = this[CAS_ENABLE]?.value == true
 fun PublicSettings.casLoginUrl(): String = this[CAS_LOGIN_URL]?.value.toString()
 fun PublicSettings.isRegistrationEnabledForNewUsers(): Boolean = this[ACCOUNT_REGISTRATION]?.value == "Public"
@@ -83,6 +85,7 @@ fun PublicSettings.showEditedStatus(): Boolean = this[SHOW_EDITED_STATUS]?.value
 fun PublicSettings.allowedMessagePinning(): Boolean = this[ALLOW_MESSAGE_PINNING]?.value == true
 fun PublicSettings.allowedMessageEditing(): Boolean = this[ALLOW_MESSAGE_EDITING]?.value == true
 fun PublicSettings.allowedMessageDeleting(): Boolean = this[ALLOW_MESSAGE_DELETING]?.value == true
+fun PublicSettings.showLastMessage(): Boolean = this[STORE_LAST_MESSAGE]?.value == true
 
 fun PublicSettings.uploadMimeTypeFilter(): Array<String>? {
     val values = this[UPLOAD_WHITELIST_MIMETYPES]?.value as String?

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

@@ -22,47 +22,64 @@
     <ImageView
         android:id="@+id/image_chat_icon"
         android:layout_width="12dp"
-        android:layout_height="12dp"
+        android:layout_height="0dp"
         android:layout_marginStart="16dp"
+        app:layout_constraintBottom_toBottomOf="@+id/text_chat_name"
         app:layout_constraintStart_toEndOf="@+id/image_avatar"
         app:layout_constraintTop_toTopOf="@+id/image_avatar"
         tools:src="@drawable/ic_hashtag_12dp" />
 
+
+    <TextView
+        android:id="@+id/text_last_message"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:layout_marginTop="2dp"
+        android:layout_weight="0.8"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textDirection="locale"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/image_chat_icon"
+        app:layout_constraintTop_toBottomOf="@+id/text_chat_name"
+        app:layout_constraintStart_toStartOf="@+id/text_chat_name"
+        tools:text="Filipe de Lima Brito: Type something that is very big and need at least to lines, or maybe even more" />
+
+
     <TextView
         android:id="@+id/text_chat_name"
         style="@style/ChatRoom.Name.TextView"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
+        android:ellipsize="end"
+        android:lines="1"
+        android:maxLines="1"
         android:textDirection="locale"
+        app:layout_constraintBottom_toTopOf="@+id/text_last_message"
+        app:layout_constraintEnd_toStartOf="@+id/text_last_message_date_time"
         app:layout_constraintStart_toEndOf="@+id/image_chat_icon"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="general" />
 
     <TextView
         android:id="@+id/text_last_message_date_time"
         style="@style/Timestamp.TextView"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        app:layout_constraintBottom_toBottomOf="@+id/text_chat_name"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/text_chat_name"
-        tools:text="11:45 AM" />
-
-    <TextView
-        android:id="@+id/text_last_message"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
+        android:gravity="center"
         android:layout_marginEnd="8dp"
+        app:layout_constraintBottom_toBottomOf="@+id/layout_unread_messages_badge"
         android:layout_marginTop="2dp"
         android:ellipsize="end"
         android:maxLines="2"
         android:textDirection="locale"
         tools:visibility="visible"
         app:layout_constraintEnd_toStartOf="@+id/layout_unread_messages_badge"
-        app:layout_constraintStart_toStartOf="@+id/image_chat_icon"
-        app:layout_constraintTop_toBottomOf="@+id/text_chat_name"
-        tools:text="Filipe de Lima Brito: Type something that is very big and need at least to lines, or maybe even more" />
+        app:layout_constraintTop_toTopOf="@+id/text_chat_name"
+        tools:text="11:45 AM" />
 
     <include
         android:id="@+id/layout_unread_messages_badge"
@@ -70,6 +87,6 @@
         android:layout_width="18dp"
         android:layout_height="18dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/text_last_message" />
+        app:layout_constraintTop_toTopOf="@+id/text_chat_name" />
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file