diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/dv/ListViewItemRelationGroupWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/dv/ListViewItemRelationGroupWidget.kt index b3fa88ea69..360b082172 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/dv/ListViewItemRelationGroupWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/dv/ListViewItemRelationGroupWidget.kt @@ -50,7 +50,7 @@ class ListViewItemRelationGroupWidget @JvmOverloads constructor( is DefaultObjectRelationValueView.Checkbox -> { val view = View(context).apply { id = generateViewId() - val size = context.dimen(R.dimen.dp_16).toInt() + val size = context.dimen(R.dimen.dv_list_gallery_item_relation_height).toInt() layoutParams = LayoutParams(size, size) setBackgroundResource(R.drawable.ic_relation_checkbox_selector) isSelected = relation.isChecked diff --git a/core-ui/src/main/res/drawable/rect_dv_cell_tag_item.xml b/core-ui/src/main/res/drawable/rect_dv_cell_tag_item.xml index 337dda41d7..8342fe3f13 100644 --- a/core-ui/src/main/res/drawable/rect_dv_cell_tag_item.xml +++ b/core-ui/src/main/res/drawable/rect_dv_cell_tag_item.xml @@ -6,6 +6,6 @@ android:color="#DFDDD0" /> - + \ No newline at end of file diff --git a/core-ui/src/main/res/layout/widget_dv_list_view_relation_object.xml b/core-ui/src/main/res/layout/widget_dv_list_view_relation_object.xml index a2207aba12..baae5568d8 100644 --- a/core-ui/src/main/res/layout/widget_dv_list_view_relation_object.xml +++ b/core-ui/src/main/res/layout/widget_dv_list_view_relation_object.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="@dimen/dv_list_gallery_item_relation_height" android:orientation="horizontal"> @@ -24,9 +25,10 @@ android:id="@+id/tvCount" android:textColor="@color/text_secondary" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="6dp" + android:layout_height="match_parent" + android:layout_marginStart="@dimen/dv_list_gallery_item_relation_count_margin_start" android:background="@drawable/bg_dv_list_item_object_count" + android:gravity="center_vertical" android:maxLines="1" android:paddingStart="4dp" android:paddingEnd="4dp" diff --git a/core-ui/src/main/res/values/dimens.xml b/core-ui/src/main/res/values/dimens.xml index a8ee06a1ce..88485dd07a 100644 --- a/core-ui/src/main/res/values/dimens.xml +++ b/core-ui/src/main/res/values/dimens.xml @@ -327,4 +327,8 @@ 16dp 4dp + + 15dp + 4dp + \ No newline at end of file diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectWrapperExtensions.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectWrapperExtensions.kt index 1ca0ea357a..8dabd9e65e 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectWrapperExtensions.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/objects/ObjectWrapperExtensions.kt @@ -23,7 +23,6 @@ import timber.log.Timber suspend fun ObjectWrapper.Basic.values( relations: List, settings: List, - details: Map, urlBuilder: UrlBuilder, storeOfObjects: ObjectStore ): List { @@ -135,7 +134,10 @@ suspend fun ObjectWrapper.Basic.values( val value = DefaultObjectRelationValueView.File( objectId = id, relationKey = relation.key, - files = files(relation = relation.key, details = details) + files = files( + relation = relation.key, + storeOfObjects = storeOfObjects + ) ) values.add(value) } @@ -145,8 +147,8 @@ suspend fun ObjectWrapper.Basic.values( relationKey = relation.key, objects = objects( relation = relation.key, - details = details, - urlBuilder = urlBuilder + urlBuilder = urlBuilder, + storeOfObjects = storeOfObjects ) ) values.add(value) @@ -163,14 +165,12 @@ suspend fun ObjectWrapper.Basic.values( suspend fun ObjectWrapper.Basic.relationsFilteredByHiddenAndDescription( relations: List, settings: List, - details: Map, urlBuilder: UrlBuilder, storeOfObjects: ObjectStore ): List { return values( relations = relations.filter { it.isHidden != true && it.key != Relations.DESCRIPTION }, settings = settings, - details = details, urlBuilder = urlBuilder, storeOfObjects = storeOfObjects ) @@ -226,9 +226,9 @@ suspend fun ObjectWrapper.Basic.tags( return result } -fun ObjectWrapper.Basic.files( +suspend fun ObjectWrapper.Basic.files( relation: Id, - details: Map + storeOfObjects: ObjectStore ) : List { val result = mutableListOf() val ids : List = when(val value = map.getOrDefault(relation, null)) { @@ -237,9 +237,8 @@ fun ObjectWrapper.Basic.files( else -> emptyList() } ids.forEach { id -> - val data = details[id] - if (data != null) { - val obj = ObjectWrapper.Basic(data.map) + val obj = storeOfObjects.get(id) + if (obj != null) { result.add( FileView( id = obj.id, @@ -255,10 +254,10 @@ fun ObjectWrapper.Basic.files( return result } -fun ObjectWrapper.Basic.objects( +suspend fun ObjectWrapper.Basic.objects( relation: Id, - details: Map, - urlBuilder: UrlBuilder + urlBuilder: UrlBuilder, + storeOfObjects: ObjectStore ) : List { val result = mutableListOf() @@ -267,9 +266,8 @@ fun ObjectWrapper.Basic.objects( is List<*> -> value.typeOf() else -> emptyList() } - ids.forEach { id -> - val wrapper = ObjectWrapper.Basic(details[id]?.map ?: return@forEach) + val wrapper = storeOfObjects.get(id) ?: return@forEach result.add(wrapper.toObjectView(urlBuilder)) } return result diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectSetRenderMapper.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectSetRenderMapper.kt index 07f6e66783..66064223d3 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectSetRenderMapper.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/relations/ObjectSetRenderMapper.kt @@ -116,7 +116,6 @@ suspend fun DVViewer.render( id = id, items = buildListViews( objects = objects, - details = details, relations = visibleRelations, urlBuilder = builder, store = store, diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/GalleryViewMapper.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/GalleryViewMapper.kt index bfa1b759c9..62d3408fcd 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/GalleryViewMapper.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/GalleryViewMapper.kt @@ -89,7 +89,6 @@ private suspend fun ObjectWrapper.Basic.mapToDefaultItem( relations = obj.values( relations = filteredRelations, urlBuilder = urlBuilder, - details = details, settings = viewerRelations, storeOfObjects = store ), @@ -162,7 +161,6 @@ private suspend fun ObjectWrapper.Basic.mapToCoverItem( relations = obj.values( relations = filteredRelations, urlBuilder = urlBuilder, - details = details, settings = dvViewer.viewerRelations, storeOfObjects = store ), diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ListViewMapper.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ListViewMapper.kt index 74494f3afe..7dd1d707a7 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ListViewMapper.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/sets/ListViewMapper.kt @@ -16,7 +16,6 @@ import com.anytypeio.anytype.presentation.sets.model.Viewer suspend fun DVViewer.buildListViews( objects: List, relations: List, - details: Map, urlBuilder: UrlBuilder, store: ObjectStore, objectOrderIds: List @@ -44,7 +43,6 @@ suspend fun DVViewer.buildListViews( relations = obj.relationsFilteredByHiddenAndDescription( relations = relations, urlBuilder = urlBuilder, - details = details, settings = viewerRelations, storeOfObjects = store ), @@ -69,7 +67,6 @@ suspend fun DVViewer.buildListViews( relations = obj.relationsFilteredByHiddenAndDescription( relations = relations, urlBuilder = urlBuilder, - details = details, settings = viewerRelations, storeOfObjects = store ), @@ -94,7 +91,6 @@ suspend fun DVViewer.buildListViews( relations = obj.relationsFilteredByHiddenAndDescription( relations = relations, urlBuilder = urlBuilder, - details = details, settings = viewerRelations, storeOfObjects = store ),