Merge branch 'anyproto:main' into app-widget

Author: MohitMandalia

app/src/main/java/com/anytypeio/anytype/ui/sets/ObjectSetFragment.kt

@@ -4,7 +4,6 @@ import android.content.Intent
 import android.content.res.ColorStateList
 import android.graphics.Color
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
 import android.text.InputType
 import android.view.ContextThemeWrapper
@@ -48,7 +47,6 @@ import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.RecyclerView
 import coil3.load
-import com.anytypeio.anytype.BuildConfig
 import com.anytypeio.anytype.R
 import com.anytypeio.anytype.core_models.Id
 import com.anytypeio.anytype.core_models.Key
@@ -57,7 +55,6 @@ import com.anytypeio.anytype.core_models.TimeInMillis
 import com.anytypeio.anytype.core_models.multiplayer.SpaceSyncAndP2PStatusState
 import com.anytypeio.anytype.core_models.primitives.SpaceId
 import com.anytypeio.anytype.core_ui.extensions.setEmojiOrNull
-import com.anytypeio.anytype.core_utils.clipboard.copyPlainTextToClipboard
 import com.anytypeio.anytype.core_ui.features.dataview.ViewerGridAdapter
 import com.anytypeio.anytype.core_ui.features.dataview.ViewerGridHeaderAdapter
 import com.anytypeio.anytype.core_ui.menu.ObjectHeaderContextMenu
@@ -80,6 +77,7 @@ import com.anytypeio.anytype.core_ui.widgets.dv.ViewersWidget
 import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget
 import com.anytypeio.anytype.core_ui.widgets.toolbar.DataViewInfo
 import com.anytypeio.anytype.core_utils.OnSwipeListener
+import com.anytypeio.anytype.core_utils.clipboard.copyPlainTextToClipboard
 import com.anytypeio.anytype.core_utils.ext.arg
 import com.anytypeio.anytype.core_utils.ext.argOrNull
 import com.anytypeio.anytype.core_utils.ext.argString
@@ -90,6 +88,7 @@ import com.anytypeio.anytype.core_utils.ext.hideKeyboard
 import com.anytypeio.anytype.core_utils.ext.hideSoftInput
 import com.anytypeio.anytype.core_utils.ext.invisible
 import com.anytypeio.anytype.core_utils.ext.safeNavigate
+import com.anytypeio.anytype.core_utils.ext.smoothScrollToFirst
 import com.anytypeio.anytype.core_utils.ext.startMarketPageOrWeb
 import com.anytypeio.anytype.core_utils.ext.subscribe
 import com.anytypeio.anytype.core_utils.ext.syncFocusWithImeVisibility
@@ -103,7 +102,7 @@ import com.anytypeio.anytype.di.common.componentManager
 import com.anytypeio.anytype.di.feature.DefaultComponentParam
 import com.anytypeio.anytype.presentation.editor.cover.CoverColor
 import com.anytypeio.anytype.presentation.editor.cover.CoverGradient
-import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType.Relation.*
+import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType.Relation.SetQuery
 import com.anytypeio.anytype.presentation.relations.value.tagstatus.RelationContext
 import com.anytypeio.anytype.presentation.sets.DataViewViewState
 import com.anytypeio.anytype.presentation.sets.ObjectSetCommand
@@ -124,8 +123,8 @@ import com.anytypeio.anytype.ui.objects.creation.ObjectTypeSelectionFragment
 import com.anytypeio.anytype.ui.objects.types.pickers.DataViewSelectSourceFragment
 import com.anytypeio.anytype.ui.objects.types.pickers.EmptyDataViewSelectSourceFragment
 import com.anytypeio.anytype.ui.objects.types.pickers.ObjectSelectTypeFragment
-import com.anytypeio.anytype.ui.objects.types.pickers.OnDataViewSelectSourceAction
 import com.anytypeio.anytype.ui.objects.types.pickers.ObjectTypeSelectionListener
+import com.anytypeio.anytype.ui.objects.types.pickers.OnDataViewSelectSourceAction
 import com.anytypeio.anytype.ui.relations.RelationDateValueFragment
 import com.anytypeio.anytype.ui.relations.RelationDateValueFragment.DateValueEditReceiver
 import com.anytypeio.anytype.ui.relations.RelationTextValueFragment
@@ -140,7 +139,6 @@ import com.anytypeio.anytype.ui.templates.EditorTemplateFragment.Companion.ARG_T
 import com.anytypeio.anytype.ui.templates.EditorTemplateFragment.Companion.ARG_TARGET_TYPE_KEY
 import com.anytypeio.anytype.ui.templates.EditorTemplateFragment.Companion.ARG_TEMPLATE_ID
 import javax.inject.Inject
-import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
@@ -895,6 +893,31 @@ open class ObjectSetFragment :
         }
     }
 
+    private fun scrollToObject(objectId: Id) {
+        val viewer = when (val state = vm.currentViewer.value) {
+            is DataViewViewState.Collection.Default -> state.viewer
+            is DataViewViewState.Set.Default -> state.viewer
+            is DataViewViewState.TypeSet.Default -> state.viewer
+            else -> null
+        }
+        when (viewer) {
+            is Viewer.GridView -> {
+                rvRows.smoothScrollToFirst(viewer.rows) { it.id == objectId }
+            }
+
+            is Viewer.GalleryView -> {
+                binding.galleryView.smoothScrollToFirst(viewer.items) { it.objectId == objectId }
+            }
+
+            is Viewer.ListView -> {
+                binding.listView.smoothScrollToFirst(viewer.items) { it.objectId == objectId }
+            }
+
+            else -> { /* no scroll for unsupported views */
+            }
+        }
+    }
+
     private fun bindHeader(header: SetOrCollectionHeaderState.Default) {
         setupHeaderMargins(header)
 
@@ -1342,6 +1365,9 @@ open class ObjectSetFragment :
                     successToast = getString(R.string.link_copied)
                 )
             }
+            is ObjectSetCommand.ScrollToObject -> {
+                scrollToObject(command.objectId)
+            }
         }
     }
 

core-utils/src/main/java/com/anytypeio/anytype/core_utils/ext/AndroidExtension.kt

@@ -26,12 +26,10 @@ import android.util.TypedValue
 import android.util.TypedValue.COMPLEX_UNIT_DIP
 import android.view.TouchDelegate
 import android.view.View
-import android.view.ViewGroup
 import android.view.ViewTreeObserver
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
-import android.widget.TextView
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.annotation.DimenRes
 import androidx.annotation.IdRes
@@ -41,7 +39,6 @@ import androidx.core.graphics.BlendModeCompat
 import androidx.core.view.updateLayoutParams
 import androidx.fragment.app.Fragment
 import androidx.navigation.NavController
-import androidx.navigation.NavDirections
 import androidx.recyclerview.widget.RecyclerView
 import com.anytypeio.anytype.core_utils.const.FileConstants.REQUEST_FILE_SAF_CODE
 import com.anytypeio.anytype.core_utils.const.FileConstants.REQUEST_MEDIA_CODE
@@ -81,6 +78,22 @@ fun RecyclerView.ViewHolder.res(@StringRes res: Int): String {
     return itemView.context.resources.getString(res)
 }
 
+/**
+ * Scrolls to the first item matching the predicate.
+ * Uses [View.post] to ensure adapter updates complete before scrolling.
+ */
+fun <T> RecyclerView.smoothScrollToFirst(
+    items: List<T>,
+    predicate: (T) -> Boolean
+) {
+    val position = items.indexOfFirst(predicate)
+    if (position >= 0) {
+        post {
+            smoothScrollToPosition(position)
+        }
+    }
+}
+
 @Deprecated("Fix getColumnIndex() issue!")
 fun Uri.parsePath(context: Context): String {
 

presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetCommand.kt

@@ -130,4 +130,6 @@ sealed class ObjectSetCommand {
     data class Browse(val url: String) : ObjectSetCommand()
 
     data class CopyLinkToClipboard(val link: String) : ObjectSetCommand()
+
+    data class ScrollToObject(val objectId: Id) : ObjectSetCommand()
 }

presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ObjectSetViewModel.kt

@@ -243,6 +243,9 @@ class ObjectSetViewModel(
 
     private val selectedTypeFlow: MutableStateFlow<ObjectWrapper.Type?> = MutableStateFlow(null)
 
+
+    private val pendingScrollToObject = MutableStateFlow<Id?>(null)
+
     val navPanelState = permission.map { permission ->
         NavPanelState.fromPermission(
             permission = permission,
@@ -702,6 +705,10 @@ class ObjectSetViewModel(
             }.distinctUntilChanged().collect { viewState ->
                 Timber.d("subscribeToDataViewViewer, newViewerState:[$viewState]")
                 _currentViewer.value = viewState
+                pendingScrollToObject.value?.let { objectId ->
+                    pendingScrollToObject.value = null
+                    dispatch(ObjectSetCommand.ScrollToObject(objectId))
+                }
             }
         }
     }
@@ -1571,6 +1578,7 @@ class ObjectSetViewModel(
             onFailure = { Timber.e(it, "Error while creating new record") },
             onSuccess = { result ->
                 action?.invoke(result)
+                pendingScrollToObject.value = result.objectId
                 proceedWithNewDataViewObject(result)
                 sendAnalyticsObjectCreateEvent(
                     startTime = startTime,

presentation/src/main/java/com/anytypeio/anytype/presentation/sets/SearchRelationViewModel.kt

@@ -61,7 +61,7 @@ abstract class SearchRelationViewModel(
     /**
      * Fetches properties from the DataView's relationLinks and maps them to [SimpleRelationView].
      * After mapping, filters out relations that are:
-     * - Hidden (isHidden = true)
+     * - Hidden (isHidden = true), except for Name and Done which are always shown
      * - Of disallowed formats (RELATIONS, EMOJI, UNDEFINED)
      *
      * @see notAllowedRelations for filtering logic
@@ -98,7 +98,7 @@ abstract class SearchRelationViewModel(
 
     private fun notAllowedRelations(relation: SimpleRelationView): Boolean =
         notAllowedRelationFormats.contains(relation.format)
-                || (relation.isHidden)
+                || (relation.key != Relations.NAME && relation.key != Relations.DONE && relation.isHidden)
 
     fun onSearchQueryChanged(txt: String) {
         viewModelScope.launch { query.send(txt) }

presentation/src/test/java/com/anytypeio/anytype/presentation/sets/SearchRelationViewModelTest.kt

@@ -12,8 +12,10 @@ import com.anytypeio.anytype.domain.objects.DefaultStoreOfRelations
 import com.anytypeio.anytype.domain.objects.StoreOfRelations
 import com.anytypeio.anytype.presentation.MockRelationFactory.relationCustomNumber
 import com.anytypeio.anytype.presentation.MockRelationFactory.relationCustomText
+import com.anytypeio.anytype.presentation.MockRelationFactory.relationDone
 import com.anytypeio.anytype.presentation.MockRelationFactory.relationIconEmoji
 import com.anytypeio.anytype.presentation.MockRelationFactory.relationLastModifiedDate
+import com.anytypeio.anytype.presentation.MockRelationFactory.relationLayout
 import com.anytypeio.anytype.presentation.MockRelationFactory.relationName
 import com.anytypeio.anytype.presentation.MockRelationFactory.relationStatus
 import com.anytypeio.anytype.presentation.MockRelationFactory.relationTag
@@ -441,10 +443,13 @@ class SearchRelationViewModelTest {
 
     @ExperimentalTime
     @Test
-    fun `hidden relations are filtered out from results`() = runTest {
+    fun `hidden relations are filtered out from results except Name and Done`() = runTest {
         // SETUP - include both hidden and non-hidden relations
-        // relationName has isHidden=true, relationStatus has isHidden=false
-        val relations = listOf(relationName, relationStatus)
+        // relationName has isHidden=true but should appear (special case)
+        // relationDone has isHidden=true but should appear (special case)
+        // relationStatus has isHidden=false and should appear
+        // relationLayout has isHidden=true and should be filtered out
+        val relations = listOf(relationName, relationDone, relationStatus, relationLayout)
 
         val state = MutableStateFlow(
             MockObjectSetFactory.makeDefaultSetObjectState(
@@ -461,14 +466,18 @@ class SearchRelationViewModelTest {
 
         vm.onStart(viewerId = viewerId)
 
-        // TESTING - only non-hidden relations should appear
+        // TESTING - Name and Done should appear despite being hidden, but relationLayout should be filtered
         vm.views.test {
             delay(100)
             val result = awaitItem()
-            // Only relationStatus should appear (isHidden=false)
-            // relationName should be filtered out (isHidden=true)
-            assertEquals(1, result.size)
-            assertEquals("Status", result.first().title)
+            // Should have relationName, relationDone, and relationStatus
+            // relationLayout should be filtered out
+            assertEquals(3, result.size)
+            val titles = result.map { it.title }
+            assert(titles.contains("Name")) { "Name should be visible despite isHidden=true" }
+            assert(titles.contains("Done")) { "Done should be visible despite isHidden=true" }
+            assert(titles.contains("Status")) { "Status should be visible" }
+            assert(!titles.contains("Layout")) { "Layout should be filtered out (hidden, not special case)" }
             cancelAndConsumeRemainingEvents()
         }
     }