From 31e4703ad6f814b5d352cf077613d41a776f8502 Mon Sep 17 00:00:00 2001 From: Konstantin Ivanov <54908981+konstantiniiv@users.noreply.github.com> Date: Wed, 3 Jul 2024 21:21:55 +0200 Subject: [PATCH] DROID-2206 Sets | Display filters for relations with the File format. (#1349) --- .../anytype/ui/sets/ViewerFilterFragment.kt | 1 + .../modals/search/SearchRelationFragment.kt | 9 +- .../fragment_create_or_update_filter.xml | 4 +- ...tion_create_from_scratch_format_picker.xml | 1 - .../dataview/modals/FilterObjectViewHolder.kt | 51 ++++++----- .../dataview/modals/FilterStatusViewHolder.kt | 5 +- .../dataview/modals/FilterTagViewHolder.kt | 76 ++++++++-------- .../core_ui/widgets/ObjectIconTextWidget.kt | 58 ------------- .../widgets/RelationValueListWidget.kt | 4 +- .../drawable/bg_relation_values_number.xml | 2 +- .../main/res/drawable/divider_filter_list.xml | 2 +- .../src/main/res/drawable/ic_tag_selected.xml | 2 +- .../layout/item_dv_viewer_filter_checkbox.xml | 3 +- .../res/layout/item_dv_viewer_filter_date.xml | 3 +- .../layout/item_dv_viewer_filter_number.xml | 3 +- .../layout/item_dv_viewer_filter_object.xml | 87 ++++++++++--------- .../layout/item_dv_viewer_filter_status.xml | 3 +- .../res/layout/item_dv_viewer_filter_tag.xml | 44 ++++++++-- .../item_dv_viewer_filter_tag_value.xml | 32 ------- .../res/layout/item_dv_viewer_filter_text.xml | 3 +- .../res/layout/widget_object_icon_text.xml | 31 ------- core-ui/src/main/res/values-night/colors.xml | 2 + core-ui/src/main/res/values/colors.xml | 2 + core-ui/src/main/res/values/dimens.xml | 2 +- core-ui/src/main/res/values/styles.xml | 6 ++ localization/src/main/res/values/strings.xml | 2 +- .../editor/render/DefaultBlockViewRenderer.kt | 4 +- .../extension/FilterConditionExtension.kt | 3 +- .../presentation/extension/FilterExtension.kt | 3 +- .../objects/ObjectWrapperMapper.kt | 2 +- .../relations/ObjectSetRenderMapper.kt | 59 +++++++++---- .../relations/RelationExtensions.kt | 16 ++-- .../search/ObjectSearchConstants.kt | 38 ++++++++ .../presentation/sets/ObjectSetExtension.kt | 2 +- .../sets/SearchRelationViewModel.kt | 2 +- .../sets/SelectFilterRelationViewModel.kt | 5 ++ .../sets/filter/CreateFilterFlowViewModel.kt | 2 + .../sets/filter/FilterViewModel.kt | 47 +++++++++- .../sets/filter/ViewerFilterViewModel.kt | 39 +++++---- 39 files changed, 360 insertions(+), 300 deletions(-) delete mode 100644 core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectIconTextWidget.kt delete mode 100644 core-ui/src/main/res/layout/widget_object_icon_text.xml diff --git a/app/src/main/java/com/anytypeio/anytype/ui/sets/ViewerFilterFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/sets/ViewerFilterFragment.kt index 16762d2543..19f5c4749e 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/sets/ViewerFilterFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/sets/ViewerFilterFragment.kt @@ -49,6 +49,7 @@ open class ViewerFilterFragment : BaseBottomSheetFragment override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + expand() binding.recycler.layoutManager = LinearLayoutManager(requireContext()) binding.recycler.adapter = filterAdapter with(lifecycleScope) { diff --git a/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/search/SearchRelationFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/search/SearchRelationFragment.kt index 77c600d16e..5bbe9b346c 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/search/SearchRelationFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/search/SearchRelationFragment.kt @@ -16,13 +16,13 @@ import com.anytypeio.anytype.core_utils.ext.drawable import com.anytypeio.anytype.core_utils.ext.invisible import com.anytypeio.anytype.core_utils.ext.subscribe import com.anytypeio.anytype.core_utils.ext.visible -import com.anytypeio.anytype.core_utils.ui.BaseBottomSheetTextInputFragment +import com.anytypeio.anytype.core_utils.ui.BaseBottomSheetFragment import com.anytypeio.anytype.databinding.FragmentSelectSortOrFilterRelationBinding import com.anytypeio.anytype.presentation.sets.SearchRelationViewModel import com.anytypeio.anytype.presentation.sets.model.SimpleRelationView abstract class SearchRelationFragment : - BaseBottomSheetTextInputFragment() { + BaseBottomSheetFragment() { abstract val ctx: String abstract val vm: SearchRelationViewModel @@ -32,7 +32,7 @@ abstract class SearchRelationFragment : SearchRelationAdapter { relation -> onRelationClicked(ctx = ctx, relation = relation) } } - override val textInput: EditText get() = binding.searchBar.root.findViewById(R.id.filterInputField) + val textInput: EditText get() = binding.searchBar.root.findViewById(R.id.filterInputField) lateinit var searchRelationInput: EditText lateinit var clearSearchText: View @@ -41,6 +41,8 @@ abstract class SearchRelationFragment : override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + setFullHeightSheet() + skipCollapsed() searchRelationInput = binding.searchBar.root.findViewById(R.id.filterInputField) searchRelationInput.apply { hint = getString(R.string.choose_relation_to_filter) @@ -74,6 +76,7 @@ abstract class SearchRelationFragment : override fun onStart() { super.onStart() + expand() vm.onStart(viewerId = viewer) } diff --git a/app/src/main/res/layout/fragment_create_or_update_filter.xml b/app/src/main/res/layout/fragment_create_or_update_filter.xml index eef6d53c38..4dad55c4b5 100644 --- a/app/src/main/res/layout/fragment_create_or_update_filter.xml +++ b/app/src/main/res/layout/fragment_create_or_update_filter.xml @@ -1,5 +1,4 @@ - diff --git a/app/src/main/res/layout/fragment_relation_create_from_scratch_format_picker.xml b/app/src/main/res/layout/fragment_relation_create_from_scratch_format_picker.xml index 8fc8bd103f..4ad75476d5 100644 --- a/app/src/main/res/layout/fragment_relation_create_from_scratch_format_picker.xml +++ b/app/src/main/res/layout/fragment_relation_create_from_scratch_format_picker.xml @@ -1,5 +1,4 @@ - if (objectView is ObjectView.Default) { - when (index) { - in 0..MAX_VISIBLE_OBJECTS_INDEX -> { - getViewByIndex(index)?.let { view -> - view.visible() - view.setup( - name = objectView.name, - icon = objectView.icon - ) + if (index == 0) { + objectName.text = objectView.name.ifBlank { + context.resources.getString(R.string.untitled) + } + when (objectView.icon) { + ObjectIcon.None -> objectIcon.gone() + else -> { + objectIcon.visible() + objectIcon.setIcon(objectView.icon) } } } } } - } else { - for (i in 0..MAX_VISIBLE_OBJECTS_INDEX) getViewByIndex(i)?.apply { - this.setup(name = null, icon = ObjectIcon.None) + val valuesSize = item.filterValue.value.size + + if (valuesSize > MAX_ITEMS) { + number.visible() + number.text = "+${valuesSize - MAX_ITEMS}" + } else { + number.gone() } + } else { + objectIcon.gone() + number.gone() + objectName.text = null } } - private fun getViewByIndex(index: Int): ObjectIconTextWidget? = when (index) { - 0 -> binding.object0 - 1 -> binding.object1 - 2 -> binding.object2 - else -> null - } - companion object { - const val MAX_VISIBLE_OBJECTS_INDEX = 2 + private const val MAX_ITEMS = 1 } } \ No newline at end of file diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/modals/FilterStatusViewHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/modals/FilterStatusViewHolder.kt index 5912957460..74101f8ad2 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/modals/FilterStatusViewHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/modals/FilterStatusViewHolder.kt @@ -38,6 +38,9 @@ class FilterStatusViewHolder(val binding: ItemDvViewerFilterStatusBinding) : if (status != null) { binding.tvValue.text = status.status setTextColor(binding.tvValue, status.color) + } else { + binding.tvValue.text = null + binding.tvValue.invisible() } } else { binding.tvValue.text = null @@ -47,7 +50,7 @@ class FilterStatusViewHolder(val binding: ItemDvViewerFilterStatusBinding) : private fun setTextColor(view: TextView, color: String) { val defaultColor = view.context.color(R.color.default_filter_tag_text_color) - val value = ThemeColor.values().find { value -> value.code == color } + val value = ThemeColor.entries.find { value -> value.code == color } if (value == null) { Timber.w("Could not find value for text color: $color") } diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/modals/FilterTagViewHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/modals/FilterTagViewHolder.kt index 606e5d191c..ad9e62a953 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/modals/FilterTagViewHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/modals/FilterTagViewHolder.kt @@ -1,24 +1,21 @@ package com.anytypeio.anytype.core_ui.features.dataview.modals -import android.content.res.ColorStateList import android.widget.ImageView import android.widget.TextView import com.anytypeio.anytype.core_models.ThemeColor import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.databinding.ItemDvViewerFilterTagBinding -import com.anytypeio.anytype.core_ui.extensions.color import com.anytypeio.anytype.core_ui.extensions.dark import com.anytypeio.anytype.core_ui.extensions.light import com.anytypeio.anytype.core_ui.widgets.RelationFormatIconWidget import com.anytypeio.anytype.core_utils.ext.gone -import com.anytypeio.anytype.core_utils.ext.invisible +import com.anytypeio.anytype.core_utils.ext.setDrawableColor import com.anytypeio.anytype.core_utils.ext.visible import com.anytypeio.anytype.presentation.extension.hasValue import com.anytypeio.anytype.presentation.sets.model.FilterView -import com.anytypeio.anytype.presentation.sets.model.TagView -import com.google.android.material.chip.Chip -class FilterTagViewHolder(val binding: ItemDvViewerFilterTagBinding) : FilterViewHolder(binding.root) { +class FilterTagViewHolder(val binding: ItemDvViewerFilterTagBinding) : + FilterViewHolder(binding.root) { override val textTitle: TextView get() = binding.tvTitle override val textCondition: TextView get() = binding.tvCondition @@ -26,10 +23,8 @@ class FilterTagViewHolder(val binding: ItemDvViewerFilterTagBinding) : FilterVie override val iconArrow: ImageView get() = binding.iconArrow override val iconRemove: ImageView get() = binding.iconRemoveTag - private val chip1 = binding.tvValue.chip1 - private val chip2 = binding.tvValue.chip2 - private val chipDots = binding.tvValue.chipDots - private val chips = listOf(chip1, chip2, chipDots) + private val tagView = binding.tag + private val numberView: TextView get() = binding.number fun bind( item: FilterView.Expression.Tag @@ -40,40 +35,45 @@ class FilterTagViewHolder(val binding: ItemDvViewerFilterTagBinding) : FilterVie condition = item.condition.title, format = item.format ) - chips.forEach { it.gone() } if (item.condition.hasValue()) { - item.filterValue.value.forEachIndexed { index, s -> - when (index) { - 0 -> bindChip(chip1, s) - 1 -> bindChip(chip2, s) - 2 -> chipDots.visible() - } + val valuesSize = item.filterValue.value.size + if (item.filterValue.value.isNotEmpty()) { + val tag = item.filterValue.value.first() + val color = ThemeColor.entries.find { it.code == tag.color } + setupTag(tagView, color, tag.tag) + } else { + tagView.gone() + } + if (valuesSize > MAX_ITEMS) { + numberView.visible() + numberView.text = "+${valuesSize - MAX_ITEMS}" + } else { + numberView.gone() } } else { - bindChip(chip1, null) - bindChip(chip2, null) - chipDots.invisible() + tagView.gone() + numberView.gone() } } - private fun bindChip(chip: Chip, value: TagView?) { - with(chip) { - val defaultTextColor = itemView.resources.getColor(R.color.text_primary, null) - val defaultBackground = itemView.resources.getColor(R.color.shape_primary, null) - val color = ThemeColor.values().find { v -> v.code == value?.color } - if (color != null && color != ThemeColor.DEFAULT) { - chipBackgroundColor = ColorStateList.valueOf(resources.light(color, defaultBackground)) - setTextColor(resources.dark(color, defaultTextColor)) - } else { - setChipBackgroundColorResource(R.color.default_filter_tag_background_color) - setTextColor(context.color(R.color.default_filter_tag_text_color)) - } - text = value?.tag - if (value != null) { - visible() - } else { - invisible() - } + private fun setupTag( + textView: TextView, + color: ThemeColor?, + txt: String + ) { + textView.apply { + visible() + val textColorPrimary = resources.getColor(R.color.text_secondary, null) + val defaultBackground = resources.getColor(R.color.shape_primary, null) + setTextColor(color?.let { resources.dark(it, textColorPrimary) } ?: textColorPrimary) + setBackgroundResource(R.drawable.rect_dv_cell_tag_item) + background.setDrawableColor(color?.let { resources.light(it, defaultBackground) } + ?: defaultBackground) + text = txt } } + + companion object { + private const val MAX_ITEMS = 1 + } } \ No newline at end of file diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectIconTextWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectIconTextWidget.kt deleted file mode 100644 index 7a703d3e13..0000000000 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectIconTextWidget.kt +++ /dev/null @@ -1,58 +0,0 @@ -package com.anytypeio.anytype.core_ui.widgets - -import android.content.Context -import android.util.AttributeSet -import android.util.TypedValue -import android.view.LayoutInflater -import androidx.constraintlayout.widget.ConstraintLayout -import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.databinding.WidgetObjectIconTextBinding -import com.anytypeio.anytype.core_utils.ext.gone -import com.anytypeio.anytype.presentation.objects.ObjectIcon - -class ObjectIconTextWidget @JvmOverloads constructor( - context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : ConstraintLayout(context, attrs, defStyleAttr) { - - val binding = WidgetObjectIconTextBinding.inflate( - LayoutInflater.from(context), this, true - ) - - init { - setupAttributeValues(attrs) - } - - private fun setupAttributeValues(set: AttributeSet?) { - - val attrs = context.obtainStyledAttributes(set, R.styleable.ObjectIconTextWidget, 0, 0) - - val nameTextSize = attrs.getDimensionPixelSize(R.styleable.ObjectIconTextWidget_nameTextSize, 0) - if (nameTextSize > 0) { - setTextSize(nameTextSize.toFloat()) - } - - val nameTextColor = attrs.getColor(R.styleable.ObjectIconTextWidget_nameTextColor, 0) - setTextColor(nameTextColor) - - attrs.recycle() - } - - fun setTextSize(textSize: Float) { - binding.objectName.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize) - } - - fun setTextColor(textColor: Int) { - binding.objectName.setTextColor(textColor) - } - - fun setup( - name: String?, - icon: ObjectIcon = ObjectIcon.None - ) { - binding.objectName.text = name - binding.objectIcon.setIcon(icon) - if (icon is ObjectIcon.None) { - binding.objectIcon.gone() - } - } -} \ No newline at end of file diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/RelationValueListWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/RelationValueListWidget.kt index 5b947f09c4..c77318a2bb 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/RelationValueListWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/RelationValueListWidget.kt @@ -193,7 +193,7 @@ class RelationValueListWidget @JvmOverloads constructor( private fun setupTags(relation: ObjectRelationView.Tags) { relation.tags.take(MAX_ITEMS).forEachIndexed { index, tag -> - val color = ThemeColor.values().find { it.code == tag.color } + val color = ThemeColor.entries.find { it.code == tag.color } if (index == 0) setupTag(text1, color, tag.tag) else setupTag( textView = text2.apply { maxWidth = maxTextWidth }, @@ -237,7 +237,7 @@ class RelationValueListWidget @JvmOverloads constructor( when { relation.status.isEmpty() -> setupSingleTextItem(name = relation.name) else -> { - val color = ThemeColor.values().find { it.code == relation.status[0].color } + val color = ThemeColor.entries.find { it.code == relation.status[0].color } val txt = relation.status[0].status setupStatus(text1, color, txt) } diff --git a/core-ui/src/main/res/drawable/bg_relation_values_number.xml b/core-ui/src/main/res/drawable/bg_relation_values_number.xml index 0fade4ae38..d9c3c097be 100644 --- a/core-ui/src/main/res/drawable/bg_relation_values_number.xml +++ b/core-ui/src/main/res/drawable/bg_relation_values_number.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/divider_filter_list.xml b/core-ui/src/main/res/drawable/divider_filter_list.xml index 69c76d16a3..f12d78576e 100644 --- a/core-ui/src/main/res/drawable/divider_filter_list.xml +++ b/core-ui/src/main/res/drawable/divider_filter_list.xml @@ -2,6 +2,6 @@ \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/ic_tag_selected.xml b/core-ui/src/main/res/drawable/ic_tag_selected.xml index 16d751063b..8a2d83f6af 100644 --- a/core-ui/src/main/res/drawable/ic_tag_selected.xml +++ b/core-ui/src/main/res/drawable/ic_tag_selected.xml @@ -10,5 +10,5 @@ android:fillColor="#00000000" android:pathData="M6,12L11,17L18,6" android:strokeWidth="1.5" - android:strokeColor="#ffffff" /> + android:strokeColor="@color/text_button_label" /> diff --git a/core-ui/src/main/res/layout/item_dv_viewer_filter_checkbox.xml b/core-ui/src/main/res/layout/item_dv_viewer_filter_checkbox.xml index de4cf0456b..cccc6e231c 100644 --- a/core-ui/src/main/res/layout/item_dv_viewer_filter_checkbox.xml +++ b/core-ui/src/main/res/layout/item_dv_viewer_filter_checkbox.xml @@ -29,7 +29,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="12dp" - android:layout_marginTop="12dp" + android:layout_marginTop="16dp" android:layout_marginEnd="12dp" app:layout_constraintEnd_toStartOf="@+id/iconArrow" app:layout_constraintStart_toEndOf="@+id/iconFormatContainer" @@ -42,6 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="12dp" + app:layout_constraintBottom_toBottomOf="@+id/iconFormatContainer" app:layout_constraintStart_toEndOf="@+id/iconFormatContainer" app:layout_constraintTop_toBottomOf="@+id/tvTitle" tools:text="Is" /> diff --git a/core-ui/src/main/res/layout/item_dv_viewer_filter_date.xml b/core-ui/src/main/res/layout/item_dv_viewer_filter_date.xml index 5a44587a8b..aaac154a33 100644 --- a/core-ui/src/main/res/layout/item_dv_viewer_filter_date.xml +++ b/core-ui/src/main/res/layout/item_dv_viewer_filter_date.xml @@ -29,7 +29,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="12dp" - android:layout_marginTop="12dp" + android:layout_marginTop="16dp" android:layout_marginEnd="12dp" app:layout_constraintEnd_toStartOf="@+id/iconArrow" app:layout_constraintStart_toEndOf="@+id/iconFormatContainer" @@ -42,6 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="12dp" + app:layout_constraintBottom_toBottomOf="@+id/iconFormatContainer" app:layout_constraintStart_toEndOf="@+id/iconFormatContainer" app:layout_constraintTop_toBottomOf="@+id/tvTitle" tools:text="Contains" /> diff --git a/core-ui/src/main/res/layout/item_dv_viewer_filter_number.xml b/core-ui/src/main/res/layout/item_dv_viewer_filter_number.xml index 959307e9f2..39db2d945f 100644 --- a/core-ui/src/main/res/layout/item_dv_viewer_filter_number.xml +++ b/core-ui/src/main/res/layout/item_dv_viewer_filter_number.xml @@ -29,7 +29,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="12dp" - android:layout_marginTop="12dp" + android:layout_marginTop="16dp" android:layout_marginEnd="12dp" app:layout_constraintEnd_toStartOf="@+id/iconArrow" app:layout_constraintStart_toEndOf="@+id/iconFormatContainer" @@ -42,6 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="12dp" + app:layout_constraintBottom_toBottomOf="@+id/iconFormatContainer" app:layout_constraintStart_toEndOf="@+id/iconFormatContainer" app:layout_constraintTop_toBottomOf="@+id/tvTitle" tools:text="Contains" /> diff --git a/core-ui/src/main/res/layout/item_dv_viewer_filter_object.xml b/core-ui/src/main/res/layout/item_dv_viewer_filter_object.xml index 9e9040d715..69f8dd0d3a 100644 --- a/core-ui/src/main/res/layout/item_dv_viewer_filter_object.xml +++ b/core-ui/src/main/res/layout/item_dv_viewer_filter_object.xml @@ -29,7 +29,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="12dp" - android:layout_marginTop="12dp" + android:layout_marginTop="16dp" android:layout_marginEnd="12dp" app:layout_constraintEnd_toStartOf="@+id/iconArrow" app:layout_constraintStart_toEndOf="@+id/iconFormatContainer" @@ -43,53 +43,58 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="12dp" + app:layout_constraintBottom_toBottomOf="@+id/iconFormatContainer" app:layout_constraintStart_toEndOf="@+id/iconFormatContainer" app:layout_constraintTop_toBottomOf="@+id/tvTitle" tools:text="Contains" /> - + tools:visibility="visible" /> - + - - - - + diff --git a/core-ui/src/main/res/layout/item_dv_viewer_filter_tag.xml b/core-ui/src/main/res/layout/item_dv_viewer_filter_tag.xml index ea5232277b..cf280eeee8 100644 --- a/core-ui/src/main/res/layout/item_dv_viewer_filter_tag.xml +++ b/core-ui/src/main/res/layout/item_dv_viewer_filter_tag.xml @@ -29,7 +29,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="12dp" - android:layout_marginTop="12dp" + android:layout_marginTop="16dp" android:layout_marginEnd="12dp" app:layout_constraintEnd_toStartOf="@+id/iconArrow" app:layout_constraintStart_toEndOf="@+id/iconFormatContainer" @@ -42,22 +42,48 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="12dp" + app:layout_constraintBottom_toBottomOf="@+id/iconFormatContainer" app:layout_constraintStart_toEndOf="@+id/iconFormatContainer" app:layout_constraintTop_toBottomOf="@+id/tvTitle" tools:text="Contains" /> - + tools:text="FavoritesFavoritesFavoritesFavorites" + tools:visibility="visible" /> + + - - - - \ No newline at end of file diff --git a/core-ui/src/main/res/layout/item_dv_viewer_filter_text.xml b/core-ui/src/main/res/layout/item_dv_viewer_filter_text.xml index 8f0fbb4b1f..90dafac0ed 100644 --- a/core-ui/src/main/res/layout/item_dv_viewer_filter_text.xml +++ b/core-ui/src/main/res/layout/item_dv_viewer_filter_text.xml @@ -29,7 +29,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="12dp" - android:layout_marginTop="12dp" + android:layout_marginTop="16dp" android:layout_marginEnd="12dp" app:layout_constraintEnd_toStartOf="@+id/iconArrow" app:layout_constraintStart_toEndOf="@+id/iconFormatContainer" @@ -42,6 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="12dp" + app:layout_constraintBottom_toBottomOf="@+id/iconFormatContainer" app:layout_constraintStart_toEndOf="@+id/iconFormatContainer" app:layout_constraintTop_toBottomOf="@+id/tvTitle" tools:text="Contains" /> diff --git a/core-ui/src/main/res/layout/widget_object_icon_text.xml b/core-ui/src/main/res/layout/widget_object_icon_text.xml deleted file mode 100644 index e2946af96a..0000000000 --- a/core-ui/src/main/res/layout/widget_object_icon_text.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - diff --git a/core-ui/src/main/res/values-night/colors.xml b/core-ui/src/main/res/values-night/colors.xml index 00c9de2c0d..6786d8ffeb 100644 --- a/core-ui/src/main/res/values-night/colors.xml +++ b/core-ui/src/main/res/values-night/colors.xml @@ -124,4 +124,6 @@ #00000000 #E86DE3 + #393835 + diff --git a/core-ui/src/main/res/values/colors.xml b/core-ui/src/main/res/values/colors.xml index 01cb687fb6..4bdecb9f0f 100644 --- a/core-ui/src/main/res/values/colors.xml +++ b/core-ui/src/main/res/values/colors.xml @@ -245,4 +245,6 @@ #FFEBEB #EBEDFE + #F2F2F2 + diff --git a/core-ui/src/main/res/values/dimens.xml b/core-ui/src/main/res/values/dimens.xml index f62e112a67..d1aae52e68 100644 --- a/core-ui/src/main/res/values/dimens.xml +++ b/core-ui/src/main/res/values/dimens.xml @@ -162,7 +162,7 @@ 144dp 40dp - 68dp + 72dp 48dp 48dp 4dp diff --git a/core-ui/src/main/res/values/styles.xml b/core-ui/src/main/res/values/styles.xml index 3e98ce5c30..e9d884d2e9 100644 --- a/core-ui/src/main/res/values/styles.xml +++ b/core-ui/src/main/res/values/styles.xml @@ -382,6 +382,12 @@ end + +