Fix pinned messages and favorite messages layouts.

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt

@@ -243,7 +243,9 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
 
             if (recycler_view.adapter == null) {
                 adapter = ChatRoomAdapter(
-                    chatRoomType, chatRoomName, presenter,
+                    chatRoomType,
+                    chatRoomName,
+                    presenter,
                     reactionListener = this@ChatRoomFragment
                 )
                 recycler_view.adapter = adapter

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

@@ -65,24 +65,29 @@ class ViewModelMapper @Inject constructor(
     private val currentUsername: String? = localRepository.get(LocalRepository.CURRENT_USERNAME_KEY)
     private val secondaryTextColor = ContextCompat.getColor(context, R.color.colorSecondaryText)
 
-    suspend fun map(message: Message, roomViewModel: RoomViewModel = RoomViewModel(
-        roles = emptyList(), isBroadcast = true)): List<BaseViewModel<*>> {
+    suspend fun map(
+        message: Message,
+        roomViewModel: RoomViewModel = RoomViewModel(roles = emptyList(), isBroadcast = true)
+    ): List<BaseViewModel<*>> {
         return translate(message, roomViewModel)
     }
 
-    suspend fun map(messages: List<Message>, roomViewModel: RoomViewModel = RoomViewModel(
-        roles = emptyList(), isBroadcast = true)): List<BaseViewModel<*>> = withContext(CommonPool) {
+    suspend fun map(
+        messages: List<Message>,
+        roomViewModel: RoomViewModel = RoomViewModel(roles = emptyList(), isBroadcast = true)
+    ): List<BaseViewModel<*>> =
+        withContext(CommonPool) {
             val list = ArrayList<BaseViewModel<*>>(messages.size)
 
-        messages.forEach {
-            list.addAll(translate(it, roomViewModel))
-        }
-
+            messages.forEach { list.addAll(translate(it, roomViewModel)) }
             return@withContext list
         }
 
-    private suspend fun translate(message: Message, roomViewModel: RoomViewModel)
-        : List<BaseViewModel<*>> = withContext(CommonPool) {
+    private suspend fun translate(
+        message: Message,
+        roomViewModel: RoomViewModel
+    ): List<BaseViewModel<*>> =
+        withContext(CommonPool) {
             val list = ArrayList<BaseViewModel<*>>()
 
             message.urls?.forEach {
@@ -127,8 +132,8 @@ class ViewModelMapper @Inject constructor(
 
     private fun mapMessageReply(message: Message, chatRoom: ChatRoom): MessageReplyViewModel {
         val name = message.sender?.name
-        val roomName = if (settings.useRealName() && name != null) name else message.sender?.username
-            ?: ""
+        val roomName =
+            if (settings.useRealName() && name != null) name else message.sender?.username ?: ""
         val permalink = messageHelper.createPermalink(message, chatRoom)
         return MessageReplyViewModel(
             messageId = message.id,

app/src/main/java/chat/rocket/android/favoritemessages/presentation/FavoriteMessagesPresenter.kt

@@ -25,9 +25,9 @@ class FavoriteMessagesPresenter @Inject constructor(
     private var offset: Int = 0
 
     /**
-     * Loads all favorite messages for room. the given room id.
+     * Loads all favorite messages for the given room id.
      *
-     * @param roomId The id of the room to get its favorite messages.
+     * @param roomId The id of the room to get favorite messages from.
      */
     fun loadFavoriteMessages(roomId: String) {
         launchUI(strategy) {

app/src/main/java/chat/rocket/android/favoritemessages/ui/FavoriteMessagesFragment.kt

@@ -69,10 +69,11 @@ class FavoriteMessagesFragment : Fragment(), FavoriteMessagesView {
                 adapter = ChatRoomAdapter(enableActions = false)
                 recycler_view.adapter = adapter
                 val linearLayoutManager =
-                    LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+                    LinearLayoutManager(context, LinearLayoutManager.VERTICAL, true)
+                linearLayoutManager.stackFromEnd = true
                 recycler_view.layoutManager = linearLayoutManager
                 recycler_view.itemAnimator = DefaultItemAnimator()
-                if (favoriteMessages.size > 10) {
+                if (favoriteMessages.size >= 30) {
                     recycler_view.addOnScrollListener(object :
                         EndlessRecyclerViewScrollListener(linearLayoutManager) {
                         override fun onLoadMore(

app/src/main/java/chat/rocket/android/pinnedmessages/presentation/PinnedMessagesPresenter.kt

@@ -26,7 +26,7 @@ class PinnedMessagesPresenter @Inject constructor(
     private var offset: Int = 0
 
     /**
-     * Load all pinned messages for the given room id.
+     * Loads all pinned messages for the given room id.
      *
      * @param roomId The id of the room to get pinned messages from.
      */
@@ -36,8 +36,7 @@ class PinnedMessagesPresenter @Inject constructor(
                 view.showLoading()
                 roomsInteractor.getById(serverUrl, roomId)?.let {
                     val pinnedMessages = client.getPinnedMessages(roomId, it.type, offset)
-                    val messageList =
-                        mapper.map(pinnedMessages.result.filterNot { it.isSystemMessage() })
+                    val messageList = mapper.map(pinnedMessages.result)
                     view.showPinnedMessages(messageList)
                     offset += 1 * 30
                 }.ifNull {

app/src/main/java/chat/rocket/android/pinnedmessages/ui/PinnedMessagesFragment.kt

@@ -71,10 +71,11 @@ class PinnedMessagesFragment : Fragment(), PinnedMessagesView {
                 adapter = ChatRoomAdapter(enableActions = false)
                 recycler_view_pinned.adapter = adapter
                 val linearLayoutManager =
-                    LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+                    LinearLayoutManager(context, LinearLayoutManager.VERTICAL, true)
+                linearLayoutManager.stackFromEnd = true
                 recycler_view_pinned.layoutManager = linearLayoutManager
                 recycler_view_pinned.itemAnimator = DefaultItemAnimator()
-                if (pinnedMessages.size > 10) {
+                if (pinnedMessages.size >= 30) {
                     recycler_view_pinned.addOnScrollListener(object :
                         EndlessRecyclerViewScrollListener(linearLayoutManager) {
                         override fun onLoadMore(