Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into...

Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into improvement/chat-list-layout

app/schemas/chat.rocket.android.db.RCDatabase/12.json → app/schemas/chat.rocket.android.db.RCDatabase/11.json

 {
   "formatVersion": 1,
   "database": {
-    "version": 12,
-    "identityHash": "c533a4d17707cba4f91d35a310b8439d",
+    "version": 11,
+    "identityHash": "fb9f1c815809b0217d326452aeb34e92",
     "entities": [
       {
         "tableName": "users",
@@ -59,7 +59,7 @@
       },
       {
         "tableName": "chatrooms",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, `muted` TEXT, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `topic` TEXT, `announcement` TEXT, `description` TEXT, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, `muted` TEXT, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
         "fields": [
           {
             "fieldPath": "id",
@@ -121,6 +121,24 @@
             "affinity": "INTEGER",
             "notNull": false
           },
+          {
+            "fieldPath": "topic",
+            "columnName": "topic",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "announcement",
+            "columnName": "announcement",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "description",
+            "columnName": "description",
+            "affinity": "TEXT",
+            "notNull": false
+          },
           {
             "fieldPath": "open",
             "columnName": "open",
@@ -1081,7 +1099,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"c533a4d17707cba4f91d35a310b8439d\")"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"fb9f1c815809b0217d326452aeb34e92\")"
     ]
   }
 }
\ No newline at end of file

app/src/main/AndroidManifest.xml

@@ -78,6 +78,11 @@
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
 
+        <activity
+            android:name=".chatdetails.ui.ChatDetailsActivity"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
+
         <activity
             android:name=".chatinformation.ui.MessageInfoActivity"
             android:theme="@style/AppTheme"

app/src/main/java/chat/rocket/android/chatdetails/adapter/OptionItemHolder.kt

+package chat.rocket.android.chatdetails.adapter
+
+import chat.rocket.android.chatdetails.domain.Option
+import chat.rocket.android.chatrooms.adapter.ItemHolder
+
+data class OptionItemHolder(override val data: Option): ItemHolder<Option>
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/adapter/OptionViewHolder.kt

+package chat.rocket.android.chatdetails.adapter
+
+import android.content.Context
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import chat.rocket.android.R
+import chat.rocket.android.chatdetails.domain.Option
+import chat.rocket.android.chatrooms.adapter.ViewHolder
+import kotlinx.android.synthetic.main.item_detail_option.view.*
+
+class OptionViewHolder(
+    itemView: View
+): ViewHolder<OptionItemHolder>(itemView) {
+
+    override fun bindViews(data: OptionItemHolder) {
+        val option = data.data
+        bindName(option, itemView.name)
+        bindIcon(option, itemView.icon)
+        itemView.setOnClickListener { option.listener() }
+    }
+
+    private fun bindIcon(option: Option, view: ImageView) {
+        val drawable = DrawableHelper.getDrawableFromId(option.icon, itemView.context)
+        drawable.let { image ->
+            val mutateDrawable = DrawableHelper.wrapDrawable(image).mutate()
+            DrawableHelper.tintDrawable(mutateDrawable, itemView.context, R.color.colorPrimaryText)
+            view.setImageDrawable(mutateDrawable)
+        }
+    }
+
+    private fun bindName(option: Option, view: TextView) {
+        view.text = option.name
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentModule.kt

+package chat.rocket.android.chatdetails.di
+
+import androidx.lifecycle.LifecycleOwner
+import chat.rocket.android.chatdetails.presentation.ChatDetailsView
+import chat.rocket.android.chatdetails.ui.ChatDetailsFragment
+import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.dagger.scope.PerFragment
+import chat.rocket.android.db.ChatRoomDao
+import chat.rocket.android.db.DatabaseManager
+import dagger.Module
+import dagger.Provides
+import kotlinx.coroutines.experimental.Job
+
+@Module
+class ChatDetailsFragmentModule {
+
+    @Provides
+    @PerFragment
+    fun provideJob() = Job()
+
+    @Provides
+    @PerFragment
+    fun chatDetailsView(frag: ChatDetailsFragment): ChatDetailsView {
+        return frag
+    }
+
+    @Provides
+    @PerFragment
+    fun provideChatRoomDao(manager: DatabaseManager): ChatRoomDao = manager.chatRoomDao()
+
+    @Provides
+    @PerFragment
+    fun provideLifecycleOwner(frag: ChatDetailsFragment): LifecycleOwner {
+        return frag
+    }
+
+    @Provides
+    @PerFragment
+    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
+        return CancelStrategy(owner, jobs)
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsFragmentProvider.kt

+package chat.rocket.android.chatdetails.di
+
+import chat.rocket.android.chatdetails.ui.ChatDetailsFragment
+import chat.rocket.android.dagger.scope.PerFragment
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class ChatDetailsFragmentProvider {
+
+    @ContributesAndroidInjector(modules = [ChatDetailsFragmentModule::class])
+    @PerFragment
+    abstract fun providesChatDetailsFragment(): ChatDetailsFragment
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/di/ChatDetailsModule.kt

+package chat.rocket.android.chatdetails.di
+
+import chat.rocket.android.chatdetails.presentation.ChatDetailsNavigator
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
+import chat.rocket.android.dagger.scope.PerActivity
+import dagger.Module
+import dagger.Provides
+
+@Module
+class ChatDetailsModule {
+
+    @Provides
+    @PerActivity
+    fun providesNavigator(activity: ChatDetailsActivity) = ChatDetailsNavigator(activity)
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/domain/ChatDetails.kt

+package chat.rocket.android.chatdetails.domain
+
+data class ChatDetails(
+    val name: String?,
+    val fullName: String?,
+    val type: String?,
+    val topic: String?,
+    val announcement: String?,
+    val description: String?
+)
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/domain/Option.kt

+package chat.rocket.android.chatdetails.domain
+
+data class Option(
+    val name: String,
+    val icon: Int,
+    val listener: () -> Unit
+)
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsNavigator.kt

+package chat.rocket.android.chatdetails.presentation
+
+import chat.rocket.android.R
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
+import chat.rocket.android.favoritemessages.ui.TAG_FAVORITE_MESSAGES_FRAGMENT
+import chat.rocket.android.files.ui.TAG_FILES_FRAGMENT
+import chat.rocket.android.members.ui.TAG_MEMBERS_FRAGMENT
+import chat.rocket.android.mentions.ui.TAG_MENTIONS_FRAGMENT
+import chat.rocket.android.pinnedmessages.ui.TAG_PINNED_MESSAGES_FRAGMENT
+import chat.rocket.android.util.extensions.addFragmentBackStack
+
+class ChatDetailsNavigator(internal val activity: ChatDetailsActivity) {
+
+    fun toMembersList(chatRoomId: String) {
+        activity.addFragmentBackStack(TAG_MEMBERS_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.members.ui.newInstance(chatRoomId)
+        }
+    }
+
+    fun toMentions(chatRoomId: String) {
+        activity.addFragmentBackStack(TAG_MENTIONS_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.mentions.ui.newInstance(chatRoomId)
+        }
+    }
+
+    fun toPinnedMessageList(chatRoomId: String) {
+        activity.addFragmentBackStack(TAG_PINNED_MESSAGES_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.pinnedmessages.ui.newInstance(chatRoomId)
+        }
+    }
+
+    fun toFavoriteMessageList(chatRoomId: String) {
+        activity.addFragmentBackStack(TAG_FAVORITE_MESSAGES_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.favoritemessages.ui.newInstance(chatRoomId)
+        }
+    }
+
+    fun toFileList(chatRoomId: String) {
+        activity.addFragmentBackStack(TAG_FILES_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.files.ui.newInstance(chatRoomId)
+        }
+    }
+}

app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsPresenter.kt

+package chat.rocket.android.chatdetails.presentation
+
+import chat.rocket.android.chatdetails.domain.ChatDetails
+import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.server.domain.GetCurrentServerInteractor
+import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.util.extension.launchUI
+import chat.rocket.android.util.retryIO
+import chat.rocket.common.model.roomTypeOf
+import chat.rocket.common.util.ifNull
+import chat.rocket.core.internal.rest.getInfo
+import chat.rocket.core.model.Room
+import javax.inject.Inject
+
+class ChatDetailsPresenter @Inject constructor(
+    private val view: ChatDetailsView,
+    private val navigator: ChatDetailsNavigator,
+    private val strategy: CancelStrategy,
+    serverInteractor: GetCurrentServerInteractor,
+    factory: ConnectionManagerFactory
+) {
+    private val currentServer = serverInteractor.get()!!
+    private val manager = factory.create(currentServer)
+    private val client = manager.client
+
+    fun getDetails(chatRoomId: String, chatRoomType: String) {
+        launchUI(strategy) {
+            try {
+                val room = retryIO("getInfo($chatRoomId, null, $chatRoomType") {
+                    client.getInfo(chatRoomId, null, roomTypeOf(chatRoomType))
+                }
+
+                view.displayDetails(roomToChatDetails(room))
+            } catch(e: Exception) {
+                e.message.let {
+                    view.showMessage(it!!)
+                }.ifNull {
+                    view.showGenericErrorMessage()
+                }
+            }
+        }
+    }
+
+    fun toFiles(chatRoomId: String) {
+        navigator.toFileList(chatRoomId)
+    }
+
+    fun toMembers(chatRoomId: String) {
+        navigator.toMembersList(chatRoomId)
+    }
+
+    fun toMentions(chatRoomId: String) {
+        navigator.toMentions(chatRoomId)
+    }
+
+    fun toPinned(chatRoomId: String) {
+        navigator.toPinnedMessageList(chatRoomId)
+    }
+
+    fun toFavorites(chatRoomId: String) {
+        navigator.toFavoriteMessageList(chatRoomId)
+    }
+
+    private fun roomToChatDetails(room: Room): ChatDetails {
+        return with(room) {
+            ChatDetails(
+                name = name,
+                fullName = fullName,
+                type = type.toString(),
+                topic = topic,
+                description = description,
+                announcement = announcement
+            )
+        }
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsView.kt

+package chat.rocket.android.chatdetails.presentation
+
+import chat.rocket.android.chatdetails.domain.ChatDetails
+import chat.rocket.android.core.behaviours.LoadingView
+import chat.rocket.android.core.behaviours.MessageView
+
+interface ChatDetailsView: MessageView {
+    fun displayDetails(room: ChatDetails)
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsActivity.kt

+package chat.rocket.android.chatdetails.ui
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import chat.rocket.android.R
+import chat.rocket.android.util.extensions.addFragment
+import dagger.android.AndroidInjection
+import dagger.android.AndroidInjector
+import dagger.android.DispatchingAndroidInjector
+import dagger.android.support.HasSupportFragmentInjector
+import kotlinx.android.synthetic.main.app_bar_chat_details.*
+import javax.inject.Inject
+
+fun Context.chatDetailsIntent(
+        chatRoomId: String,
+        chatRoomType: String,
+        isSubscribed: Boolean = true,
+        isMenuDisabled: Boolean = false
+): Intent {
+    return Intent(this, ChatDetailsActivity::class.java).apply {
+        putExtra(INTENT_CHAT_ROOM_ID, chatRoomId)
+        putExtra(INTENT_CHAT_ROOM_TYPE, chatRoomType)
+        putExtra(INTENT_CHAT_IS_SUBSCRIBED, isSubscribed)
+        putExtra(INTENT_CHAT_DISABLED_MENU, isMenuDisabled)
+    }
+}
+
+private const val INTENT_CHAT_ROOM_ID = "chat_room_id"
+private const val INTENT_CHAT_ROOM_TYPE = "chat_room_type"
+private const val INTENT_CHAT_IS_SUBSCRIBED = "is_chat_room_subscribed"
+private const val INTENT_CHAT_DISABLED_MENU = "is_menu_disabled"
+
+class ChatDetailsActivity: AppCompatActivity(), HasSupportFragmentInjector {
+    @Inject
+    lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_chat_details)
+        setupToolbar()
+
+        val chatRoomId = intent.getStringExtra(INTENT_CHAT_ROOM_ID)
+        requireNotNull(chatRoomId) { "no chat_room_id provided in Intent extras" }
+
+        val chatRoomType = intent.getStringExtra(INTENT_CHAT_ROOM_TYPE)
+        requireNotNull(chatRoomType) { "no chat_room_type provided in Intent extras" }
+
+        val isSubscribed = intent.getBooleanExtra(INTENT_CHAT_IS_SUBSCRIBED, true)
+        val disableMenu = intent.getBooleanExtra(INTENT_CHAT_DISABLED_MENU, false)
+
+        if (supportFragmentManager.findFragmentByTag(TAG_CHAT_DETAILS_FRAGMENT) == null) {
+            addFragment(TAG_CHAT_DETAILS_FRAGMENT, R.id.fragment_container) {
+                newInstance(chatRoomId, chatRoomType, isSubscribed, disableMenu)
+            }
+        }
+    }
+
+    override fun supportFragmentInjector(): AndroidInjector<Fragment> =
+            fragmentDispatchingAndroidInjector
+
+    override fun onBackPressed() {
+        super.onBackPressed()
+        overridePendingTransition(R.anim.close_enter, R.anim.close_exit)
+    }
+
+    fun setNavigationIcon(resource: Int) {
+        toolbar.setNavigationIcon(resource)
+    }
+
+    fun setToolbarTitle(title: String) {
+        toolbar_title.text = title
+    }
+
+    private fun setupToolbar() {
+        setSupportActionBar(toolbar)
+        supportActionBar?.setDisplayShowTitleEnabled(false)
+        setToolbarTitle(getString(R.string.title_channel_details))
+        setNavigationIcon(R.drawable.ic_close_white_24dp)
+        toolbar.setNavigationOnClickListener { onBackPressed() }
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsAdapter.kt

+package chat.rocket.android.chatdetails.ui
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import chat.rocket.android.R
+import chat.rocket.android.chatdetails.adapter.OptionItemHolder
+import chat.rocket.android.chatdetails.adapter.OptionViewHolder
+import chat.rocket.android.chatdetails.domain.Option
+import chat.rocket.android.util.extensions.inflate
+
+class ChatDetailsAdapter: RecyclerView.Adapter<OptionViewHolder>() {
+    private val options: MutableList<Option> = ArrayList()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): OptionViewHolder = OptionViewHolder(parent.inflate(R.layout.item_detail_option))
+
+    override fun onBindViewHolder(holder: OptionViewHolder, position: Int) = holder.bindViews(OptionItemHolder(options[position]))
+
+    override fun getItemCount(): Int = options.size
+
+    fun addOption(name: String, icon: Int, listener: () -> Unit) {
+        options.add(Option(name, icon, listener))
+        notifyDataSetChanged()
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt

+package chat.rocket.android.chatdetails.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.LinearLayoutManager
+import chat.rocket.android.R
+import chat.rocket.android.chatdetails.domain.ChatDetails
+import chat.rocket.android.chatdetails.presentation.ChatDetailsPresenter
+import chat.rocket.android.chatdetails.presentation.ChatDetailsView
+import chat.rocket.android.chatdetails.viewmodel.ChatDetailsViewModel
+import chat.rocket.android.chatdetails.viewmodel.ChatDetailsViewModelFactory
+import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.util.extensions.showToast
+import chat.rocket.android.util.extensions.ui
+import chat.rocket.android.widget.DividerItemDecoration
+import chat.rocket.common.model.RoomType
+import chat.rocket.common.model.roomTypeOf
+import dagger.android.support.AndroidSupportInjection
+import kotlinx.android.synthetic.main.fragment_chat_details.*
+import javax.inject.Inject
+
+fun newInstance(
+    chatRoomId: String,
+    chatRoomType: String,
+    isSubscribed: Boolean,
+    disableMenu: Boolean
+): ChatDetailsFragment {
+    return ChatDetailsFragment().apply {
+        arguments = Bundle(1).apply {
+            putString(BUNDLE_CHAT_ROOM_ID, chatRoomId)
+            putString(BUNDLE_CHAT_ROOM_TYPE, chatRoomType)
+            putBoolean(BUNDLE_IS_SUBSCRIBED, isSubscribed)
+            putBoolean(BUNDLE_DISABLE_MENU, disableMenu)
+        }
+    }
+}
+
+internal const val TAG_CHAT_DETAILS_FRAGMENT = "ChatDetailsFragment"
+
+private const val BUNDLE_CHAT_ROOM_ID = "BUNDLE_CHAT_ROOM_ID"
+private const val BUNDLE_CHAT_ROOM_TYPE = "BUNDLE_CHAT_ROOM_TYPE"
+private const val BUNDLE_IS_SUBSCRIBED = "BUNDLE_IS_SUBSCRIBED"
+private const val BUNDLE_DISABLE_MENU = "BUNDLE_DISABLE_MENU"
+
+class ChatDetailsFragment: Fragment(), ChatDetailsView {
+    @Inject
+    lateinit var presenter: ChatDetailsPresenter
+    @Inject
+    lateinit var factory: ChatDetailsViewModelFactory
+
+    private var adapter: ChatDetailsAdapter? = null
+
+    private lateinit var viewModel: ChatDetailsViewModel
+
+    private var chatRoomId: String? = null
+    private var chatRoomType: String? = null
+    private var isSubscribed: Boolean = true
+    private var disableMenu: Boolean = false
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        AndroidSupportInjection.inject(this)
+        val bundle = arguments
+        if (bundle != null) {
+            chatRoomId = bundle.getString(BUNDLE_CHAT_ROOM_ID)
+            chatRoomType = bundle.getString(BUNDLE_CHAT_ROOM_TYPE)
+            isSubscribed = bundle.getBoolean(BUNDLE_IS_SUBSCRIBED)
+            disableMenu = bundle.getBoolean(BUNDLE_DISABLE_MENU)
+        }
+    }
+
+    override fun onCreateView(
+            inflater: LayoutInflater,
+            container: ViewGroup?,
+            savedInstanceState: Bundle?
+    ): View? = container?.inflate(R.layout.fragment_chat_details)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        viewModel = ViewModelProviders.of(this, factory).get(ChatDetailsViewModel::class.java)
+        setupOptions()
+        setupToolbar()
+        getDetails()
+    }
+
+    override fun displayDetails(room: ChatDetails) {
+        ui {
+            val text = room.name
+            name.text = text
+            bindImage(chatRoomType!!)
+            content_topic.text = if (room.topic.isNullOrEmpty()) getString(R.string.msg_no_topic) else room.topic
+            content_announcement.text = if (room.announcement.isNullOrEmpty()) getString(R.string.msg_no_announcement) else room.announcement
+            content_description.text = if (room.description.isNullOrEmpty()) getString(R.string.msg_no_description) else room.description
+        }
+    }
+
+    override fun showGenericErrorMessage() = showMessage(R.string.msg_generic_error)
+
+    override fun showMessage(resId: Int) {
+        ui {
+            showToast(resId)
+        }
+    }
+
+    override fun showMessage(message: String) {
+        ui {
+            showToast(message)
+        }
+    }
+
+    private fun addOptions(adapter: ChatDetailsAdapter?) {
+        adapter?.let {
+            if (!disableMenu) {
+                it.addOption(getString(R.string.title_files), R.drawable.ic_files_24dp) {
+                    presenter.toFiles(chatRoomId!!)
+                }
+            }
+
+            if (chatRoomType != RoomType.DIRECT_MESSAGE && !disableMenu) {
+                it.addOption(getString(R.string.msg_mentions), R.drawable.ic_at_black_20dp) {
+                    presenter.toMentions(chatRoomId!!)
+                }
+                it.addOption(getString(R.string.title_members), R.drawable.ic_people_outline_black_24dp) {
+                    presenter.toMembers(chatRoomId!!)
+                }
+            }
+
+            it.addOption(getString(R.string.title_favorite_messages), R.drawable.ic_star_border_white_24dp) {
+                presenter.toFavorites(chatRoomId!!)
+            }
+            it.addOption(getString(R.string.title_pinned_messages), R.drawable.ic_action_message_pin_24dp) {
+                presenter.toPinned(chatRoomId!!)
+            }
+        }
+    }
+
+    private fun bindImage(chatRoomType: String) {
+        val drawable = when (roomTypeOf(chatRoomType)) {
+            is RoomType.Channel -> {
+                DrawableHelper.getDrawableFromId(R.drawable.ic_hashtag_black_12dp, context!!)
+            }
+            is RoomType.PrivateGroup -> {
+                DrawableHelper.getDrawableFromId(R.drawable.ic_lock_black_12_dp, context!!)
+            }
+            else -> null
+        }
+
+        drawable?.let {
+            val wrappedDrawable = DrawableHelper.wrapDrawable(it)
+            val mutableDrawable = wrappedDrawable.mutate()
+            DrawableHelper.tintDrawable(mutableDrawable, context!!, R.color.colorPrimary)
+            DrawableHelper.compoundDrawable(name, mutableDrawable)
+        }
+    }
+
+    private fun getDetails() {
+        if (isSubscribed)
+            viewModel.getDetails(chatRoomId!!).observe(viewLifecycleOwner, Observer { details ->
+                displayDetails(details)
+            })
+        else
+            presenter.getDetails(chatRoomId!!, chatRoomType!!)
+    }
+
+    private fun setupOptions() {
+        ui {
+            if (options.adapter == null) {
+                adapter = ChatDetailsAdapter()
+                options.adapter = adapter
+
+                with(options) {
+                    layoutManager = LinearLayoutManager(it)
+                    addItemDecoration(
+                        DividerItemDecoration(
+                                it,
+                                resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_start),
+                                resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_end)
+                        )
+                    )
+                    itemAnimator = DefaultItemAnimator()
+                    isNestedScrollingEnabled = false
+                }
+            }
+            addOptions(adapter)
+        }
+    }
+
+    private fun setupToolbar() {
+        (activity as ChatDetailsActivity).let {
+            it.setNavigationIcon(R.drawable.ic_close_white_24dp)
+            it.setToolbarTitle(getString(R.string.title_channel_details))
+        }
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModel.kt

+package chat.rocket.android.chatdetails.viewmodel
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Transformations
+import androidx.lifecycle.ViewModel
+import chat.rocket.android.chatdetails.domain.ChatDetails
+import chat.rocket.android.db.ChatRoomDao
+
+class ChatDetailsViewModel(private val chatRoomDao: ChatRoomDao): ViewModel() {
+
+    fun getDetails(chatRoomId: String): LiveData<ChatDetails> {
+        return Transformations.switchMap(chatRoomDao.get(chatRoomId)) { room ->
+            val entity = room.chatRoom
+            val data: MutableLiveData<ChatDetails> = MutableLiveData()
+
+            data.value = ChatDetails(
+                entity.name,
+                entity.fullname,
+                entity.type,
+                entity.topic,
+                entity.announcement,
+                entity.description
+            )
+
+            return@switchMap data
+        }
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatdetails/viewmodel/ChatDetailsViewModelFactory.kt

+package chat.rocket.android.chatdetails.viewmodel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import chat.rocket.android.db.ChatRoomDao
+import javax.inject.Inject
+
+class ChatDetailsViewModelFactory @Inject constructor(private val chatRoomDao: ChatRoomDao) : ViewModelProvider.NewInstanceFactory() {
+
+    @Suppress("UNCHECKED_CAST")
+    override fun <T : ViewModel?> create(modelClass: Class<T>) =
+            ChatDetailsViewModel(chatRoomDao) as T
+}
\ No newline at end of file

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

 package chat.rocket.android.chatroom.presentation
 
 import chat.rocket.android.R
+import chat.rocket.android.chatdetails.ui.chatDetailsIntent
 import chat.rocket.android.chatinformation.ui.messageInformationIntent
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatroom.ui.chatRoomIntent
@@ -13,35 +14,20 @@ import chat.rocket.android.server.ui.changeServerIntent
 import chat.rocket.android.util.extensions.addFragmentBackStack
 
 class ChatRoomNavigator(internal val activity: ChatRoomActivity) {
-
-    fun toMembersList(chatRoomId: String) {
-        activity.addFragmentBackStack(TAG_MEMBERS_FRAGMENT, R.id.fragment_container) {
-            chat.rocket.android.members.ui.newInstance(chatRoomId)
-        }
-    }
-
-    fun toMentions(chatRoomId: String) {
-        activity.addFragmentBackStack(TAG_MENTIONS_FRAGMENT, R.id.fragment_container) {
-            chat.rocket.android.mentions.ui.newInstance(chatRoomId)
-        }
-    }
-
-    fun toPinnedMessageList(chatRoomId: String) {
-        activity.addFragmentBackStack(TAG_PINNED_MESSAGES_FRAGMENT, R.id.fragment_container) {
-            chat.rocket.android.pinnedmessages.ui.newInstance(chatRoomId)
-        }
-    }
-
-    fun toFavoriteMessageList(chatRoomId: String) {
-        activity.addFragmentBackStack(TAG_FAVORITE_MESSAGES_FRAGMENT, R.id.fragment_container) {
-            chat.rocket.android.favoritemessages.ui.newInstance(chatRoomId)
-        }
-    }
-
-    fun toFileList(chatRoomId: String) {
-        activity.addFragmentBackStack(TAG_FILES_FRAGMENT, R.id.fragment_container) {
-            chat.rocket.android.files.ui.newInstance(chatRoomId)
-        }
+    fun toChatDetails(
+        chatRoomId: String,
+        chatRoomType: String,
+        isChatRoomSubscribed: Boolean,
+        isMenuDisabled: Boolean
+    ) {
+        activity.startActivity(
+            activity.chatDetailsIntent(
+                chatRoomId,
+                chatRoomType,
+                isChatRoomSubscribed,
+                isMenuDisabled
+            )
+        )
     }
 
     fun toNewServer() {

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

@@ -38,7 +38,6 @@ import chat.rocket.android.server.infraestructure.state
 import chat.rocket.android.util.extension.getByteArray
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
-import chat.rocket.android.util.extensions.exhaustive
 import chat.rocket.android.util.retryDB
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
@@ -887,20 +886,14 @@ class ChatRoomPresenter @Inject constructor(
         }
     }
 
-    fun toMembersList(chatRoomId: String) =
-        navigator.toMembersList(chatRoomId)
-
-    fun toMentions(chatRoomId: String) =
-        navigator.toMentions(chatRoomId)
-
-    fun toPinnedMessageList(chatRoomId: String) =
-        navigator.toPinnedMessageList(chatRoomId)
-
-    fun toFavoriteMessageList(chatRoomId: String) =
-        navigator.toFavoriteMessageList(chatRoomId)
-
-    fun toFileList(chatRoomId: String) =
-        navigator.toFileList(chatRoomId)
+    fun toChatDetails(
+        chatRoomId: String,
+        chatRoomType: String,
+        isSubscribed: Boolean,
+        isMenuDisabled: Boolean
+    ) {
+        navigator.toChatDetails(chatRoomId, chatRoomType, isSubscribed, isMenuDisabled)
+    }
 
     fun loadChatRooms() {
         launchUI(strategy) {
@@ -929,7 +922,7 @@ class ChatRoomPresenter @Inject constructor(
     // TODO: move this to new interactor or FetchChatRoomsInteractor?
     private suspend fun getChatRoomAsync(roomId: String): ChatRoom? = withContext(CommonPool) {
         retryDB("getRoom($roomId)") {
-            dbManager.chatRoomDao().get(roomId)?.let {
+            dbManager.chatRoomDao().getSync(roomId)?.let {
                 with(it.chatRoom) {
                     ChatRoom(
                             id = id,

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

@@ -87,7 +87,9 @@ import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
 import kotlinx.android.synthetic.main.emoji_image_row_item.*
+import kotlinx.android.synthetic.main.emoji_image_row_item.view.*
 import kotlinx.android.synthetic.main.emoji_row_item.*
+import kotlinx.android.synthetic.main.emoji_row_item.view.*
 import kotlinx.android.synthetic.main.fragment_chat_room.*
 import kotlinx.android.synthetic.main.message_attachment_options.*
 import kotlinx.android.synthetic.main.message_composer.*
@@ -96,6 +98,7 @@ import timber.log.Timber
 import java.io.File
 import java.io.IOException
 import kotlinx.android.synthetic.main.reaction_praises_list_item.*
+import kotlinx.android.synthetic.main.reaction_praises_list_item.view.*
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
@@ -142,11 +145,7 @@ private const val BUNDLE_CHAT_ROOM_IS_FAVORITE = "chat_room_is_favorite"
 private const val BUNDLE_CHAT_ROOM_MESSAGE = "chat_room_message"
 
 internal const val MENU_ACTION_FAVORITE_UNFAVORITE_CHAT = 1
-internal const val MENU_ACTION_MEMBER = 2
-internal const val MENU_ACTION_MENTIONS = 3
-internal const val MENU_ACTION_PINNED_MESSAGES = 4
-internal const val MENU_ACTION_FAVORITE_MESSAGES = 5
-internal const val MENU_ACTION_FILES = 6
+internal const val MENU_ACTION_SHOW_DETAILS = 2
 
 class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiReactionListener,
     ChatRoomAdapter.OnActionSelected, Drawable.Callback {
@@ -163,7 +162,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     internal lateinit var chatRoomType: String
     private var newMessageCount: Int = 0
     private var chatRoomMessage: String? = null
-    private var isSubscribed: Boolean = true
+    internal var isSubscribed: Boolean = true
     private var isReadOnly: Boolean = false
     private var isCreator: Boolean = false
     internal var isFavorite: Boolean = false
@@ -704,9 +703,9 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                     GlideApp.with(requireContext()).asBitmap()
                 }
 
-                glideRequest.load(url).into(emoji_image_view)
+                glideRequest.load(url).into(view_flipper.emoji_image_view)
             } else {
-                emoji_view.text = EmojiParser.parse(requireContext(), shortname)
+                view_flipper.emoji_view.text = EmojiParser.parse(requireContext(), shortname)
             }
 
             var listing = ""

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

@@ -8,50 +8,11 @@ import androidx.appcompat.widget.SearchView
 import androidx.core.content.res.ResourcesCompat
 import chat.rocket.android.R
 import chat.rocket.android.util.extension.onQueryTextListener
-import chat.rocket.common.model.RoomType
 
 internal fun ChatRoomFragment.setupMenu(menu: Menu) {
     setupSearchMessageMenuItem(menu, requireContext())
     setupFavoriteMenuItem(menu)
-
-    menu.add(
-        Menu.NONE,
-        MENU_ACTION_PINNED_MESSAGES,
-        Menu.NONE,
-        R.string.title_pinned_messages
-    )
-
-    menu.add(
-        Menu.NONE,
-        MENU_ACTION_FAVORITE_MESSAGES,
-        Menu.NONE,
-        R.string.title_favorite_messages
-    )
-
-    if (chatRoomType != RoomType.DIRECT_MESSAGE && !disableMenu) {
-        menu.add(
-            Menu.NONE,
-            MENU_ACTION_MEMBER,
-            Menu.NONE,
-            R.string.title_members_list
-        )
-
-        menu.add(
-            Menu.NONE,
-            MENU_ACTION_MENTIONS,
-            Menu.NONE,
-            R.string.msg_mentions
-        )
-    }
-
-    if (!disableMenu) {
-        menu.add(
-            Menu.NONE,
-            MENU_ACTION_FILES,
-            Menu.NONE,
-            R.string.title_files
-        )
-    }
+    setupDetailsMenuItem(menu)
 }
 
 internal fun ChatRoomFragment.setOnMenuItemClickListener(item: MenuItem) {
@@ -60,11 +21,12 @@ internal fun ChatRoomFragment.setOnMenuItemClickListener(item: MenuItem) {
             chatRoomId,
             isFavorite
         )
-        MENU_ACTION_MEMBER -> presenter.toMembersList(chatRoomId)
-        MENU_ACTION_MENTIONS -> presenter.toMentions(chatRoomId)
-        MENU_ACTION_PINNED_MESSAGES -> presenter.toPinnedMessageList(chatRoomId)
-        MENU_ACTION_FAVORITE_MESSAGES -> presenter.toFavoriteMessageList(chatRoomId)
-        MENU_ACTION_FILES -> presenter.toFileList(chatRoomId)
+        MENU_ACTION_SHOW_DETAILS -> presenter.toChatDetails(
+            chatRoomId,
+            chatRoomType,
+            isSubscribed,
+            disableMenu
+        )
     }
 }
 
@@ -139,4 +101,14 @@ private fun ChatRoomFragment.setupFavoriteMenuItem(menu: Menu) {
         ).setIcon(R.drawable.ic_star_border_white_24dp)
             .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
     }
+}
+
+private fun ChatRoomFragment.setupDetailsMenuItem(menu: Menu) {
+    menu.add(
+            Menu.NONE,
+            MENU_ACTION_SHOW_DETAILS,
+            Menu.NONE,
+            "Channel Details"
+    ).setIcon(R.drawable.ic_info_outline_white_24dp)
+            .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt

@@ -164,7 +164,7 @@ class UiModelMapper @Inject constructor(
 
     // TODO: move this to new interactor or FetchChatRoomsInteractor?
     private suspend fun getChatRoomAsync(roomId: String): ChatRoom? = withContext(CommonPool) {
-        return@withContext dbManager.chatRoomDao().get(roomId)?.let {
+        return@withContext dbManager.chatRoomDao().getSync(roomId)?.let {
             with(it.chatRoom) {
                 ChatRoom(
                     id = id,

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

@@ -11,6 +11,9 @@ import chat.rocket.android.authentication.server.di.ServerFragmentProvider
 import chat.rocket.android.authentication.signup.di.SignupFragmentProvider
 import chat.rocket.android.authentication.twofactor.di.TwoFAFragmentProvider
 import chat.rocket.android.authentication.ui.AuthenticationActivity
+import chat.rocket.android.chatdetails.di.ChatDetailsFragmentProvider
+import chat.rocket.android.chatdetails.di.ChatDetailsModule
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
 import chat.rocket.android.chatinformation.di.MessageInfoFragmentProvider
 import chat.rocket.android.chatinformation.ui.MessageInfoActivity
 import chat.rocket.android.chatroom.di.ChatRoomFragmentProvider
@@ -41,7 +44,6 @@ import dagger.android.ContributesAndroidInjector
 
 @Module
 abstract class ActivityBuilder {
-
     @PerActivity
     @ContributesAndroidInjector(
             modules = [AuthenticationModule::class,
@@ -75,7 +77,16 @@ abstract class ActivityBuilder {
     @ContributesAndroidInjector(
         modules = [
             ChatRoomModule::class,
-            ChatRoomFragmentProvider::class,
+            ChatRoomFragmentProvider::class
+        ]
+    )
+    abstract fun bindChatRoomActivity(): ChatRoomActivity
+
+    @PerActivity
+    @ContributesAndroidInjector(
+        modules = [
+            ChatDetailsModule::class,
+            ChatDetailsFragmentProvider::class,
             MembersFragmentProvider::class,
             MentionsFragmentProvider::class,
             PinnedMessagesFragmentProvider::class,
@@ -83,7 +94,7 @@ abstract class ActivityBuilder {
             FilesFragmentProvider::class
         ]
     )
-    abstract fun bindChatRoomActivity(): ChatRoomActivity
+    abstract fun bindChatDetailsActivity(): ChatDetailsActivity
 
     @PerActivity
     @ContributesAndroidInjector(modules = [PasswordFragmentProvider::class])
@@ -96,6 +107,7 @@ abstract class ActivityBuilder {
     @PerActivity
     @ContributesAndroidInjector(modules = [MessageInfoFragmentProvider::class])
     abstract fun bindMessageInfoActiviy(): MessageInfoActivity
+
     @ContributesAndroidInjector(modules = [DrawModule::class])
     abstract fun bindDrawingActivity(): DrawingActivity
 }

app/src/main/java/chat/rocket/android/db/ChatRoomDao.kt

@@ -9,7 +9,6 @@ import androidx.room.Transaction
 import androidx.room.Update
 import chat.rocket.android.db.model.ChatRoom
 import chat.rocket.android.db.model.ChatRoomEntity
-import chat.rocket.common.model.RoomType
 
 @Dao
 abstract class ChatRoomDao : BaseDao<ChatRoomEntity> {
@@ -18,7 +17,14 @@ abstract class ChatRoomDao : BaseDao<ChatRoomEntity> {
         $BASE_QUERY
         WHERE chatrooms.id = :id
         """)
-    abstract fun get(id: String): ChatRoom?
+    abstract fun get(id: String): LiveData<ChatRoom>
+
+    @Transaction
+    @Query("""
+        $BASE_QUERY
+        WHERE chatrooms.id = :id
+        """)
+    abstract fun getSync(id: String): ChatRoom?
 
     @Transaction
     @Query("$BASE_QUERY $FILTER_NOT_OPENED")

app/src/main/java/chat/rocket/android/db/DatabaseManager.kt

@@ -98,7 +98,7 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
 
     suspend fun getRoom(id: String) = withContext(dbManagerContext) {
         retryDB("getRoom($id)") {
-            chatRoomDao().get(id)
+            chatRoomDao().getSync(id)
         }
     }
 
@@ -338,7 +338,7 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
     }
 
     private suspend fun updateRoom(data: Room): ChatRoomEntity? {
-        return retryDB("getChatRoom(${data.id})") { chatRoomDao().get(data.id) }?.let { current ->
+        return retryDB("getChatRoom(${data.id})") { chatRoomDao().getSync(data.id) }?.let { current ->
             with(data) {
                 val chatRoom = current.chatRoom
 
@@ -351,10 +351,13 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
                     ownerId = user?.id ?: chatRoom.ownerId,
                     readonly = readonly,
                     updatedAt = updatedAt ?: chatRoom.updatedAt,
+                    topic = topic,
+                    announcement = announcement,
+                    description = description,
                     lastMessageText = mapLastMessageText(lastMessage),
                     lastMessageUserId = lastMessage?.sender?.id,
                     lastMessageTimestamp = lastMessage?.timestamp,
-                    muted = muted
+                    muted = muted ?: chatRoom.muted
                 )
             }
         }
@@ -376,7 +379,7 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
         context.getString(R.string.msg_sent_attachment)
 
     private suspend fun updateSubscription(data: Subscription): ChatRoomEntity? {
-        return retryDB("getRoom(${data.roomId}") { chatRoomDao().get(data.roomId) }?.let { current ->
+        return retryDB("getRoom(${data.roomId}") { chatRoomDao().getSync(data.roomId) }?.let { current ->
             with(data) {
 
                 val userId = if (type is RoomType.DirectMessage) {
@@ -399,6 +402,9 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
                     readonly = readonly ?: chatRoom.readonly,
                     isDefault = isDefault,
                     favorite = isFavorite,
+                    topic = chatRoom.topic,
+                    announcement = chatRoom.announcement,
+                    description = chatRoom.description,
                     open = open,
                     alert = alert,
                     unread = unread,
@@ -464,6 +470,9 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
             readonly = subscription.readonly,
             isDefault = subscription.isDefault,
             favorite = subscription.isFavorite,
+            topic = room.topic,
+            announcement = room.announcement,
+            description = room.description,
             open = subscription.open,
             alert = subscription.alert,
             unread = subscription.unread,
@@ -501,6 +510,9 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
                 readonly = readonly,
                 isDefault = default,
                 favorite = favorite,
+                topic = topic,
+                announcement = announcement,
+                description = description,
                 open = open,
                 alert = alert,
                 unread = unread,

app/src/main/java/chat/rocket/android/db/RCDatabase.kt

@@ -25,7 +25,7 @@ import chat.rocket.android.emoji.internal.db.StringListConverter
         AttachmentFieldEntity::class, AttachmentActionEntity::class, UrlEntity::class,
         ReactionEntity::class, MessagesSync::class
     ],
-    version = 12,
+    version = 11,
     exportSchema = true
 )
 @TypeConverters(StringListConverter::class)

app/src/main/java/chat/rocket/android/db/model/ChatRoomEntity.kt

@@ -34,6 +34,9 @@ data class ChatRoomEntity(
     var readonly: Boolean? = false,
     var isDefault: Boolean? = false,
     var favorite: Boolean? = false,
+    var topic: String? = null,
+    var announcement: String? = null,
+    var description: String? = null,
     var open: Boolean = true,
     var alert: Boolean = false,
     var unread: Long = 0,

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

@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
 import chat.rocket.android.chatroom.adapter.ChatRoomAdapter
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatroom.uimodel.BaseUiModel
@@ -115,9 +116,9 @@ class FavoriteMessagesFragment : Fragment(), FavoriteMessagesView {
     }
 
     private fun setupToolbar() {
-        (activity as ChatRoomActivity).let {
-            it.showToolbarTitle(getString(R.string.title_favorite_messages))
-            it.hideToolbarChatRoomIcon()
+        (activity as ChatDetailsActivity).let {
+            it.setToolbarTitle(getString(R.string.title_favorite_messages))
+            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
         }
     }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/files/ui/FilesFragment.kt

@@ -15,7 +15,7 @@ import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
-import chat.rocket.android.chatroom.ui.ChatRoomActivity
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
 import chat.rocket.android.files.adapter.FilesAdapter
 import chat.rocket.android.files.presentation.FilesPresenter
 import chat.rocket.android.files.presentation.FilesView
@@ -152,9 +152,9 @@ class FilesFragment : Fragment(), FilesView {
     }
 
     private fun setupToolbar(totalFiles: Long) {
-        (activity as ChatRoomActivity).let {
-            it.showToolbarTitle(getString(R.string.title_files_total, totalFiles))
-            it.hideToolbarChatRoomIcon()
+        (activity as ChatDetailsActivity).let {
+            it.setToolbarTitle(getString(R.string.title_files_total, totalFiles))
+            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
         }
     }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/members/di/MembersFragmentModule.kt

 package chat.rocket.android.members.di
 
 import androidx.lifecycle.LifecycleOwner
-import chat.rocket.android.chatroom.ui.ChatRoomActivity
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.members.presentation.MembersNavigator
@@ -22,7 +22,7 @@ class MembersFragmentModule {
 
     @Provides
     @PerFragment
-    fun provideChatRoomNavigator(activity: ChatRoomActivity) = MembersNavigator(activity)
+    fun provideChatRoomNavigator(activity: ChatDetailsActivity) = MembersNavigator(activity)
 
     @Provides
     @PerFragment

app/src/main/java/chat/rocket/android/members/presentation/MembersNavigator.kt

 package chat.rocket.android.members.presentation
 
-import chat.rocket.android.chatroom.ui.ChatRoomActivity
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
 import chat.rocket.android.members.ui.TAG_MEMBER_BOTTOM_SHEET_FRAGMENT
 import chat.rocket.android.members.ui.newInstance
 
-class MembersNavigator(internal val activity: ChatRoomActivity) {
+class MembersNavigator(internal val activity: ChatDetailsActivity) {
 
     fun toMemberDetails(avatarUri: String, realName: String, username: String, email: String, utcOffset: String) {
         activity.apply {

app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt

@@ -12,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
-import chat.rocket.android.chatroom.ui.ChatRoomActivity
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
 import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
 import chat.rocket.android.members.adapter.MembersAdapter
 import chat.rocket.android.members.presentation.MembersPresenter
@@ -127,13 +127,13 @@ class MembersFragment : Fragment(), MembersView {
     }
 
     private fun setupToolbar(totalMembers: Long? = null) {
-        (activity as ChatRoomActivity).let {
+        (activity as ChatDetailsActivity).let {
             if (totalMembers != null) {
-                it.showToolbarTitle(getString(R.string.title_counted_members, totalMembers))
+                it.setToolbarTitle(getString(R.string.title_counted_members, totalMembers))
             } else {
-                it.showToolbarTitle(getString(R.string.title_members))
+                it.setToolbarTitle(getString(R.string.title_members))
             }
-            it.hideToolbarChatRoomIcon()
+            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
         }
     }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/mentions/ui/MentionsFragment.kt

@@ -12,8 +12,8 @@ import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
 import chat.rocket.android.chatroom.adapter.ChatRoomAdapter
-import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatroom.uimodel.BaseUiModel
 import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
 import chat.rocket.android.mentions.presentention.MentionsPresenter
@@ -122,9 +122,9 @@ class MentionsFragment : Fragment(), MentionsView {
     }
 
     private fun setupToolbar() {
-        (activity as ChatRoomActivity).let {
-            it.showToolbarTitle(getString(R.string.msg_mentions))
-            it.hideToolbarChatRoomIcon()
+        (activity as ChatDetailsActivity).let {
+            it.setToolbarTitle(getString(R.string.msg_mentions))
+            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
         }
     }
 }
\ No newline at end of file

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

@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
+import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
 import chat.rocket.android.chatroom.adapter.ChatRoomAdapter
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatroom.uimodel.BaseUiModel
@@ -122,9 +123,9 @@ class PinnedMessagesFragment : Fragment(), PinnedMessagesView {
     }
 
     private fun setupToolbar() {
-        (activity as ChatRoomActivity).let {
-            it.showToolbarTitle(getString(R.string.title_pinned_messages))
-            it.hideToolbarChatRoomIcon()
+        (activity as ChatDetailsActivity).let {
+            it.setToolbarTitle(getString(R.string.title_pinned_messages))
+            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
         }
     }
 }
\ No newline at end of file

app/src/main/res/drawable/ic_files_24dp.xml

@@ -3,10 +3,8 @@
     android:height="24dp"
     android:viewportHeight="17.0"
     android:viewportWidth="18.0">
-
     <path
         android:fillColor="#FF1D74F5"
         android:fillType="nonZero"
         android:pathData="M4.221,11.799L10.444,5.576C10.97,5.05 11.833,5.067 12.383,5.617C12.928,6.163 12.946,7.034 12.423,7.557L6.195,13.785C5.226,14.754 3.613,14.717 2.599,13.704C1.582,12.687 1.546,11.08 2.52,10.106L9.295,3.331C10.713,1.913 13.07,1.966 14.552,3.448C16.035,4.931 16.087,7.287 14.668,8.706L7.898,15.476L8.747,16.324L15.516,9.555C17.383,7.688 17.316,4.588 15.364,2.636C13.414,0.686 10.313,0.616 8.446,2.483L1.671,9.258C0.248,10.681 0.302,13.03 1.788,14.515C3.27,15.997 5.626,16.051 7.044,14.633L13.272,8.405C14.242,7.435 14.209,5.82 13.195,4.805C12.175,3.786 10.569,3.754 9.595,4.728L3.373,10.95L4.221,11.799Z" />
-
 </vector>
\ No newline at end of file

app/src/main/res/drawable/ic_info_outline_white_24dp.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
+</vector>

app/src/main/res/drawable/ic_people_outline_black_24dp.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16.5,13c-1.2,0 -3.07,0.34 -4.5,1 -1.43,-0.67 -3.3,-1 -4.5,-1C5.33,13 1,14.08 1,16.25L1,19h22v-2.75c0,-2.17 -4.33,-3.25 -6.5,-3.25zM12.5,17.5h-10v-1.25c0,-0.54 2.56,-1.75 5,-1.75s5,1.21 5,1.75v1.25zM21.5,17.5L14,17.5v-1.25c0,-0.46 -0.2,-0.86 -0.52,-1.22 0.88,-0.3 1.96,-0.53 3.02,-0.53 2.44,0 5,1.21 5,1.75v1.25zM7.5,12c1.93,0 3.5,-1.57 3.5,-3.5S9.43,5 7.5,5 4,6.57 4,8.5 5.57,12 7.5,12zM7.5,6.5c1.1,0 2,0.9 2,2s-0.9,2 -2,2 -2,-0.9 -2,-2 0.9,-2 2,-2zM16.5,12c1.93,0 3.5,-1.57 3.5,-3.5S18.43,5 16.5,5 13,6.57 13,8.5s1.57,3.5 3.5,3.5zM16.5,6.5c1.1,0 2,0.9 2,2s-0.9,2 -2,2 -2,-0.9 -2,-2 0.9,-2 2,-2z"/>
+</vector>

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".chatdetails.ui.ChatDetailsActivity">
+    <include
+        android:id="@+id/layout_app_bar"
+        layout="@layout/app_bar_chat_details" />
+    <FrameLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.appbar.AppBarLayout 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:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/colorPrimary"
+    android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        app:layout_scrollFlags="scroll|enterAlways"
+        app:navigationIcon="@drawable/ic_close_white_24dp"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+        <TextView
+            android:id="@+id/toolbar_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawablePadding="@dimen/text_view_drawable_padding"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="@color/colorWhite"
+            android:textSize="18sp"
+            android:textStyle="bold"
+            tools:text="@string/title_channel_details" />
+    </androidx.appcompat.widget.Toolbar>
+</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@color/whitesmoke"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+        <RelativeLayout
+            android:background="@color/colorWhite"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:padding="15dp">
+            <TextView
+                android:id="@+id/name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/ChatDetails.Title.TextView"
+                android:drawablePadding="@dimen/text_view_drawable_padding"
+                tools:text="#important"/>
+            <TextView
+                android:id="@+id/title_topic"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/name"
+                android:layout_marginTop="20dp"
+                style="@style/ChatDetails.Title.TextView"
+                android:text="@string/title_topic" />
+            <TextView
+                android:id="@+id/content_topic"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/title_topic"
+                style="@style/ChatDetails.Content.TextView"
+                android:text="@string/msg_no_topic" />
+            <TextView
+                android:id="@+id/title_announcement"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/content_topic"
+                android:layout_marginTop="15dp"
+                style="@style/ChatDetails.Title.TextView"
+                android:text="@string/title_announcement" />
+            <TextView
+                android:id="@+id/content_announcement"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/title_announcement"
+                style="@style/ChatDetails.Content.TextView"
+                android:text="@string/msg_no_announcement" />
+            <TextView
+                android:id="@+id/title_description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/content_announcement"
+                android:layout_marginTop="15dp"
+                style="@style/ChatDetails.Title.TextView"
+                android:text="@string/title_description" />
+            <TextView
+                android:id="@+id/content_description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/title_description"
+                android:layout_marginBottom="10dp"
+                style="@style/ChatDetails.Content.TextView"
+                android:text="@string/msg_no_description" />
+        </RelativeLayout>
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/options"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+    </LinearLayout>
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?android:attr/selectableItemBackground"
+    android:padding="20dp">
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        tools:ignore="ContentDescription"
+        android:src="@drawable/ic_add_24dp"/>
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@id/icon"
+        android:layout_alignBottom="@id/icon"
+        android:gravity="center_vertical"
+        android:layout_marginStart="57dp"
+        style="@style/ChatDetails.Title.TextView"
+        tools:text="Files"/>
+</RelativeLayout>
\ No newline at end of file

app/src/main/res/values-de/strings.xml

@@ -22,8 +22,12 @@
     <string name="title_update_profile">Update Profil</string>
     <string name="title_about">Über</string>
     <string name="title_create_channel">Erstelle Raum</string>
+    <string name="title_are_you_sure">Are you sure?</string><!-- TODO Add translation -->
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_topic">Thema</string>
+    <string name="title_announcement">Ankündigung</string>
+    <string name="title_description">Beschreibung</string>
     <string name="title_licence">Licence</string> <!-- TODO Add translation -->
-    <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
 
     <!-- Actions -->
     <string name="action_connect">Verbinde</string>
@@ -155,6 +159,9 @@
     <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
     <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">You are muted on this channel</string>
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
     <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reacted with %2$s</item>
@@ -322,5 +329,6 @@
     <string name="notif_success_sending">Nachricht gesendet nach %1$s!</string>
     <string name="read_by">Gelesen von</string>
     <string name="message_information_title">Nachricht Information</string>
-    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>     <!--TODO - Add proper translation-->
+    <!--TODO - Add proper translation-->
+    <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
 </resources>
\ No newline at end of file

app/src/main/res/values-es/strings.xml

@@ -23,6 +23,10 @@
     <string name="title_create_channel">Crear canal</string>
     <string name="title_licence">Licence</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_topic">Tema</string>
+    <string name="title_announcement">Anuncio</string>
+    <string name="title_description">Descripción</string>
 
     <!-- Actions -->
     <string name="action_connect">Conectar</string>
@@ -171,6 +175,10 @@
     <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
     <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">You are muted on this channel</string> <!-- TODO - Add proper translation -->
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
+
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
         <item quantity="other">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
@@ -324,5 +332,4 @@
     <string name="msg_sent_attachment">Envió un archivo</string>
     <!--TODO - Add proper translation-->
     <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
-
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -24,6 +24,10 @@
     <string name="title_create_channel">Créer salon</string>
     <string name="title_licence">Licence</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_topic">Sujet</string>
+    <string name="title_announcement">Annonce</string>
+    <string name="title_description">La description</string>
 
     <!-- Actions -->
     <string name="action_connect">Se connecter</string>
@@ -163,6 +167,10 @@
     <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
     <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">You are muted on this channel</string> <!-- TODO - Add proper translation -->
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
+
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
         <item quantity="other">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->

app/src/main/res/values-hi-rIN/strings.xml

@@ -24,6 +24,10 @@
     <string name="title_create_channel">चैनल बनाएं</string>
     <string name="title_licence">Licence</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_topic">विषय</string>
+    <string name="title_announcement">घोषणा</string>
+    <string name="title_description">विवरण</string>
 
     <!-- Actions -->
     <string name="action_connect">जुडिये</string>
@@ -177,6 +181,10 @@
     <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
     <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">You are muted on this channel</string> <!-- TODO - Add proper translation -->
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
+
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
         <item quantity="few">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->

app/src/main/res/values-it/strings.xml

@@ -24,6 +24,10 @@
     <string name="title_create_channel">Crea Canale</string>
     <string name="title_licence">Licence</string> <!-- TODO ADD translation -->
     <string name="title_are_you_sure">Sei sicuro che vuoi uscire ?</string>
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_topic">Argomento</string>
+    <string name="title_announcement">Annuncio</string>
+    <string name="title_description">Descrizione</string>
 
     <!-- Actions -->
     <string name="action_connect">Collega</string>
@@ -154,8 +158,12 @@
     <string name="msg_two_factor_authentication">Autenticazione a 2 fattori (2FA)</string>
     <string name="msg__your_2fa_code">Qual è il tuo codice 2FA ?</string>
     <string name="msg_permalink_copied">Permalink copiato</string>
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
     <string name="msg_send_email">Send email</string>
     <string name="msg_android_app_support">Android app support</string>
+
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s ha reagito con %2$s</item>
         <item quantity="other">%1$s ha reagito con %2$s</item>

app/src/main/res/values-ja/strings.xml

@@ -26,6 +26,10 @@
     <string name="title_licence">Licence</string> <!-- TODO Add translation -->
     <string name="title_create_channel">新しいチャネルを作成</string>
     <string name="title_are_you_sure">本気ですか？</string>
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_topic">トピック</string>
+    <string name="title_announcement">発表</string>
+    <string name="title_description">説明</string>
 
     <!-- Actions -->
     <string name="action_connect">接続</string>
@@ -161,6 +165,9 @@
     <string name="msg_view_more">更に表示</string>
     <string name="msg_view_less">隠す</string>
     <string name="msg_muted_on_this_channel">あなたはこのチャンネルでミュートされています</string>
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
     <!-- TODO - Add proper translation -->
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reacted with %2$s</item>

app/src/main/res/values-pt-rBR/strings.xml

@@ -24,6 +24,10 @@
     <string name="title_create_channel">Criar chat</string>
     <string name="title_licence">Licença</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Você tem certeza?</string>
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_topic">Tópico</string>
+    <string name="title_announcement">Anúncio</string>
+    <string name="title_description">Descrição</string>
 
     <!-- Actions -->
     <string name="action_connect">Conectar</string>
@@ -164,6 +168,9 @@
     <string name="msg_send_email">Enviar e-mail</string>
     <string name="msg_android_app_support">Suporte ao aplicativo Android</string>
     <string name="msg_muted_on_this_channel">Você está silenciado neste canal</string>
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reagiu com %2$s</item>
         <item quantity="other">%1$s reagiram com %2$s</item>

app/src/main/res/values-ru-rRU/strings.xml

@@ -22,8 +22,12 @@
     <string name="title_update_profile">Обновить профиль</string>
     <string name="title_about">О программе</string>
     <string name="title_create_channel">Создать новый канал</string>
-    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
-    <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_topic">Тема</string>
+    <string name="title_announcement">Объявление</string>
+    <string name="title_description">Описание</string>
+    <string name="title_licence">Лицензия</string>
+    <string name="title_are_you_sure">Вы уверены?</string>
 
     <!-- Actions -->
     <string name="action_connect">Подключиться</string>
@@ -36,7 +40,7 @@
     <string name="action_create_channel">Создать канал</string>
     <string name="action_create">Создать</string>
     <string name="action_logout">Выйти</string>
-    <string name="action_attach_a_files">Attach a file</string> <!-- TODO Add translation -->
+    <string name="action_attach_a_files">Прикрепить файл</string>
     <string name="action_confirm_password">Подтверждение изменения пароля</string>
     <string name="action_join_chat">Присоединиться к чату</string>
     <string name="action_add_account">Добавить аккаунт</string>
@@ -54,17 +58,17 @@
     <string name="action_create_server">Создать новый сервер</string>
     <string name="action_register">Зарегистрировать</string>
     <string name="action_confirm">Подтвердить</string>
-    <string name="action_delete_account">Delete account</string> <!-- TODO Add translation -->
+    <string name="action_delete_account">Удалить аккаунт</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
-        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
-        <item name="item_password">Change password</item> <!-- TODO Add translation -->
-        <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
-        <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
-        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
-        <item name="item_licence">Licence</item> <!-- TODO Add translation -->
-        <item name="item_about">About</item> <!-- TODO Add translation -->
+        <item name="item_preferences">Персональные</item>
+        <item name="item_password">Изменить пароль</item>
+        <item name="item_share_app">Поделиться приложением</item>
+        <item name="item_rate_us">Оцените нас</item>
+        <item name="item_contact_us">Связаться с нами</item>
+        <item name="item_licence">Лицензия</item>
+        <item name="item_about">О программе</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -159,13 +163,17 @@
     <string name="msg_view_more">больше</string>
     <string name="msg_view_less">меньше</string>
     <string name="msg_permalink_copied">Ссылка скопирована</string>
-    <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
-    <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
-    <string name="msg_muted_on_this_channel">You are muted on this channel</string> <!-- TODO - Add proper translation -->
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
+    <string name="msg_send_email">Отправить e-mail</string>
+    <string name="msg_android_app_support">Поддержка Android-приложения</string>
+    <string name="msg_muted_on_this_channel">Вы лишены дара речи на этом канале</string>
+
     <plurals name="msg_reacted_with_">
-        <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
-        <item quantity="few">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
-        <item quantity="many">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
+        <item quantity="one">%1$s реагирует с %2$s</item>
+        <item quantity="few">%1$s реагируют с %2$s</item>
+        <item quantity="many">%1$s реагируют с %2$s</item>
     </plurals>
 
     <!-- Create channel messages -->

app/src/main/res/values-tr/strings.xml

@@ -24,6 +24,10 @@
     <string name="title_create_channel">Yeni Kanal Oluştur</string>
     <string name="title_licence">Licence</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_topic">konu</string>
+    <string name="title_announcement">duyuru</string>
+    <string name="title_description">Açıklama</string>
 
     <!-- Actions -->
     <string name="action_connect">Bağlan</string>
@@ -178,10 +182,15 @@
     <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
     <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">You are muted on this channel</string> <!-- TODO - Add proper translation -->
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
+
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
         <item quantity="other">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
     </plurals>
+
     <!-- Preferences messages -->
     <string name="msg_analytics_tracking">İstatistik takibi</string>
     <string name="msg_send_analytics_tracking">Uygulamanın gelişmesine katkıda bulunmak için anonim istatistik bilgisi gönder</string>
@@ -325,5 +334,4 @@
     <string name="message_information_title">Mesaj bilgisi</string>
     <!--TODO - Add proper translation-->
     <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string>
-
 </resources>

app/src/main/res/values-uk/strings.xml

@@ -24,6 +24,10 @@
     <string name="title_create_channel">Створити новий канал</string>
     <string name="title_licence">Licence</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
+    <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
+    <string name="title_topic">Тема</string>
+    <string name="title_announcement">Оголошення</string>
+    <string name="title_description">Опис</string>
 
     <!-- Actions -->
     <string name="action_connect">Підключитися</string>
@@ -161,6 +165,10 @@
     <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
     <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
     <string name="msg_muted_on_this_channel">You are muted on this channel</string> <!-- TODO - Add proper translation -->
+    <string name="msg_no_topic">No topic added</string> <!-- TODO Add translation -->
+    <string name="msg_no_announcement">No announcement added</string> <!-- TODO Add translation -->
+    <string name="msg_no_description">No description added</string> <!-- TODO Add translation -->
+
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
         <item quantity="few">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->

app/src/main/res/values/colors.xml

@@ -55,6 +55,8 @@
 
     <color name="colorDivider">#1F000000</color>
 
+    <color name="colorLightGrey">#F4F5F7</color>
+
     <!-- Suggestions -->
     <color name="suggestion_background_color">@color/colorWhite</color>
 

app/src/main/res/values/strings.xml

@@ -36,6 +36,10 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="title_create_channel">Create Channel</string>
     <string name="title_licence">Licence</string>
     <string name="title_are_you_sure">Are you sure?</string>
+    <string name="title_channel_details">Channel Details</string>
+    <string name="title_topic">Topic</string>
+    <string name="title_announcement">Announcement</string>
+    <string name="title_description">Description</string>
 
     <!-- Actions -->
     <string name="action_connect">Connect</string>
@@ -171,8 +175,12 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="msg_two_factor_authentication">Two-factor Authentication</string>
     <string name="msg__your_2fa_code">What’s your 2FA code?</string>
     <string name="msg_permalink_copied">Permalink copied</string>
+    <string name="msg_no_topic">No topic added</string>
+    <string name="msg_no_announcement">No announcement added</string>
+    <string name="msg_no_description">No description added</string>
     <string name="msg_send_email">Send email</string>
     <string name="msg_android_app_support">Android app support</string>
+
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reacted with %2$s</item>
         <item quantity="other">%1$s reacted with %2$s</item>

app/src/main/res/values/styles.xml

@@ -169,6 +169,16 @@
         <item name="android:textSize">16sp</item>
     </style>
 
+    <style name="ChatDetails.Title.TextView" parent="TextAppearance.AppCompat.Title">
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/colorPrimary</item>
+    </style>
+
+    <style name="ChatDetails.Content.TextView" parent="TextAppearance.AppCompat.Title">
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">@color/colorSecondaryTextLight</item>
+    </style>
+
     <style name="Sender.Name.TextView" parent="TextAppearance.AppCompat.Title">
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">1</item>