Introduce RoomMemberProfile files

vector/src/main/AndroidManifest.xml

@@ -125,6 +125,7 @@
                 <data android:host="matrix.to" />
             </intent-filter>
         </activity>
+        <activity android:name=".features.roommemberprofile.RoomMemberProfileActivity" />
 
         <!-- Services -->
 

vector/src/main/java/im/vector/riotx/core/di/FragmentModule.kt

@@ -38,6 +38,7 @@ import im.vector.riotx.features.home.room.detail.RoomDetailFragment
 import im.vector.riotx.features.home.room.list.RoomListFragment
 import im.vector.riotx.features.login.*
 import im.vector.riotx.features.login.terms.LoginTermsFragment
+import im.vector.riotx.features.roommemberprofile.RoomMemberProfileFragment
 import im.vector.riotx.features.reactions.EmojiChooserFragment
 import im.vector.riotx.features.reactions.EmojiSearchResultFragment
 import im.vector.riotx.features.roomdirectory.PublicRoomsFragment
@@ -271,6 +272,11 @@ interface FragmentModule {
     @FragmentKey(RoomMemberListFragment::class)
     fun bindRoomMemberListFragment(fragment: RoomMemberListFragment): Fragment
 
+    @Binds
+    @IntoMap
+    @FragmentKey(RoomMemberProfileFragment::class)
+    fun bindRoomMemberProfileFragment(fragment: RoomMemberProfileFragment): Fragment
+
     @Binds
     @IntoMap
     @FragmentKey(BreadcrumbsFragment::class)

vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt

@@ -912,7 +912,7 @@ class RoomDetailFragment @Inject constructor(
     }
 
     override fun onAvatarClicked(informationData: MessageInformationData) {
-        vectorBaseActivity.notImplemented("Click on user avatar")
+        navigator.openRoomMemberProfile(userId = informationData.senderId, context = requireActivity())
     }
 
     override fun onMemberNameClicked(informationData: MessageInformationData) {

vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt

@@ -33,13 +33,14 @@ import im.vector.riotx.features.createdirect.CreateDirectRoomActivity
 import im.vector.riotx.features.home.room.detail.RoomDetailActivity
 import im.vector.riotx.features.home.room.detail.RoomDetailArgs
 import im.vector.riotx.features.home.room.filtered.FilteredRoomsActivity
+import im.vector.riotx.features.roommemberprofile.RoomMemberProfileActivity
+import im.vector.riotx.features.roommemberprofile.RoomMemberProfileArgs
 import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity
 import im.vector.riotx.features.roomdirectory.createroom.CreateRoomActivity
 import im.vector.riotx.features.roomdirectory.roompreview.RoomPreviewActivity
 import im.vector.riotx.features.roomprofile.RoomProfileActivity
 import im.vector.riotx.features.settings.VectorSettingsActivity
 import im.vector.riotx.features.share.SharedData
-import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -81,12 +82,9 @@ class DefaultNavigator @Inject constructor(
         }
     }
 
-    override fun openUserDetail(userId: String, context: Context, buildTask: Boolean) {
+    override fun openRoomMemberProfile(userId: String, context: Context, buildTask: Boolean) {
-        if (context is VectorBaseActivity) {
+        val args = RoomMemberProfileArgs(userId = userId)
-            context.notImplemented("Open user detail")
+        context.startActivity(RoomMemberProfileActivity.newIntent(context, args))
-        } else {
-            context.toast(R.string.not_implemented)
-        }
     }
 
     override fun openRoomForSharing(activity: Activity, roomId: String, sharedData: SharedData) {

vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt

@@ -50,7 +50,8 @@ interface Navigator {
 
     fun openGroupDetail(groupId: String, context: Context, buildTask: Boolean = false)
 
-    fun openUserDetail(userId: String, context: Context, buildTask: Boolean = false)
+    fun openRoomMemberProfile(userId: String, context: Context, buildTask: Boolean = false)
 
     fun openRoomProfile(context: Context, roomId: String)
+
 }

vector/src/main/java/im/vector/riotx/features/permalink/PermalinkHandler.kt

@@ -68,7 +68,7 @@ class PermalinkHandler @Inject constructor(private val session: Session,
                 Single.just(true)
             }
             is PermalinkData.UserLink     -> {
-                navigator.openUserDetail(permalinkData.userId, context, buildTask)
+                navigator.openRoomMemberProfile(permalinkData.userId, context, buildTask)
                 Single.just(true)
             }
             is PermalinkData.FallbackLink -> {

vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileAction.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package im.vector.riotx.features.roommemberprofile
+
+import im.vector.riotx.core.platform.VectorViewModelAction
+
+sealed class RoomMemberProfileAction : VectorViewModelAction

vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileActivity.kt

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package im.vector.riotx.features.roommemberprofile
+
+import android.content.Context
+import android.content.Intent
+import androidx.appcompat.widget.Toolbar
+import im.vector.riotx.R
+import im.vector.riotx.core.extensions.addFragment
+import im.vector.riotx.core.platform.ToolbarConfigurable
+import im.vector.riotx.core.platform.VectorBaseActivity
+
+class RoomMemberProfileActivity : VectorBaseActivity(), ToolbarConfigurable {
+
+    companion object {
+
+        private const val EXTRA_FRAGMENT_ARGS = "EXTRA_FRAGMENT_ARGS"
+
+        fun newIntent(context: Context, args: RoomMemberProfileArgs): Intent {
+            return Intent(context, RoomMemberProfileActivity::class.java).apply {
+                putExtra(EXTRA_FRAGMENT_ARGS, args)
+            }
+        }
+    }
+
+    override fun getLayoutRes() = R.layout.activity_simple
+
+    override fun initUiAndData() {
+        if (isFirstCreation()) {
+            val fragmentArgs: RoomMemberProfileArgs = intent?.extras?.getParcelable(EXTRA_FRAGMENT_ARGS)
+                                                      ?: return
+            addFragment(R.id.simpleFragmentContainer, RoomMemberProfileFragment::class.java, fragmentArgs)
+        }
+    }
+
+    override fun configure(toolbar: Toolbar) {
+        configureToolbar(toolbar)
+    }
+
+}

vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileFragment.kt

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package im.vector.riotx.features.roommemberprofile
+
+import android.os.Bundle
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+import com.airbnb.mvrx.args
+import android.view.View
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import im.vector.riotx.R
+import im.vector.riotx.core.platform.VectorBaseFragment
+import timber.log.Timber
+import javax.inject.Inject
+
+@Parcelize
+data class RoomMemberProfileArgs(
+        val userId: String,
+        val roomId: String? = null
+) : Parcelable
+
+class RoomMemberProfileFragment @Inject constructor(
+        val viewModelFactory: RoomMemberProfileViewModel.Factory
+) : VectorBaseFragment() {
+
+    private val fragmentArgs: RoomMemberProfileArgs by args()
+    private val viewModel: RoomMemberProfileViewModel by fragmentViewModel()
+
+    override fun getLayoutResId() = R.layout.fragment_room_member_profile
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        // Initialize your view, subscribe to viewModel...
+    }
+
+    override fun invalidate() = withState(viewModel) { state ->
+        Timber.v("Invalidate: $state")
+    }
+
+}

vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewModel.kt

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package im.vector.riotx.features.roommemberprofile
+
+import com.airbnb.mvrx.FragmentViewModelContext
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.ViewModelContext
+import com.squareup.inject.assisted.Assisted
+import com.squareup.inject.assisted.AssistedInject
+import im.vector.matrix.android.api.session.Session
+import im.vector.riotx.core.platform.VectorViewModel
+import timber.log.Timber
+
+class RoomMemberProfileViewModel @AssistedInject constructor(@Assisted initialState: RoomMemberProfileViewState,
+                                                             private val session: Session)
+    : VectorViewModel<RoomMemberProfileViewState, RoomMemberProfileAction>(initialState) {
+
+    @AssistedInject.Factory
+    interface Factory {
+        fun create(initialState: RoomMemberProfileViewState): RoomMemberProfileViewModel
+    }
+
+    companion object : MvRxViewModelFactory<RoomMemberProfileViewModel, RoomMemberProfileViewState> {
+
+        @JvmStatic
+        override fun create(viewModelContext: ViewModelContext, state: RoomMemberProfileViewState): RoomMemberProfileViewModel? {
+            val fragment: RoomMemberProfileFragment = (viewModelContext as FragmentViewModelContext).fragment()
+            return fragment.viewModelFactory.create(state)
+        }
+    }
+
+    override fun handle(action: RoomMemberProfileAction) {
+        Timber.v("Handle $action")
+    }
+
+}

vector/src/main/java/im/vector/riotx/features/roommemberprofile/RoomMemberProfileViewState.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package im.vector.riotx.features.roommemberprofile
+
+import com.airbnb.mvrx.MvRxState
+
+data class RoomMemberProfileViewState(
+        val userId: String,
+        val roomId: String?
+) : MvRxState {
+
+    constructor(args: RoomMemberProfileArgs) : this(roomId = args.roomId, userId = args.userId)
+
+}

vector/src/main/res/layout/fragment_room_member_profile.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2020 New Vector Ltd
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  -->
+
+<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/rootConstraintLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="RoomMemberProfileFragment"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>