anyproto/anytype-kotlin
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00
Code Activity

DROID-1992 Tech | Objects details refactoring (#1997)

Browse source
This commit is contained in:
Konstantin Ivanov 2025-01-27 13:04:14 +01:00 • committed by GitHub
parent 6d37f78dd2
commit 524e15d26e
Signed by: github
GPG key ID: B5690EEEBB952194
116 changed files with 2197 additions and 2420 deletions
Download patch file Download diff file Expand all files Collapse all files

3
middleware/src/main/java/com/anytypeio/anytype/middleware/interactor/MiddlewareEventMapper.kt
View file

@ -5,6 +5,7 @@ import com.anytypeio.anytype.core_models.Event
import com.anytypeio.anytype.middleware.BuildConfig
import com.anytypeio.anytype.middleware.mappers.MWidgetLayout
import com.anytypeio.anytype.middleware.mappers.core
import com.anytypeio.anytype.middleware.mappers.toCoreFieldsModel
import com.anytypeio.anytype.middleware.mappers.toCoreModel
import com.anytypeio.anytype.middleware.mappers.toCoreModels
import com.anytypeio.anytype.middleware.mappers.toCoreModelsAlign
@ -118,7 +119,7 @@ fun anytype.Event.Message.toCoreModels(
Event.Command.UpdateFields(
context = context,
target = event.id,
fields = event.fields.toCoreModel()
fields = event.fields.toCoreFieldsModel()
)
}
blockSetFile != null -> {

10
middleware/src/main/java/com/anytypeio/anytype/middleware/mappers/ToCoreModelMappers.kt
View file

@ -89,11 +89,7 @@ fun MObjectView.toPayload(): Payload {
context = rootId,
root = rootId,
blocks = blocks.toCoreModels(),
details = Block.Details(
details.associate { details ->
details.id to details.details.toCoreModel()
}
),
details = details.associate { d -> d.id to d.details.orEmpty() },
objectRestrictions = restrictions?.object_?.map { it.toCoreModel() }.orEmpty(),
dataViewRestrictions = restrictions?.dataview?.map { it.toCoreModel() }.orEmpty()
)
@ -299,7 +295,9 @@ fun List<MBlock>.toCoreModels(): List<Block> = mapNotNull { block ->
}
}
fun Map<String, *>?.toCoreModel(): Block.Fields = Block.Fields(this?.toMap().orEmpty())
fun Map<String, *>?.toCoreFieldsModel(): Block.Fields = Block.Fields(this?.toMap().orEmpty())
fun Map<String, *>?.toCoreModel(): Map<String, Any?> = this?.toMap().orEmpty()
fun MBlock.toCoreModelsText(): Block.Content.Text {
val content = checkNotNull(text)

2
middleware/src/test/java/com/anytypeio/anytype/MiddlewareEventChannelTest.kt
View file

@ -276,7 +276,7 @@ class MiddlewareEventChannelTest {
val icon = Pair("icon", ":package:")
val name = Pair("name", "Document I")
val details = com.anytypeio.anytype.core_models.Block.Fields(map = mutableMapOf(icon, name))
val details = mutableMapOf(icon, name)
val msg = anytype.Event.Object.Details.Set(
id = id,