Code review

changelog.d/3752.feature

@@ -1 +1 @@
-Better expose adding spaces as Subspaces #3752
+Better expose adding spaces as Subspaces

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

@@ -67,11 +67,10 @@ class AppStateHandler @Inject constructor(
         return selectedSpaceDataSource.currentValue?.orNull()?.let {
             if (it is RoomGroupingMethod.BySpace) {
                 // try to refresh sum?
-                return it.spaceSummary?.roomId?.let { activeSessionHolder.getSafeActiveSession()?.getRoomSummary(it) }?.let {
+                it.spaceSummary?.roomId?.let { activeSessionHolder.getSafeActiveSession()?.getRoomSummary(it) }?.let {
                     RoomGroupingMethod.BySpace(it)
                 } ?: it
-            }
+            } else it
-            return it
         }
     }
 

vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt

@@ -16,11 +16,14 @@
 
 package im.vector.app.core.extensions
 
+import android.graphics.drawable.Drawable
 import android.text.InputType
 import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
+import android.widget.ImageView
 import androidx.appcompat.widget.SearchView
+import androidx.core.view.isVisible
 import im.vector.app.R
 
 /**
@@ -50,3 +53,8 @@ fun View.getMeasurements(): Pair<Int, Int> {
     val height = measuredHeight
     return width to height
 }
+
+fun ImageView.setDrawableOrHide(drawableRes: Drawable?) {
+    setImageDrawable(drawableRes)
+    isVisible = drawableRes != null
+}

vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt

@@ -26,6 +26,7 @@ import androidx.core.view.isGone
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import im.vector.app.R
+import im.vector.app.core.extensions.setDrawableOrHide
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.databinding.ViewBottomSheetActionButtonBinding
 import im.vector.app.features.themes.ThemeUtils
@@ -80,8 +81,7 @@ class BottomSheetActionButton @JvmOverloads constructor(
     var rightIcon: Drawable? = null
         set(value) {
             field = value
-            views.bottomSheetActionIcon.setImageDrawable(value)
+            views.bottomSheetActionIcon.setDrawableOrHide(value)
-            views.bottomSheetActionIcon.isVisible = field != null
         }
 
     var tint: Int? = null

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

@@ -55,7 +55,7 @@ class CreateRoomActivity : VectorBaseActivity<ActivitySimpleBinding>(), ToolbarC
                     CreateRoomFragment::class.java,
                     CreateRoomArgs(
                             intent?.getStringExtra(INITIAL_NAME) ?: "",
-                            isSubSpace = intent?.getBooleanExtra(IS_SPACE, false) ?: false
+                            isSpace = intent?.getBooleanExtra(IS_SPACE, false) ?: false
                     )
             )
         }

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

@@ -53,7 +53,7 @@ import javax.inject.Inject
 data class CreateRoomArgs(
         val initialName: String,
         val parentSpaceId: String? = null,
-        val isSubSpace: Boolean = false
+        val isSpace: Boolean = false
 ) : Parcelable
 
 class CreateRoomFragment @Inject constructor(
@@ -98,7 +98,7 @@ class CreateRoomFragment @Inject constructor(
 
     override fun onResume() {
         super.onResume()
-        views.createRoomTitle.text = getString(if (args.isSubSpace) R.string.create_new_space else R.string.create_new_room)
+        views.createRoomTitle.text = getString(if (args.isSpace) R.string.create_new_space else R.string.create_new_room)
     }
 
     private fun setupRoomJoinRuleSharedActionViewModel() {
@@ -121,7 +121,7 @@ class CreateRoomFragment @Inject constructor(
     private fun setupWaitingView() {
         views.waitingView.waitingStatusText.isVisible = true
         views.waitingView.waitingStatusText.setText(
-                if (args.isSubSpace) R.string.create_space_in_progress else R.string.create_room_in_progress
+                if (args.isSpace) R.string.create_space_in_progress else R.string.create_room_in_progress
         )
     }
 
@@ -133,7 +133,7 @@ class CreateRoomFragment @Inject constructor(
     }
 
     private fun setupRecyclerView() {
-        if (args.isSubSpace) {
+        if (args.isSpace) {
             views.createRoomForm.configureWith(createSpaceController)
             createSpaceController.listener = this
         } else {
@@ -236,7 +236,7 @@ class CreateRoomFragment @Inject constructor(
             sharedActionViewModel.post(RoomDirectorySharedAction.Close)
         } else {
             // Populate list with Epoxy
-            if (args.isSubSpace) {
+            if (args.isSpace) {
                 createSpaceController.setData(state)
             } else {
                 createRoomController.setData(state)

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

@@ -44,7 +44,7 @@ data class CreateRoomViewState(
     constructor(args: CreateRoomArgs) : this(
             roomName = args.initialName,
             parentSpaceId = args.parentSpaceId,
-            isSubSpace = args.isSubSpace
+            isSubSpace = args.isSpace
     )
 
     /**

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

@@ -47,13 +47,11 @@ class CreateSubSpaceController @Inject constructor(
     private fun buildForm(data: CreateRoomViewState, enableFormElement: Boolean) {
         val host = this
 
-        if (data.isSubSpace) {
+        genericPillItem {
-            genericPillItem {
+            id("beta")
-                id("beta")
+            imageRes(R.drawable.ic_beta_pill)
-                imageRes(R.drawable.ic_beta_pill)
+            tintIcon(false)
-                tintIcon(false)
+            text(host.stringProvider.getString(R.string.space_add_space_to_any_space_you_manage))
-                text(host.stringProvider.getString(R.string.space_add_space_to_any_space_you_manage))
-            }
         }
 
         formEditableSquareAvatarItem {

vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomSpaceChooserBottomSheet.kt

@@ -17,27 +17,17 @@
 package im.vector.app.features.spaces.manage
 
 import android.os.Bundle
-import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.setFragmentResult
-import com.airbnb.mvrx.args
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.databinding.BottomSheetAddRoomsOrSpacesToSpaceBinding
-import kotlinx.parcelize.Parcelize
 
 class SpaceAddRoomSpaceChooserBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetAddRoomsOrSpacesToSpaceBinding>() {
 
-    @Parcelize
-    data class Args(
-            val spaceId: String
-    ) : Parcelable
-
     override val showExpanded = true
 
-    private val addSubRoomsArgs: Args by args()
-
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
             BottomSheetAddRoomsOrSpacesToSpaceBinding.inflate(inflater, container, false)
 
@@ -68,9 +58,7 @@ class SpaceAddRoomSpaceChooserBottomSheet : VectorBaseBottomSheetDialogFragment<
 
         fun newInstance(spaceId: String)
                 : SpaceAddRoomSpaceChooserBottomSheet {
-            return SpaceAddRoomSpaceChooserBottomSheet().apply {
+            return SpaceAddRoomSpaceChooserBottomSheet()
-                setArguments(Args(spaceId))
-            }
         }
     }
 }

vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt

@@ -153,7 +153,7 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>(),
                     addFragmentToBackstack(
                             R.id.simpleFragmentContainer,
                             CreateRoomFragment::class.java,
-                            CreateRoomArgs("", parentSpaceId = args?.spaceId, isSubSpace = true)
+                            CreateRoomArgs("", parentSpaceId = args?.spaceId, isSpace = true)
                     )
                 }
                 SpaceManagedSharedViewEvents.NavigateToManageRooms -> {

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?colorSurface"
+    android:background="?android:colorBackground"
     android:orientation="vertical">
 
     <TextView