Open user details view from member list

- Removes ChatDetailsActivity - using fragment instead;
- more refactor.

app/src/main/AndroidManifest.xml

@@ -78,11 +78,6 @@
             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/analytics/event/ScreenViewEvent.kt

@@ -19,7 +19,6 @@ sealed class ScreenViewEvent(val screenName: String) {
     object UserDetails : ScreenViewEvent("UserDetailsFragment")
     object FavoriteMessages : ScreenViewEvent("FavoriteMessagesFragment")
     object Files : ScreenViewEvent("FilesFragment")
-    object MemberBottomSheet : ScreenViewEvent("MemberBottomSheetFragment")
     object Members : ScreenViewEvent("MembersFragment")
     object Mentions : ScreenViewEvent("MentionsFragment")
     object MessageInfo : ScreenViewEvent("MessageInfoFragment")

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 {
@@ -27,16 +20,4 @@ class ChatDetailsFragmentModule {
     @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/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/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.chatroom.presentation.ChatRoomNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
@@ -10,11 +11,12 @@ 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 timber.log.Timber
 import javax.inject.Inject
 
 class ChatDetailsPresenter @Inject constructor(
     private val view: ChatDetailsView,
-    private val navigator: ChatDetailsNavigator,
+    private val navigator: ChatRoomNavigator,
     private val strategy: CancelStrategy,
     serverInteractor: GetCurrentServerInteractor,
     factory: ConnectionManagerFactory
@@ -29,11 +31,11 @@ class ChatDetailsPresenter @Inject constructor(
                 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!!)
+            } catch(exception: Exception) {
+                Timber.e(exception)
+                exception.message?.let {
+                    view.showMessage(it)
                 }.ifNull {
                     view.showGenericErrorMessage()
                 }

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/ChatDetailsFragment.kt

 package chat.rocket.android.chatdetails.ui
 
+import DrawableHelper
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,6 +16,7 @@ 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.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.ui
@@ -32,7 +34,7 @@ fun newInstance(
     disableMenu: Boolean
 ): ChatDetailsFragment {
     return ChatDetailsFragment().apply {
-        arguments = Bundle(1).apply {
+        arguments = Bundle(4).apply {
             putString(BUNDLE_CHAT_ROOM_ID, chatRoomId)
             putString(BUNDLE_CHAT_ROOM_TYPE, chatRoomType)
             putBoolean(BUNDLE_IS_SUBSCRIBED, isSubscribed)
@@ -48,14 +50,12 @@ 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 {
+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
@@ -72,13 +72,15 @@ class ChatDetailsFragment: Fragment(), ChatDetailsView {
             chatRoomType = bundle.getString(BUNDLE_CHAT_ROOM_TYPE)
             isSubscribed = bundle.getBoolean(BUNDLE_IS_SUBSCRIBED)
             disableMenu = bundle.getBoolean(BUNDLE_DISABLE_MENU)
+        } else {
+            requireNotNull(bundle) { "no arguments supplied when the fragment was instantiated" }
         }
     }
 
     override fun onCreateView(
-            inflater: LayoutInflater,
-            container: ViewGroup?,
-            savedInstanceState: Bundle?
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
     ): View? = container?.inflate(R.layout.fragment_chat_details)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -94,9 +96,12 @@ class ChatDetailsFragment: Fragment(), ChatDetailsView {
             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
+            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
         }
     }
 
@@ -126,15 +131,24 @@ class ChatDetailsFragment: Fragment(), ChatDetailsView {
                 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) {
+                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) {
+            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) {
+            it.addOption(
+                getString(R.string.title_pinned_messages),
+                R.drawable.ic_action_message_pin_24dp
+            ) {
                 presenter.toPinned(chatRoomId!!)
             }
         }
@@ -178,9 +192,9 @@ class ChatDetailsFragment: Fragment(), ChatDetailsView {
                     layoutManager = LinearLayoutManager(it)
                     addItemDecoration(
                         DividerItemDecoration(
-                                it,
-                                resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_start),
-                                resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_end)
+                            it,
+                            resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_start),
+                            resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_end)
                         )
                     )
                     itemAnimator = DefaultItemAnimator()
@@ -192,9 +206,9 @@ class ChatDetailsFragment: Fragment(), ChatDetailsView {
     }
 
     private fun setupToolbar() {
-        (activity as ChatDetailsActivity).let {
-            it.setNavigationIcon(R.drawable.ic_close_white_24dp)
-            it.setToolbarTitle(getString(R.string.title_channel_details))
+        with((activity as ChatRoomActivity)) {
+            hideToolbarChatRoomIcon()
+            showToolbarTitle(getString(R.string.title_channel_details))
         }
     }
 }
\ 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.chatdetails.ui.TAG_CHAT_DETAILS_FRAGMENT
 import chat.rocket.android.chatinformation.ui.messageInformationIntent
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatroom.ui.chatRoomIntent
+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.server.ui.changeServerIntent
 import chat.rocket.android.userdetails.ui.TAG_USER_DETAILS_FRAGMENT
 import chat.rocket.android.util.extensions.addFragmentBackStack
-import javax.inject.Inject
 
-class ChatRoomNavigator @Inject constructor(internal val activity: ChatRoomActivity) {
+class ChatRoomNavigator(internal val activity: ChatRoomActivity) {
 
     fun toUserDetails(userId: String) {
         activity.addFragmentBackStack(TAG_USER_DETAILS_FRAGMENT, R.id.fragment_container) {
@@ -49,14 +53,50 @@ class ChatRoomNavigator @Inject constructor(internal val activity: ChatRoomActiv
         isChatRoomSubscribed: Boolean,
         isMenuDisabled: Boolean
     ) {
-        activity.startActivity(
-            activity.chatDetailsIntent(
+        activity.addFragmentBackStack(TAG_CHAT_DETAILS_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.chatdetails.ui.newInstance(
                 chatRoomId,
                 chatRoomType,
                 isChatRoomSubscribed,
                 isMenuDisabled
             )
-        )
+        }
+    }
+
+    fun toMembersList(chatRoomId: String) {
+        activity.addFragmentBackStack(TAG_MEMBERS_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.members.ui.newInstance(chatRoomId)
+        }
+    }
+
+    fun toMemberDetails(userId: String) {
+        activity.addFragmentBackStack(TAG_USER_DETAILS_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.userdetails.ui.newInstance(userId)
+        }
+    }
+
+    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 toNewServer() {

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

@@ -108,7 +108,7 @@ private fun ChatRoomFragment.setupDetailsMenuItem(menu: Menu) {
             Menu.NONE,
             MENU_ACTION_SHOW_DETAILS,
             Menu.NONE,
-            "Channel Details"
+            R.string.title_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/dagger/module/ActivityBuilder.kt

@@ -12,8 +12,6 @@ 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
@@ -79,15 +77,7 @@ abstract class ActivityBuilder {
     @ContributesAndroidInjector(
         modules = [ChatRoomModule::class,
             ChatRoomFragmentProvider::class,
-            UserDetailsFragmentProvider::class
-        ]
-    )
-    abstract fun bindChatRoomActivity(): ChatRoomActivity
-
-    @PerActivity
-    @ContributesAndroidInjector(
-        modules = [
-            ChatDetailsModule::class,
+            UserDetailsFragmentProvider::class,
             ChatDetailsFragmentProvider::class,
             MembersFragmentProvider::class,
             MentionsFragmentProvider::class,
@@ -96,7 +86,7 @@ abstract class ActivityBuilder {
             FilesFragmentProvider::class
         ]
     )
-    abstract fun bindChatDetailsActivity(): ChatDetailsActivity
+    abstract fun bindChatRoomActivity(): ChatRoomActivity
 
     @PerActivity
     @ContributesAndroidInjector(modules = [PasswordFragmentProvider::class])

app/src/main/java/chat/rocket/android/favoritemessages/di/FavoriteMessagesFragmentModule.kt

 package chat.rocket.android.favoritemessages.di
 
-import androidx.lifecycle.LifecycleOwner
-import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
-import chat.rocket.android.db.DatabaseManager
-import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.favoritemessages.presentation.FavoriteMessagesView
 import chat.rocket.android.favoritemessages.ui.FavoriteMessagesFragment
-import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import dagger.Module
 import dagger.Provides
-import kotlinx.coroutines.experimental.Job
-import javax.inject.Named
 
 @Module
 class FavoriteMessagesFragmentModule {
@@ -21,20 +14,4 @@ class FavoriteMessagesFragmentModule {
     fun provideFavoriteMessagesView(frag: FavoriteMessagesFragment): FavoriteMessagesView {
         return frag
     }
-
-    @Provides
-    @PerFragment
-    fun provideJob() = Job()
-
-    @Provides
-    @PerFragment
-    fun provideLifecycleOwner(frag: FavoriteMessagesFragment): 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/favoritemessages/ui/FavoriteMessagesFragment.kt

@@ -12,7 +12,6 @@ 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
@@ -116,9 +115,6 @@ class FavoriteMessagesFragment : Fragment(), FavoriteMessagesView {
     }
 
     private fun setupToolbar() {
-        (activity as ChatDetailsActivity).let {
-            it.setToolbarTitle(getString(R.string.title_favorite_messages))
-            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
-        }
+        (activity as ChatRoomActivity).showToolbarTitle(getString(R.string.title_favorite_messages))
     }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/files/di/FilesFragmentModule.kt

 package chat.rocket.android.files.di
 
-import androidx.lifecycle.LifecycleOwner
-import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.files.presentation.FilesView
 import chat.rocket.android.files.ui.FilesFragment
 import dagger.Module
 import dagger.Provides
-import kotlinx.coroutines.experimental.Job
 
 @Module
 class FilesFragmentModule {
@@ -17,20 +14,4 @@ class FilesFragmentModule {
     fun provideFilesView(frag: FilesFragment): FilesView {
         return frag
     }
-
-    @Provides
-    @PerFragment
-    fun provideJob() = Job()
-
-    @Provides
-    @PerFragment
-    fun provideLifecycleOwner(frag: FilesFragment): 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/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.chatdetails.ui.ChatDetailsActivity
+import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.files.adapter.FilesAdapter
 import chat.rocket.android.files.presentation.FilesPresenter
 import chat.rocket.android.files.presentation.FilesView
@@ -152,9 +152,11 @@ class FilesFragment : Fragment(), FilesView {
     }
 
     private fun setupToolbar(totalFiles: Long) {
-        (activity as ChatDetailsActivity).let {
-            it.setToolbarTitle(getString(R.string.title_files_total, totalFiles))
-            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
-        }
+        (activity as ChatRoomActivity).showToolbarTitle(
+            (getString(
+                R.string.title_files_total,
+                totalFiles
+            ))
+        )
     }
 }
\ 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.chatdetails.ui.ChatDetailsActivity
-import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
-import chat.rocket.android.members.presentation.MembersNavigator
 import chat.rocket.android.members.presentation.MembersView
 import chat.rocket.android.members.ui.MembersFragment
 import dagger.Module
 import dagger.Provides
-import kotlinx.coroutines.experimental.Job
 
 @Module
 class MembersFragmentModule {
@@ -19,24 +14,4 @@ class MembersFragmentModule {
     fun membersView(frag: MembersFragment): MembersView {
         return frag
     }
-
-    @Provides
-    @PerFragment
-    fun provideMembersNavigator(activity: ChatDetailsActivity) = MembersNavigator(activity)
-
-    @Provides
-    @PerFragment
-    fun provideJob() = Job()
-
-    @Provides
-    @PerFragment
-    fun provideLifecycleOwner(frag: MembersFragment): 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/members/di/MembersFragmentProvider.kt

 package chat.rocket.android.members.di
 
-import chat.rocket.android.members.ui.MembersFragment
 import chat.rocket.android.dagger.scope.PerFragment
-import chat.rocket.android.members.ui.MemberBottomSheetFragment
+import chat.rocket.android.members.ui.MembersFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
@@ -12,9 +11,4 @@ abstract class MembersFragmentProvider {
     @ContributesAndroidInjector(modules = [MembersFragmentModule::class])
     @PerFragment
     abstract fun provideMembersFragment(): MembersFragment
-
-    @ContributesAndroidInjector()
-    @PerFragment
-    abstract fun provideMemberBottomSheetFragment(): MemberBottomSheetFragment
-
 }
\ No newline at end of file

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

-package chat.rocket.android.members.presentation
-
-import chat.rocket.android.R
-import chat.rocket.android.chatdetails.ui.ChatDetailsActivity
-import chat.rocket.android.userdetails.ui.TAG_USER_DETAILS_FRAGMENT
-import chat.rocket.android.util.extensions.addFragmentBackStack
-
-class MembersNavigator(internal val activity: ChatDetailsActivity) {
-
-    fun toMemberDetails(userId: String) {
-        // TODO
-//        activity.addFragmentBackStack(TAG_USER_DETAILS_FRAGMENT, R.id.fragment_container) {
-//            chat.rocket.android.userdetails.ui.newInstance(userId)
-//        }
-    }
-}

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

 package chat.rocket.android.members.presentation
 
+import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.members.uimodel.MemberUiModel
 import chat.rocket.android.members.uimodel.MemberUiModelMapper
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
-import chat.rocket.android.util.retryDB
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull
@@ -18,7 +18,7 @@ import javax.inject.Named
 
 class MembersPresenter @Inject constructor(
     private val view: MembersView,
-    private val navigator: MembersNavigator,
+    private val navigator: ChatRoomNavigator,
     private val dbManager: DatabaseManager,
     @Named("currentServer") private val currentServer: String,
     private val strategy: CancelStrategy,

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

-package chat.rocket.android.members.ui
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import chat.rocket.android.R
-import chat.rocket.android.analytics.AnalyticsManager
-import chat.rocket.android.analytics.event.ScreenViewEvent
-import chat.rocket.android.util.extensions.content
-import chat.rocket.android.util.extensions.textContent
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import dagger.android.support.AndroidSupportInjection
-import kotlinx.android.synthetic.main.fragment_member_bottom_sheet.*
-import javax.inject.Inject
-
-fun newInstance(
-    avatarUri: String,
-    realName: String,
-    username: String,
-    email: String,
-    utcOffset: String
-): BottomSheetDialogFragment {
-    return MemberBottomSheetFragment().apply {
-        arguments = Bundle(1).apply {
-            putString(BUNDLE_AVATAR_URI, avatarUri)
-            putString(BUNDLE_REAL_NAME, realName)
-            putString(BUNDLE_USERNAME, username)
-            putString(BUNDLE_EMAIL, email)
-            putString(BUNDLE_UTC_OFFSET, utcOffset)
-        }
-    }
-}
-
-internal const val TAG_MEMBER_BOTTOM_SHEET_FRAGMENT = "MemberBottomSheetFragment"
-
-private const val BUNDLE_AVATAR_URI = "avatar_uri"
-private const val BUNDLE_REAL_NAME = "real_name"
-private const val BUNDLE_USERNAME = "username"
-private const val BUNDLE_EMAIL = "email"
-private const val BUNDLE_UTC_OFFSET = "utc_offset"
-
-class MemberBottomSheetFragment : BottomSheetDialogFragment() {
-    @Inject
-    lateinit var analyticsManager: AnalyticsManager
-    private lateinit var avatarUri: String
-    private lateinit var realName: String
-    private lateinit var username: String
-    private lateinit var email: String
-    private lateinit var utcOffset: String
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        AndroidSupportInjection.inject(this)
-
-        val bundle = arguments
-        if (bundle != null) {
-            avatarUri = bundle.getString(BUNDLE_AVATAR_URI)
-            realName = bundle.getString(BUNDLE_REAL_NAME)
-            username = bundle.getString(BUNDLE_USERNAME)
-            email = bundle.getString(BUNDLE_EMAIL)
-            utcOffset = bundle.getString(BUNDLE_UTC_OFFSET)
-        } else {
-            requireNotNull(bundle) { "no arguments supplied when the fragment was instantiated" }
-        }
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? =
-        inflater.inflate(R.layout.fragment_member_bottom_sheet, container, false)
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        showMemberDetails()
-
-        analyticsManager.logScreenView(ScreenViewEvent.MemberBottomSheet)
-    }
-
-    private fun showMemberDetails() {
-        image_bottom_sheet_avatar.setImageURI(avatarUri)
-        text_bottom_sheet_member_name.content = realName
-        text_bottom_sheet_member_username.content = username
-
-        if (email.isNotEmpty()) {
-            text_member_email_address.textContent = email
-        } else {
-            text_email_address.isVisible = false
-            text_member_email_address.isVisible = false
-        }
-
-        if (utcOffset.isNotEmpty()) {
-            text_member_utc.content = utcOffset
-        } else {
-            text_utc.isVisible = false
-            text_member_utc.isVisible = false
-        }
-    }
-}
\ No newline at end of file

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

@@ -12,16 +12,18 @@ 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.ui.ChatRoomActivity
 import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
 import chat.rocket.android.members.adapter.MembersAdapter
 import chat.rocket.android.members.presentation.MembersPresenter
 import chat.rocket.android.members.presentation.MembersView
 import chat.rocket.android.members.uimodel.MemberUiModel
+import chat.rocket.android.util.extensions.clearLightStatusBar
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.ui
 import dagger.android.support.AndroidSupportInjection
+import kotlinx.android.synthetic.main.app_bar_chat_room.*
 import kotlinx.android.synthetic.main.fragment_members.*
 import javax.inject.Inject
 
@@ -120,20 +122,31 @@ class MembersFragment : Fragment(), MembersView {
 
     private fun setupRecyclerView() {
         ui {
-            recycler_view.layoutManager = linearLayoutManager
-            recycler_view.addItemDecoration(DividerItemDecoration(it, DividerItemDecoration.HORIZONTAL))
+            recycler_view.layoutManager = LinearLayoutManager(context)
+            recycler_view.addItemDecoration(
+                DividerItemDecoration(
+                    it,
+                    DividerItemDecoration.HORIZONTAL
+                )
+            )
             recycler_view.adapter = adapter
         }
     }
 
     private fun setupToolbar(totalMembers: Long? = null) {
-        (activity as ChatDetailsActivity).let {
+        with((activity as ChatRoomActivity)) {
             if (totalMembers != null) {
-                it.setToolbarTitle(getString(R.string.title_counted_members, totalMembers))
+                showToolbarTitle(
+                    (getString(
+                        R.string.title_counted_members,
+                        totalMembers
+                    ))
+                )
             } else {
-                it.setToolbarTitle(getString(R.string.title_members))
+                showToolbarTitle((getString(R.string.title_members)))
             }
-            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+            this.clearLightStatusBar()
+            toolbar.isVisible = true
         }
     }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/mentions/di/MentionsFragmentModule.kt

 package chat.rocket.android.mentions.di
 
-import androidx.lifecycle.LifecycleOwner
-import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.mentions.presentention.MentionsView
 import chat.rocket.android.mentions.ui.MentionsFragment
 import dagger.Module
 import dagger.Provides
-import kotlinx.coroutines.experimental.Job
 
 @Module
 class MentionsFragmentModule {
@@ -17,20 +14,4 @@ class MentionsFragmentModule {
     fun provideMentionsView(frag: MentionsFragment): MentionsView {
         return frag
     }
-
-    @Provides
-    @PerFragment
-    fun provideJob() = Job()
-
-    @Provides
-    @PerFragment
-    fun provideLifecycleOwner(frag: MentionsFragment): 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/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
@@ -121,9 +121,6 @@ class MentionsFragment : Fragment(), MentionsView {
     }
 
     private fun setupToolbar() {
-        (activity as ChatDetailsActivity).let {
-            it.setToolbarTitle(getString(R.string.msg_mentions))
-            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
-        }
+        (activity as ChatRoomActivity).showToolbarTitle((getString(R.string.msg_mentions)))
     }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/pinnedmessages/di/PinnedMessagesFragmentModule.kt

 package chat.rocket.android.pinnedmessages.di
 
-import androidx.lifecycle.LifecycleOwner
-import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.pinnedmessages.presentation.PinnedMessagesView
 import chat.rocket.android.pinnedmessages.ui.PinnedMessagesFragment
 import dagger.Module
 import dagger.Provides
-import kotlinx.coroutines.experimental.Job
 
 @Module
 class PinnedMessagesFragmentModule {
@@ -17,20 +14,4 @@ class PinnedMessagesFragmentModule {
     fun providePinnedMessagesView(frag: PinnedMessagesFragment): PinnedMessagesView {
         return frag
     }
-
-    @Provides
-    @PerFragment
-    fun provideJob() = Job()
-
-    @Provides
-    @PerFragment
-    fun provideLifecycleOwner(frag: PinnedMessagesFragment): 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/pinnedmessages/ui/PinnedMessagesFragment.kt

@@ -12,14 +12,12 @@ 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.pinnedmessages.presentation.PinnedMessagesPresenter
 import chat.rocket.android.pinnedmessages.presentation.PinnedMessagesView
-import chat.rocket.android.server.domain.AnalyticsTrackingInteractor
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.ui
@@ -123,9 +121,6 @@ class PinnedMessagesFragment : Fragment(), PinnedMessagesView {
     }
 
     private fun setupToolbar() {
-        (activity as ChatDetailsActivity).let {
-            it.setToolbarTitle(getString(R.string.title_pinned_messages))
-            it.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
-        }
+        (activity as ChatRoomActivity).showToolbarTitle((getString(R.string.title_pinned_messages)))
     }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/userdetails/di/UserDetailsFragmentModule.kt

 package chat.rocket.android.userdetails.di
 
-import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.userdetails.presentation.UserDetailsView
 import chat.rocket.android.userdetails.ui.UserDetailsFragment
@@ -13,8 +12,4 @@ class UserDetailsFragmentModule {
     @Provides
     @PerFragment
     fun provideUserDetailsView(frag: UserDetailsFragment): UserDetailsView = frag
-
-    @Provides
+}
\ No newline at end of file
-    @PerFragment
-    fun provideLifecycleOwner(frag: UserDetailsFragment): LifecycleOwner = frag
-}

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/fragment_member_bottom_sheet.xml

-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/member_bottom_sheet"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="16dp"
-    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
-    tools:context=".members.ui.MemberBottomSheetFragment">
-
-    <com.facebook.drawee.view.SimpleDraweeView
-        android:id="@+id/image_bottom_sheet_avatar"
-        android:layout_width="0dp"
-        android:layout_height="200dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <LinearLayout
-        android:id="@+id/name_and_username_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/colorBackgroundMemberContainer"
-        android:orientation="vertical"
-        android:paddingStart="16dp"
-        android:paddingTop="10dp"
-        android:paddingBottom="10dp"
-        app:layout_constraintBottom_toBottomOf="@+id/image_bottom_sheet_avatar"
-        app:layout_constraintLeft_toLeftOf="parent">
-
-        <TextView
-            android:id="@+id/text_bottom_sheet_member_name"
-            style="@style/TextAppearance.AppCompat.Title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/colorWhite"
-            tools:text="Ronald Perkins" />
-
-        <TextView
-            android:id="@+id/text_bottom_sheet_member_username"
-            style="@style/Sender.Name.TextView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:textColor="@color/colorWhite"
-            tools:text="\@ronaldPerkins" />
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/text_email_address"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:text="@string/msg_email_address"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/image_bottom_sheet_avatar" />
-
-    <TextView
-        android:id="@+id/text_member_email_address"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="10dp"
-        android:textColor="@color/colorPrimaryText"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_email_address"
-        tools:text="ronald@perkins.com" />
-
-    <TextView
-        android:id="@+id/text_utc"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:text="@string/msg_utc_offset"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_member_email_address" />
-
-    <TextView
-        android:id="@+id/text_member_utc"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="10dp"
-        android:textColor="@color/colorPrimaryText"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_utc"
-        tools:text="+01:00" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file