From b1cc69b8cb63a70613019ecf943de8f9ff611d16 Mon Sep 17 00:00:00 2001 From: Nadezhda-Gurova <84003815+Nadezhda-Gurova@users.noreply.github.com> Date: Mon, 16 Sep 2024 11:55:23 +0200 Subject: [PATCH] DROID-2817 Relations | Fix | Convert file sizes in Relation block to KB/MB (#1558) Co-authored-by: Konstantin Ivanov <54908981+konstantiniiv@users.noreply.github.com> --- .../holders/relations/RelationBlockViewHolder.kt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/relations/RelationBlockViewHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/relations/RelationBlockViewHolder.kt index c19fda4af9..f193416f85 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/relations/RelationBlockViewHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/relations/RelationBlockViewHolder.kt @@ -5,10 +5,9 @@ import android.view.ViewGroup import android.widget.FrameLayout import android.widget.TextView import androidx.core.view.updateLayoutParams -import androidx.core.view.updatePadding import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_models.Relation -import com.anytypeio.anytype.core_ui.BuildConfig +import com.anytypeio.anytype.core_models.Relations import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.databinding.ItemBlockRelationCheckboxBinding import com.anytypeio.anytype.core_ui.databinding.ItemBlockRelationDefaultBinding @@ -33,6 +32,7 @@ import com.anytypeio.anytype.core_ui.databinding.ItemBlockRelationDeletedBinding import com.anytypeio.anytype.core_ui.extensions.clearDrawable import com.anytypeio.anytype.core_ui.extensions.setDrawable import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil +import com.anytypeio.anytype.core_utils.ext.readableFileSize import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.relations.ObjectRelationView import com.anytypeio.anytype.presentation.sets.model.ObjectView @@ -169,8 +169,15 @@ sealed class RelationBlockViewHolder( override fun applyRelationValue(item: ObjectRelationView) { tvValue.apply { - text = item.value if (item is ObjectRelationView.Default) { + if (item.format == Relation.Format.NUMBER && + item.key == Relations.SIZE_IN_BYTES + ) { + val sizeInBytes = item.value?.toLongOrNull() ?: 0L + text = sizeInBytes.readableFileSize() + } else { + text = item.value + } when (item.format) { Relation.Format.SHORT_TEXT -> setHint(R.string.enter_text) Relation.Format.LONG_TEXT -> setHint(R.string.enter_text)