Feature/bca/improve leave space

changelog.d/3692.feature

@@ -0,0 +1 @@
+Allow to also leave rooms when leaving a space

tools/check/forbidden_strings_in_code.txt

@@ -162,7 +162,7 @@ Formatter\.formatShortFileSize===1
 # android\.text\.TextUtils
 
 ### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If the enum is not used as a Json class, change the value in file forbidden_strings_in_code.txt
-enum class===105
+enum class===106
 
 ### Do not import temporary legacy classes
 import org.matrix.android.sdk.internal.legacy.riot===3

vector/src/main/AndroidManifest.xml

@@ -319,6 +319,7 @@
         <activity android:name=".features.spaces.SpaceCreationActivity" />
         <activity android:name=".features.spaces.manage.SpaceManageActivity" />
         <activity android:name=".features.spaces.people.SpacePeopleActivity" />
+        <activity android:name=".features.spaces.leave.SpaceLeaveAdvancedActivity" />
         <!-- Services -->
 
         <service

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

@@ -146,6 +146,7 @@ import im.vector.app.features.spaces.create.CreateSpaceAdd3pidInvitesFragment
 import im.vector.app.features.spaces.create.CreateSpaceDefaultRoomsFragment
 import im.vector.app.features.spaces.create.CreateSpaceDetailsFragment
 import im.vector.app.features.spaces.explore.SpaceDirectoryFragment
+import im.vector.app.features.spaces.leave.SpaceLeaveAdvancedFragment
 import im.vector.app.features.spaces.manage.SpaceAddRoomFragment
 import im.vector.app.features.spaces.manage.SpaceManageRoomsFragment
 import im.vector.app.features.spaces.manage.SpaceSettingsFragment
@@ -828,4 +829,9 @@ interface FragmentModule {
     @IntoMap
     @FragmentKey(RoomJoinRuleChooseRestrictedFragment::class)
     fun bindRoomJoinRuleChooseRestrictedFragment(fragment: RoomJoinRuleChooseRestrictedFragment): Fragment
+
+    @Binds
+    @IntoMap
+    @FragmentKey(SpaceLeaveAdvancedFragment::class)
+    fun bindSpaceLeaveAdvancedFragment(fragment: SpaceLeaveAdvancedFragment): Fragment
 }

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

@@ -84,10 +84,12 @@ import im.vector.app.features.settings.devices.DeviceVerificationInfoBottomSheet
 import im.vector.app.features.share.IncomingShareActivity
 import im.vector.app.features.signout.soft.SoftLogoutActivity
 import im.vector.app.features.spaces.InviteRoomSpaceChooserBottomSheet
+import im.vector.app.features.spaces.LeaveSpaceBottomSheet
 import im.vector.app.features.spaces.SpaceCreationActivity
 import im.vector.app.features.spaces.SpaceExploreActivity
 import im.vector.app.features.spaces.SpaceSettingsMenuBottomSheet
 import im.vector.app.features.spaces.invite.SpaceInviteBottomSheet
+import im.vector.app.features.spaces.leave.SpaceLeaveAdvancedActivity
 import im.vector.app.features.spaces.manage.SpaceManageActivity
 import im.vector.app.features.spaces.share.ShareSpaceBottomSheet
 import im.vector.app.features.terms.ReviewTermsActivity
@@ -171,6 +173,7 @@ interface ScreenComponent {
     fun inject(activity: SpaceExploreActivity)
     fun inject(activity: SpaceManageActivity)
     fun inject(activity: RoomJoinRuleActivity)
+    fun inject(activity: SpaceLeaveAdvancedActivity)
 
     /* ==========================================================================================
      * BottomSheets
@@ -199,6 +202,7 @@ interface ScreenComponent {
     fun inject(bottomSheet: SpaceInviteBottomSheet)
     fun inject(bottomSheet: JoinReplacementRoomBottomSheet)
     fun inject(bottomSheet: MigrateRoomBottomSheet)
+    fun inject(bottomSheet: LeaveSpaceBottomSheet)
 
     /* ==========================================================================================
      * Others

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

@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2021 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.app.features.spaces
+
+import android.app.Activity
+import android.graphics.Typeface
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.text.toSpannable
+import androidx.core.view.isInvisible
+import androidx.core.view.isVisible
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.args
+import com.airbnb.mvrx.parentFragmentViewModel
+import com.airbnb.mvrx.withState
+import com.jakewharton.rxbinding3.widget.checkedChanges
+import im.vector.app.R
+import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.error.ErrorFormatter
+import im.vector.app.core.extensions.registerStartForActivityResult
+import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.core.resources.ColorProvider
+import im.vector.app.core.utils.styleMatchingText
+import im.vector.app.databinding.BottomSheetLeaveSpaceBinding
+import im.vector.app.features.spaces.leave.SpaceLeaveAdvancedActivity
+import io.reactivex.android.schedulers.AndroidSchedulers
+import kotlinx.parcelize.Parcelize
+import me.gujun.android.span.span
+import org.matrix.android.sdk.api.util.toMatrixItem
+import javax.inject.Inject
+
+class LeaveSpaceBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetLeaveSpaceBinding>() {
+
+    val settingsViewModel: SpaceMenuViewModel by parentFragmentViewModel()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetLeaveSpaceBinding {
+        return BottomSheetLeaveSpaceBinding.inflate(inflater, container, false)
+    }
+
+    @Inject lateinit var colorProvider: ColorProvider
+    @Inject lateinit var errorFormatter: ErrorFormatter
+
+    override fun injectWith(injector: ScreenComponent) {
+        injector.inject(this)
+    }
+
+    @Parcelize
+    data class Args(
+            val spaceId: String
+    ) : Parcelable
+
+    override val showExpanded = true
+
+    private val spaceArgs: SpaceBottomSheetSettingsArgs by args()
+
+    private val cherryPickLeaveActivityResult = registerStartForActivityResult { activityResult ->
+        if (activityResult.resultCode == Activity.RESULT_OK) {
+            // nothing actually?
+        } else {
+            // move back to default
+            settingsViewModel.handle(SpaceLeaveViewAction.SetAutoLeaveAll)
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        views.autoLeaveRadioGroup.checkedChanges()
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe {
+                    when (it) {
+                        views.leaveAll.id      -> {
+                            settingsViewModel.handle(SpaceLeaveViewAction.SetAutoLeaveAll)
+                        }
+                        views.leaveNone.id     -> {
+                            settingsViewModel.handle(SpaceLeaveViewAction.SetAutoLeaveNone)
+                        }
+                        views.leaveSelected.id -> {
+                            settingsViewModel.handle(SpaceLeaveViewAction.SetAutoLeaveSelected)
+                            // launch dedicated activity
+                            cherryPickLeaveActivityResult.launch(
+                                    SpaceLeaveAdvancedActivity.newIntent(requireContext(), spaceArgs.spaceId)
+                            )
+                        }
+                    }
+                }
+                .disposeOnDestroyView()
+
+        views.leaveButton.debouncedClicks {
+            settingsViewModel.handle(SpaceLeaveViewAction.LeaveSpace)
+        }
+
+        views.cancelButton.debouncedClicks {
+            dismiss()
+        }
+    }
+
+    override fun invalidate() = withState(settingsViewModel) { state ->
+        super.invalidate()
+
+        val spaceSummary = state.spaceSummary ?: return@withState
+        val bestName = spaceSummary.toMatrixItem().getBestName()
+        val commonText = getString(R.string.space_leave_prompt_msg_with_name, bestName)
+                .toSpannable().styleMatchingText(bestName, Typeface.BOLD)
+
+        val warningMessage: CharSequence = if (spaceSummary.otherMemberIds.isEmpty()) {
+            span {
+                +commonText
+                +"\n\n"
+                span(getString(R.string.space_leave_prompt_msg_only_you)) {
+                    textColor = colorProvider.getColorFromAttribute(R.attr.colorError)
+                }
+            }
+        } else if (state.isLastAdmin) {
+            span {
+                +commonText
+                +"\n\n"
+                span(getString(R.string.space_leave_prompt_msg_as_admin)) {
+                    textColor = colorProvider.getColorFromAttribute(R.attr.colorError)
+                }
+            }
+        } else if (!spaceSummary.isPublic) {
+            span {
+                +commonText
+                +"\n\n"
+                span(getString(R.string.space_leave_prompt_msg_private)) {
+                    textColor = colorProvider.getColorFromAttribute(R.attr.colorError)
+                }
+            }
+        } else {
+            commonText
+        }
+
+        views.bottomLeaveSpaceWarningText.setTextOrHide(warningMessage)
+
+        views.inlineErrorText.setTextOrHide(null)
+        if (state.leavingState is Loading) {
+            views.leaveButton.isInvisible = true
+            views.cancelButton.isInvisible = true
+            views.leaveProgress.isVisible = true
+        } else {
+            views.leaveButton.isInvisible = false
+            views.cancelButton.isInvisible = false
+            views.leaveProgress.isVisible = false
+            if (state.leavingState is Fail) {
+                views.inlineErrorText.setTextOrHide(errorFormatter.toHumanReadable(state.leavingState.error))
+            }
+        }
+
+        val hasChildren = (spaceSummary.spaceChildren?.size ?: 0) > 0
+        if (hasChildren) {
+            views.autoLeaveRadioGroup.isVisible = true
+            when (state.leaveMode) {
+                SpaceMenuState.LeaveMode.LEAVE_ALL      -> {
+                    views.autoLeaveRadioGroup.check(views.leaveAll.id)
+                }
+                SpaceMenuState.LeaveMode.LEAVE_NONE     -> {
+                    views.autoLeaveRadioGroup.check(views.leaveNone.id)
+                }
+                SpaceMenuState.LeaveMode.LEAVE_SELECTED -> {
+                    views.autoLeaveRadioGroup.check(views.leaveSelected.id)
+                }
+            }
+        } else {
+            views.autoLeaveRadioGroup.isVisible = false
+        }
+    }
+
+    companion object {
+
+        fun newInstance(spaceId: String)
+                : LeaveSpaceBottomSheet {
+            return LeaveSpaceBottomSheet().apply {
+                setArguments(SpaceBottomSheetSettingsArgs(spaceId))
+            }
+        }
+    }
+}

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

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2021 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.app.features.spaces
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class SpaceLeaveViewAction : VectorViewModelAction {
+    object SetAutoLeaveAll : SpaceLeaveViewAction()
+    object SetAutoLeaveNone : SpaceLeaveViewAction()
+    object SetAutoLeaveSelected : SpaceLeaveViewAction()
+    object LeaveSpace : SpaceLeaveViewAction()
+}

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2021 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.app.features.spaces
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.Uninitialized
+import org.matrix.android.sdk.api.session.room.model.RoomSummary
+
+data class SpaceMenuState(
+        val spaceId: String,
+        val spaceSummary: RoomSummary? = null,
+        val canEditSettings: Boolean = false,
+        val canInvite: Boolean = false,
+        val canAddChild: Boolean = false,
+        val isLastAdmin: Boolean = false,
+        val leaveMode: LeaveMode = LeaveMode.LEAVE_NONE,
+        val leavingState: Async<Unit> = Uninitialized
+) : MvRxState {
+    constructor(args: SpaceBottomSheetSettingsArgs) : this(spaceId = args.spaceId)
+
+    enum class LeaveMode {
+        LEAVE_ALL, LEAVE_NONE, LEAVE_SELECTED
+    }
+}