diff --git a/analytics/src/main/java/com/anytypeio/anytype/analytics/features/WidgetAnalytics.kt b/analytics/src/main/java/com/anytypeio/anytype/analytics/features/WidgetAnalytics.kt index 0ed55f50dc..03c4648a07 100644 --- a/analytics/src/main/java/com/anytypeio/anytype/analytics/features/WidgetAnalytics.kt +++ b/analytics/src/main/java/com/anytypeio/anytype/analytics/features/WidgetAnalytics.kt @@ -22,6 +22,7 @@ object WidgetAnalytics { const val WIDGET_LAYOUT_LIST = "List" const val WIDGET_LAYOUT_COMPACT_LIST = "CompactList" const val WIDGET_LAYOUT_LINK = "Link" + const val WIDGET_LAYOUT_VIEW = "View" const val WIDGET_SOURCE_FAVORITES = "Favorites" const val WIDGET_SOURCE_RECENT = "Recent" diff --git a/core-models/src/main/java/com/anytypeio/anytype/core_models/Block.kt b/core-models/src/main/java/com/anytypeio/anytype/core_models/Block.kt index 85dcc2adca..9b5565c7e9 100644 --- a/core-models/src/main/java/com/anytypeio/anytype/core_models/Block.kt +++ b/core-models/src/main/java/com/anytypeio/anytype/core_models/Block.kt @@ -379,7 +379,7 @@ data class Block( val activeView: Id? = null ) : Content() { enum class Layout { - TREE, LINK, LIST, COMPACT_LIST + TREE, LINK, LIST, COMPACT_LIST, VIEW } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c51ca53ca9..3b812d4011 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -middlewareVersion = "v0.34.1" +middlewareVersion = "v0.34.2" kotlinVersion = '1.9.22' androidxCoreVersion = "1.13.0" diff --git a/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToCoreModelMappers.kt b/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToCoreModelMappers.kt index 8b191346cc..4fe4f641ef 100644 --- a/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToCoreModelMappers.kt +++ b/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToCoreModelMappers.kt @@ -427,6 +427,7 @@ fun MBlock.toCoreWidget(): Block.Content.Widget { MWidgetLayout.Tree -> Block.Content.Widget.Layout.TREE MWidgetLayout.List -> Block.Content.Widget.Layout.LIST MWidgetLayout.CompactList -> Block.Content.Widget.Layout.COMPACT_LIST + MWidgetLayout.View -> Block.Content.Widget.Layout.VIEW }, limit = content.limit, activeView = content.viewId.ifEmpty { null } diff --git a/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToMiddlewareModelMappers.kt b/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToMiddlewareModelMappers.kt index 4440b80a9e..59e7528b0e 100644 --- a/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToMiddlewareModelMappers.kt +++ b/middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToMiddlewareModelMappers.kt @@ -508,6 +508,7 @@ fun Block.Content.Widget.Layout.mw() : MWidgetLayout = when(this) { Block.Content.Widget.Layout.LINK -> MWidgetLayout.Link Block.Content.Widget.Layout.LIST -> MWidgetLayout.List Block.Content.Widget.Layout.COMPACT_LIST -> MWidgetLayout.CompactList + Block.Content.Widget.Layout.VIEW -> MWidgetLayout.View } fun NetworkMode.toMiddlewareModel(): MNetworkMode = when (this) { diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/extension/AnalyticsExt.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/extension/AnalyticsExt.kt index ef6cfbc071..635ed5211a 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/extension/AnalyticsExt.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/extension/AnalyticsExt.kt @@ -1488,6 +1488,9 @@ fun CoroutineScope.sendChangeWidgetLayoutEvent( Block.Content.Widget.Layout.COMPACT_LIST -> { put(WidgetAnalytics.LAYOUT, WidgetAnalytics.WIDGET_LAYOUT_COMPACT_LIST) } + Block.Content.Widget.Layout.VIEW -> { + put(WidgetAnalytics.LAYOUT, WidgetAnalytics.WIDGET_LAYOUT_VIEW) + } } if (isInEditMode) put(WidgetAnalytics.CONTEXT, WidgetAnalytics.CONTEXT_EDITOR) diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/Widget.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/Widget.kt index 641fa9e301..222f7a095f 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/Widget.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/widgets/Widget.kt @@ -162,6 +162,10 @@ fun List.parseWidgets( ) ) } + + Block.Content.Widget.Layout.VIEW -> { + + } } } } diff --git a/protocol/src/main/proto/models.proto b/protocol/src/main/proto/models.proto index 806cd6691f..83100e325d 100644 --- a/protocol/src/main/proto/models.proto +++ b/protocol/src/main/proto/models.proto @@ -568,6 +568,7 @@ message Block { Tree = 1; List = 2; CompactList = 3; + View = 4; } } }