Room profile: start initializing all the classes + move some packages

vector/src/main/AndroidManifest.xml

@@ -65,7 +65,7 @@
         <activity android:name=".features.home.room.filtered.FilteredRoomsActivity" />
         <activity android:name=".features.home.room.detail.RoomDetailActivity" />
         <activity android:name=".features.debug.DebugMenuActivity" />
-        <activity android:name=".features.home.createdirect.CreateDirectRoomActivity" />
+        <activity android:name="im.vector.riotx.features.createdirect.CreateDirectRoomActivity" />
         <activity android:name=".features.webview.VectorWebViewActivity" />
         <activity android:name=".features.link.LinkHandlerActivity">
             <intent-filter>
@@ -96,6 +96,7 @@
                 <category android:name="android.intent.category.OPENABLE" />
             </intent-filter>
         </activity>
+        <activity android:name=".features.roomprofile.RoomProfileActivity" />
         <!-- Services -->
 
         <service

vector/src/main/java/im/vector/riotx/AppStateHandler.kt

@@ -24,8 +24,8 @@ import im.vector.matrix.android.api.session.group.model.GroupSummary
 import im.vector.matrix.android.api.session.room.model.RoomSummary
 import im.vector.matrix.rx.rx
 import im.vector.riotx.features.home.HomeRoomListDataSource
-import im.vector.riotx.features.home.group.ALL_COMMUNITIES_GROUP_ID
+import im.vector.riotx.features.grouplist.ALL_COMMUNITIES_GROUP_ID
-import im.vector.riotx.features.home.group.SelectedGroupDataSource
+import im.vector.riotx.features.grouplist.SelectedGroupDataSource
 import im.vector.riotx.features.home.room.list.ChronologicalRoomComparator
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers

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

@@ -30,9 +30,9 @@ import im.vector.riotx.features.crypto.verification.SASVerificationVerifiedFragm
 import im.vector.riotx.features.home.HomeDetailFragment
 import im.vector.riotx.features.home.HomeDrawerFragment
 import im.vector.riotx.features.home.LoadingFragment
-import im.vector.riotx.features.home.createdirect.CreateDirectRoomDirectoryUsersFragment
+import im.vector.riotx.features.createdirect.CreateDirectRoomDirectoryUsersFragment
-import im.vector.riotx.features.home.createdirect.CreateDirectRoomKnownUsersFragment
+import im.vector.riotx.features.createdirect.CreateDirectRoomKnownUsersFragment
-import im.vector.riotx.features.home.group.GroupListFragment
+import im.vector.riotx.features.grouplist.GroupListFragment
 import im.vector.riotx.features.home.room.detail.RoomDetailFragment
 import im.vector.riotx.features.home.room.list.RoomListFragment
 import im.vector.riotx.features.login.LoginFragment
@@ -42,6 +42,7 @@ import im.vector.riotx.features.roomdirectory.PublicRoomsFragment
 import im.vector.riotx.features.roomdirectory.createroom.CreateRoomFragment
 import im.vector.riotx.features.roomdirectory.picker.RoomDirectoryPickerFragment
 import im.vector.riotx.features.roomdirectory.roompreview.RoomPreviewNoPreviewFragment
+import im.vector.riotx.features.roomprofile.RoomProfileFragment
 import im.vector.riotx.features.settings.*
 import im.vector.riotx.features.settings.ignored.VectorSettingsIgnoredUsersFragment
 import im.vector.riotx.features.settings.push.PushGatewaysFragment
@@ -194,4 +195,9 @@ interface FragmentModule {
     @IntoMap
     @FragmentKey(PublicRoomsFragment::class)
     fun bindPublicRoomsFragment(fragment: PublicRoomsFragment): Fragment
+
+    @Binds
+    @IntoMap
+    @FragmentKey(RoomProfileFragment::class)
+    fun bindRoomProfileFragment(fragment: RoomProfileFragment): Fragment
 }

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

@@ -26,7 +26,7 @@ import im.vector.riotx.features.MainActivity
 import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity
 import im.vector.riotx.features.home.HomeActivity
 import im.vector.riotx.features.home.HomeModule
-import im.vector.riotx.features.home.createdirect.CreateDirectRoomActivity
+import im.vector.riotx.features.createdirect.CreateDirectRoomActivity
 import im.vector.riotx.features.home.room.detail.readreceipts.DisplayReadReceiptsBottomSheet
 import im.vector.riotx.features.home.room.detail.timeline.action.MessageActionsBottomSheet
 import im.vector.riotx.features.home.room.detail.timeline.edithistory.ViewEditHistoryBottomSheet

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

@@ -34,7 +34,7 @@ import im.vector.riotx.features.crypto.keysrequest.KeyRequestHandler
 import im.vector.riotx.features.crypto.verification.IncomingVerificationRequestHandler
 import im.vector.riotx.features.home.AvatarRenderer
 import im.vector.riotx.features.home.HomeRoomListDataSource
-import im.vector.riotx.features.home.group.SelectedGroupDataSource
+import im.vector.riotx.features.grouplist.SelectedGroupDataSource
 import im.vector.riotx.features.html.EventHtmlRenderer
 import im.vector.riotx.features.navigation.Navigator
 import im.vector.riotx.features.notifications.*

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

@@ -28,7 +28,7 @@ import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreShare
 import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupSharedViewModel
 import im.vector.riotx.features.crypto.verification.SasVerificationViewModel
 import im.vector.riotx.features.home.HomeSharedActionViewModel
-import im.vector.riotx.features.home.createdirect.CreateDirectRoomSharedActionViewModel
+import im.vector.riotx.features.createdirect.CreateDirectRoomSharedActionViewModel
 import im.vector.riotx.features.home.room.detail.timeline.action.MessageSharedActionViewModel
 import im.vector.riotx.features.home.room.list.actions.RoomListQuickActionsSharedActionViewModel
 import im.vector.riotx.features.reactions.EmojiChooserViewModel

vector/src/main/java/im/vector/riotx/core/utils/UserColor.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home
+package im.vector.riotx.core.utils
 
 import androidx.annotation.ColorRes
 import im.vector.riotx.R

vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomAction.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.createdirect
+package im.vector.riotx.features.createdirect
 
 import im.vector.matrix.android.api.session.user.model.User
 import im.vector.riotx.core.platform.VectorViewModelAction

vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomActivity.kt

@@ -16,7 +16,7 @@
  *
  */
 
-package im.vector.riotx.features.home.createdirect
+package im.vector.riotx.features.createdirect
 
 import android.content.Context
 import android.content.Intent

vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomDirectoryUsersFragment.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.createdirect
+package im.vector.riotx.features.createdirect
 
 import android.content.Context
 import android.os.Bundle

vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomKnownUsersFragment.kt

@@ -16,7 +16,7 @@
  *
  */
 
-package im.vector.riotx.features.home.createdirect
+package im.vector.riotx.features.createdirect
 
 import android.os.Bundle
 import android.view.Menu

vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomLetterHeaderItem.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.createdirect
+package im.vector.riotx.features.createdirect
 
 import android.widget.TextView
 import com.airbnb.epoxy.EpoxyAttribute

vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomSharedAction.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.createdirect
+package im.vector.riotx.features.createdirect
 
 import im.vector.riotx.core.platform.VectorSharedAction
 

vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomSharedActionViewModel.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.createdirect
+package im.vector.riotx.features.createdirect
 
 import im.vector.riotx.core.platform.VectorSharedActionViewModel
 import javax.inject.Inject

vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomUserItem.kt

@@ -16,7 +16,7 @@
  *
  */
 
-package im.vector.riotx.features.home.createdirect
+package im.vector.riotx.features.createdirect
 
 import android.view.View
 import android.widget.ImageView

vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewModel.kt

@@ -16,7 +16,7 @@
  *
  */
 
-package im.vector.riotx.features.home.createdirect
+package im.vector.riotx.features.createdirect
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData

vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomViewState.kt

@@ -16,7 +16,7 @@
  *
  */
 
-package im.vector.riotx.features.home.createdirect
+package im.vector.riotx.features.createdirect
 
 import androidx.paging.PagedList
 import arrow.core.Option

vector/src/main/java/im/vector/riotx/features/createdirect/DirectoryUsersController.kt

@@ -16,7 +16,7 @@
  *
  */
 
-package im.vector.riotx.features.home.createdirect
+package im.vector.riotx.features.createdirect
 
 import com.airbnb.epoxy.EpoxyController
 import com.airbnb.mvrx.*

vector/src/main/java/im/vector/riotx/features/createdirect/KnownUsersController.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.createdirect
+package im.vector.riotx.features.createdirect
 
 import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.paging.PagedListEpoxyController

vector/src/main/java/im/vector/riotx/features/grouplist/GroupListAction.kt

@@ -12,9 +12,10 @@
  * 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.home.group
+package im.vector.riotx.features.grouplist
 
 import im.vector.matrix.android.api.session.group.model.GroupSummary
 import im.vector.riotx.core.platform.VectorViewModelAction

vector/src/main/java/im/vector/riotx/features/grouplist/GroupListFragment.kt

@@ -12,9 +12,10 @@
  * 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.home.group
+package im.vector.riotx.features.grouplist
 
 import android.os.Bundle
 import android.view.View

vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewModel.kt

@@ -12,9 +12,10 @@
  * 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.home.group
+package im.vector.riotx.features.grouplist
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData

vector/src/main/java/im/vector/riotx/features/grouplist/GroupListViewState.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.group
+package im.vector.riotx.features.grouplist
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState

vector/src/main/java/im/vector/riotx/features/grouplist/GroupSummaryController.kt

@@ -12,9 +12,10 @@
  * 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.home.group
+package im.vector.riotx.features.grouplist
 
 import com.airbnb.epoxy.EpoxyController
 import im.vector.matrix.android.api.session.group.model.GroupSummary

vector/src/main/java/im/vector/riotx/features/grouplist/GroupSummaryItem.kt

@@ -12,9 +12,10 @@
  * 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.home.group
+package im.vector.riotx.features.grouplist
 
 import android.widget.ImageView
 import android.widget.TextView

vector/src/main/java/im/vector/riotx/features/grouplist/SelectedGroupDataSource.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.riotx.features.home.group
+package im.vector.riotx.features.grouplist
 
 import arrow.core.Option
 import im.vector.matrix.android.api.session.group.model.GroupSummary

vector/src/main/java/im/vector/riotx/features/home/AvatarRenderer.kt

@@ -35,6 +35,7 @@ import im.vector.riotx.core.di.ActiveSessionHolder
 import im.vector.riotx.core.glide.GlideApp
 import im.vector.riotx.core.glide.GlideRequest
 import im.vector.riotx.core.glide.GlideRequests
+import im.vector.riotx.core.utils.getColorFromUserId
 import javax.inject.Inject
 
 /**

vector/src/main/java/im/vector/riotx/features/home/HomeDetailViewModel.kt

@@ -26,7 +26,7 @@ import im.vector.matrix.rx.rx
 import im.vector.riotx.core.di.HasScreenInjector
 import im.vector.riotx.core.platform.VectorViewModel
 import im.vector.riotx.core.resources.StringProvider
-import im.vector.riotx.features.home.group.SelectedGroupDataSource
+import im.vector.riotx.features.grouplist.SelectedGroupDataSource
 import im.vector.riotx.features.ui.UiStateRepository
 import io.reactivex.schedulers.Schedulers
 

vector/src/main/java/im/vector/riotx/features/home/HomeDrawerFragment.kt

@@ -23,7 +23,7 @@ import im.vector.riotx.R
 import im.vector.riotx.core.extensions.observeK
 import im.vector.riotx.core.extensions.replaceChildFragment
 import im.vector.riotx.core.platform.VectorBaseFragment
-import im.vector.riotx.features.home.group.GroupListFragment
+import im.vector.riotx.features.grouplist.GroupListFragment
 import kotlinx.android.synthetic.main.fragment_home_drawer.*
 import javax.inject.Inject
 

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

@@ -89,7 +89,7 @@ import im.vector.riotx.features.command.Command
 import im.vector.riotx.features.home.AvatarRenderer
 import im.vector.riotx.features.home.NavigateToRoomInterceptor
 import im.vector.riotx.features.home.PermalinkHandler
-import im.vector.riotx.features.home.getColorFromUserId
+import im.vector.riotx.core.utils.getColorFromUserId
 import im.vector.riotx.features.home.room.detail.composer.TextComposerAction
 import im.vector.riotx.features.home.room.detail.composer.TextComposerView
 import im.vector.riotx.features.home.room.detail.composer.TextComposerViewModel
@@ -215,6 +215,9 @@ class RoomDetailFragment @Inject constructor(
         setupNotificationView()
         setupJumpToReadMarkerView()
         setupJumpToBottomView()
+        roomToolbarContentView.setOnClickListener {
+            navigator.openRoomProfile(requireActivity(), roomDetailArgs.roomId)
+        }
         roomDetailViewModel.subscribe { renderState(it) }
         textComposerViewModel.subscribe { renderTextComposerState(it) }
         roomDetailViewModel.sendMessageResultLiveData.observeEvent(this) { renderSendMessageResult(it) }
@@ -318,9 +321,9 @@ class RoomDetailFragment @Inject constructor(
         AlertDialog.Builder(requireActivity())
                 .setTitle(R.string.dialog_title_error)
                 .setMessage(getString(R.string.error_file_too_big,
-                        error.filename,
+                                      error.filename,
-                        TextUtils.formatFileSize(requireContext(), error.fileSizeInBytes),
+                                      TextUtils.formatFileSize(requireContext(), error.fileSizeInBytes),
-                        TextUtils.formatFileSize(requireContext(), error.homeServerLimitInBytes)
+                                      TextUtils.formatFileSize(requireContext(), error.homeServerLimitInBytes)
                 ))
                 .setPositiveButton(R.string.ok, null)
                 .show()
@@ -405,7 +408,8 @@ class RoomDetailFragment @Inject constructor(
         composerLayout.composerRelatedMessageActionIcon.setImageDrawable(ContextCompat.getDrawable(requireContext(), iconRes))
         composerLayout.sendButton.setContentDescription(getString(descriptionRes))
 
-        avatarRenderer.render(event.senderAvatar, event.root.senderId ?: "", event.getDisambiguatedDisplayName(), composerLayout.composerRelatedMessageAvatar)
+        avatarRenderer.render(event.senderAvatar, event.root.senderId
+                                                  ?: "", event.getDisambiguatedDisplayName(), composerLayout.composerRelatedMessageAvatar)
         composerLayout.expand {
             // need to do it here also when not using quick reply
             focusComposerAndShowKeyboard()
@@ -418,7 +422,8 @@ class RoomDetailFragment @Inject constructor(
         if (text != composerLayout.composerEditText.text.toString()) {
             // Ignore update to avoid saving a draft
             composerLayout.composerEditText.setText(text)
-            composerLayout.composerEditText.setSelection(composerLayout.composerEditText.text?.length ?: 0)
+            composerLayout.composerEditText.setSelection(composerLayout.composerEditText.text?.length
+                                                         ?: 0)
         }
     }
 
@@ -442,9 +447,9 @@ class RoomDetailFragment @Inject constructor(
             when (requestCode) {
                 REACTION_SELECT_REQUEST_CODE -> {
                     val eventId = data.getStringExtra(EmojiReactionPickerActivity.EXTRA_EVENT_ID)
-                            ?: return
+                                  ?: return
                     val reaction = data.getStringExtra(EmojiReactionPickerActivity.EXTRA_REACTION_RESULT)
-                            ?: return
+                                   ?: return
                     // TODO check if already reacted with that?
                     roomDetailViewModel.handle(RoomDetailAction.SendReaction(eventId, reaction))
                 }
@@ -1176,7 +1181,8 @@ class RoomDetailFragment @Inject constructor(
                 // current user
                 if (composerLayout.composerEditText.text.isNullOrBlank()) {
                     composerLayout.composerEditText.append(Command.EMOTE.command + " ")
-                    composerLayout.composerEditText.setSelection(composerLayout.composerEditText.text?.length ?: 0)
+                    composerLayout.composerEditText.setSelection(composerLayout.composerEditText.text?.length
+                                                                 ?: 0)
 //                    vibrate = true
                 }
             } else {

vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt

@@ -24,7 +24,7 @@ import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
 import im.vector.matrix.android.api.session.room.timeline.hasBeenEdited
 import im.vector.riotx.core.extensions.localDateTime
 import im.vector.riotx.core.resources.ColorProvider
-import im.vector.riotx.features.home.getColorFromUserId
+import im.vector.riotx.core.utils.getColorFromUserId
 import im.vector.riotx.core.date.VectorDateFormatter
 import im.vector.riotx.features.home.room.detail.timeline.item.MessageInformationData
 import im.vector.riotx.features.home.room.detail.timeline.item.ReactionInfoData
@@ -60,7 +60,8 @@ class MessageInformationDataFactory @Inject constructor(private val session: Ses
         val avatarUrl = event.senderAvatar
         val memberName = event.getDisambiguatedDisplayName()
         val formattedMemberName = span(memberName) {
-            textColor = colorProvider.getColor(getColorFromUserId(event.root.senderId ?: ""))
+            textColor = colorProvider.getColor(getColorFromUserId(event.root.senderId
+                                                                                             ?: ""))
         }
 
         val displayReadMarker = readMarkerVisible && event.hasReadMarker

vector/src/main/java/im/vector/riotx/features/home/room/list/RoomListFragment.kt

@@ -229,7 +229,7 @@ class RoomListFragment @Inject constructor(
                 roomListViewModel.handle(RoomListAction.ChangeRoomNotificationState(quickAction.roomId, RoomNotificationState.MUTE))
             }
             is RoomListQuickActionsSharedAction.Settings                  -> {
-                vectorBaseActivity.notImplemented("Opening room settings")
+                navigator.openRoomProfile(requireActivity(), quickAction.roomId)
             }
             is RoomListQuickActionsSharedAction.Leave                     -> {
                 AlertDialog.Builder(requireContext())

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

@@ -26,13 +26,14 @@ import im.vector.riotx.core.utils.toast
 import im.vector.riotx.features.crypto.keysbackup.settings.KeysBackupManageActivity
 import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupActivity
 import im.vector.riotx.features.debug.DebugMenuActivity
-import im.vector.riotx.features.home.createdirect.CreateDirectRoomActivity
+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.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
@@ -113,7 +114,7 @@ class DefaultNavigator @Inject constructor() : Navigator {
         Timber.v("Open user detail $userId")
     }
 
-    override fun openRoomSettings(context: Context, roomId: String) {
+    override fun openRoomProfile(context: Context, roomId: String) {
-        Timber.v("Open room settings$roomId")
+        context.startActivity(RoomProfileActivity.newIntent(context, roomId))
     }
 }

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

@@ -51,5 +51,5 @@ interface Navigator {
 
     fun openUserDetail(userId: String, context: Context)
 
-    fun openRoomSettings(context: Context, roomId: String)
+    fun openRoomProfile(context: Context, roomId: String)
 }

vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileAction.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2019 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.roomprofile
+
+import im.vector.riotx.core.platform.VectorViewModelAction
+
+sealed class RoomProfileAction: VectorViewModelAction {
+}

vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileActivity.kt

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2019 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.roomprofile
+
+import android.content.Context
+import android.content.Intent
+import im.vector.riotx.R
+import im.vector.riotx.core.extensions.addFragment
+import im.vector.riotx.core.platform.VectorBaseActivity
+
+class RoomProfileActivity : VectorBaseActivity() {
+
+    companion object {
+
+        private const val EXTRA_ROOM_PROFILE_ARGS = "EXTRA_ROOM_PROFILE_ARGS"
+
+        fun newIntent(context: Context, roomId: String): Intent {
+            val roomProfileArgs = RoomProfileArgs(roomId)
+            return Intent(context, RoomProfileActivity::class.java).apply {
+                putExtra(EXTRA_ROOM_PROFILE_ARGS, roomProfileArgs)
+            }
+        }
+    }
+
+    override fun getLayoutRes() = R.layout.activity_simple
+
+    override fun initUiAndData() {
+        if (isFirstCreation()) {
+            val roomProfileArgs: RoomProfileArgs = intent?.extras?.getParcelable(EXTRA_ROOM_PROFILE_ARGS)
+                                                   ?: return
+            addFragment(R.id.simpleFragmentContainer, RoomProfileFragment::class.java, roomProfileArgs)
+        }
+    }
+
+
+}

vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileController.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2019 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.roomprofile
+
+import com.airbnb.epoxy.TypedEpoxyController
+import javax.inject.Inject
+
+class RoomProfileController @Inject constructor()
+    : TypedEpoxyController<RoomProfileViewState>() {
+
+    override fun buildModels(data: RoomProfileViewState?) {
+        if (data == null) {
+            return
+        }
+    }
+}

vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileFragment.kt

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2019 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.roomprofile
+
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.View
+import com.airbnb.epoxy.EpoxyController
+import com.airbnb.mvrx.args
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import im.vector.riotx.R
+import im.vector.riotx.core.platform.VectorBaseFragment
+import kotlinx.android.parcel.Parcelize
+import javax.inject.Inject
+
+@Parcelize
+data class RoomProfileArgs(
+        val roomId: String
+) : Parcelable
+
+class RoomProfileFragment @Inject constructor(
+        private val roomProfileController: RoomProfileController,
+        val roomProfileViewModelFactory: RoomProfileViewModel.Factory
+) : VectorBaseFragment() {
+
+    private val roomProfileArgs: RoomProfileArgs by args()
+    private val roomProfileViewModel: RoomProfileViewModel by fragmentViewModel()
+
+    override fun getLayoutResId() = R.layout.fragment_room_profile
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+
+    override fun invalidate() = withState(roomProfileViewModel) {
+        roomProfileController.setData(it)
+    }
+
+
+}

vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewModel.kt

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2019 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.roomprofile
+
+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.riotx.core.platform.VectorViewModel
+
+class RoomProfileViewModel @AssistedInject constructor(@Assisted initialState: RoomProfileViewState)
+    : VectorViewModel<RoomProfileViewState, RoomProfileAction>(initialState) {
+
+    @AssistedInject.Factory
+    interface Factory {
+        fun create(initialState: RoomProfileViewState): RoomProfileViewModel
+    }
+
+    companion object : MvRxViewModelFactory<RoomProfileViewModel, RoomProfileViewState> {
+
+        @JvmStatic
+        override fun create(viewModelContext: ViewModelContext, state: RoomProfileViewState): RoomProfileViewModel? {
+            val fragment: RoomProfileFragment = (viewModelContext as FragmentViewModelContext).fragment()
+            return fragment.roomProfileViewModelFactory.create(state)
+        }
+    }
+
+    override fun handle(action: RoomProfileAction) {
+    }
+
+}

vector/src/main/java/im/vector/riotx/features/roomprofile/RoomProfileViewState.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2019 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.roomprofile
+
+import com.airbnb.mvrx.MvRxState
+
+data class RoomProfileViewState(
+        val roomId: String
+) : MvRxState {
+
+    constructor(args: RoomProfileArgs) : this(roomId = args.roomId)
+}

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

@@ -18,6 +18,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/roomToolbarContentView"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/roomProfileTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="ROOM PROFILE" />
+
+
+</FrameLayout>