Merge pull request #843 from RocketChat/fix/member-details

[FIX] Member details transparency/Pagination

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

+package chat.rocket.android.member.ui
+
+import android.os.Bundle
+import android.support.design.widget.BottomSheetDialogFragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import chat.rocket.android.R
+import chat.rocket.android.util.extensions.content
+import chat.rocket.android.util.extensions.setVisible
+import chat.rocket.android.util.extensions.textContent
+import kotlinx.android.synthetic.main.fragment_member_bottom_sheet.*
+
+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)
+        }
+    }
+}
+
+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() {
+    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)
+
+        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()
+    }
+
+    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.setVisible(false)
+            text_member_email_address.setVisible(false)
+        }
+
+        if (utcOffset.isNotEmpty()){
+            text_member_utc.content = utcOffset
+        } else {
+            text_utc.setVisible(false)
+            text_member_utc.setVisible(false)
+        }
+    }
+}
\ No newline at end of file

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

 package chat.rocket.android.members.di
 
 import android.arch.lifecycle.LifecycleOwner
+import chat.rocket.android.chatroom.ui.ChatRoomActivity
 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
@@ -13,6 +15,9 @@ import kotlinx.coroutines.experimental.Job
 @PerFragment
 class MembersFragmentModule {
 
+    @Provides
+    fun provideChatRoomNavigator(activity: ChatRoomActivity) = MembersNavigator(activity)
+
     @Provides
     fun membersView(frag: MembersFragment): MembersView {
         return frag

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.member.ui.newInstance
+
+class MembersNavigator(internal val activity: ChatRoomActivity) {
+
+    fun toMemberDetails(avatarUri: String, realName: String, username: String, email: String, utcOffset: String) {
+        activity.apply {
+            newInstance(avatarUri, realName, username, email, utcOffset)
+                .show(supportFragmentManager, "MemberBottomSheetFragment")
+        }
+    }
+}

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

 package chat.rocket.android.members.presentation
 
 import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.members.viewmodel.MemberViewModel
 import chat.rocket.android.members.viewmodel.MemberViewModelMapper
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
@@ -13,6 +14,7 @@ import chat.rocket.core.internal.rest.getMembers
 import javax.inject.Inject
 
 class MembersPresenter @Inject constructor(private val view: MembersView,
+                                           private val navigator: MembersNavigator,
                                            private val strategy: CancelStrategy,
                                            private val serverInteractor: GetCurrentServerInteractor,
                                            factory: RocketChatClientFactory,
@@ -38,4 +40,14 @@ class MembersPresenter @Inject constructor(private val view: MembersView,
             }
         }
     }
+
+    fun toMemberDetails(memberViewModel: MemberViewModel) {
+        val avatarUri = memberViewModel.avatarUri.toString()
+        val realName = memberViewModel.realName.toString()
+        val username = "@${memberViewModel.username}"
+        val email = memberViewModel.email ?: ""
+        val utcOffset =  memberViewModel.utcOffset.toString()
+
+        navigator.toMemberDetails(avatarUri, realName, username, email, utcOffset)
+    }
 }
\ No newline at end of file

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

 package chat.rocket.android.members.ui
 
 import android.os.Bundle
-import android.support.design.widget.BottomSheetBehavior
 import android.support.v4.app.Fragment
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.LinearLayoutManager
@@ -16,11 +15,12 @@ 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.viewmodel.MemberViewModel
-import chat.rocket.android.util.extensions.*
+import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.util.extensions.setVisible
+import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.widget.DividerItemDecoration
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_members.*
-import kotlinx.android.synthetic.main.member_bottom_sheet.*
 import javax.inject.Inject
 
 fun newInstance(chatRoomId: String, chatRoomType: String): Fragment {
@@ -37,9 +37,8 @@ private const val BUNDLE_CHAT_ROOM_TYPE = "chat_room_type"
 
 class MembersFragment : Fragment(), MembersView {
     @Inject lateinit var presenter: MembersPresenter
-    private val adapter: MembersAdapter = MembersAdapter { memberViewModel -> showMemberDetails(memberViewModel) }
+    private val adapter: MembersAdapter = MembersAdapter { memberViewModel -> presenter.toMemberDetails(memberViewModel) }
     private val linearLayoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
-    private val bottomSheetBehavior by lazy { BottomSheetBehavior.from(member_bottom_sheet) }
 
     private lateinit var chatRoomId: String
     private lateinit var chatRoomType: String
@@ -72,7 +71,7 @@ class MembersFragment : Fragment(), MembersView {
             setupToolbar(total)
             if (adapter.itemCount == 0) {
                 adapter.prependData(dataSet)
-                if (dataSet.size >= 60) {
+                if (dataSet.size >= 59) { // TODO Check why the API retorns the specified count -1
                     recycler_view.addOnScrollListener(object : EndlessRecyclerViewScrollListener(linearLayoutManager) {
                         override fun onLoadMore(page: Int, totalItemsCount: Int, recyclerView: RecyclerView?) {
                             presenter.loadChatRoomsMembers(chatRoomId, chatRoomType, page * 60L)
@@ -103,24 +102,6 @@ class MembersFragment : Fragment(), MembersView {
         }
     }
 
-    private fun showMemberDetails(memberViewModel: MemberViewModel) {
-        image_bottom_sheet_avatar.setImageURI(memberViewModel.avatarUri)
-        text_bottom_sheet_member_name.content = memberViewModel.realName
-        text_bottom_sheet_member_username.content = "@${memberViewModel.username}"
-
-        val memberEmail = memberViewModel.email
-        if (memberEmail != null) {
-            text_member_email_address.textContent = memberEmail
-        } else {
-            text_email_address.setVisible(false)
-            text_member_email_address.setVisible(false)
-        }
-
-        text_member_utc.content = memberViewModel.utcOffset.toString()
-
-        bottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
-    }
-
     private fun setupToolbar(totalMembers: Long) {
         (activity as ChatRoomActivity).setupToolbarTitle(getString(R.string.title_members, totalMembers))
     }

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

@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    tools:context=".chatroom.ui.ChatRoomFragment">
 
     <com.wang.avi.AVLoadingIndicatorView
         android:id="@+id/view_loading"

app/src/main/res/layout/member_bottom_sheet.xml → app/src/main/res/layout/fragment_member_bottom_sheet.xml

@@ -4,9 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/member_bottom_sheet"
     android:layout_width="match_parent"
-    android:layout_height="340dp"
-    app:behavior_hideable="true"
-    app:behavior_peekHeight="0dp"
+    android:layout_height="match_parent"
+    android:paddingBottom="16dp"
     app:layout_behavior="android.support.design.widget.BottomSheetBehavior">
 
     <com.facebook.drawee.view.SimpleDraweeView
@@ -14,28 +13,35 @@
         android:layout_width="match_parent"
         android:layout_height="200dp" />
 
-    <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:layout_marginStart="16dp"
-        android:textColor="@color/white"
-        app:layout_constraintBottom_toTopOf="@+id/text_bottom_sheet_member_username"
-        app:layout_constraintLeft_toLeftOf="parent"
-        tools:text="Ronald Perkins" />
-
-    <TextView
-        android:id="@+id/text_bottom_sheet_member_username"
-        style="@style/Sender.Name.TextView"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:id="@+id/name_and_username_container"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
-        android:layout_marginStart="16dp"
-        android:textColor="@color/white"
+        android:background="@color/colorBackgroundMemberContainer"
+        android:orientation="vertical"
+        android:paddingBottom="10dp"
+        android:paddingStart="16dp"
+        android:paddingTop="10dp"
         app:layout_constraintBottom_toBottomOf="@+id/image_bottom_sheet_avatar"
-        app:layout_constraintLeft_toLeftOf="parent"
-        tools:text="\@ronaldPerkins" />
+        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/white"
+            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/white"
+            tools:text="\@ronaldPerkins" />
+    </LinearLayout>
 
     <TextView
         android:id="@+id/text_email_address"

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

@@ -9,16 +9,15 @@
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <include layout="@layout/member_bottom_sheet" />
+        android:layout_height="match_parent"
+        android:scrollbars="vertical" />
 
     <com.wang.avi.AVLoadingIndicatorView
         android:id="@+id/view_loading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:layout_centerInParent="true"
+        android:layout_gravity="center"
         app:indicatorColor="@color/black"
         app:indicatorName="BallPulseIndicator" />
 

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

@@ -25,6 +25,8 @@
 
     <color name="colorDim">#99000000</color>
 
+    <color name="colorBackgroundMemberContainer">#4D000000</color>
+
     <color name="white">#FFFFFFFF</color>
     <color name="black">#FF000000</color>
     <color name="red">#FFFF0000</color>