Skip to content

DROID-4166 Widgets | Fix | Fix "See all" button to navigate to the currently active view #2911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 24, 2025
Merged

DROID-4166 Widgets | Fix | Fix "See all" button to navigate to the currently active view #2911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ec164c
DROID-4166 fixes
uburoiubu Nov 24, 2025
630d21c
DROID-4166 fixes
uburoiubu Nov 24, 2025
517367c
DROID-4166 fixes
uburoiubu Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/src/main/java/com/anytypeio/anytype/ui/home/WidgetSection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ fun LazyListScope.renderWidgetSection(
onWidgetMenuAction: (WidgetId, DropDownMenuAction) -> Unit,
onWidgetElementClicked: (WidgetId, ObjectWrapper.Basic) -> Unit,
onWidgetSourceClicked: (WidgetId) -> Unit,
onSeeAllClicked: (WidgetId, ViewId?) -> Unit,
onWidgetMenuTriggered: (WidgetId) -> Unit,
onToggleExpandedWidgetState: (WidgetId) -> Unit,
onChangeWidgetView: (WidgetId, ViewId) -> Unit,
Expand Down Expand Up @@ -249,6 +250,7 @@ fun LazyListScope.renderWidgetSection(
onWidgetElementClicked(item.id, obj)
},
onWidgetSourceClicked = onWidgetSourceClicked,
onSeeAllClicked = onSeeAllClicked,
onWidgetMenuTriggered = onWidgetMenuTriggered,
onDropDownMenuAction = { action ->
onWidgetMenuAction(item.id, action)
Expand Down Expand Up @@ -311,6 +313,7 @@ fun LazyListScope.renderWidgetSection(
onWidgetElementClicked(item.id, obj)
},
onWidgetSourceClicked = onWidgetSourceClicked,
onSeeAllClicked = onSeeAllClicked,
onWidgetMenuTriggered = onWidgetMenuTriggered,
onDropDownMenuAction = { action ->
onWidgetMenuAction(item.id, action)
Expand Down Expand Up @@ -373,6 +376,7 @@ fun LazyListScope.renderWidgetSection(
onWidgetElementClicked(item.id, obj)
},
onWidgetSourceClicked = onWidgetSourceClicked,
onSeeAllClicked = onSeeAllClicked,
onWidgetMenuTriggered = onWidgetMenuTriggered,
onDropDownMenuAction = { action ->
onWidgetMenuAction(item.id, action)
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/anytypeio/anytype/ui/home/WidgetsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ fun WidgetsScreen(
},
onWidgetElementClicked = viewModel::onWidgetElementClicked,
onWidgetSourceClicked = viewModel::onWidgetSourceClicked,
onSeeAllClicked = viewModel::onSeeAllClicked,
onWidgetMenuTriggered = viewModel::onWidgetMenuTriggered,
onToggleExpandedWidgetState = viewModel::onToggleWidgetExpandedState,
onChangeWidgetView = viewModel::onChangeCurrentWidgetView,
Expand Down Expand Up @@ -215,6 +216,7 @@ fun WidgetsScreen(
},
onWidgetElementClicked = viewModel::onWidgetElementClicked,
onWidgetSourceClicked = viewModel::onWidgetSourceClicked,
onSeeAllClicked = viewModel::onSeeAllClicked,
onWidgetMenuTriggered = viewModel::onWidgetMenuTriggered,
onToggleExpandedWidgetState = viewModel::onToggleWidgetExpandedState,
onChangeWidgetView = viewModel::onChangeCurrentWidgetView,
Expand Down
20 changes: 17 additions & 3 deletions app/src/main/java/com/anytypeio/anytype/ui/widgets/types/DataViewWidget.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ fun DataViewListWidgetCard(
mode: InteractionMode,
onWidgetObjectClicked: (ObjectWrapper.Basic) -> Unit,
onWidgetSourceClicked: (WidgetId) -> Unit,
onSeeAllClicked: (WidgetId, ViewId?) -> Unit,
onWidgetMenuTriggered: (WidgetId) -> Unit,
onDropDownMenuAction: (DropDownMenuAction) -> Unit,
onChangeWidgetView: (WidgetId, ViewId) -> Unit,
Expand Down Expand Up @@ -153,8 +154,9 @@ fun DataViewListWidgetCard(
}
}
if (item.hasMore && item.isExpanded) {
val activeViewId = item.tabs.firstOrNull { it.isSelected }?.id
SeeAllButton(
onClick = { onWidgetSourceClicked(item.id) }
onClick = { onSeeAllClicked(item.id, activeViewId) }
)
}
} else {
Expand All @@ -179,6 +181,7 @@ fun ChatListWidgetCard(
mode: InteractionMode,
onWidgetObjectClicked: (ObjectWrapper.Basic) -> Unit,
onWidgetSourceClicked: (WidgetId) -> Unit,
onSeeAllClicked: (WidgetId, ViewId?) -> Unit,
onWidgetMenuTriggered: (WidgetId) -> Unit,
onDropDownMenuAction: (DropDownMenuAction) -> Unit,
onChangeWidgetView: (WidgetId, ViewId) -> Unit,
Expand Down Expand Up @@ -285,8 +288,9 @@ fun ChatListWidgetCard(
}
}
if (item.hasMore && item.isExpanded) {
val activeViewId = item.tabs.firstOrNull { it.isSelected }?.id
SeeAllButton(
onClick = { onWidgetSourceClicked(item.id) }
onClick = { onSeeAllClicked(item.id, activeViewId) }
)
}
} else {
Expand All @@ -311,6 +315,7 @@ fun GalleryWidgetCard(
mode: InteractionMode,
onWidgetObjectClicked: (ObjectWrapper.Basic) -> Unit,
onWidgetSourceClicked: (WidgetId) -> Unit,
onSeeAllClicked: (WidgetId, ViewId?) -> Unit,
onWidgetMenuTriggered: (WidgetId) -> Unit,
onDropDownMenuAction: (DropDownMenuAction) -> Unit,
onChangeWidgetView: (WidgetId, ViewId) -> Unit,
Expand Down Expand Up @@ -391,7 +396,8 @@ fun GalleryWidgetCard(
)
.clip(RoundedCornerShape(8.dp))
.clickable {
onWidgetSourceClicked(item.id)
val activeViewId = item.tabs.firstOrNull { it.isSelected }?.id
onSeeAllClicked(item.id, activeViewId)
}
) {
Text(
Expand Down Expand Up @@ -1031,6 +1037,7 @@ fun DataViewListWidgetCard_Standard_Preview() {
mode = InteractionMode.Default,
onWidgetObjectClicked = {},
onWidgetSourceClicked = {},
onSeeAllClicked = { _, _ -> },
onWidgetMenuTriggered = {},
onDropDownMenuAction = {},
onChangeWidgetView = { _, _ -> },
Expand Down Expand Up @@ -1081,6 +1088,7 @@ fun DataViewListWidgetCard_Compact_Preview() {
mode = InteractionMode.Default,
onWidgetObjectClicked = {},
onWidgetSourceClicked = {},
onSeeAllClicked = { _, _ -> },
onWidgetMenuTriggered = {},
onDropDownMenuAction = {},
onChangeWidgetView = { _, _ -> },
Expand Down Expand Up @@ -1110,6 +1118,7 @@ fun DataViewListWidgetCard_Loading_Preview() {
mode = InteractionMode.Default,
onWidgetObjectClicked = {},
onWidgetSourceClicked = {},
onSeeAllClicked = { _, _ -> },
onWidgetMenuTriggered = {},
onDropDownMenuAction = {},
onChangeWidgetView = { _, _ -> },
Expand Down Expand Up @@ -1139,6 +1148,7 @@ fun DataViewListWidgetCard_Empty_Preview() {
mode = InteractionMode.Default,
onWidgetObjectClicked = {},
onWidgetSourceClicked = {},
onSeeAllClicked = { _, _ -> },
onWidgetMenuTriggered = {},
onDropDownMenuAction = {},
onChangeWidgetView = { _, _ -> },
Expand Down Expand Up @@ -1174,6 +1184,7 @@ fun DataViewListWidgetCard_Collapsed_Preview() {
mode = InteractionMode.Default,
onWidgetObjectClicked = {},
onWidgetSourceClicked = {},
onSeeAllClicked = { _, _ -> },
onWidgetMenuTriggered = {},
onDropDownMenuAction = {},
onChangeWidgetView = { _, _ -> },
Expand Down Expand Up @@ -1236,6 +1247,7 @@ fun DataViewListWidgetCard_WithTabs_Preview() {
mode = InteractionMode.Default,
onWidgetObjectClicked = {},
onWidgetSourceClicked = {},
onSeeAllClicked = { _, _ -> },
onWidgetMenuTriggered = {},
onDropDownMenuAction = {},
onChangeWidgetView = { _, _ -> },
Expand Down Expand Up @@ -1276,6 +1288,7 @@ fun DataViewListWidgetCard_EditMode_Preview() {
mode = InteractionMode.Edit,
onWidgetObjectClicked = {},
onWidgetSourceClicked = {},
onSeeAllClicked = { _, _ -> },
onWidgetMenuTriggered = {},
onDropDownMenuAction = {},
onChangeWidgetView = { _, _ -> },
Expand Down Expand Up @@ -1319,6 +1332,7 @@ fun DataViewListWidgetCard_Favorites_Preview() {
mode = InteractionMode.Default,
onWidgetObjectClicked = {},
onWidgetSourceClicked = {},
onSeeAllClicked = { _, _ -> },
onWidgetMenuTriggered = {},
onDropDownMenuAction = {},
onChangeWidgetView = { _, _ -> },
Expand Down
36 changes: 36 additions & 0 deletions presentation/src/main/java/com/anytypeio/anytype/presentation/home/HomeScreenViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1283,6 +1283,42 @@ class HomeScreenViewModel(
}
}

fun onSeeAllClicked(widgetId: Id, viewId: ViewId?) {
Timber.d("onSeeAllClicked: widgetId=$widgetId, viewId=$viewId")
val widget = currentWidgets?.find { it.id == widgetId } ?: return
val source = widget.source

if (source is Widget.Source.Default) {
if (source.obj.isArchived != true) {
dispatchSelectHomeTabCustomSourceEvent(
widget = widgetId,
source = source
)
// Check if it's a Set or Collection layout and we have a viewId
val layout = source.obj.layout
if ((layout == ObjectType.Layout.SET || layout == ObjectType.Layout.COLLECTION) && viewId != null) {
viewModelScope.launch {
navigate(
Navigation.OpenSet(
ctx = source.obj.id,
space = vmParams.spaceId.id,
view = viewId
)
)
}
} else {
// Fall back to standard navigation without view
proceedWithOpeningObject(source.obj)
}
} else {
sendToast("Open bin to restore your archived object")
}
} else {
// For non-default sources, delegate to standard handler
onWidgetSourceClicked(widgetId)
}
}

fun onBinWidgetClicked() {
viewModelScope.launch {
navigation(
Expand Down