Skip to content

DROID-3641 Widgets | Fix | Fix view layout resolving #2387

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 2 commits into from
May 9, 2025
Merged

DROID-3641 Widgets | Fix | Fix view layout resolving #2387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7204069
DROID-3641 fixes
uburoiubu May 9, 2025
6c80d69
DROID-3641 fixes
uburoiubu May 9, 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: 2 additions & 2 deletions ...n/src/main/java/com/anytypeio/anytype/presentation/widgets/DataViewListWidgetContainer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ class DataViewListWidgetContainer(
)
)
if (params != null) {
if (target?.type == DVViewerType.GALLERY) {
if (widget is Widget.View && target?.type == DVViewerType.GALLERY) {
galleryWidgetSubscribe(
obj = obj,
activeView = view,
Expand Down Expand Up @@ -336,7 +336,7 @@ class DataViewListWidgetContainer(
tabs = emptyList(),
elements = emptyList(),
isExpanded = true,
isCompact = (widget as? Widget.List)?.isCompact ?: false,
isCompact = widget.isCompact,
name = when(val source = widget.source) {
is Widget.Source.Bundled -> WidgetView.Name.Bundled(source = source)
is Widget.Source.Default -> WidgetView.Name.Default(
Expand Down
4 changes: 4 additions & 0 deletions ...ion/src/main/java/com/anytypeio/anytype/presentation/widgets/SelectWidgetTypeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ class SelectWidgetTypeViewModel(
// If the layout is a data view, provide View and Link widgets
objectLayout?.isDataView() == true -> listOf(
WidgetTypeView.View(),
WidgetTypeView.CompactList(),
WidgetTypeView.List(),
WidgetTypeView.Link()
)

Expand Down Expand Up @@ -145,6 +147,8 @@ class SelectWidgetTypeViewModel(
// If the layout is a data view, provide View and Link widgets
objectLayout?.isDataView() == true -> listOf(
WidgetTypeView.View(isSelected = false),
WidgetTypeView.CompactList(),
WidgetTypeView.List(),
WidgetTypeView.Link(isSelected = false)
)

Expand Down
Loading