DROID-3310 Spaces | Fix | Fix menu for updating space icon (#2048)

app/src/main/java/com/anytypeio/anytype/ui/settings/space/SpaceSettingsFragment.kt

@@ -103,7 +103,7 @@ class SpaceSettingsFragment : BaseBottomSheetComposeFragment() {
                         )
                     },
                     onDebugClicked = vm::onSpaceDebugClicked,
-                    onRandomGradientClicked = vm::onRandomSpaceGradientClicked,
+                    onRemoveIconClicked = vm::onRemoveSpaceIconClicked,
                     onManageSharedSpaceClicked = vm::onManageSharedSpaceClicked,
                     onSharePrivateSpaceClicked = vm::onSharePrivateSpaceClicked,
                     onAddMoreSpacesClicked = vm::onAddMoreSpacesClicked,

feature-ui-settings/src/main/java/com/anytypeio/anytype/ui_settings/account/ProfileScreen.kt

@@ -47,7 +47,6 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.VisualTransformation
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -491,7 +490,7 @@ fun ProfileImageBlock(
                 },
             ) {
                 Text(
-                    text = stringResource(R.string.profile_settings_remove_image),
+                    text = stringResource(R.string.remove_image),
                     style = BodyRegular,
                     color = colorResource(id = R.color.text_primary)
                 )

feature-ui-settings/src/main/java/com/anytypeio/anytype/ui_settings/main/MainSettingScreen.kt

@@ -42,7 +42,7 @@ fun SpaceHeader(
     icon: SpaceIconView?,
     modifier: Modifier = Modifier,
     onNameSet: (String) -> Unit,
-    onRandomGradientClicked: () -> Unit,
+    onRemoveIconClicked: () -> Unit,
     isEditEnabled: Boolean,
     onSpaceImagePicked: (Uri) -> Unit
 ) {
@@ -90,18 +90,6 @@ fun SpaceHeader(
                         isSpaceIconMenuExpanded.value = false
                     }
                 ) {
-                    DropdownMenuItem(
-                        onClick = {
-                            onRandomGradientClicked()
-                            isSpaceIconMenuExpanded.value = false
-                        },
-                    ) {
-                        Text(
-                            text = stringResource(R.string.space_settings_apply_random_gradient),
-                            style = BodyRegular,
-                            color = colorResource(id = R.color.text_primary)
-                        )
-                    }
                     if (ActivityResultContracts.PickVisualMedia.isPhotoPickerAvailable(context)) {
                         Divider(
                             thickness = 0.5.dp,
@@ -124,6 +112,18 @@ fun SpaceHeader(
                             )
                         }
                     }
+                    DropdownMenuItem(
+                        onClick = {
+                            onRemoveIconClicked()
+                            isSpaceIconMenuExpanded.value = false
+                        },
+                    ) {
+                        Text(
+                            text = stringResource(R.string.remove_image),
+                            style = BodyRegular,
+                            color = colorResource(id = R.color.text_primary)
+                        )
+                    }
                 }
             }
         }

feature-ui-settings/src/main/java/com/anytypeio/anytype/ui_settings/space/Settings.kt

@@ -65,7 +65,7 @@ fun SpaceSettingsScreen(
     onNetworkIdClicked: (Id) -> Unit,
     onCreatedByClicked: (Id) -> Unit,
     onDebugClicked: () -> Unit,
-    onRandomGradientClicked: () -> Unit,
+    onRemoveIconClicked: () -> Unit,
     onSharePrivateSpaceClicked: () -> Unit,
     onManageSharedSpaceClicked: () -> Unit,
     onAddMoreSpacesClicked: () -> Unit,
@@ -91,7 +91,7 @@ fun SpaceSettingsScreen(
                     else -> null
                 },
                 onNameSet = onNameSet,
-                onRandomGradientClicked = onRandomGradientClicked,
+                onRemoveIconClicked = onRemoveIconClicked,
                 isEditEnabled = when(state) {
                     is ViewState.Error -> false
                     ViewState.Init -> false
@@ -327,7 +327,7 @@ fun SpaceSettingsScreenPreview() {
         onNetworkIdClicked = {} ,
         onCreatedByClicked = {},
         onDebugClicked = {},
-        onRandomGradientClicked = {},
+        onRemoveIconClicked = {},
         onManageSharedSpaceClicked = {},
         onSharePrivateSpaceClicked = {},
         onAddMoreSpacesClicked = {},

localization/src/main/res/values-be-rBY/strings.xml

@@ -46,7 +46,7 @@
     <string name="space_settings_apply_random_gradient">Apply random solid color</string>
     <string name="space_settings_apply_upload_image">Загрузіць відарыс</string>
     <string name="profile_settings_apply_upload_image">Загрузіць відарыс</string>
-    <string name="profile_settings_remove_image">Remove image</string>
+    <string name="remove_image">Remove image</string>
     <string name="delete_space">Выдаліць прастору</string>
     <string name="you_can_store">Вы можаце бясплатна захоўваць да %1$s вашых файлаў на нашым зашыфраваным вузле рэзервовага капіравання. Калі вы вычарпаеце ліміт, файлы будуць захоўвацца толькі лакальна.</string>
     <string name="in_order_to_save">Каб зэканоміць месца на лакальнай прыладзе, вы можаце загрузіць усе свае файлы ў наш зашыфраваны вузел рэзервовага капіявання. Файлы будуць загружаны назад, калі вы іх адкрыеце.</string>

localization/src/main/res/values-de-rDE/strings.xml

@@ -46,7 +46,7 @@
     <string name="space_settings_apply_random_gradient">Zufällige Volltonfarbe verwenden</string>
     <string name="space_settings_apply_upload_image">Bild hochladen</string>
     <string name="profile_settings_apply_upload_image">Bild hochladen</string>
-    <string name="profile_settings_remove_image">Bild entfernen</string>
+    <string name="remove_image">Bild entfernen</string>
     <string name="delete_space">Space löschen</string>
     <string name="you_can_store">Du kannst bis zu %1$s deiner Dateien auf unserem verschlüsselten und kostenlosen Backup-Knoten speichern. Wenn das Limit erreicht wurde, werden Dateien nur noch lokal gespeichert.</string>
     <string name="in_order_to_save">Um Platz auf deinem Gerät zu sparen, können alle deine Dateien auf unseren verschlüsselten Backup-Knoten ausgelagert werden. Die Dateien werden beim Öffnen dann wieder heruntergeladen.</string>

localization/src/main/res/values-es-rES/strings.xml

@@ -46,7 +46,7 @@
     <string name="space_settings_apply_random_gradient">Aplicar color sólido aleatorio</string>
     <string name="space_settings_apply_upload_image">Cargar una imagen</string>
     <string name="profile_settings_apply_upload_image">Cargar una imagen</string>
-    <string name="profile_settings_remove_image">Eliminar imagen</string>
+    <string name="remove_image">Eliminar imagen</string>
     <string name="delete_space">Eliminar espacio</string>
     <string name="you_can_store">Puedes almacenar gratuitamente hasta %1$s de archivos en nuestro nodo de respaldo cifrado. Si llegas al límite, los archivos se almacenarán solo localmente.</string>
     <string name="in_order_to_save">Para ahorrar espacio en tu dispositivo local, puedes guardar todos tus archivos en nuestro nodo de respaldo cifrado. Los archivos se cargarán de nuevo cuando los abras.</string>

localization/src/main/res/values-fr-rFR/strings.xml

@@ -46,7 +46,7 @@
     <string name="space_settings_apply_random_gradient">Appliquer une couleur solide aléatoire</string>
     <string name="space_settings_apply_upload_image">Upload image</string>
     <string name="profile_settings_apply_upload_image">Upload image</string>
-    <string name="profile_settings_remove_image">Supprimer l’image</string>
+    <string name="remove_image">Supprimer l’image</string>
     <string name="delete_space">Supprimer l\'espace</string>
     <string name="you_can_store">Vous pouvez stocker gratuitement jusqu\'à %1$s de vos fichiers sur notre nœud de sauvegarde chiffré. Si vous atteignez la limite, les fichiers ne seront stockés que localement.</string>
     <string name="in_order_to_save">Afin d\'économiser de l\'espace sur votre appareil, vous pouvez décharger tous vos fichiers vers notre nœud de sauvegarde chiffré. Les fichiers seront rechargés lorsque vous les ouvrirez.</string>

localization/src/main/res/values-in-rID/strings.xml

@@ -46,7 +46,7 @@
     <string name="space_settings_apply_random_gradient">Beri warna polos acak</string>
     <string name="space_settings_apply_upload_image">Upload image</string>
     <string name="profile_settings_apply_upload_image">Upload image</string>
-    <string name="profile_settings_remove_image">Hapus gambar</string>
+    <string name="remove_image">Hapus gambar</string>
     <string name="delete_space">Hapus ruang</string>
     <string name="you_can_store">Kamu bisa menyimpan berkasmu hingga %1$s di simpul cadangan terenkripsi kami secara gratis. Jika melewati batas, berkasmu hanya akan disimpan secara lokal.</string>
     <string name="in_order_to_save">Untuk menghemat penyimpanan ruang pada perangkat lokal, anda dapat melepaskan semua berkas ke simpul cadangan terenkripsi kami. Berkas - berkas akan diunduh kembali saat kamu membuka mereka. </string>

localization/src/main/res/values-it-rIT/strings.xml

@@ -46,7 +46,7 @@
     <string name="space_settings_apply_random_gradient">Applica colore tinta unita casuale</string>
     <string name="space_settings_apply_upload_image">Upload image</string>
     <string name="profile_settings_apply_upload_image">Upload image</string>
-    <string name="profile_settings_remove_image">Rimuovi immagine</string>
+    <string name="remove_image">Rimuovi immagine</string>
     <string name="delete_space">Elimina spazio</string>
     <string name="you_can_store">Puoi archiviare gratuitamente fino a %1$s di file personali sul nostro nodo di backup crittografato. Se raggiungi il limite, i file verranno archiviati solo localmente.</string>
     <string name="in_order_to_save">Per risparmiare spazio sul tuo dispositivo locale, puoi liberare tutti i tuoi file trasferendoli al nostro nodo di backup criptato. I file verranno ricaricati quando li apri</string>

localization/src/main/res/values-nl-rNL/strings.xml

@@ -46,7 +46,7 @@
     <string name="space_settings_apply_random_gradient">Pas willekeurige effen kleur toe</string>
     <string name="space_settings_apply_upload_image">Upload afbeelding</string>
     <string name="profile_settings_apply_upload_image">Upload afbeelding</string>
-    <string name="profile_settings_remove_image">Remove image</string>
+    <string name="remove_image">Remove image</string>
     <string name="delete_space">Verwijder ruimte</string>
     <string name="you_can_store">Je kunt maximaal %1$s van je bestanden gratis opslaan op onze versleutelde back-up node. Als de limiet is bereikt, zullen bestanden alleen lokaal worden opgeslagen.</string>
     <string name="in_order_to_save">Om ruimte op je lokale apparaat te besparen, kun je al je bestanden naar onze versleutelde back-upnode verplaatsen. De bestanden worden opnieuw geladen wanneer je ze opent.</string>

localization/src/main/res/values-no-rNO/strings.xml

@@ -46,7 +46,7 @@
     <string name="space_settings_apply_random_gradient">Apply random solid color</string>
     <string name="space_settings_apply_upload_image">Last opp bilde</string>
     <string name="profile_settings_apply_upload_image">Last opp bilde</string>
-    <string name="profile_settings_remove_image">Remove image</string>
+    <string name="remove_image">Remove image</string>
     <string name="delete_space">Slett rom</string>
     <string name="you_can_store">You can store up to %1$s of your files on our encrypted backup node for free. If you reach the limit, files will be stored only locally.</string>
     <string name="in_order_to_save">For å spare plass på den lokale enheten din, kan du slette alle lokale filer og beholde dem på vår krypterte sikkerhetskopi-node. Filene vil bli lastet ned igjen når du åpner dem.</string>

localization/src/main/res/values-pt-rBR/strings.xml

@@ -46,7 +46,7 @@
     <string name="space_settings_apply_random_gradient">Apply random solid color</string>
     <string name="space_settings_apply_upload_image">Carregue uma imagem</string>
     <string name="profile_settings_apply_upload_image">Carregue uma imagem</string>
-    <string name="profile_settings_remove_image">Remove image</string>
+    <string name="remove_image">Remove image</string>
     <string name="delete_space">Excluir Espaço</string>
     <string name="you_can_store">Você pode armazenar até %1$s de seus arquivos em nosso nó de backup criptografado gratuitamente. Se você atingir o limite, os arquivos serão armazenados apenas localmente.</string>
     <string name="in_order_to_save">Para economizar espaço no seu dispositivo local, você pode descarregar todos os seus arquivos no nosso servidor de backup criptografado. Os arquivos serão carregados novamente quando forem abertos.</string>

localization/src/main/res/values-ru-rRU/strings.xml

@@ -46,7 +46,7 @@
     <string name="space_settings_apply_random_gradient">Применить случайный сплошной цвет</string>
     <string name="space_settings_apply_upload_image">Загрузить изображение</string>
     <string name="profile_settings_apply_upload_image">Загрузить изображение</string>
-    <string name="profile_settings_remove_image">Удалить изображение</string>
+    <string name="remove_image">Remove image</string>
     <string name="delete_space">Удалить пространство</string>
     <string name="you_can_store">Вы можете бесплатно хранить до %1$s ваших файлов на нашем узле резервного копирования. При достижении лимита файлы будут храниться только локально.</string>
     <string name="in_order_to_save">Чтобы сохранить место на вашем локальном устройстве, вы можете выгрузить все ваши файлы в наш зашифрованный узел резервного копирования. Файлы будут загружены обратно, когда вы откроете их.</string>

localization/src/main/res/values-tr-rTR/strings.xml

@@ -46,7 +46,7 @@
     <string name="space_settings_apply_random_gradient">Rastgele düz renk uygula</string>
     <string name="space_settings_apply_upload_image">Resim yükle</string>
     <string name="profile_settings_apply_upload_image">Resim yükle</string>
-    <string name="profile_settings_remove_image">Görseli kaldır</string>
+    <string name="remove_image">Görseli kaldır</string>
     <string name="delete_space">Alanı sil</string>
     <string name="you_can_store">Dosyalarınızın %1$s kadarını şifrelenmiş yedekleme düğümümüzde ücretsiz olarak saklayabilirsiniz. Sınıra ulaşırsanız dosyalar yalnızca yerel olarak depolanacaktır.</string>
     <string name="in_order_to_save">Yerel cihazınızda yer kazanmak için tüm dosyalarınızı şifrelenmiş yedekleme düğümümüze aktarabilirsiniz.  Dosyaları açtığınızda geri yüklenecektir.</string>

localization/src/main/res/values-uk-rUA/strings.xml

@@ -46,7 +46,7 @@
     <string name="space_settings_apply_random_gradient">Apply random solid color</string>
     <string name="space_settings_apply_upload_image">Upload image</string>
     <string name="profile_settings_apply_upload_image">Upload image</string>
-    <string name="profile_settings_remove_image">Remove image</string>
+    <string name="remove_image">Remove image</string>
     <string name="delete_space">Видалити простір </string>
     <string name="you_can_store">You can store up to %1$s of your files on our encrypted backup node for free. If you reach the limit, files will be stored only locally.</string>
     <string name="in_order_to_save">Щоб заощадити місце на вашому локальному пристрої, ви можете вивантажити всі ваші файли на наш зашифрований вузол резервного копіювання. Файли будуть завантажені назад, коли ви їх відкриєте.</string>

localization/src/main/res/values-zh-rCN/strings.xml

@@ -46,7 +46,7 @@
     <string name="space_settings_apply_random_gradient">应用随机纯色</string>
     <string name="space_settings_apply_upload_image">上传图像</string>
     <string name="profile_settings_apply_upload_image">上传图像</string>
-    <string name="profile_settings_remove_image">Remove image</string>
+    <string name="remove_image">Remove image</string>
     <string name="delete_space">删除空间</string>
     <string name="you_can_store">您可以在我们的节点上免费加密备份存储多达 %1$s 的文件。如果达到限制，文件将仅存储在本地。</string>
     <string name="in_order_to_save">为了节省本地设备上的空间，您可以将所有文件卸载到我们的加密备份节点。打开文件时，文件将被重新加载。</string>

localization/src/main/res/values-zh-rTW/strings.xml

@@ -46,7 +46,7 @@
     <string name="space_settings_apply_random_gradient">Apply random solid color</string>
     <string name="space_settings_apply_upload_image">上傳圖片</string>
     <string name="profile_settings_apply_upload_image">上傳圖片</string>
-    <string name="profile_settings_remove_image">Remove image</string>
+    <string name="remove_image">Remove image</string>
     <string name="delete_space">刪除空間</string>
     <string name="you_can_store">您目前擁有 %1$s 的加密節點儲存空間，您可以將檔案備份到我們的節點當中。 當儲存空間容量到達上限，新的檔案只能存放在您的本地儲存區中。</string>
     <string name="in_order_to_save">為了節省本地設備上的空間，您可以將所有檔案傳輸到我們的加密備份節點。 當您打開這些檔案時，它們將被重新載入。</string>

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

@@ -62,7 +62,7 @@
     <string name="space_settings_apply_random_gradient">Apply random solid color</string>
     <string name="space_settings_apply_upload_image">Upload image</string>
     <string name="profile_settings_apply_upload_image">Upload image</string>
-    <string name="profile_settings_remove_image">Remove image</string>
+    <string name="remove_image">Remove image</string>
     <string name="delete_space">Delete space</string>
     <string name="you_can_store">You can store up to %1$s of your files on our encrypted backup node for free. If you reach the limit, files will be stored only locally.</string>
     <string name="in_order_to_save">In order to save space on your local device, you can offload all your files to our encrypted backup node. The files will be loaded back when you open them.</string>

presentation/src/main/java/com/anytypeio/anytype/presentation/spaces/SpaceSettingsViewModel.kt

@@ -21,7 +21,6 @@ import com.anytypeio.anytype.core_models.ext.isPossibleToUpgrade
 import com.anytypeio.anytype.core_models.membership.MembershipUpgradeReason
 import com.anytypeio.anytype.core_models.membership.TierId
 import com.anytypeio.anytype.core_models.multiplayer.ParticipantStatus
-import com.anytypeio.anytype.core_models.multiplayer.SpaceAccessType
 import com.anytypeio.anytype.core_models.multiplayer.SpaceMemberPermissions
 import com.anytypeio.anytype.core_models.primitives.SpaceId
 import com.anytypeio.anytype.core_utils.ui.ViewState
@@ -172,13 +171,13 @@ class SpaceSettingsViewModel(
         proceedWithSpaceDebug()
     }
 
-    fun onRandomSpaceGradientClicked() {
+    fun onRemoveSpaceIconClicked() {
         viewModelScope.launch {
             val config = spaceConfig
             if (config != null) {
                 setSpaceDetails.async(
                     SetSpaceDetails.Params(
-                        space = SpaceId(config.space),
+                        space = params.space,
                         details = mapOf(
                             Relations.ICON_OPTION to spaceGradientProvider.randomId().toDouble(),
                             Relations.ICON_IMAGE to null,