feat: update create space dialog for edit mode

Author: joragua

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/SpacesListFragment.kt

@@ -71,7 +71,8 @@ class SpacesListFragment :
     private val binding get() = _binding!!
 
     private var isMultiPersonal = false
-    private var editSpacesPermission: Boolean = false
+    private var editSpacesPermission = false
+    private var editQuotaPermission = false
     private lateinit var currentSpace: OCSpace
 
     private val spacesListViewModel: SpacesListViewModel by viewModel {
@@ -119,7 +120,12 @@ class SpacesListFragment :
         }
 
         binding.fabCreateSpace.setOnClickListener {
-            val dialog = CreateSpaceDialogFragment.newInstance(requireArguments().getString(BUNDLE_ACCOUNT_NAME), this)
+            val dialog = CreateSpaceDialogFragment.newInstance(
+                isEditMode = false,
+                canEditQuota = false,
+                currentSpace = null,
+                listener = this
+            )
             dialog.show(requireActivity().supportFragmentManager, DIALOG_CREATE_SPACE)
             binding.fabCreateSpace.isFocusable = false
         }
@@ -176,6 +182,7 @@ class SpacesListFragment :
                         uiResult.data?.let {
                             binding.fabCreateSpace.isVisible = it.contains(DRIVES_CREATE_ALL_PERMISSION)
                             editSpacesPermission = it.contains(DRIVES_READ_WRITE_ALL_PERMISSION)
+                            editQuotaPermission = it.contains(DRIVES_READ_WRITE_PROJECT_QUOTA_ALL_PERMISSION)
                         }
                     }
                     is UIResult.Loading -> { }
@@ -304,8 +311,12 @@ class SpacesListFragment :
                 dialog.dismiss()
                 when(menuOption) {
                     SpaceMenuOption.EDIT -> {
-                        val accountName = requireArguments().getString(BUNDLE_ACCOUNT_NAME)
-                        val editDialog = CreateSpaceDialogFragment.newInstance(accountName, this@SpacesListFragment)
+                        val editDialog = CreateSpaceDialogFragment.newInstance(
+                            isEditMode = true,
+                            canEditQuota = editQuotaPermission,
+                            currentSpace = currentSpace,
+                            listener = this@SpacesListFragment
+                        )
                         editDialog.show(requireActivity().supportFragmentManager, DIALOG_CREATE_SPACE)
                     }
                 }
@@ -321,6 +332,7 @@ class SpacesListFragment :
         const val BUNDLE_ACCOUNT_NAME = "accountName"
         const val DRIVES_CREATE_ALL_PERMISSION = "Drives.Create.all"
         const val DRIVES_READ_WRITE_ALL_PERMISSION = "Drives.ReadWrite.all"
+        const val DRIVES_READ_WRITE_PROJECT_QUOTA_ALL_PERMISSION = "Drives.ReadWriteProjectQuota.all"
 
         private const val DIALOG_CREATE_SPACE = "DIALOG_CREATE_SPACE"
 

owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/createspace/CreateSpaceDialogFragment.kt

@@ -24,10 +24,12 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
 import androidx.fragment.app.DialogFragment
 import com.owncloud.android.R
 import com.owncloud.android.databinding.CreateSpaceDialogBinding
+import com.owncloud.android.domain.spaces.model.OCSpace
 
 class CreateSpaceDialogFragment : DialogFragment() {
     private var _binding: CreateSpaceDialogBinding? = null
@@ -44,12 +46,31 @@ class CreateSpaceDialogFragment : DialogFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        val currentSpace = requireArguments().getParcelable<OCSpace>(ARG_CURRENT_SPACE)
+        val isEditMode = requireArguments().getBoolean(ARG_EDIT_SPACE_MODE)
         binding.apply {
             cancelCreateSpaceButton.setOnClickListener { dialog?.dismiss() }
             createSpaceDialogNameValue.doOnTextChanged { name, _, _, _ ->
                 val errorMessage = validateName(name.toString())
                 updateUI(errorMessage)
             }
+
+            if (isEditMode) {
+                createSpaceDialogTitle.text = getString(R.string.edit_space)
+                val canEditQuota = requireArguments().getBoolean(ARG_CAN_EDIT_SPACE_QUOTA)
+                createSpaceDialogQuotaSection.isVisible = canEditQuota
+
+                currentSpace?.let {
+                    createSpaceDialogNameValue.setText(it.name)
+                    createSpaceDialogSubtitleValue.setText(it.description)
+                }
+
+                createSpaceButton.apply {
+                    text = getString(R.string.edit_space_button)
+                    contentDescription = getString(R.string.edit_space_button)
+                }
+            }
+
             createSpaceButton.setOnClickListener {
                 val spaceQuota = convertToBytes(binding.createSpaceDialogQuotaUnit.selectedItem.toString())
                 createSpaceListener.createSpace(
@@ -94,12 +115,21 @@ class CreateSpaceDialogFragment : DialogFragment() {
     }
 
     companion object {
-        private const val ARG_ACCOUNT_NAME = "ACCOUNT_NAME"
+        private const val ARG_EDIT_SPACE_MODE = "EDIT_SPACE_MODE"
+        private const val ARG_CAN_EDIT_SPACE_QUOTA = "CAN_EDIT_SPACE_QUOTA"
+        private const val ARG_CURRENT_SPACE = "CURRENT_SPACE"
         private const val FORBIDDEN_CHARACTERS = """[/\\.:?*"'><|]"""
 
-        fun newInstance(accountName: String?, listener: CreateSpaceListener): CreateSpaceDialogFragment {
+        fun newInstance(
+            isEditMode: Boolean,
+            canEditQuota: Boolean,
+            currentSpace: OCSpace?,
+            listener: CreateSpaceListener
+        ): CreateSpaceDialogFragment {
             val args = Bundle().apply {
-                putString(ARG_ACCOUNT_NAME, accountName)
+                putBoolean(ARG_EDIT_SPACE_MODE, isEditMode)
+                putBoolean(ARG_CAN_EDIT_SPACE_QUOTA, canEditQuota)
+                putParcelable(ARG_CURRENT_SPACE, currentSpace)
             }
             return CreateSpaceDialogFragment().apply {
                 createSpaceListener = listener

owncloudApp/src/main/res/layout/create_space_dialog.xml

@@ -23,6 +23,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
+    android:minWidth="275dp"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:padding="@dimen/standard_half_margin">
@@ -119,6 +120,7 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <LinearLayout
+            android:id="@+id/create_space_dialog_quota_section"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"

owncloudApp/src/main/res/values/strings.xml

@@ -851,6 +851,7 @@
     <string name="create_space_correctly">Space created correctly</string>
     <string name="create_space_failed">Space could not be created</string>
     <string name="edit_space">Edit space</string>
+    <string name="edit_space_button">Edit</string>
 
     <string name="feedback_dialog_get_in_contact_description"><![CDATA[ Ask for help in our <a href=\"%1$s\"><b>forum</b></a> or contribute in our <a href=\"%2$s\"><b>GitHub repo</b></a>]]></string>
 

owncloudDomain/src/main/java/com/owncloud/android/domain/spaces/model/OCSpace.kt

@@ -3,8 +3,9 @@
  *
  * @author Abel García de Prada
  * @author Juan Carlos Garrote Gascón
+ * @author Jorge Aguado Recio
  *
- * Copyright (C) 2024 ownCloud GmbH.
+ * Copyright (C) 2025 ownCloud GmbH.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -21,6 +22,10 @@
 
 package com.owncloud.android.domain.spaces.model
 
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
 data class OCSpace(
     val accountName: String,
     val driveAlias: String?,
@@ -34,7 +39,7 @@ data class OCSpace(
     val webUrl: String?,
     val description: String?,
     val special: List<SpaceSpecial>?,
-) {
+) : Parcelable {
     val isPersonal get() = driveType == DRIVE_TYPE_PERSONAL
     val isProject get() = driveType == DRIVE_TYPE_PROJECT
 
@@ -57,24 +62,28 @@ data class OCSpace(
     }
 }
 
+@Parcelize
 data class SpaceOwner(
     val user: SpaceUser
-)
+) : Parcelable
 
+@Parcelize
 data class SpaceQuota(
     val remaining: Long?,
     val state: String?,
     val total: Long,
     val used: Long?,
-)
+) : Parcelable
 
+@Parcelize
 data class SpaceRoot(
     val eTag: String?,
     val id: String,
     val webDavUrl: String,
     val deleted: SpaceDeleted?,
-)
+) : Parcelable
 
+@Parcelize
 data class SpaceSpecial(
     val eTag: String,
     val file: SpaceFile,
@@ -84,20 +93,24 @@ data class SpaceSpecial(
     val size: Int,
     val specialFolder: SpaceSpecialFolder,
     val webDavUrl: String
-)
+) : Parcelable
 
+@Parcelize
 data class SpaceDeleted(
     val state: String,
-)
+) : Parcelable
 
+@Parcelize
 data class SpaceUser(
     val id: String
-)
+) : Parcelable
 
+@Parcelize
 data class SpaceFile(
     val mimeType: String
-)
+) : Parcelable
 
+@Parcelize
 data class SpaceSpecialFolder(
     val name: String
-)
+) : Parcelable