DROID-3120 Files | Show hidden files in Manage space files screen (#1910

)
anyproto · Dec 12, 2024 · 85d64f7 · 85d64f7
1 parent 0a42774
commit 85d64f7
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 37 deletions.
diff --git a/...entation/src/main/java/com/anytypeio/anytype/presentation/search/ObjectSearchConstants.kt b/...entation/src/main/java/com/anytypeio/anytype/presentation/search/ObjectSearchConstants.kt
@@ -1106,44 +1106,52 @@ object ObjectSearchConstants {
         )
     )
 
-    fun filesFilters(space: Id) = listOf(
-        DVFilter(
-            relation = Relations.IS_DELETED,
-            condition = DVFilterCondition.NOT_EQUAL,
-            value = true
-        ),
-        DVFilter(
-            relation = Relations.IS_ARCHIVED,
-            condition = DVFilterCondition.NOT_EQUAL,
-            value = true
-        ),
-        DVFilter(
-            relation = Relations.IS_HIDDEN,
-            condition = DVFilterCondition.NOT_EQUAL,
-            value = true
-        ),
-        DVFilter(
-            relation = Relations.IS_HIDDEN_DISCOVERY,
-            condition = DVFilterCondition.NOT_EQUAL,
-            value = true
-        ),
-        DVFilter(
-            relation = Relations.LAYOUT,
-            condition = DVFilterCondition.IN,
-            value = listOf(
-                ObjectType.Layout.IMAGE.code.toDouble(),
-                ObjectType.Layout.FILE.code.toDouble(),
-                ObjectType.Layout.VIDEO.code.toDouble(),
-                ObjectType.Layout.AUDIO.code.toDouble(),
-                ObjectType.Layout.PDF.code.toDouble()
+    fun filesFilters(space: Id, hiddenDiscovery: Boolean = true) = buildList {
+        addAll(
+            listOf(
+                DVFilter(
+                    relation = Relations.IS_DELETED,
+                    condition = DVFilterCondition.NOT_EQUAL,
+                    value = true
+                ),
+                DVFilter(
+                    relation = Relations.IS_ARCHIVED,
+                    condition = DVFilterCondition.NOT_EQUAL,
+                    value = true
+                ),
+                DVFilter(
+                    relation = Relations.IS_HIDDEN,
+                    condition = DVFilterCondition.NOT_EQUAL,
+                    value = true
+                ),
+                DVFilter(
+                    relation = Relations.LAYOUT,
+                    condition = DVFilterCondition.IN,
+                    value = listOf(
+                        ObjectType.Layout.IMAGE.code.toDouble(),
+                        ObjectType.Layout.FILE.code.toDouble(),
+                        ObjectType.Layout.VIDEO.code.toDouble(),
+                        ObjectType.Layout.AUDIO.code.toDouble(),
+                        ObjectType.Layout.PDF.code.toDouble()
+                    )
+                ),
+                DVFilter(
+                    relation = Relations.SPACE_ID,
+                    condition = DVFilterCondition.EQUAL,
+                    value = space
+                )
             )
-        ),
-        DVFilter(
-            relation = Relations.SPACE_ID,
-            condition = DVFilterCondition.EQUAL,
-            value = space
         )
-    )
+        if (hiddenDiscovery) {
+            add(
+                DVFilter(
+                    relation = Relations.IS_HIDDEN_DISCOVERY,
+                    condition = DVFilterCondition.NOT_EQUAL,
+                    value = true
+                )
+            )
+        }
+    }
 
     fun setsByObjectTypeFilters(types: List<Id>) = listOf(
         DVFilter(

diff --git a/...rc/main/java/com/anytypeio/anytype/presentation/widgets/collection/CollectionViewModel.kt b/...rc/main/java/com/anytypeio/anytype/presentation/widgets/collection/CollectionViewModel.kt
@@ -230,6 +230,7 @@ class CollectionViewModel(
     }
 
     fun onStart(subscription: Subscription) {
+        Timber.i("CollectionViewModel, onStart, subscription:${subscription}")
         val isFirstLaunch = this.subscription == Subscription.None
         this.subscription = subscription
         if (permission.value?.isOwnerOrEditor() == true && isFirstLaunch && (subscription == Subscription.Bin || subscription == Subscription.Files)) {

diff --git a/...ation/src/main/java/com/anytypeio/anytype/presentation/widgets/collection/Subscription.kt b/...ation/src/main/java/com/anytypeio/anytype/presentation/widgets/collection/Subscription.kt
@@ -75,7 +75,12 @@ sealed class Subscription(
             )
         ),
         limit = 0,
-        space = { spaces -> ObjectSearchConstants.filesFilters(spaces) }
+        space = { spaces ->
+            ObjectSearchConstants.filesFilters(
+                space = spaces,
+                hiddenDiscovery = false
+            )
+        }
     )
 
     data object None : Subscription("", emptyList(), emptyList(), 0, space = { emptyList() })