From 6fcbe663cdb8269dcf28014fc26c0899ad996fe9 Mon Sep 17 00:00:00 2001
From: Konstantin Ivanov <54908981+konstantiniiv@users.noreply.github.com>
Date: Sat, 12 Apr 2025 12:15:59 +0200
Subject: [PATCH] DROID-3555 Primitives | Show Types in the All Objects tab
 (#2297)

---
 .../anytype/feature_allcontent/models/AllContentModels.kt      | 2 +-
 .../feature_allcontent/models/AllContentSearchParams.kt        | 3 ++-
 .../feature_object_type/viewmodel/ObjectTypeViewModel.kt       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/feature-all-content/src/main/java/com/anytypeio/anytype/feature_allcontent/models/AllContentModels.kt b/feature-all-content/src/main/java/com/anytypeio/anytype/feature_allcontent/models/AllContentModels.kt
index eb7530912d..3b2d6e68cb 100644
--- a/feature-all-content/src/main/java/com/anytypeio/anytype/feature_allcontent/models/AllContentModels.kt
+++ b/feature-all-content/src/main/java/com/anytypeio/anytype/feature_allcontent/models/AllContentModels.kt
@@ -199,7 +199,7 @@ suspend fun ObjectWrapper.Basic.toAllContentItem(
     return UiContentItem.Item(
         id = obj.id,
         space = space,
-        name = fieldParser.getObjectName(obj),
+        name = fieldParser.getObjectNameOrPluralsForTypes(obj),
         description = getDescriptionOrSnippet(),
         type = typeUrl,
         typeName = objectTypes.firstOrNull { type ->
diff --git a/feature-all-content/src/main/java/com/anytypeio/anytype/feature_allcontent/models/AllContentSearchParams.kt b/feature-all-content/src/main/java/com/anytypeio/anytype/feature_allcontent/models/AllContentSearchParams.kt
index 85a677a1fb..197c1a7340 100644
--- a/feature-all-content/src/main/java/com/anytypeio/anytype/feature_allcontent/models/AllContentSearchParams.kt
+++ b/feature-all-content/src/main/java/com/anytypeio/anytype/feature_allcontent/models/AllContentSearchParams.kt
@@ -25,7 +25,8 @@ val allContentTabLayouts = mapOf(
     ),
     AllContentTab.LISTS to listOf(
         ObjectType.Layout.SET,
-        ObjectType.Layout.COLLECTION
+        ObjectType.Layout.COLLECTION,
+        ObjectType.Layout.OBJECT_TYPE,
     ),
     AllContentTab.FILES to listOf(
         ObjectType.Layout.FILE,
diff --git a/feature-object-type/src/main/java/com/anytypeio/anytype/feature_object_type/viewmodel/ObjectTypeViewModel.kt b/feature-object-type/src/main/java/com/anytypeio/anytype/feature_object_type/viewmodel/ObjectTypeViewModel.kt
index a7920d2272..896b9f6cd1 100644
--- a/feature-object-type/src/main/java/com/anytypeio/anytype/feature_object_type/viewmodel/ObjectTypeViewModel.kt
+++ b/feature-object-type/src/main/java/com/anytypeio/anytype/feature_object_type/viewmodel/ObjectTypeViewModel.kt
@@ -332,7 +332,7 @@ class ObjectTypeViewModel(
         _objectTypePermissionsState.value = objectPermissions
 
         uiTitleState.value = UiTitleState(
-            title = objType.pluralName.orEmpty(),
+            title = fieldParser.getObjectPluralName(objType),
             isEditable = objectPermissions.canEditDetails
         )
         val newIcon = objType.objectIcon()