Code review

vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt

@@ -83,7 +83,7 @@ class CreateRoomActivity : VectorBaseActivity<ActivitySimpleBinding>(), ToolbarC
 
     companion object {
 
-        const val RESULT_CREATED_ROOM_ID = "RESULT_CREATED_ROOM_ID"
+        private const val RESULT_CREATED_ROOM_ID = "RESULT_CREATED_ROOM_ID"
 
         fun getIntent(context: Context,
                       initialName: String = "",
@@ -99,5 +99,9 @@ class CreateRoomActivity : VectorBaseActivity<ActivitySimpleBinding>(), ToolbarC
                 ))
             }
         }
+
+        fun getCreatedRoomId(data: Intent?): String? {
+            return data?.extras?.getString(RESULT_CREATED_ROOM_ID)
+        }
     }
 }

vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt

@@ -25,9 +25,9 @@ import com.airbnb.mvrx.Uninitialized
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
+import im.vector.app.AppStateHandler
 import im.vector.app.core.di.MavericksAssistedViewModelFactory
 import im.vector.app.core.di.hiltMavericksViewModelFactory
-import im.vector.app.AppStateHandler
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.features.raw.wellknown.getElementWellknown
@@ -53,10 +53,10 @@ import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset
 import org.matrix.android.sdk.api.session.room.model.create.RestrictedRoomPreset
 import timber.log.Timber
 
-class CreateRoomViewModel @AssistedInject constructor(@Assisted val initialState: CreateRoomViewState,
+class CreateRoomViewModel @AssistedInject constructor(@Assisted private val initialState: CreateRoomViewState,
                                                       private val session: Session,
                                                       private val rawService: RawService,
-                                                      private val vectorPreferences: VectorPreferences,
+                                                      vectorPreferences: VectorPreferences,
                                                       appStateHandler: AppStateHandler
 ) : VectorViewModel<CreateRoomViewState, CreateRoomAction, CreateRoomViewEvents>(initialState) {
 

vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt

@@ -26,17 +26,15 @@ import com.airbnb.mvrx.Mavericks
 import com.airbnb.mvrx.viewModel
 import dagger.hilt.android.AndroidEntryPoint
 import im.vector.app.R
-import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.extensions.registerStartForActivityResult
 import im.vector.app.core.extensions.replaceFragment
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.databinding.ActivitySimpleBinding
 import im.vector.app.features.matrixto.MatrixToBottomSheet
-import im.vector.app.features.roomdirectory.createroom.CreateRoomActivity
 import im.vector.app.features.navigation.Navigator
+import im.vector.app.features.roomdirectory.createroom.CreateRoomActivity
 import im.vector.app.features.spaces.explore.SpaceDirectoryArgs
 import im.vector.app.features.spaces.explore.SpaceDirectoryFragment
-import im.vector.app.features.spaces.explore.SpaceDirectoryState
 import im.vector.app.features.spaces.explore.SpaceDirectoryViewAction
 import im.vector.app.features.spaces.explore.SpaceDirectoryViewEvents
 import im.vector.app.features.spaces.explore.SpaceDirectoryViewModel
@@ -52,7 +50,7 @@ class SpaceExploreActivity : VectorBaseActivity<ActivitySimpleBinding>(), Matrix
 
     private val createRoomResultLauncher = registerStartForActivityResult { activityResult ->
         if (activityResult.resultCode == Activity.RESULT_OK) {
-            activityResult.data?.extras?.getString(CreateRoomActivity.RESULT_CREATED_ROOM_ID)?.let {
+            CreateRoomActivity.getCreatedRoomId(activityResult.data)?.let {
                 // we want to refresh from API
                 sharedViewModel.handle(SpaceDirectoryViewAction.RefreshUntilFound(it))
             }

vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt

@@ -273,8 +273,8 @@ class SpaceDirectoryViewModel @AssistedInject constructor(
                 )
 
                 knownSummaries = (
-                        knownSummaries
-                                + (paginate.children.mapNotNull {
+                        knownSummaries +
+                                (paginate.children.mapNotNull {
                             session.getRoomSummary(it.childRoomId)
                                     ?.takeIf { it.membership == Membership.JOIN } // only take if joined because it will be up to date (synced)
                         })

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

@@ -60,9 +60,7 @@
         android:layout_marginBottom="16dp "
         android:contentDescription="@string/a11y_create_room"
         android:scaleType="center"
-        app:maxImageSize="20dp"
         android:src="@drawable/ic_fab_add"
-        android:visibility="visible"
-        tools:visibility="visible" />
+        app:maxImageSize="20dp" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>