From 7748d2926f73793d7dd7f457787e12d3282dac9c Mon Sep 17 00:00:00 2001 From: Evgenii Kozlov Date: Fri, 31 Dec 2021 16:43:47 +0300 Subject: [PATCH] Feat | Dark mode (#2018) --- .../com/anytypeio/anytype/ext/MarkupExt.kt | 8 +- .../anytype/ui/editor/EditorFragment.kt | 7 +- .../modals/PickFilterConditionFragment.kt | 4 +- .../drawable/background_dashboard_button.xml | 2 +- .../background_desktop_bottom_sheet.xml | 2 +- .../drawable/ic_arrow_expand_dv_viewer.xml | 2 +- .../res/drawable/ic_dashboard_add_doc.xml | 4 +- .../res/drawable/ic_dashboard_marketplace.xml | 2 +- .../main/res/drawable/ic_dashboard_search.xml | 4 +- app/src/main/res/drawable/ic_logo.xml | 3 +- .../main/res/drawable/ic_profile_forward.xml | 4 +- .../main/res/drawable/ic_viewer_chosen.xml | 2 +- app/src/main/res/drawable/rounded_dialog.xml | 2 +- app/src/main/res/drawable/shimmer_circle.xml | 5 + .../res/layout/alert_mnemonic_reminder.xml | 2 +- .../res/layout/fragment_create_account.xml | 7 +- .../fragment_create_data_view_viewer.xml | 19 +- .../fragment_create_or_update_filter.xml | 1 - ...ate_or_update_filter_input_field_value.xml | 3 +- .../main/res/layout/fragment_dashboard.xml | 12 +- .../layout/fragment_edit_data_view_viewer.xml | 23 +-- app/src/main/res/layout/fragment_editor.xml | 45 ++--- .../main/res/layout/fragment_invitation.xml | 2 +- app/src/main/res/layout/fragment_link.xml | 21 +-- .../layout/fragment_link_to_object_or_web.xml | 9 +- .../layout/fragment_modify_viewer_sort.xml | 7 +- .../res/layout/fragment_object_layout.xml | 3 +- .../main/res/layout/fragment_object_menu.xml | 10 +- .../res/layout/fragment_object_search.xml | 5 +- .../main/res/layout/fragment_object_set.xml | 4 +- .../layout/fragment_object_type_change.xml | 4 +- .../res/layout/fragment_page_icon_picker.xml | 5 +- app/src/main/res/layout/fragment_profile.xml | 32 ++-- .../fragment_relation_create_from_scratch.xml | 3 +- .../fragment_relation_object_value_add.xml | 3 +- .../layout/fragment_relation_text_value.xml | 2 +- .../res/layout/fragment_select_account.xml | 2 +- .../fragment_select_filter_condition.xml | 23 +++ app/src/main/res/layout/fragment_splash.xml | 4 +- .../res/layout/fragment_user_settings.xml | 4 +- .../res/layout/item_choose_profile_add.xml | 2 +- .../layout/item_choose_profile_profile.xml | 3 +- .../layout/item_dashboard_card_default.xml | 5 +- .../res/layout/item_desktop_page_task.xml | 14 +- .../layout/item_desktop_page_without_icon.xml | 20 +-- .../layout/item_desktop_set_without_icon.xml | 2 +- .../layout/layout_object_set_dv_header.xml | 2 +- .../relation_option_value_add_fragment.xml | 1 - app/src/main/res/values-night/colors.xml | 25 +++ app/src/main/res/values/colors.xml | 4 +- app/src/main/res/values/dimens.xml | 1 + app/src/main/res/values/strings.xml | 1 + app/src/main/res/values/styles.xml | 33 ++-- .../anytypeio/anytype/core_ui/common/Color.kt | 8 +- .../anytype/core_ui/common/Markup.kt | 67 ++++--- .../anytypeio/anytype/core_ui/common/Span.kt | 2 +- .../core_ui/extensions/PaletteExtension.kt | 47 +++++ .../core_ui/extensions/ResExtension.kt | 2 +- .../holders/DVGridCellStatusHolder.kt | 9 +- .../dataview/holders/DVGridCellTagHolder.kt | 15 +- .../dataview/modals/FilterTagViewHolder.kt | 10 +- .../features/editor/MarkupColorAdapter.kt | 10 +- .../core_ui/features/editor/MarkupMapper.kt | 8 +- .../features/editor/TextBlockHolder.kt | 33 ++-- .../editor/holders/interface/TextHolder.kt | 10 +- .../features/editor/holders/other/Code.kt | 15 +- .../holders/relations/RelationViewHolder.kt | 9 +- .../features/editor/holders/text/Numbered.kt | 5 +- .../features/editor/holders/text/Text.kt | 13 +- .../features/objects/ObjectTypeBaseAdapter.kt | 3 - .../objects/holders/ObjectTypeHolder.kt | 7 +- .../features/sets/CreateFilterAdapter.kt | 22 ++- .../core_ui/widgets/ColorCircleWidget.kt | 3 +- .../core_ui/widgets/ObjectIconWidget.kt | 2 +- .../core_ui/widgets/text/StatusWidget.kt | 9 +- .../anytype/core_ui/widgets/text/TagWidget.kt | 15 +- .../widgets/text/TextHighlightWidget.kt | 7 +- .../core_ui/widgets/text/TextInputWidget.kt | 2 +- .../widgets/text/highlight/HighlightDrawer.kt | 22 ++- .../toolbar/DataViewPaginatorToolbar.kt | 3 +- .../widgets/toolbar/MarkupToolbarWidget.kt | 33 +++- .../color/selector_paginator_number_color.xml | 4 +- .../rectangle_default_button.xml | 2 +- .../rectangle_default_button_disabled.xml | 2 +- .../drawable-hdpi/rectangle_stroke_button.xml | 2 +- .../rect_data_view_gallery_item.xml | 13 ++ .../drawable-xxxhdpi/ic_dv_filter_search.xml | 4 +- .../rect_dv_filter_search.xml | 2 +- .../drawable/background_layout_icon_basic.xml | 4 +- .../background_layout_icon_basic_image.xml | 2 +- .../bg_toolbar_style_block_left_active.xml | 2 +- .../bg_toolbar_style_block_middle_active.xml | 2 +- .../bg_toolbar_style_block_right_active.xml | 2 +- .../drawable/bg_toolbar_style_set_link.xml | 2 +- .../main/res/drawable/circle_cell_action.xml | 2 +- .../circle_default_avatar_background.xml | 2 +- .../main/res/drawable/circle_profile_icon.xml | 4 +- .../drawable/circle_selected_color_circle.xml | 2 +- .../res/drawable/dashboard_card_ripple.xml | 7 + .../src/main/res/drawable/default_ripple.xml | 2 +- core-ui/src/main/res/drawable/divider.xml | 5 +- .../src/main/res/drawable/divider_dv_grid.xml | 2 +- .../main/res/drawable/divider_relations.xml | 2 +- core-ui/src/main/res/drawable/dragger.xml | 2 +- .../res/drawable/ic_add_new_object_to_set.xml | 4 +- .../src/main/res/drawable/ic_arrow_down.xml | 2 +- .../drawable/ic_block_action_add_below.xml | 8 +- .../res/drawable/ic_block_action_copy.xml | 4 +- .../res/drawable/ic_block_action_delete.xml | 10 +- .../res/drawable/ic_block_action_download.xml | 6 +- .../drawable/ic_block_action_duplicate.xml | 8 +- .../res/drawable/ic_block_action_move.xml | 4 +- .../res/drawable/ic_block_action_move_to.xml | 6 +- .../res/drawable/ic_block_action_style.xml | 4 +- .../src/main/res/drawable/ic_block_toggle.xml | 2 +- .../res/drawable/ic_block_toolbar_actions.xml | 8 +- .../res/drawable/ic_block_toolbar_add_new.xml | 6 +- .../ic_block_toolbar_block_actions.xml | 8 +- .../drawable/ic_block_toolbar_block_style.xml | 4 +- .../res/drawable/ic_block_toolbar_mention.xml | 2 +- .../res/drawable/ic_bookmark_placeholder.xml | 2 +- .../drawable/ic_cell_relation_call_with.xml | 2 +- .../drawable/ic_cell_relation_go_to_link.xml | 4 +- .../ic_cell_relation_go_to_mail_client.xml | 4 +- .../res/drawable/ic_create_viewer_gallery.xml | 8 +- .../res/drawable/ic_create_viewer_grid.xml | 8 +- .../res/drawable/ic_create_viewer_kanban.xml | 4 +- .../res/drawable/ic_create_viewer_list.xml | 6 +- .../drawable/ic_data_view_grid_checkbox.xml | 2 +- .../src/main/res/drawable/ic_default_plus.xml | 4 +- .../res/drawable/ic_doc_search_delete.xml | 2 +- .../drawable/ic_dv_customize_panel_filter.xml | 6 +- .../drawable/ic_dv_customize_panel_group.xml | 8 +- .../ic_dv_customize_panel_relations.xml | 12 +- .../drawable/ic_dv_customize_panel_sort.xml | 8 +- .../res/drawable/ic_dv_customize_view.xml | 12 +- .../main/res/drawable/ic_dv_modal_plus.xml | 4 +- .../src/main/res/drawable/ic_file_light.xml | 2 +- .../src/main/res/drawable/ic_layout_basic.xml | 16 +- .../src/main/res/drawable/ic_layout_note.xml | 20 ++- .../main/res/drawable/ic_layout_profile.xml | 12 +- .../src/main/res/drawable/ic_layout_task.xml | 16 +- .../res/drawable/ic_main_toolbar_back.xml | 2 +- .../res/drawable/ic_main_toolbar_home.xml | 8 +- .../res/drawable/ic_mention_loading_state.xml | 2 +- .../res/drawable/ic_non_existent_object.xml | 2 +- .../ic_object_action_add_to_favorites.xml | 2 +- .../res/drawable/ic_object_action_archive.xml | 10 +- .../res/drawable/ic_object_action_restore.xml | 6 +- .../res/drawable/ic_object_action_search.xml | 4 +- .../drawable/ic_object_action_template.xml | 6 +- .../drawable/ic_object_action_undoredo.xml | 8 +- .../drawable/ic_object_action_unfavorite.xml | 4 +- .../drawable/ic_object_menu_arrow_forward.xml | 2 +- .../res/drawable/ic_object_menu_cover.xml | 4 +- .../res/drawable/ic_object_menu_history.xml | 4 +- .../main/res/drawable/ic_object_menu_icon.xml | 4 +- .../res/drawable/ic_object_menu_layout.xml | 4 +- .../res/drawable/ic_object_menu_relations.xml | 4 +- .../src/main/res/drawable/ic_option_add.xml | 4 +- .../res/drawable/ic_option_checked_black.xml | 2 +- .../res/drawable/ic_page_toolbar_search.xml | 4 +- .../main/res/drawable/ic_paginator_arrow.xml | 2 +- core-ui/src/main/res/drawable/ic_picture.xml | 8 +- .../drawable/ic_relation_attachment_32.xml | 4 +- .../drawable/ic_relation_attachment_48.xml | 16 +- .../res/drawable/ic_relation_checkbox_32.xml | 6 +- .../res/drawable/ic_relation_checkbox_48.xml | 6 +- .../main/res/drawable/ic_relation_date_32.xml | 8 +- .../main/res/drawable/ic_relation_date_48.xml | 8 +- .../res/drawable/ic_relation_email_32.xml | 6 +- .../res/drawable/ic_relation_email_48.xml | 6 +- .../ic_relation_format_attachment_small.xml | 2 +- .../ic_relation_format_checkbox_small.xml | 4 +- .../drawable/ic_relation_format_checked.xml | 2 +- .../ic_relation_format_date_small.xml | 6 +- .../ic_relation_format_email_small.xml | 4 +- .../ic_relation_format_number_small.xml | 8 +- .../ic_relation_format_object_small.xml | 4 +- .../ic_relation_format_phone_number_small.xml | 2 +- .../ic_relation_format_status_small.xml | 6 +- .../drawable/ic_relation_format_tag_small.xml | 4 +- .../ic_relation_format_text_small.xml | 6 +- .../drawable/ic_relation_format_url_small.xml | 4 +- .../drawable/ic_relation_is_not_featured.xml | 2 +- .../main/res/drawable/ic_relation_name_48.xml | 8 +- .../res/drawable/ic_relation_number_32.xml | 10 +- .../res/drawable/ic_relation_number_48.xml | 10 +- .../res/drawable/ic_relation_object_32.xml | 6 +- .../res/drawable/ic_relation_object_48.xml | 6 +- .../drawable/ic_relation_phone_number_32.xml | 4 +- .../drawable/ic_relation_phone_number_48.xml | 4 +- .../res/drawable/ic_relation_status_32.xml | 8 +- .../res/drawable/ic_relation_status_48.xml | 8 +- .../main/res/drawable/ic_relation_tag_32.xml | 6 +- .../main/res/drawable/ic_relation_tag_48.xml | 6 +- .../main/res/drawable/ic_relation_text_32.xml | 8 +- .../main/res/drawable/ic_relation_text_48.xml | 8 +- .../main/res/drawable/ic_relation_url_32.xml | 6 +- .../main/res/drawable/ic_relation_url_48.xml | 6 +- core-ui/src/main/res/drawable/ic_search.xml | 2 +- .../main/res/drawable/ic_search_delete.xml | 2 +- .../res/drawable/ic_search_next_result.xml | 2 +- .../drawable/ic_search_previous_result.xml | 2 +- .../drawable/ic_settings_arrow_forward.xml | 14 ++ .../main/res/drawable/ic_slash_style_bold.xml | 2 +- .../drawable/ic_slash_style_breakthrough.xml | 6 +- .../res/drawable/ic_slash_style_bulleted.xml | 2 +- .../main/res/drawable/ic_slash_style_code.xml | 4 +- .../res/drawable/ic_slash_style_heading.xml | 2 +- .../drawable/ic_slash_style_highlighted.xml | 2 +- .../res/drawable/ic_slash_style_italic.xml | 4 +- .../main/res/drawable/ic_slash_style_link.xml | 4 +- .../res/drawable/ic_slash_style_numbered.xml | 2 +- .../drawable/ic_slash_style_subheading.xml | 2 +- .../main/res/drawable/ic_slash_style_text.xml | 2 +- .../res/drawable/ic_slash_style_title.xml | 2 +- .../res/drawable/ic_slash_style_toggle.xml | 2 +- .../src/main/res/drawable/ic_slash_widget.xml | 4 +- .../res/drawable/ic_style_toolbar_bullet.xml | 8 +- .../ic_style_toolbar_button_background.xml | 2 +- ...style_toolbar_button_background_active.xml | 2 +- .../ic_style_toolbar_callout_background.xml | 2 +- .../drawable/ic_style_toolbar_checkbox.xml | 8 +- .../ic_style_toolbar_highlight_cursor.xml | 2 +- .../res/drawable/ic_style_toolbar_more.xml | 6 +- .../drawable/ic_style_toolbar_numbered.xml | 10 +- ...e_toolbar_text_style_background_active.xml | 2 +- .../res/drawable/ic_style_toolbar_toogle.xml | 8 +- .../main/res/drawable/ic_tag_not_selected.xml | 2 +- .../src/main/res/drawable/ic_three_dots.xml | 6 +- .../res/drawable/ic_toolbar_markup_bold.xml | 4 +- .../ic_toolbar_markup_bold_active.xml | 4 +- .../ic_toolbar_markup_bold_disabled.xml | 4 +- .../res/drawable/ic_toolbar_markup_code.xml | 4 +- .../ic_toolbar_markup_code_active.xml | 4 +- .../ic_toolbar_markup_code_disabled.xml | 4 +- .../res/drawable/ic_toolbar_markup_italic.xml | 4 +- .../ic_toolbar_markup_italic_active.xml | 4 +- .../ic_toolbar_markup_italic_disabled.xml | 4 +- .../res/drawable/ic_toolbar_markup_link.xml | 4 +- .../ic_toolbar_markup_link_active.xml | 4 +- .../ic_toolbar_markup_link_disabled.xml | 4 +- .../ic_toolbar_markup_strike_through.xml | 6 +- ...c_toolbar_markup_strike_through_active.xml | 6 +- ...toolbar_markup_strike_through_disabled.xml | 4 +- .../ic_toolbar_style_align_center.xml | 8 +- ...ic_toolbar_style_align_center_disabled.xml | 8 +- .../drawable/ic_toolbar_style_align_left.xml | 8 +- .../ic_toolbar_style_align_left_disabled.xml | 8 +- .../drawable/ic_toolbar_style_align_right.xml | 8 +- .../ic_toolbar_style_align_right_disabled.xml | 8 +- .../res/drawable/ic_toolbar_style_bold.xml | 4 +- .../ic_toolbar_style_bold_disabled.xml | 4 +- .../res/drawable/ic_toolbar_style_code.xml | 4 +- .../ic_toolbar_style_code_disabled.xml | 4 +- .../res/drawable/ic_toolbar_style_italic.xml | 4 +- .../ic_toolbar_style_italic_disabled.xml | 4 +- .../res/drawable/ic_toolbar_style_link.xml | 4 +- .../ic_toolbar_style_link_disabled.xml | 4 +- .../ic_toolbar_style_strike_through.xml | 6 +- ..._toolbar_style_strike_through_disabled.xml | 6 +- core-ui/src/main/res/drawable/ic_video.xml | 4 +- ...tem_block_code_multi_select_unselected.xml | 2 +- ...bject_in_list_background_basic_initial.xml | 2 +- ...ect_in_list_background_profile_initial.xml | 2 +- .../rect_block_action_button_background.xml | 2 +- .../main/res/drawable/rect_bottom_sheet.xml | 2 +- .../rect_data_view_customize_view_button.xml | 4 +- ...rect_object_icon_card_emoji_background.xml | 2 +- .../main/res/drawable/rect_search_input.xml | 6 + .../res/drawable/rect_white_radius_12.xml | 2 +- .../rectangle_avatar_initial_background_8.xml | 2 +- .../rectangle_bookmark_placeholder.xml | 4 +- .../rectangle_dashboard_text_skeleton.xml | 2 +- .../res/drawable/rectangle_doc_search.xml | 2 +- ...angle_modify_viewer_relation_order_dnd.xml | 2 +- ...ctangle_object_icon_emoji_background_8.xml | 2 +- .../rectangle_object_in_list_emoji_icon.xml | 2 +- .../rectangle_object_menu_action_ripple.xml | 2 +- .../res/drawable/rounded_button_cancel.xml | 2 +- ...ed_rectangle_block_style_toolbar_group.xml | 2 +- core-ui/src/main/res/drawable/sheet_top.xml | 2 +- .../main/res/drawable/tab_style_toolbar.xml | 2 +- .../res/drawable/tab_style_toolbar_active.xml | 2 +- .../layout/block_style_toolbar_background.xml | 22 +-- .../res/layout/block_style_toolbar_color.xml | 22 +-- .../src/main/res/layout/item_block_action.xml | 2 +- .../main/res/layout/item_block_bookmark.xml | 2 +- .../res/layout/item_block_title_profile.xml | 4 +- .../res/layout/item_block_unsupported.xml | 2 +- .../layout/item_doc_cover_gallery_header.xml | 2 +- .../layout/item_document_relation_default.xml | 4 +- .../layout/item_document_relation_status.xml | 4 +- .../item_dv_viewer_filter_condition.xml | 2 +- .../layout/item_edit_cell_option_create.xml | 2 +- .../item_edit_cell_tag_or_status_empty.xml | 1 + .../layout/item_featured_relation_default.xml | 2 +- .../layout/item_markup_color_background.xml | 2 +- .../res/layout/item_markup_color_text.xml | 2 +- .../item_modify_viewer_relation_order.xml | 2 +- .../res/layout/item_object_menu_action.xml | 10 +- .../res/layout/item_object_relation_text.xml | 3 +- .../item_object_type_horizontal_item.xml | 2 +- .../res/layout/item_object_type_search.xml | 11 +- ...elation_create_from_scratch_name_input.xml | 2 +- .../res/layout/item_slash_widget_color.xml | 2 +- .../layout/item_slash_widget_subheader.xml | 2 +- .../main/res/layout/item_viewer_container.xml | 6 +- .../res/layout/item_viewer_relation_list.xml | 2 +- .../item_viewer_relation_list_section.xml | 2 +- .../res/layout/tab_item_style_toolbar.xml | 2 +- .../main/res/layout/widet_undo_redo_panel.xml | 4 +- .../widget_block_style_toolbar_colors.xml | 5 +- .../widget_data_view_customize_view.xml | 1 + .../widget_doc_search_engine_toolbar.xml | 3 + .../widget_dv_list_view_relation_object.xml | 4 +- .../widget_dv_list_view_relation_tag.xml | 5 +- .../main/res/layout/widget_editor_slash.xml | 2 +- .../main/res/layout/widget_mention_menu.xml | 3 +- .../res/layout/widget_object_menu_item.xml | 4 +- .../main/res/layout/widget_search_view.xml | 8 +- .../res/layout/widget_style_toolbar_main.xml | 2 +- core-ui/src/main/res/values-night/colors.xml | 66 +++++++ core-ui/src/main/res/values/colors.xml | 87 +++++++-- core-ui/src/main/res/values/styles.xml | 169 +++++++++--------- .../anytype/core_ui/BlockAdapterTest.kt | 9 +- .../anytype/core_ui/common/SpanTest.kt | 14 +- .../drawable/ic_page_icon_picker_search.xml | 4 +- .../page_icon_picker_filter_background.xml | 2 +- .../presentation/editor/editor/Markup.kt | 7 +- .../presentation/editor/editor/ThemeColor.kt | 5 - .../anytype/sample/RoundedBgTextView.kt | 2 +- versioning.gradle | 2 +- 334 files changed, 1346 insertions(+), 960 deletions(-) create mode 100644 app/src/main/res/drawable/shimmer_circle.xml create mode 100644 app/src/main/res/layout/fragment_select_filter_condition.xml create mode 100644 app/src/main/res/values-night/colors.xml create mode 100644 core-ui/src/main/java/com/anytypeio/anytype/core_ui/extensions/PaletteExtension.kt create mode 100644 core-ui/src/main/res/drawable-night/rect_data_view_gallery_item.xml create mode 100644 core-ui/src/main/res/drawable/dashboard_card_ripple.xml create mode 100644 core-ui/src/main/res/drawable/ic_settings_arrow_forward.xml create mode 100644 core-ui/src/main/res/drawable/rect_search_input.xml create mode 100644 core-ui/src/main/res/values-night/colors.xml diff --git a/app/src/main/java/com/anytypeio/anytype/ext/MarkupExt.kt b/app/src/main/java/com/anytypeio/anytype/ext/MarkupExt.kt index 64e4e590e3..210ab4d8e6 100644 --- a/app/src/main/java/com/anytypeio/anytype/ext/MarkupExt.kt +++ b/app/src/main/java/com/anytypeio/anytype/ext/MarkupExt.kt @@ -20,16 +20,12 @@ fun Editable.extractMarks(): List = getSpans(0, length, Span::class.java). is Span.TextColor-> Mark( range = getSpanStart(span)..getSpanEnd(span), type = Mark.Type.TEXT_COLOR, - param = span.foregroundColor.let { color -> - ThemeColor.text[color] - } + param = span.value ) is Span.Highlight -> Mark( range = getSpanStart(span)..getSpanEnd(span), type = Mark.Type.BACKGROUND_COLOR, - param = span.value.let { background -> - ThemeColor.background[background.toInt()] - } + param = span.value ) is Span.Italic -> Mark( range = getSpanStart(span)..getSpanEnd(span), diff --git a/app/src/main/java/com/anytypeio/anytype/ui/editor/EditorFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/editor/EditorFragment.kt index 02d88d32be..dbd67160c8 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/editor/EditorFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/editor/EditorFragment.kt @@ -7,7 +7,6 @@ import android.app.ProgressDialog import android.content.ClipData import android.content.ClipDescription import android.content.Intent -import android.graphics.Color import android.graphics.Point import android.net.Uri import android.os.Build @@ -55,7 +54,6 @@ import com.anytypeio.anytype.core_models.ext.getSubstring import com.anytypeio.anytype.core_ui.extensions.addTextFromSelectedStart import com.anytypeio.anytype.core_ui.extensions.color import com.anytypeio.anytype.core_ui.extensions.cursorYBottomCoordinate -import com.anytypeio.anytype.core_ui.extensions.isKeyboardVisible import com.anytypeio.anytype.core_ui.features.editor.* import com.anytypeio.anytype.core_ui.features.editor.holders.other.Code import com.anytypeio.anytype.core_ui.features.editor.holders.other.Title @@ -78,7 +76,6 @@ import com.anytypeio.anytype.presentation.editor.EditorViewModel import com.anytypeio.anytype.presentation.editor.EditorViewModelFactory import com.anytypeio.anytype.presentation.editor.Snack import com.anytypeio.anytype.presentation.editor.editor.* -import com.anytypeio.anytype.presentation.editor.editor.actions.ActionItemType import com.anytypeio.anytype.presentation.editor.editor.control.ControlPanelState import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType import com.anytypeio.anytype.presentation.editor.editor.model.BlockView @@ -126,7 +123,7 @@ import kotlin.math.abs const val REQUEST_FILE_CODE = 745 @RuntimePermissions -open class EditorFragment : NavigationFragment(R.layout.fragment_editor), +open class EditorFragment : NavigationFragment(R.layout.fragment_editor), OnFragmentInteractionListener, TurnIntoActionReceiver, SelectProgrammingLanguageReceiver, @@ -342,7 +339,7 @@ open class EditorFragment : NavigationFragment(R.layout.fragment_editor), } } } else { - topToolbar.setBackgroundColor(Color.WHITE) + topToolbar.setBackgroundColor(requireContext().color(R.color.defaultCanvasColor)) topToolbar.statusText.animate().alpha(0f).setDuration(DEFAULT_TOOLBAR_ANIM_DURATION) .start() topToolbar.container.animate().alpha(1f).setDuration(DEFAULT_TOOLBAR_ANIM_DURATION) diff --git a/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/PickFilterConditionFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/PickFilterConditionFragment.kt index 406007b4d8..a1b4d0c0d3 100644 --- a/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/PickFilterConditionFragment.kt +++ b/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/PickFilterConditionFragment.kt @@ -19,7 +19,7 @@ import com.anytypeio.anytype.di.common.componentManager import com.anytypeio.anytype.presentation.sets.filter.PickFilterConditionViewModel import com.anytypeio.anytype.presentation.sets.model.Viewer import com.anytypeio.anytype.ui.sets.modals.filter.UpdateConditionActionReceiver -import kotlinx.android.synthetic.main.fragment_list.* +import kotlinx.android.synthetic.main.fragment_select_filter_condition.* import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.launch import javax.inject.Inject @@ -42,7 +42,7 @@ class PickFilterConditionFragment : BaseBottomSheetFragment() { container: ViewGroup?, savedInstanceState: Bundle? ): View? { - return inflater.inflate(R.layout.fragment_list, container, false) + return inflater.inflate(R.layout.fragment_select_filter_condition, container, false) } override fun onStart() { diff --git a/app/src/main/res/drawable/background_dashboard_button.xml b/app/src/main/res/drawable/background_dashboard_button.xml index 9cd2288179..bd6d907887 100644 --- a/app/src/main/res/drawable/background_dashboard_button.xml +++ b/app/src/main/res/drawable/background_dashboard_button.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_desktop_bottom_sheet.xml b/app/src/main/res/drawable/background_desktop_bottom_sheet.xml index 6aecf182d9..2939b2db6c 100644 --- a/app/src/main/res/drawable/background_desktop_bottom_sheet.xml +++ b/app/src/main/res/drawable/background_desktop_bottom_sheet.xml @@ -2,5 +2,5 @@ - + diff --git a/app/src/main/res/drawable/ic_arrow_expand_dv_viewer.xml b/app/src/main/res/drawable/ic_arrow_expand_dv_viewer.xml index 0490fd168f..a167f52af2 100644 --- a/app/src/main/res/drawable/ic_arrow_expand_dv_viewer.xml +++ b/app/src/main/res/drawable/ic_arrow_expand_dv_viewer.xml @@ -4,7 +4,7 @@ android:viewportWidth="16" android:viewportHeight="16"> diff --git a/app/src/main/res/drawable/ic_dashboard_add_doc.xml b/app/src/main/res/drawable/ic_dashboard_add_doc.xml index 70229a6322..c3d9b3de8c 100644 --- a/app/src/main/res/drawable/ic_dashboard_add_doc.xml +++ b/app/src/main/res/drawable/ic_dashboard_add_doc.xml @@ -5,8 +5,8 @@ android:viewportHeight="25"> + android:fillColor="@color/glyph_selected"/> + android:fillColor="@color/glyph_selected"/> diff --git a/app/src/main/res/drawable/ic_dashboard_marketplace.xml b/app/src/main/res/drawable/ic_dashboard_marketplace.xml index e113dea133..f42e7cb9da 100644 --- a/app/src/main/res/drawable/ic_dashboard_marketplace.xml +++ b/app/src/main/res/drawable/ic_dashboard_marketplace.xml @@ -5,6 +5,6 @@ android:viewportHeight="25"> diff --git a/app/src/main/res/drawable/ic_dashboard_search.xml b/app/src/main/res/drawable/ic_dashboard_search.xml index c490f0777f..3694adf11d 100644 --- a/app/src/main/res/drawable/ic_dashboard_search.xml +++ b/app/src/main/res/drawable/ic_dashboard_search.xml @@ -5,9 +5,9 @@ android:viewportHeight="25"> + android:fillColor="@color/glyph_selected"/> diff --git a/app/src/main/res/drawable/ic_logo.xml b/app/src/main/res/drawable/ic_logo.xml index ce92cbb223..7f328aa969 100644 --- a/app/src/main/res/drawable/ic_logo.xml +++ b/app/src/main/res/drawable/ic_logo.xml @@ -5,6 +5,7 @@ android:viewportHeight="30"> diff --git a/app/src/main/res/drawable/ic_profile_forward.xml b/app/src/main/res/drawable/ic_profile_forward.xml index bbb0559914..c48643a855 100644 --- a/app/src/main/res/drawable/ic_profile_forward.xml +++ b/app/src/main/res/drawable/ic_profile_forward.xml @@ -8,11 +8,11 @@ android:pathData="M0,0.125h24v24h-24z"/> diff --git a/app/src/main/res/drawable/ic_viewer_chosen.xml b/app/src/main/res/drawable/ic_viewer_chosen.xml index d871388244..509c48466b 100644 --- a/app/src/main/res/drawable/ic_viewer_chosen.xml +++ b/app/src/main/res/drawable/ic_viewer_chosen.xml @@ -4,7 +4,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/rounded_dialog.xml b/app/src/main/res/drawable/rounded_dialog.xml index 55a506e098..3fdccd13a9 100644 --- a/app/src/main/res/drawable/rounded_dialog.xml +++ b/app/src/main/res/drawable/rounded_dialog.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/res/drawable/shimmer_circle.xml b/app/src/main/res/drawable/shimmer_circle.xml new file mode 100644 index 0000000000..dc1aaf06d1 --- /dev/null +++ b/app/src/main/res/drawable/shimmer_circle.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/alert_mnemonic_reminder.xml b/app/src/main/res/layout/alert_mnemonic_reminder.xml index 37dca27685..5cacf144b3 100644 --- a/app/src/main/res/layout/alert_mnemonic_reminder.xml +++ b/app/src/main/res/layout/alert_mnemonic_reminder.xml @@ -13,7 +13,7 @@ android:layout_marginEnd="20dp" android:lineHeight="26sp" android:fontFamily="@font/inter_bold" - android:textColor="@color/black" + android:textColor="@color/text_primary" android:textSize="22sp" android:text="Don’t forget to take and save your keychain phrase from settings" /> diff --git a/app/src/main/res/layout/fragment_create_account.xml b/app/src/main/res/layout/fragment_create_account.xml index e38d7b8970..7f3f7eddb8 100644 --- a/app/src/main/res/layout/fragment_create_account.xml +++ b/app/src/main/res/layout/fragment_create_account.xml @@ -52,8 +52,8 @@ android:layout_marginStart="20dp" android:textSize="13sp" android:layout_marginTop="11dp" - android:text="New profile" - android:textColor="#929082" + android:text="@string/new_profile" + android:textColor="@color/text_secondary" android:fontFamily="@font/inter_regular" app:layout_constraintTop_toBottomOf="@id/profileIcon" app:layout_constraintStart_toStartOf="parent" /> @@ -67,7 +67,8 @@ android:background="@null" android:fontFamily="@font/inter_bold" android:hint="@string/type_your_name" - android:textColorHint="#CBC9BD" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_tertiary" android:textSize="22sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvNewProfile" /> diff --git a/app/src/main/res/layout/fragment_create_data_view_viewer.xml b/app/src/main/res/layout/fragment_create_data_view_viewer.xml index 857fa2e2f7..fd4fb7ca4c 100644 --- a/app/src/main/res/layout/fragment_create_data_view_viewer.xml +++ b/app/src/main/res/layout/fragment_create_data_view_viewer.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/inter_regular" android:textSize="@dimen/sp_13" - android:textColor="#929082" + android:textColor="@color/text_secondary" android:layout_marginTop="23dp" android:text="@string/name" /> @@ -42,7 +42,8 @@ android:maxLines="1" android:imeOptions="actionDone" android:fontFamily="@font/inter_bold" - android:textColorHint="@color/gray" + android:textColorHint="@color/text_secondary" + android:textColor="@color/text_primary" android:textCursorDrawable="@drawable/cursor" android:textSize="22sp" /> @@ -50,14 +51,14 @@ android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_marginTop="10dp" - android:background="@color/viewer_divider" /> + android:background="@color/shape_primary" /> @@ -65,7 +66,7 @@ android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_marginTop="8dp" - android:background="@color/viewer_divider" /> + android:background="@color/shape_primary" /> + android:background="@color/shape_primary" /> + android:background="@color/shape_primary" /> + android:background="@color/shape_primary" /> + android:background="@color/shape_primary" /> diff --git a/app/src/main/res/layout/fragment_create_or_update_filter_input_field_value.xml b/app/src/main/res/layout/fragment_create_or_update_filter_input_field_value.xml index f8acaa45f2..749da37f16 100644 --- a/app/src/main/res/layout/fragment_create_or_update_filter_input_field_value.xml +++ b/app/src/main/res/layout/fragment_create_or_update_filter_input_field_value.xml @@ -2,7 +2,6 @@ + app:tabTextColor="@color/dashboard_card_background" /> @@ -206,7 +206,7 @@ android:background="@drawable/default_ripple" android:paddingEnd="20dp" android:text="@string/delete" - android:textColor="@color/black" + android:textColor="@color/text_primary" android:textSize="17sp" /> diff --git a/app/src/main/res/layout/fragment_edit_data_view_viewer.xml b/app/src/main/res/layout/fragment_edit_data_view_viewer.xml index 20686f0c4a..15fc3af3a7 100644 --- a/app/src/main/res/layout/fragment_edit_data_view_viewer.xml +++ b/app/src/main/res/layout/fragment_edit_data_view_viewer.xml @@ -24,7 +24,7 @@ android:layout_height="match_parent" android:layout_gravity="center" android:gravity="center" - android:text="@string/new_view" /> + android:text="@string/edit_view" /> @@ -63,7 +64,7 @@ android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_marginTop="10dp" - android:background="@color/viewer_divider" /> + android:background="@color/shape_primary" /> + android:background="@color/shape_primary" /> + android:background="@color/shape_primary" /> + android:background="@color/shape_primary" /> + android:background="@color/shape_primary" /> + android:background="@color/shape_primary" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> @@ -65,16 +65,16 @@ android:id="@+id/objectTypesToolbar" android:layout_width="0dp" android:layout_height="wrap_content" - android:background="@color/white" + android:background="@color/background_primary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent"/> + app:layout_constraintStart_toStartOf="parent" /> @@ -93,7 +93,7 @@ android:id="@+id/bottomMenu" android:layout_width="0dp" android:layout_height="@dimen/default_toolbar_height" - android:background="@color/white" + android:background="@color/defaultCanvasColor" android:translationY="@dimen/default_toolbar_height" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -104,6 +104,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="invisible" + android:background="@color/background_primary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -113,7 +114,7 @@ android:id="@+id/scrollAndMoveHint" android:layout_width="match_parent" android:layout_height="48dp" - android:background="@color/white" + android:background="@color/defaultCanvasColor" android:translationY="-48dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -123,11 +124,11 @@ android:id="@+id/scrollAndMoveBottomAction" android:layout_width="match_parent" android:layout_height="64dp" + android:background="@color/background_primary" android:visibility="gone" - android:background="@color/white" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintBottom_toBottomOf="parent"/> + app:layout_constraintStart_toStartOf="parent" /> + android:visibility="invisible" /> @@ -44,8 +44,9 @@ android:background="@null" android:fontFamily="@font/inter_regular" android:hint="@string/hint_link" + android:textColorHint="@color/text_tertiary" android:inputType="textUri" - android:textColor="#ACA996" + android:textColor="@color/text_secondary" android:textSize="17sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -54,11 +55,11 @@ @@ -71,13 +72,9 @@ android:layout_marginTop="16dp" android:layout_marginEnd="5dp" android:layout_marginBottom="16dp" - android:background="@drawable/rounded_button_cancel" - android:fontFamily="@font/inter_regular" - android:stateListAnimator="@animator/scale_shrink" - android:text="@string/cancel" + style="@style/DefaultStrokeButtonStyle" android:textAllCaps="false" - android:textSize="17sp" - android:textColor="#2C2B27" + android:text="@string/cancel" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/guideline2" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/fragment_link_to_object_or_web.xml b/app/src/main/res/layout/fragment_link_to_object_or_web.xml index ecb4d01c07..de0cb7b6a8 100644 --- a/app/src/main/res/layout/fragment_link_to_object_or_web.xml +++ b/app/src/main/res/layout/fragment_link_to_object_or_web.xml @@ -4,16 +4,15 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/root" android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/default_dashboard_background_color"> + android:layout_height="match_parent"> @@ -91,7 +90,7 @@ android:fontFamily="@font/inter_regular" android:gravity="center" android:text="@string/search_no_results_try" - android:textColor="#929082" + android:textColor="@color/text_secondary" android:textSize="17sp" android:visibility="invisible" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_modify_viewer_sort.xml b/app/src/main/res/layout/fragment_modify_viewer_sort.xml index 5a0339c157..68d76ca6ec 100644 --- a/app/src/main/res/layout/fragment_modify_viewer_sort.xml +++ b/app/src/main/res/layout/fragment_modify_viewer_sort.xml @@ -8,8 +8,7 @@ + android:layout_marginBottom="18dp"> @@ -92,7 +91,7 @@ tools:text="Object" android:fontFamily="@font/inter_semibold" android:textSize="17sp" - android:textColor="@color/black" + android:textColor="@color/text_primary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/dragger" /> diff --git a/app/src/main/res/layout/fragment_object_layout.xml b/app/src/main/res/layout/fragment_object_layout.xml index 00232ef8ca..156bffa482 100644 --- a/app/src/main/res/layout/fragment_object_layout.xml +++ b/app/src/main/res/layout/fragment_object_layout.xml @@ -4,8 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - tools:context="com.anytypeio.anytype.ui.editor.layout.ObjectLayoutFragment" - android:orientation="vertical"> + tools:context="com.anytypeio.anytype.ui.editor.layout.ObjectLayoutFragment"> @@ -59,7 +59,7 @@ android:layout_marginStart="72dp" android:layout_marginTop="8dp" android:layout_marginEnd="16dp" - android:background="#E4E2D7" + android:background="@color/shape_primary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/optionCover" /> @@ -84,7 +84,7 @@ android:layout_marginStart="72dp" android:layout_marginTop="8dp" android:layout_marginEnd="16dp" - android:background="#E4E2D7" + android:background="@color/shape_primary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/optionLayout" /> @@ -109,7 +109,7 @@ android:layout_marginStart="72dp" android:layout_marginTop="8dp" android:layout_marginEnd="16dp" - android:background="#E4E2D7" + android:background="@color/shape_primary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/optionRelations" /> @@ -132,7 +132,7 @@ android:layout_width="0dp" android:layout_height="0.5dp" android:layout_marginTop="21dp" - android:background="#E4E2D7" + android:background="@color/shape_primary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/optionHistory" /> diff --git a/app/src/main/res/layout/fragment_object_search.xml b/app/src/main/res/layout/fragment_object_search.xml index e2d91d1892..a30d7b384e 100644 --- a/app/src/main/res/layout/fragment_object_search.xml +++ b/app/src/main/res/layout/fragment_object_search.xml @@ -1,5 +1,4 @@ - @@ -91,7 +90,7 @@ android:fontFamily="@font/inter_regular" android:gravity="center" android:text="@string/search_no_results_try" - android:textColor="#929082" + android:textColor="@color/text_secondary" android:textSize="17sp" android:visibility="invisible" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_object_set.xml b/app/src/main/res/layout/fragment_object_set.xml index 2f81b7ff98..4131e49de9 100644 --- a/app/src/main/res/layout/fragment_object_set.xml +++ b/app/src/main/res/layout/fragment_object_set.xml @@ -7,7 +7,7 @@ android:layout_height="match_parent" android:focusable="true" android:focusableInTouchMode="true" - android:background="@color/white" + android:background="@color/background_primary" app:layoutDescription="@xml/fragment_object_set_scene"> diff --git a/app/src/main/res/layout/fragment_object_type_change.xml b/app/src/main/res/layout/fragment_object_type_change.xml index fd04367810..8207c1b15b 100644 --- a/app/src/main/res/layout/fragment_object_type_change.xml +++ b/app/src/main/res/layout/fragment_object_type_change.xml @@ -52,8 +52,8 @@ android:hint="@string/search" android:maxLines="1" android:singleLine="true" - android:textColor="@color/black" - android:textColorHint="@color/gray" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_secondary" android:textCursorDrawable="@drawable/cursor" android:textSize="15sp" tools:text="Search" /> diff --git a/app/src/main/res/layout/fragment_page_icon_picker.xml b/app/src/main/res/layout/fragment_page_icon_picker.xml index 98cd32b59c..6673047eab 100644 --- a/app/src/main/res/layout/fragment_page_icon_picker.xml +++ b/app/src/main/res/layout/fragment_page_icon_picker.xml @@ -3,7 +3,6 @@ android:id="@+id/sheet" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/default_bottom_sheet_background" android:orientation="vertical"> + android:scrollbars="none" + tools:context=".ui.profile.ProfileFragment"> + android:layout_height="24dp" + android:layout_gravity="end|center_vertical" + android:layout_marginEnd="16dp" + android:theme="@style/GreyProgressBar" + android:visibility="invisible" + tools:visibility="visible" /> @@ -299,8 +305,8 @@ android:layout_height="wrap_content" android:layout_marginBottom="16dp" android:fontFamily="monospace" - android:textSize="11sp" android:textColor="@color/white" + android:textSize="11sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/app/src/main/res/layout/fragment_relation_create_from_scratch.xml b/app/src/main/res/layout/fragment_relation_create_from_scratch.xml index 481d06f885..a11364e4f4 100644 --- a/app/src/main/res/layout/fragment_relation_create_from_scratch.xml +++ b/app/src/main/res/layout/fragment_relation_create_from_scratch.xml @@ -21,7 +21,7 @@ android:layout_marginTop="18sp" android:textSize="17sp" android:fontFamily="@font/inter_bold" - android:textColor="@color/black" + android:textColor="@color/text_primary" android:text="@string/new_relation" android:layout_gravity="center_horizontal" android:layout_width="wrap_content" @@ -36,7 +36,6 @@ @@ -63,7 +62,7 @@ android:layout_width="match_parent" android:layout_height="68dp" android:layout_gravity="bottom" - android:background="@color/white"> + android:background="@color/background_secondary"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_select_account.xml b/app/src/main/res/layout/fragment_select_account.xml index a497f832bd..0c88312bc7 100644 --- a/app/src/main/res/layout/fragment_select_account.xml +++ b/app/src/main/res/layout/fragment_select_account.xml @@ -70,7 +70,7 @@ android:drawableStart="@drawable/ic_plus" android:drawablePadding="26dp" android:text="@string/add_profile" - android:textColor="#ACA996" + android:textColor="@color/text_secondary" android:textSize="17sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/fragment_select_filter_condition.xml b/app/src/main/res/layout/fragment_select_filter_condition.xml new file mode 100644 index 0000000000..b12c8127da --- /dev/null +++ b/app/src/main/res/layout/fragment_select_filter_condition.xml @@ -0,0 +1,23 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_splash.xml b/app/src/main/res/layout/fragment_splash.xml index 9387a50ff8..7d47a02035 100644 --- a/app/src/main/res/layout/fragment_splash.xml +++ b/app/src/main/res/layout/fragment_splash.xml @@ -2,7 +2,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white"> + android:background="@color/background_primary"> diff --git a/app/src/main/res/layout/fragment_user_settings.xml b/app/src/main/res/layout/fragment_user_settings.xml index 7d288bbb9b..673f40846c 100644 --- a/app/src/main/res/layout/fragment_user_settings.xml +++ b/app/src/main/res/layout/fragment_user_settings.xml @@ -49,7 +49,7 @@ android:layout_marginStart="20dp" android:fontFamily="@font/inter_regular" android:text="@string/default_object_type_title" - android:textColor="@color/black" + android:textColor="@color/text_primary" android:textSize="17sp" /> diff --git a/app/src/main/res/layout/item_choose_profile_add.xml b/app/src/main/res/layout/item_choose_profile_add.xml index 87119bedab..15ad5eadc4 100644 --- a/app/src/main/res/layout/item_choose_profile_add.xml +++ b/app/src/main/res/layout/item_choose_profile_add.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_marginStart="32dp" android:text="@string/add_profile" - android:textColor="#ACA996" + android:textColor="@color/text_secondary" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/imageView" diff --git a/app/src/main/res/layout/item_choose_profile_profile.xml b/app/src/main/res/layout/item_choose_profile_profile.xml index 2228bb6481..3e4948f8fe 100644 --- a/app/src/main/res/layout/item_choose_profile_profile.xml +++ b/app/src/main/res/layout/item_choose_profile_profile.xml @@ -31,7 +31,7 @@ android:id="@+id/name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/black" + android:textColor="@color/text_primary" android:textSize="17sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -44,6 +44,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_peers" + android:textColor="@color/text_secondary" android:textSize="15sp" /> diff --git a/app/src/main/res/layout/item_dashboard_card_default.xml b/app/src/main/res/layout/item_dashboard_card_default.xml index 55326d4669..b4a2ce3b18 100644 --- a/app/src/main/res/layout/item_dashboard_card_default.xml +++ b/app/src/main/res/layout/item_dashboard_card_default.xml @@ -5,8 +5,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/default_dashboard_card_height" app:cardCornerRadius="16dp" - android:foreground="?android:attr/selectableItemBackground" - android:clickable="true" + app:cardBackgroundColor="@color/dashboard_card_background" app:cardElevation="0dp"> + android:background="@drawable/shimmer_circle" /> @@ -19,12 +19,12 @@ + android:visibility="invisible" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_desktop_page_without_icon.xml b/app/src/main/res/layout/item_desktop_page_without_icon.xml index 4ef6993834..ad45cf0761 100644 --- a/app/src/main/res/layout/item_desktop_page_without_icon.xml +++ b/app/src/main/res/layout/item_desktop_page_without_icon.xml @@ -4,21 +4,21 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="@dimen/default_dashboard_card_height" - android:foreground="?android:attr/selectableItemBackground" android:clickable="true" + app:cardBackgroundColor="@color/dashboard_card_background" app:cardCornerRadius="16dp" app:cardElevation="0dp"> + app:shimmer_duration="2000" + tools:visibility="invisible"> + android:visibility="invisible" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_desktop_set_without_icon.xml b/app/src/main/res/layout/item_desktop_set_without_icon.xml index 7e7dc18476..83963609e1 100644 --- a/app/src/main/res/layout/item_desktop_set_without_icon.xml +++ b/app/src/main/res/layout/item_desktop_set_without_icon.xml @@ -4,9 +4,9 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="@dimen/default_dashboard_card_height" - android:foreground="?android:attr/selectableItemBackground" android:clickable="true" app:cardCornerRadius="16dp" + app:cardBackgroundColor="@color/dashboard_card_background" app:cardElevation="0dp"> + + #000000 + + #FF5722 + #000000 + #3F51B5 + + #6a6962 + #FFBB2C + #ACA996 + + #FFBB2C + #FFFFFF + #FFFFFF + #ACA996 + #ACA996 + #3F51B5 + + #DFDDD0 + #ACA996 + + #0066C3 + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 6626c70f2e..8516d3aa2c 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,7 +1,9 @@ + #FFFFFF + #FF5722 - #FFC107 + #000000 #3F51B5 #6a6962 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index d75697dead..43bcab613a 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -38,4 +38,5 @@ 68dp 126dp 48dp + 0.5dp \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dd2a9c37a2..95577e44c3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -261,4 +261,5 @@ Do the computation of an expensive paragraph of text on a background thread: Clear cache All files will be deleted from your current device. They can be downloaded again from a backup node or another device. + new profile diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 0723b33f62..a446a89b49 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,13 +1,13 @@ - @@ -78,12 +79,12 @@ @@ -116,14 +117,14 @@ end 1 true - @color/black + @color/text_primary 15sp @@ -133,19 +134,19 @@ end 1 true - #929082 + @color/text_secondary 12sp @@ -173,19 +174,19 @@ @@ -236,7 +237,7 @@ 17sp @font/inter_semibold -0.01 - @color/black + @color/text_primary center diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/common/Color.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/common/Color.kt index 8da7580b0f..d86f53fd5b 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/common/Color.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/common/Color.kt @@ -1,8 +1,6 @@ package com.anytypeio.anytype.core_ui.common import android.graphics.Color -import com.anytypeio.anytype.presentation.editor.editor.ThemeColor -import com.anytypeio.anytype.presentation.editor.editor.model.BlockView enum class ThemeColorCode( val title: String, @@ -69,8 +67,4 @@ enum class ThemeColorCode( val text = values().associate { color -> color.text to color.title } val background = values().associate { color -> color.background to color.title } } -} - -fun BlockView.TextSupport.getBlockTextColor(): Int = color?.let { code -> - ThemeColor.values().find { it.title == code }?.text ?: ThemeColor.DEFAULT.text -} ?: ThemeColor.DEFAULT.text \ No newline at end of file +} \ No newline at end of file diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/common/Markup.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/common/Markup.kt index 1d110fd53c..ad5a53c9f4 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/common/Markup.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/common/Markup.kt @@ -8,6 +8,7 @@ import android.text.style.ClickableSpan import android.view.View import androidx.core.content.ContextCompat import com.anytypeio.anytype.core_ui.R +import com.anytypeio.anytype.core_ui.extensions.dark import com.anytypeio.anytype.core_ui.extensions.drawable import com.anytypeio.anytype.core_ui.widgets.text.MentionSpan import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget @@ -19,7 +20,7 @@ import timber.log.Timber fun Markup.toSpannable( textColor: Int, - context: Context? = null, + context: Context, click: ((String) -> Unit)? = null, mentionImageSize: Int = 0, mentionImagePadding: Int = 0, @@ -49,18 +50,28 @@ fun Markup.toSpannable( Markup.DEFAULT_SPANNABLE_FLAG ) is Markup.Mark.TextColor -> { - val color = mark.color() ?: ThemeColor.DEFAULT.text + val value = mark.color() + val span = if (value != null && value != ThemeColor.DEFAULT) { + Span.TextColor( + color = context.resources.dark(color = value, default = textColor), + value = mark.color + ) + } else { + Span.TextColor( + color = textColor, + value = mark.color + ) + } setSpan( - Span.TextColor(color), + span, mark.from, mark.to, Markup.DEFAULT_SPANNABLE_FLAG ) } is Markup.Mark.BackgroundColor -> { - val background = mark.background() ?: ThemeColor.DEFAULT.background setSpan( - Span.Highlight(background.toString()), + Span.Highlight(mark.background), mark.from, mark.to, Markup.DEFAULT_SPANNABLE_FLAG @@ -87,20 +98,18 @@ fun Markup.toSpannable( ) } is Markup.Mark.Mention -> { - context?.let { - setMentionSpan( - mark = mark, - context = it, - click = click, - mentionImageSize = mentionImageSize, - mentionImagePadding = mentionImagePadding, - mentionCheckedIcon = mentionCheckedIcon, - mentionUncheckedIcon = mentionUncheckedIcon, - onImageReady = onImageReady, - mentionInitialsSize = mentionInitialsSize, - textColor = textColor - ) - } ?: run { Timber.d("Mention Span context is null") } + setMentionSpan( + mark = mark, + context = context, + click = click, + mentionImageSize = mentionImageSize, + mentionImagePadding = mentionImagePadding, + mentionCheckedIcon = mentionCheckedIcon, + mentionUncheckedIcon = mentionUncheckedIcon, + onImageReady = onImageReady, + mentionInitialsSize = mentionInitialsSize, + textColor = textColor + ) } is Markup.Mark.Object -> setSpan( Span.ObjectLink( @@ -118,7 +127,7 @@ fun Markup.toSpannable( fun Editable.setMarkup( markup: Markup, - context: Context? = null, + context: Context, click: ((String) -> Unit)? = null, mentionImageSize: Int = 0, mentionImagePadding: Int = 0, @@ -150,18 +159,28 @@ fun Editable.setMarkup( Markup.DEFAULT_SPANNABLE_FLAG ) is Markup.Mark.TextColor -> { - val color = mark.color() ?: ThemeColor.DEFAULT.text + val value = mark.color() + val span = if (value != null && value != ThemeColor.DEFAULT) { + Span.TextColor( + color = context.resources.dark(color = value, default = textColor), + value = mark.color + ) + } else { + Span.TextColor( + color = textColor, + value = mark.color + ) + } setSpan( - Span.TextColor(color), + span, mark.from, mark.to, Markup.DEFAULT_SPANNABLE_FLAG ) } is Markup.Mark.BackgroundColor -> { - val background = mark.background() ?: ThemeColor.DEFAULT.background setSpan( - Span.Highlight(background.toString()), + Span.Highlight(mark.background), mark.from, mark.to, Markup.DEFAULT_SPANNABLE_FLAG diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/common/Span.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/common/Span.kt index b8b02dccaf..b84cfc7271 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/common/Span.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/common/Span.kt @@ -22,7 +22,7 @@ interface Span { class Bold : StyleSpan(Typeface.BOLD), Span class Italic : StyleSpan(Typeface.ITALIC), Span class Strikethrough : StrikethroughSpan(), Span - class TextColor(color: Int) : ForegroundColorSpan(color), Span + class TextColor(color: Int, val value: String) : ForegroundColorSpan(color), Span class Url(url: String, val color: Int) : URLSpan(url), Span { override fun updateDrawState(ds: TextPaint) { diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/extensions/PaletteExtension.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/extensions/PaletteExtension.kt new file mode 100644 index 0000000000..dc7b5b8f77 --- /dev/null +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/extensions/PaletteExtension.kt @@ -0,0 +1,47 @@ +package com.anytypeio.anytype.core_ui.extensions + +import android.content.res.Resources +import com.anytypeio.anytype.core_ui.R +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor + +fun Resources.dark(color: ThemeColor, default: Int): Int = when (color) { + ThemeColor.DEFAULT -> default + ThemeColor.GREY -> getColor(R.color.palette_dark_grey, null) + ThemeColor.YELLOW -> getColor(R.color.palette_dark_yellow, null) + ThemeColor.ORANGE -> getColor(R.color.palette_dark_orange, null) + ThemeColor.RED -> getColor(R.color.palette_dark_red, null) + ThemeColor.PINK -> getColor(R.color.palette_dark_pink, null) + ThemeColor.PURPLE -> getColor(R.color.palette_dark_purple, null) + ThemeColor.BLUE -> getColor(R.color.palette_dark_blue, null) + ThemeColor.ICE -> getColor(R.color.palette_dark_ice, null) + ThemeColor.TEAL -> getColor(R.color.palette_dark_teal, null) + ThemeColor.GREEN -> getColor(R.color.palette_dark_green, null) +} + +fun Resources.light(color: ThemeColor, default: Int): Int = when (color) { + ThemeColor.DEFAULT -> default + ThemeColor.GREY -> getColor(R.color.palette_light_grey, null) + ThemeColor.YELLOW -> getColor(R.color.palette_light_yellow, null) + ThemeColor.ORANGE -> getColor(R.color.palette_light_orange, null) + ThemeColor.RED -> getColor(R.color.palette_light_red, null) + ThemeColor.PINK -> getColor(R.color.palette_light_pink, null) + ThemeColor.PURPLE -> getColor(R.color.palette_light_purple, null) + ThemeColor.BLUE -> getColor(R.color.palette_light_blue, null) + ThemeColor.ICE -> getColor(R.color.palette_light_ice, null) + ThemeColor.TEAL -> getColor(R.color.palette_light_teal, null) + ThemeColor.GREEN -> getColor(R.color.palette_light_green, null) +} + +fun Resources.lighter(color: ThemeColor, default: Int): Int = when (color) { + ThemeColor.DEFAULT -> default + ThemeColor.GREY -> getColor(R.color.palette_very_light_grey, null) + ThemeColor.YELLOW -> getColor(R.color.palette_very_light_yellow, null) + ThemeColor.ORANGE -> getColor(R.color.palette_very_light_orange, null) + ThemeColor.RED -> getColor(R.color.palette_very_light_red, null) + ThemeColor.PINK -> getColor(R.color.palette_very_light_pink, null) + ThemeColor.PURPLE -> getColor(R.color.palette_very_light_purple, null) + ThemeColor.BLUE -> getColor(R.color.palette_very_light_blue, null) + ThemeColor.ICE -> getColor(R.color.palette_very_light_ice, null) + ThemeColor.TEAL -> getColor(R.color.palette_very_light_teal, null) + ThemeColor.GREEN -> getColor(R.color.palette_very_light_green, null) +} \ No newline at end of file diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/extensions/ResExtension.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/extensions/ResExtension.kt index d3d9c8d08d..c430e2860f 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/extensions/ResExtension.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/extensions/ResExtension.kt @@ -288,4 +288,4 @@ fun ObjectLayoutView.getName(): Int? = when (this) { is ObjectLayoutView.ObjectType -> null is ObjectLayoutView.Relation -> null is ObjectLayoutView.Space -> null -} +} \ No newline at end of file diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/holders/DVGridCellStatusHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/holders/DVGridCellStatusHolder.kt index 2f6504b453..0424870733 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/holders/DVGridCellStatusHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/holders/DVGridCellStatusHolder.kt @@ -3,7 +3,7 @@ package com.anytypeio.anytype.core_ui.features.dataview.holders import android.view.View import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.extensions.color +import com.anytypeio.anytype.core_ui.extensions.dark import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.sets.model.CellView import kotlinx.android.synthetic.main.item_viewer_grid_cell_description.view.* @@ -15,10 +15,11 @@ class DVGridCellStatusHolder(view: View) : RecyclerView.ViewHolder(view) { if (status != null) { tvText.text = status.status val color = ThemeColor.values().find { v -> v.title == status.color } - if (color != null) { - tvText.setTextColor(color.text) + val defaultTextColor = resources.getColor(R.color.text_primary, null) + if (color != null && color != ThemeColor.DEFAULT) { + tvText.setTextColor(resources.dark(color, defaultTextColor)) } else { - tvText.setTextColor(context.color(R.color.default_filter_status_text_color)) + tvText.setTextColor(defaultTextColor) } } else { tvText.text = "" diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/holders/DVGridCellTagHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/holders/DVGridCellTagHolder.kt index 4768fa8865..2c8c81391b 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/holders/DVGridCellTagHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/dataview/holders/DVGridCellTagHolder.kt @@ -4,7 +4,8 @@ import android.view.View import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -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_utils.ext.gone import com.anytypeio.anytype.core_utils.ext.setDrawableColor import com.anytypeio.anytype.core_utils.ext.visible @@ -23,12 +24,14 @@ class DVGridCellTagHolder(view: View) : RecyclerView.ViewHolder(view) { view.visible() view.text = tagView.tag val color = ThemeColor.values().find { v -> v.title == tagView.color } - if (color != null) { - view.background.setDrawableColor(color.background) - view.setTextColor(color.text) + val defaultTextColor = itemView.resources.getColor(R.color.text_primary, null) + val defaultBackground = itemView.resources.getColor(R.color.shape_primary, null) + if (color != null && color != ThemeColor.DEFAULT) { + view.background.setDrawableColor(itemView.resources.light(color, defaultBackground)) + view.setTextColor(itemView.resources.dark(color, defaultTextColor)) } else { - view.background.setDrawableColor(itemView.context.color(R.color.default_filter_tag_background_color)) - view.setTextColor(itemView.context.color(R.color.default_filter_tag_text_color)) + view.background.setDrawableColor(defaultBackground) + view.setTextColor(defaultTextColor) } } } 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 302ea245d3..585bc8b668 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 @@ -6,6 +6,8 @@ import android.widget.ImageView import android.widget.TextView import com.anytypeio.anytype.core_ui.R 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_utils.ext.gone import com.anytypeio.anytype.core_utils.ext.invisible import com.anytypeio.anytype.core_utils.ext.visible @@ -58,10 +60,12 @@ class FilterTagViewHolder(view: View) : FilterViewHolder(view) { 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.title == value?.color } - if (color != null) { - chipBackgroundColor = ColorStateList.valueOf(color.background) - setTextColor(color.text) + 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)) diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/MarkupColorAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/MarkupColorAdapter.kt index 84c1f6b024..7ed6d95a59 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/MarkupColorAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/MarkupColorAdapter.kt @@ -5,6 +5,8 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R +import com.anytypeio.anytype.core_ui.extensions.dark +import com.anytypeio.anytype.core_ui.extensions.light import com.anytypeio.anytype.core_ui.widgets.ColorCircleWidget import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.editor.markup.MarkupColorView @@ -75,15 +77,17 @@ class MarkupColorAdapter( class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { private val circle = itemView.findViewById(R.id.circle) fun bind(view: MarkupColorView.Text) { - val color = ThemeColor.values().first { it.title == view.code } circle.isSelected = view.isSelected - circle.innerColor = color.text + val color = ThemeColor.values().first { it.title == view.code } + val default = itemView.resources.getColor(R.color.text_primary, null) + circle.innerColor = itemView.resources.dark(color, default) } fun bind(view: MarkupColorView.Background) { val color = ThemeColor.values().first { it.title == view.code } + val default = itemView.resources.getColor(R.color.background_primary, null) circle.isSelected = view.isSelected - circle.innerColor = color.background + circle.innerColor = itemView.resources.light(color, default) } } } \ No newline at end of file diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/MarkupMapper.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/MarkupMapper.kt index fbd4b1edca..936e2a8977 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/MarkupMapper.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/MarkupMapper.kt @@ -15,16 +15,12 @@ fun Editable.marks(): List = getSpans(0, length, Span::class.java). is Span.TextColor -> Markup.Mark.TextColor( from = getSpanStart(span), to = getSpanEnd(span), - color = span.foregroundColor.let { color -> - ThemeColor.text[color] - }.orEmpty() + color = span.value ) is Span.Highlight -> Markup.Mark.BackgroundColor( from = getSpanStart(span), to = getSpanEnd(span), - background = span.value.let { background -> - ThemeColor.background[background.toInt()] - }.orEmpty() + background = span.value ) is Span.Italic -> Markup.Mark.Italic( from = getSpanStart(span), diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/TextBlockHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/TextBlockHolder.kt index b851253209..f721601ab7 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/TextBlockHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/TextBlockHolder.kt @@ -5,10 +5,7 @@ import android.text.Editable import android.text.Spannable import android.widget.TextView import com.anytypeio.anytype.core_ui.common.* -import com.anytypeio.anytype.core_ui.extensions.applyMovementMethod -import com.anytypeio.anytype.core_ui.extensions.cursorYBottomCoordinate -import com.anytypeio.anytype.core_ui.extensions.preserveSelection -import com.anytypeio.anytype.core_ui.extensions.range +import com.anytypeio.anytype.core_ui.extensions.* import com.anytypeio.anytype.core_ui.features.editor.holders.`interface`.TextHolder import com.anytypeio.anytype.core_ui.menu.EditorContextMenu import com.anytypeio.anytype.core_ui.tools.* @@ -30,6 +27,8 @@ import timber.log.Timber */ interface TextBlockHolder : TextHolder { + fun getDefaultTextColor(): Int + fun setup( onContextMenuStyleClick: (IntRange) -> Unit ) { @@ -64,7 +63,10 @@ interface TextBlockHolder : TextHolder { } private fun setSpannable(markup: Markup, textColor: Int) { - content.setText(markup.toSpannable(textColor = textColor), TextView.BufferType.SPANNABLE) + content.setText( + markup.toSpannable(textColor = textColor, context = content.context), + TextView.BufferType.SPANNABLE + ) } fun getMentionIconSize(): Int @@ -100,8 +102,8 @@ interface TextBlockHolder : TextHolder { Timber.d("Setting background color: $color") if (!color.isNullOrEmpty()) { val value = ThemeColor.values().find { value -> value.title == color } - if (value != null) { - root.setBackgroundColor(value.background) + if (value != null && value != ThemeColor.DEFAULT) { + root.setBackgroundColor(root.resources.lighter(value, 0)) } else { Timber.e("Could not find value for background color: $color, setting background to null") root.background = null @@ -284,7 +286,7 @@ interface TextBlockHolder : TextHolder { text = item.text, markup = item, clicked = clicked, - textColor = item.getBlockTextColor() + textColor = getBlockTextColor(item.color) ) } } @@ -293,7 +295,7 @@ interface TextBlockHolder : TextHolder { } } else if (payload.markupChanged()) { content.pauseTextWatchers { - setMarkup(item, clicked, item.getBlockTextColor()) + setMarkup(item, clicked, getBlockTextColor(item.color)) if (item is Checkable) { applyCheckedCheckboxColorSpan(item.isChecked) } @@ -310,7 +312,8 @@ interface TextBlockHolder : TextHolder { if (payload.textColorChanged()) { val color = item.color ?: ThemeColor.DEFAULT.title - setTextColor(color) + content.setTextColor(getBlockTextColor(color)) + setMarkup(item, clicked, getBlockTextColor(item.color)) } if (payload.backgroundColorChanged()) { @@ -388,4 +391,14 @@ interface TextBlockHolder : TextHolder { fun clearTextWatchers() { content.clearTextWatchers() } + + fun getBlockTextColor(color: String?): Int { + val value = ThemeColor.values().find { value -> value.title == color } + val default = getDefaultTextColor() + return if (value != null && value != ThemeColor.DEFAULT) { + content.resources.dark(value, default) + } else { + default + } + } } \ No newline at end of file diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/interface/TextHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/interface/TextHolder.kt index b0352243b0..b9a1129e20 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/interface/TextHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/interface/TextHolder.kt @@ -2,6 +2,8 @@ package com.anytypeio.anytype.core_ui.features.editor.holders.`interface` import android.view.Gravity import android.view.View +import com.anytypeio.anytype.core_ui.R +import com.anytypeio.anytype.core_ui.extensions.dark import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget import com.anytypeio.anytype.core_utils.text.BackspaceKeyDetector import com.anytypeio.anytype.presentation.editor.editor.ThemeColor @@ -47,11 +49,11 @@ interface TextHolder { fun setTextColor(color: String) { val value = ThemeColor.values().find { value -> value.title == color } - if (value != null) { - content.setTextColor(value.text) + val default = content.context.getColor(R.color.text_primary) + if (value != null && value != ThemeColor.DEFAULT) { + content.setTextColor(content.resources.dark(value, default)) } else { - Timber.e("Could not find value for text color: $color, setting default text color") - content.setTextColor(ThemeColor.DEFAULT.text) + content.setTextColor(default) } } diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Code.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Code.kt index 8766235517..8aef5597a2 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Code.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Code.kt @@ -13,6 +13,7 @@ import android.widget.TextView import androidx.core.view.updateLayoutParams import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.common.ThemeColorCode +import com.anytypeio.anytype.core_ui.extensions.lighter import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder import com.anytypeio.anytype.core_ui.features.editor.EditorTouchProcessor @@ -24,6 +25,7 @@ import com.anytypeio.anytype.core_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.imm import com.anytypeio.anytype.core_utils.text.BackspaceKeyDetector import com.anytypeio.anytype.library_syntax_highlighter.Syntaxes +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.editor.editor.model.Focusable @@ -202,14 +204,13 @@ class Code(view: View) : BlockViewHolder(view), BlockViewHolder.DragAndDropHolde private fun setBackgroundColor(color: String? = null) { Timber.d("Setting background color: $color") - if (color != null) { - val value = ThemeColorCode.values().find { value -> value.title == color } - if (value != null) - (container.background as? GradientDrawable)?.setColor(value.background) - else - Timber.e("Could not find value for background color: $color") + val value = ThemeColor.values().find { value -> value.title == color } + if (value != null && value != ThemeColor.DEFAULT) { + (container.background as? GradientDrawable)?.setColor(root.resources.lighter(value, 0)) } else { - (container.background as? GradientDrawable)?.setColor(ThemeColorCode.DEFAULT.background) + val defaultBackgroundColor = + content.context.resources.getColor(R.color.shape_tertiary, null) + (container.background as? GradientDrawable)?.setColor(defaultBackgroundColor) } } diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/relations/RelationViewHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/relations/RelationViewHolder.kt index 7073a06fbf..b416a61c64 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/relations/RelationViewHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/relations/RelationViewHolder.kt @@ -8,7 +8,7 @@ import androidx.core.view.updateLayoutParams import androidx.core.view.updatePadding import com.anytypeio.anytype.core_models.Relation import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.extensions.color +import com.anytypeio.anytype.core_ui.extensions.dark import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder import com.anytypeio.anytype.core_ui.widgets.GridCellFileItem import com.anytypeio.anytype.core_ui.widgets.RelationObjectItem @@ -121,10 +121,11 @@ sealed class RelationViewHolder( val status = item.status.first() text = status.status val color = ThemeColor.values().find { v -> v.title == status.color } - if (color != null) { - setTextColor(color.text) + val defaultTextColor = resources.getColor(R.color.text_primary, null) + if (color != null && color != ThemeColor.DEFAULT) { + setTextColor(resources.dark(color, defaultTextColor)) } else { - setTextColor(context.color(R.color.default_filter_status_text_color)) + setTextColor(defaultTextColor) } } else { text = null diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Numbered.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Numbered.kt index 72c2649541..19a350174d 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Numbered.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Numbered.kt @@ -20,7 +20,6 @@ import com.anytypeio.anytype.presentation.editor.editor.mention.MentionEvent import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.editor.editor.slash.SlashEvent import kotlinx.android.synthetic.main.item_block_numbered.view.* -import timber.log.Timber class Numbered( view: View, @@ -114,10 +113,10 @@ class Numbered( override fun setTextColor(color: String) { super.setTextColor(color) val value = ThemeColor.values().find { value -> value.title == color } - if (value != null) { + if (value != null && value != ThemeColor.DEFAULT) { number.setTextColor(value.text) } else { - number.setTextColor(ThemeColor.DEFAULT.text) + number.setTextColor(itemView.context.getColor(R.color.anytype_text_default)) } } diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Text.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Text.kt index 56271a643e..dc4e03d87d 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Text.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/text/Text.kt @@ -3,20 +3,21 @@ package com.anytypeio.anytype.core_ui.features.editor.holders.text import android.text.Editable import android.view.View import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.common.getBlockTextColor import com.anytypeio.anytype.core_ui.extensions.applyMovementMethod import com.anytypeio.anytype.core_ui.extensions.color import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder import com.anytypeio.anytype.core_ui.features.editor.TextBlockHolder import com.anytypeio.anytype.core_ui.tools.DefaultTextWatcher -import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType import com.anytypeio.anytype.presentation.editor.editor.model.BlockView import com.anytypeio.anytype.presentation.editor.editor.model.Checkable abstract class Text( view: View -) : BlockViewHolder(view), TextBlockHolder, BlockViewHolder.IndentableHolder, BlockViewHolder.DragAndDropHolder { +) : BlockViewHolder(view), TextBlockHolder, BlockViewHolder.IndentableHolder, + BlockViewHolder.DragAndDropHolder { + + private val defTextColor: Int = itemView.context.resources.getColor(R.color.text_primary, null) fun bind( item: BlockView.TextBlockProps, @@ -96,7 +97,7 @@ abstract class Text( text = item.text, markup = item, clicked = clicked, - textColor = item.getBlockTextColor() + textColor = getBlockTextColor(item.color) ) } if (item is BlockView.Searchable) { @@ -115,7 +116,7 @@ abstract class Text( if (color != null) { setTextColor(color) } else { - setTextColor(content.context.color(R.color.black)) + setTextColor(content.context.color(R.color.anytype_text_default)) } setBackgroundColor(color = item.backgroundColor) } @@ -139,4 +140,6 @@ abstract class Text( fun selection(item: BlockView.Selectable) { select(item) } + + override fun getDefaultTextColor(): Int = defTextColor } \ No newline at end of file diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/ObjectTypeBaseAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/ObjectTypeBaseAdapter.kt index 7dee4d30ef..97e75902e2 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/ObjectTypeBaseAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/ObjectTypeBaseAdapter.kt @@ -64,9 +64,6 @@ abstract class ObjectTypeBaseAdapter( is ObjectTypeHorizontalHolder -> { holder.bind(data[position] as ObjectTypeView.Item) } - is ObjectTypeSearchHolder -> { - holder.bind() - } } } diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/holders/ObjectTypeHolder.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/holders/ObjectTypeHolder.kt index 23eac45b85..eca3f67e7c 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/holders/ObjectTypeHolder.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/objects/holders/ObjectTypeHolder.kt @@ -4,7 +4,6 @@ import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.extensions.drawable import com.anytypeio.anytype.core_utils.ext.gone import com.anytypeio.anytype.core_utils.ext.visible import com.anytypeio.anytype.presentation.objects.ObjectTypeView @@ -61,8 +60,4 @@ class ObjectTypeSearchHolder(parent: ViewGroup) : RecyclerView.ViewHolder( parent, false ) -) { - fun bind() { - itemView.icon.setImageDrawable(itemView.context.drawable(R.drawable.ic_search)) - } -} \ No newline at end of file +) \ No newline at end of file diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/sets/CreateFilterAdapter.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/sets/CreateFilterAdapter.kt index 56fd7a29eb..7fe3b503c5 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/sets/CreateFilterAdapter.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/sets/CreateFilterAdapter.kt @@ -5,7 +5,8 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.anytypeio.anytype.core_ui.R -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_utils.ext.formatTimestamp import com.anytypeio.anytype.core_utils.ext.invisible import com.anytypeio.anytype.core_utils.ext.setDrawableColor @@ -128,12 +129,14 @@ class CreateFilterAdapter( ivSelectTagIcon.isSelected = item.isSelected tvTagName.text = item.name val color = ThemeColor.values().find { v -> v.title == item.color } - if (color != null) { - tvTagName.background.setDrawableColor(color.background) - tvTagName.setTextColor(color.text) + val defaultTextColor = resources.getColor(R.color.text_primary, null) + val defaultBackground = resources.getColor(R.color.shape_primary, null) + if (color != null && color != ThemeColor.DEFAULT) { + tvTagName.background.setDrawableColor(resources.light(color, defaultTextColor)) + tvTagName.setTextColor(resources.dark(color, defaultBackground)) } else { - tvTagName.background.setDrawableColor(context.color(R.color.default_filter_tag_background_color)) - tvTagName.setTextColor(context.color(R.color.default_filter_tag_text_color)) + tvTagName.background.setDrawableColor(defaultBackground) + tvTagName.setTextColor(defaultTextColor) } } } @@ -143,10 +146,11 @@ class CreateFilterAdapter( ivSelectStatusIcon.isSelected = item.isSelected tvStatusName.text = item.name val color = ThemeColor.values().find { v -> v.title == item.color } - if (color != null) { - tvStatusName.setTextColor(color.text) + val defaultTextColor = resources.getColor(R.color.text_primary, null) + if (color != null && color != ThemeColor.DEFAULT) { + tvStatusName.setTextColor(resources.dark(color, defaultTextColor)) } else { - tvStatusName.setTextColor(context.color(R.color.default_filter_status_text_color)) + tvStatusName.setTextColor(defaultTextColor) } } } diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ColorCircleWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ColorCircleWidget.kt index 31ed3b8291..fdf670aac2 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ColorCircleWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ColorCircleWidget.kt @@ -60,7 +60,6 @@ class ColorCircleWidget : View { attrs.recycle() } - override fun onDraw(canvas: Canvas) { super.onDraw(canvas) @@ -71,7 +70,7 @@ class ColorCircleWidget : View { // background paint.apply { - color = Color.WHITE + color = 0 style = Paint.Style.FILL } canvas.apply { drawCircle(cx, cy, radius, paint) } diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectIconWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectIconWidget.kt index 91c335b0c2..19016c0a36 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectIconWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ObjectIconWidget.kt @@ -150,7 +150,7 @@ class ObjectIconWidget @JvmOverloads constructor( } private fun setBasicInitials(name: String) { - val textColor = context.color(R.color.default_object_basic_avatar_text_color) + val textColor = context.color(R.color.text_tertiary) ivImage.invisible() emojiContainer.invisible() ivCheckbox.invisible() diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/StatusWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/StatusWidget.kt index 7c7c169d55..794381e936 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/StatusWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/StatusWidget.kt @@ -4,7 +4,7 @@ import android.content.Context import android.util.AttributeSet import androidx.appcompat.widget.AppCompatTextView import com.anytypeio.anytype.core_ui.R -import com.anytypeio.anytype.core_ui.extensions.color +import com.anytypeio.anytype.core_ui.extensions.dark import com.anytypeio.anytype.presentation.editor.editor.ThemeColor class StatusWidget @JvmOverloads constructor( @@ -14,11 +14,12 @@ class StatusWidget @JvmOverloads constructor( ) : AppCompatTextView(context, attrs, defStyleAttr) { fun setColor(color: String?) { + val defaultTextColor = resources.getColor(R.color.text_primary, null) val themeColor = ThemeColor.values().find { it.title == color } - if (themeColor != null) { - setTextColor(themeColor.text) + if (themeColor != null && themeColor != ThemeColor.DEFAULT) { + setTextColor(resources.dark(themeColor, defaultTextColor)) } else { - setTextColor(context.color(R.color.default_filter_tag_text_color)) + setTextColor(defaultTextColor) } } } \ No newline at end of file diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TagWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TagWidget.kt index 553a99e207..8bd79a4914 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TagWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TagWidget.kt @@ -5,7 +5,8 @@ import android.text.TextUtils import android.util.AttributeSet import androidx.appcompat.widget.AppCompatTextView import com.anytypeio.anytype.core_ui.R -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_utils.ext.dimen import com.anytypeio.anytype.core_utils.ext.setDrawableColor import com.anytypeio.anytype.core_utils.ext.visible @@ -33,13 +34,15 @@ class TagWidget @JvmOverloads constructor( } private fun setColor(color: String?) { + val defaultTextColor = resources.getColor(R.color.text_primary, null) + val defaultBackground = resources.getColor(R.color.shape_primary, null) val themeColor = ThemeColor.values().find { it.title == color } - if (themeColor != null) { - background.setDrawableColor(themeColor.background) - setTextColor(themeColor.text) + if (themeColor != null && themeColor != ThemeColor.DEFAULT) { + background.setDrawableColor(resources.light(themeColor, defaultBackground)) + setTextColor(resources.dark(themeColor, defaultTextColor)) } else { - background.setDrawableColor(context.color(R.color.default_filter_tag_background_color)) - setTextColor(context.color(R.color.default_filter_tag_text_color)) + background.setDrawableColor(defaultBackground) + setTextColor(defaultTextColor) } } } \ No newline at end of file diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TextHighlightWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TextHighlightWidget.kt index 1d0fd97881..01351342ad 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TextHighlightWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TextHighlightWidget.kt @@ -36,7 +36,12 @@ class TextHighlightWidget @JvmOverloads constructor( override fun onDraw(canvas: Canvas?) { if (text is Spanned && layout != null) { canvas?.withTranslation(totalPaddingLeft.toFloat(), totalPaddingTop.toFloat()) { - highlightDrawer?.draw(canvas, text as Spanned, layout) + highlightDrawer?.draw( + canvas = canvas, + text = text as Spanned, + layout = layout, + resources = context.resources + ) } } super.onDraw(canvas) diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TextInputWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TextInputWidget.kt index a10d96e9a6..4b104fac5c 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TextInputWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TextInputWidget.kt @@ -239,7 +239,7 @@ class TextInputWidget : AppCompatEditText { // need to draw bg first so that text can be on top during super.onDraw() if (text is Spanned && layout != null) { canvas?.withTranslation(totalPaddingLeft.toFloat(), totalPaddingTop.toFloat()) { - highlightDrawer?.draw(canvas, text as Spanned, layout) + highlightDrawer?.draw(canvas, text as Spanned, layout, context.resources) } } super.onDraw(canvas) diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/highlight/HighlightDrawer.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/highlight/HighlightDrawer.kt index 6dc42cd78a..08b7b91e68 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/highlight/HighlightDrawer.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/highlight/HighlightDrawer.kt @@ -1,12 +1,17 @@ package com.anytypeio.anytype.core_ui.widgets.text.highlight +import android.content.res.Resources import android.graphics.Canvas import android.graphics.drawable.Drawable import android.text.Annotation import android.text.Layout import android.text.Spanned import androidx.core.graphics.drawable.DrawableCompat +import com.anytypeio.anytype.core_ui.R import com.anytypeio.anytype.core_ui.common.Span +import com.anytypeio.anytype.core_ui.extensions.dark +import com.anytypeio.anytype.core_ui.extensions.lighter +import com.anytypeio.anytype.presentation.editor.editor.ThemeColor import timber.log.Timber /** @@ -83,7 +88,7 @@ class HighlightDrawer( * @param text * @param layout Layout that contains the text */ - fun draw(canvas: Canvas, text: Spanned, layout: Layout) { + fun draw(canvas: Canvas, text: Spanned, layout: Layout, resources: Resources) { text.getSpans(0, text.length, Annotation::class.java).forEach { span -> when (span.key) { Span.Keyboard.KEYBOARD_KEY -> drawCodeHighlight( @@ -96,7 +101,8 @@ class HighlightDrawer( span = span, text = text, layout = layout, - canvas = canvas + canvas = canvas, + resources = resources ) else -> Timber.e("Unexpected span: $span") } @@ -107,9 +113,17 @@ class HighlightDrawer( span: Annotation, text: Spanned, layout: Layout, - canvas: Canvas + canvas: Canvas, + resources: Resources ) { - DrawableCompat.wrap(drawableMid).setTint(span.value.toInt()) + val value = ThemeColor.values().find { value -> value.title == span.value } + val default = resources.getColor(R.color.background_primary, null) + val color = if (value != null && value != ThemeColor.DEFAULT) { + resources.lighter(value, default) + } else { + default + } + DrawableCompat.wrap(drawableMid).setTint(color) val spanStart = text.getSpanStart(span) val spanEnd = text.getSpanEnd(span) diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/DataViewPaginatorToolbar.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/DataViewPaginatorToolbar.kt index 9b61d1f844..706d936ad4 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/DataViewPaginatorToolbar.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/DataViewPaginatorToolbar.kt @@ -1,7 +1,6 @@ package com.anytypeio.anytype.core_ui.widgets.toolbar import android.content.Context -import android.graphics.Color import android.util.AttributeSet import android.view.LayoutInflater import android.view.ViewGroup @@ -28,7 +27,7 @@ class DataViewPaginatorToolbar @JvmOverloads constructor( init { LayoutInflater.from(context).inflate(R.layout.widget_data_view_pagination_toolbar, this) - setBackgroundColor(Color.WHITE) + setBackgroundColor(resources.getColor(R.color.background_primary, null)) rvPaginator.apply { layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false) val spacing = resources.getDimension(R.dimen.dp_12).toInt() diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/MarkupToolbarWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/MarkupToolbarWidget.kt index 219d5fe35b..46bb69fb8c 100644 --- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/MarkupToolbarWidget.kt +++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/toolbar/MarkupToolbarWidget.kt @@ -5,6 +5,9 @@ import android.util.AttributeSet import android.view.LayoutInflater import android.widget.LinearLayout import com.anytypeio.anytype.core_ui.R +import com.anytypeio.anytype.core_ui.extensions.dark +import com.anytypeio.anytype.core_ui.extensions.light +import com.anytypeio.anytype.core_ui.extensions.lighter import com.anytypeio.anytype.core_ui.extensions.tint import com.anytypeio.anytype.core_ui.reactive.clicks import com.anytypeio.anytype.core_utils.ext.invisible @@ -73,25 +76,37 @@ class MarkupToolbarWidget : LinearLayout { if (props?.markupTextColor != null) { val code = ThemeColor.values().first { it.title == props.markupTextColor } - textColorCircle.tint(code.text) + val default = resources.getColor(R.color.text_primary, null) + val value = resources.dark(code, default) + textColorCircle.tint(value) } else { val code = ThemeColor.values().find { it.title == props?.blockTextColor } - if (code != null) - textColorCircle.tint(code.text) - else + if (code != null) { + val default = resources.getColor(R.color.text_primary, null) + val value = resources.dark(code, default) + textColorCircle.tint(value) + } + else { textColorCircle.backgroundTintList = null + } } if (props?.markupHighlightColor != null) { val code = ThemeColor.values().first { it.title == props.markupHighlightColor } - if (code == ThemeColor.DEFAULT) + if (code == ThemeColor.DEFAULT) { backgroundColorCircle.backgroundTintList = null - else - backgroundColorCircle.tint(code.background) + } else { + val default = resources.getColor(R.color.background_primary, null) + val value = resources.light(code, default) + backgroundColorCircle.tint(value) + } } else { val code = ThemeColor.values().find { it.title == props?.blockBackroundColor } - if (code != null) - backgroundColorCircle.tint(code.background) + if (code != null) { + val default = resources.getColor(R.color.background_primary, null) + val value = resources.lighter(code, default) + backgroundColorCircle.tint(value) + } else backgroundColorCircle.backgroundTintList = null } diff --git a/core-ui/src/main/res/color/selector_paginator_number_color.xml b/core-ui/src/main/res/color/selector_paginator_number_color.xml index 08074c1e75..a45eb9ec46 100644 --- a/core-ui/src/main/res/color/selector_paginator_number_color.xml +++ b/core-ui/src/main/res/color/selector_paginator_number_color.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable-hdpi/rectangle_default_button.xml b/core-ui/src/main/res/drawable-hdpi/rectangle_default_button.xml index c0eaff2343..f3b92bf6e1 100644 --- a/core-ui/src/main/res/drawable-hdpi/rectangle_default_button.xml +++ b/core-ui/src/main/res/drawable-hdpi/rectangle_default_button.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable-hdpi/rectangle_default_button_disabled.xml b/core-ui/src/main/res/drawable-hdpi/rectangle_default_button_disabled.xml index e42bc79bbe..35740d534a 100644 --- a/core-ui/src/main/res/drawable-hdpi/rectangle_default_button_disabled.xml +++ b/core-ui/src/main/res/drawable-hdpi/rectangle_default_button_disabled.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable-hdpi/rectangle_stroke_button.xml b/core-ui/src/main/res/drawable-hdpi/rectangle_stroke_button.xml index 1f68771493..56ae73d285 100644 --- a/core-ui/src/main/res/drawable-hdpi/rectangle_stroke_button.xml +++ b/core-ui/src/main/res/drawable-hdpi/rectangle_stroke_button.xml @@ -3,6 +3,6 @@ android:shape="rectangle"> + android:color="@color/shape_primary" /> \ No newline at end of file diff --git a/core-ui/src/main/res/drawable-night/rect_data_view_gallery_item.xml b/core-ui/src/main/res/drawable-night/rect_data_view_gallery_item.xml new file mode 100644 index 0000000000..17fd164fc6 --- /dev/null +++ b/core-ui/src/main/res/drawable-night/rect_data_view_gallery_item.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable-xxxhdpi/ic_dv_filter_search.xml b/core-ui/src/main/res/drawable-xxxhdpi/ic_dv_filter_search.xml index ab36367703..7eded1905c 100644 --- a/core-ui/src/main/res/drawable-xxxhdpi/ic_dv_filter_search.xml +++ b/core-ui/src/main/res/drawable-xxxhdpi/ic_dv_filter_search.xml @@ -4,11 +4,11 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable-xxxhdpi/rect_dv_filter_search.xml b/core-ui/src/main/res/drawable-xxxhdpi/rect_dv_filter_search.xml index ee97351fe7..b27d4e8d32 100644 --- a/core-ui/src/main/res/drawable-xxxhdpi/rect_dv_filter_search.xml +++ b/core-ui/src/main/res/drawable-xxxhdpi/rect_dv_filter_search.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/background_layout_icon_basic.xml b/core-ui/src/main/res/drawable/background_layout_icon_basic.xml index 9a9e0e3cad..62cf31dbce 100644 --- a/core-ui/src/main/res/drawable/background_layout_icon_basic.xml +++ b/core-ui/src/main/res/drawable/background_layout_icon_basic.xml @@ -2,9 +2,9 @@ + android:color="@color/shape_tertiary"/> + android:color="@color/background_primary" /> \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/background_layout_icon_basic_image.xml b/core-ui/src/main/res/drawable/background_layout_icon_basic_image.xml index c3c1d3e258..d50a230cd5 100644 --- a/core-ui/src/main/res/drawable/background_layout_icon_basic_image.xml +++ b/core-ui/src/main/res/drawable/background_layout_icon_basic_image.xml @@ -3,6 +3,6 @@ android:shape="rectangle"> + android:color="@color/background_primary" /> \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/bg_toolbar_style_block_left_active.xml b/core-ui/src/main/res/drawable/bg_toolbar_style_block_left_active.xml index c8222279e8..87f116a94f 100644 --- a/core-ui/src/main/res/drawable/bg_toolbar_style_block_left_active.xml +++ b/core-ui/src/main/res/drawable/bg_toolbar_style_block_left_active.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/bg_toolbar_style_block_middle_active.xml b/core-ui/src/main/res/drawable/bg_toolbar_style_block_middle_active.xml index cd60e109c9..a60dd139cc 100644 --- a/core-ui/src/main/res/drawable/bg_toolbar_style_block_middle_active.xml +++ b/core-ui/src/main/res/drawable/bg_toolbar_style_block_middle_active.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/bg_toolbar_style_block_right_active.xml b/core-ui/src/main/res/drawable/bg_toolbar_style_block_right_active.xml index 5652d9e64d..cf9c3e497a 100644 --- a/core-ui/src/main/res/drawable/bg_toolbar_style_block_right_active.xml +++ b/core-ui/src/main/res/drawable/bg_toolbar_style_block_right_active.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/bg_toolbar_style_set_link.xml b/core-ui/src/main/res/drawable/bg_toolbar_style_set_link.xml index 1c08dddfe8..56ae73d285 100644 --- a/core-ui/src/main/res/drawable/bg_toolbar_style_set_link.xml +++ b/core-ui/src/main/res/drawable/bg_toolbar_style_set_link.xml @@ -3,6 +3,6 @@ android:shape="rectangle"> + android:color="@color/shape_primary" /> \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/circle_cell_action.xml b/core-ui/src/main/res/drawable/circle_cell_action.xml index 28bd4f0387..566c9ec303 100644 --- a/core-ui/src/main/res/drawable/circle_cell_action.xml +++ b/core-ui/src/main/res/drawable/circle_cell_action.xml @@ -3,5 +3,5 @@ android:shape="oval"> + android:color="@color/shape_primary" /> \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/circle_default_avatar_background.xml b/core-ui/src/main/res/drawable/circle_default_avatar_background.xml index 513f7b680d..dc1aaf06d1 100644 --- a/core-ui/src/main/res/drawable/circle_default_avatar_background.xml +++ b/core-ui/src/main/res/drawable/circle_default_avatar_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/circle_profile_icon.xml b/core-ui/src/main/res/drawable/circle_profile_icon.xml index 7c39b2a681..fff5715eec 100644 --- a/core-ui/src/main/res/drawable/circle_profile_icon.xml +++ b/core-ui/src/main/res/drawable/circle_profile_icon.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/circle_selected_color_circle.xml b/core-ui/src/main/res/drawable/circle_selected_color_circle.xml index bada7a3efb..6d11921634 100644 --- a/core-ui/src/main/res/drawable/circle_selected_color_circle.xml +++ b/core-ui/src/main/res/drawable/circle_selected_color_circle.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/dashboard_card_ripple.xml b/core-ui/src/main/res/drawable/dashboard_card_ripple.xml new file mode 100644 index 0000000000..caefed1872 --- /dev/null +++ b/core-ui/src/main/res/drawable/dashboard_card_ripple.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/default_ripple.xml b/core-ui/src/main/res/drawable/default_ripple.xml index 3497301de2..f535f826b8 100644 --- a/core-ui/src/main/res/drawable/default_ripple.xml +++ b/core-ui/src/main/res/drawable/default_ripple.xml @@ -1,6 +1,6 @@ + android:color="@color/background_secondary"> diff --git a/core-ui/src/main/res/drawable/divider.xml b/core-ui/src/main/res/drawable/divider.xml index b9e0ee9138..e5cc62ad92 100644 --- a/core-ui/src/main/res/drawable/divider.xml +++ b/core-ui/src/main/res/drawable/divider.xml @@ -1,7 +1,4 @@ - - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/divider_dv_grid.xml b/core-ui/src/main/res/drawable/divider_dv_grid.xml index 39a7f129c7..2428bf7b86 100644 --- a/core-ui/src/main/res/drawable/divider_dv_grid.xml +++ b/core-ui/src/main/res/drawable/divider_dv_grid.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/divider_relations.xml b/core-ui/src/main/res/drawable/divider_relations.xml index abba236d7f..2428bf7b86 100644 --- a/core-ui/src/main/res/drawable/divider_relations.xml +++ b/core-ui/src/main/res/drawable/divider_relations.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/dragger.xml b/core-ui/src/main/res/drawable/dragger.xml index 5daf439a45..2375a6fdd9 100644 --- a/core-ui/src/main/res/drawable/dragger.xml +++ b/core-ui/src/main/res/drawable/dragger.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/ic_add_new_object_to_set.xml b/core-ui/src/main/res/drawable/ic_add_new_object_to_set.xml index 4661adab46..3dc0063788 100644 --- a/core-ui/src/main/res/drawable/ic_add_new_object_to_set.xml +++ b/core-ui/src/main/res/drawable/ic_add_new_object_to_set.xml @@ -5,8 +5,8 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_arrow_down.xml b/core-ui/src/main/res/drawable/ic_arrow_down.xml index c3bb522902..44b6225b76 100644 --- a/core-ui/src/main/res/drawable/ic_arrow_down.xml +++ b/core-ui/src/main/res/drawable/ic_arrow_down.xml @@ -7,6 +7,6 @@ android:pathData="M1.25,1L5.25,5L9.25,1" android:strokeWidth="1.25" android:fillColor="#00000000" - android:strokeColor="#ACA996" + android:strokeColor="@color/glyph_active" android:strokeLineCap="round"/> diff --git a/core-ui/src/main/res/drawable/ic_block_action_add_below.xml b/core-ui/src/main/res/drawable/ic_block_action_add_below.xml index 866c7696a9..11deb7d51e 100644 --- a/core-ui/src/main/res/drawable/ic_block_action_add_below.xml +++ b/core-ui/src/main/res/drawable/ic_block_action_add_below.xml @@ -7,14 +7,14 @@ android:pathData="M8,5.7505L16,5.7505A4.25,4.25 0,0 1,20.25 10.0005L20.25,18.0005A4.25,4.25 0,0 1,16 22.2505L8,22.2505A4.25,4.25 0,0 1,3.75 18.0005L3.75,10.0005A4.25,4.25 0,0 1,8 5.7505z" android:strokeWidth="1.5" android:fillColor="#00000000" - android:strokeColor="#ACA996"/> + android:strokeColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_block_action_copy.xml b/core-ui/src/main/res/drawable/ic_block_action_copy.xml index cd54ca354b..3101801edc 100644 --- a/core-ui/src/main/res/drawable/ic_block_action_copy.xml +++ b/core-ui/src/main/res/drawable/ic_block_action_copy.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_block_action_delete.xml b/core-ui/src/main/res/drawable/ic_block_action_delete.xml index 6891cf592c..0a5e4ffe25 100644 --- a/core-ui/src/main/res/drawable/ic_block_action_delete.xml +++ b/core-ui/src/main/res/drawable/ic_block_action_delete.xml @@ -8,22 +8,22 @@ android:pathData="M0,0.0005h24v24h-24z"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:strokeColor="@color/glyph_active"/> + android:strokeColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_block_action_download.xml b/core-ui/src/main/res/drawable/ic_block_action_download.xml index eeb82ded8e..6b94ec41e4 100644 --- a/core-ui/src/main/res/drawable/ic_block_action_download.xml +++ b/core-ui/src/main/res/drawable/ic_block_action_download.xml @@ -5,13 +5,13 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_block_action_duplicate.xml b/core-ui/src/main/res/drawable/ic_block_action_duplicate.xml index 99bc850599..7534490aea 100644 --- a/core-ui/src/main/res/drawable/ic_block_action_duplicate.xml +++ b/core-ui/src/main/res/drawable/ic_block_action_duplicate.xml @@ -5,16 +5,16 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_block_action_move.xml b/core-ui/src/main/res/drawable/ic_block_action_move.xml index a085a1acfb..5039915567 100644 --- a/core-ui/src/main/res/drawable/ic_block_action_move.xml +++ b/core-ui/src/main/res/drawable/ic_block_action_move.xml @@ -7,12 +7,12 @@ android:pathData="M3,16L12,22L21,16" android:strokeWidth="1.5" android:fillColor="#00000000" - android:strokeColor="#ACA996" + android:strokeColor="@color/glyph_active" android:strokeLineCap="round"/> diff --git a/core-ui/src/main/res/drawable/ic_block_action_move_to.xml b/core-ui/src/main/res/drawable/ic_block_action_move_to.xml index d5b60eb2fd..0874fb013a 100644 --- a/core-ui/src/main/res/drawable/ic_block_action_move_to.xml +++ b/core-ui/src/main/res/drawable/ic_block_action_move_to.xml @@ -5,13 +5,13 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_block_action_style.xml b/core-ui/src/main/res/drawable/ic_block_action_style.xml index 6852edc7f8..e34ac58e16 100644 --- a/core-ui/src/main/res/drawable/ic_block_action_style.xml +++ b/core-ui/src/main/res/drawable/ic_block_action_style.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_block_toggle.xml b/core-ui/src/main/res/drawable/ic_block_toggle.xml index 183a6d8d60..b31e9eb819 100644 --- a/core-ui/src/main/res/drawable/ic_block_toggle.xml +++ b/core-ui/src/main/res/drawable/ic_block_toggle.xml @@ -4,7 +4,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_actions.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_actions.xml index 7c9926c414..3040ddd356 100644 --- a/core-ui/src/main/res/drawable/ic_block_toolbar_actions.xml +++ b/core-ui/src/main/res/drawable/ic_block_toolbar_actions.xml @@ -5,15 +5,15 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_add_new.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_add_new.xml index 43770c3c63..bc928ae885 100644 --- a/core-ui/src/main/res/drawable/ic_block_toolbar_add_new.xml +++ b/core-ui/src/main/res/drawable/ic_block_toolbar_add_new.xml @@ -5,12 +5,12 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active" /> + android:fillColor="@color/glyph_active" /> diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_block_actions.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_block_actions.xml index a61a5bde3a..d852e227a8 100644 --- a/core-ui/src/main/res/drawable/ic_block_toolbar_block_actions.xml +++ b/core-ui/src/main/res/drawable/ic_block_toolbar_block_actions.xml @@ -5,15 +5,15 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active" /> + android:fillColor="@color/glyph_active" /> + android:fillColor="@color/glyph_active" /> diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_block_style.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_block_style.xml index 6852edc7f8..e34ac58e16 100644 --- a/core-ui/src/main/res/drawable/ic_block_toolbar_block_style.xml +++ b/core-ui/src/main/res/drawable/ic_block_toolbar_block_style.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_mention.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_mention.xml index 628944eb8e..66702dc94a 100644 --- a/core-ui/src/main/res/drawable/ic_block_toolbar_mention.xml +++ b/core-ui/src/main/res/drawable/ic_block_toolbar_mention.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_bookmark_placeholder.xml b/core-ui/src/main/res/drawable/ic_bookmark_placeholder.xml index 04a926d709..b6bc78cc3c 100644 --- a/core-ui/src/main/res/drawable/ic_bookmark_placeholder.xml +++ b/core-ui/src/main/res/drawable/ic_bookmark_placeholder.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_cell_relation_call_with.xml b/core-ui/src/main/res/drawable/ic_cell_relation_call_with.xml index 699ac9d7bd..4606bee049 100644 --- a/core-ui/src/main/res/drawable/ic_cell_relation_call_with.xml +++ b/core-ui/src/main/res/drawable/ic_cell_relation_call_with.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_cell_relation_go_to_link.xml b/core-ui/src/main/res/drawable/ic_cell_relation_go_to_link.xml index 32982be2b3..de1767133b 100644 --- a/core-ui/src/main/res/drawable/ic_cell_relation_go_to_link.xml +++ b/core-ui/src/main/res/drawable/ic_cell_relation_go_to_link.xml @@ -4,11 +4,11 @@ android:viewportWidth="24" android:viewportHeight="25"> diff --git a/core-ui/src/main/res/drawable/ic_cell_relation_go_to_mail_client.xml b/core-ui/src/main/res/drawable/ic_cell_relation_go_to_mail_client.xml index 83d08c7864..a13e463d87 100644 --- a/core-ui/src/main/res/drawable/ic_cell_relation_go_to_mail_client.xml +++ b/core-ui/src/main/res/drawable/ic_cell_relation_go_to_mail_client.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_create_viewer_gallery.xml b/core-ui/src/main/res/drawable/ic_create_viewer_gallery.xml index 0e89656529..ff08bec849 100644 --- a/core-ui/src/main/res/drawable/ic_create_viewer_gallery.xml +++ b/core-ui/src/main/res/drawable/ic_create_viewer_gallery.xml @@ -5,18 +5,18 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_create_viewer_grid.xml b/core-ui/src/main/res/drawable/ic_create_viewer_grid.xml index 7c71238fab..2ab06a11f7 100644 --- a/core-ui/src/main/res/drawable/ic_create_viewer_grid.xml +++ b/core-ui/src/main/res/drawable/ic_create_viewer_grid.xml @@ -5,15 +5,15 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_create_viewer_kanban.xml b/core-ui/src/main/res/drawable/ic_create_viewer_kanban.xml index 674c1d7665..fc48c45e21 100644 --- a/core-ui/src/main/res/drawable/ic_create_viewer_kanban.xml +++ b/core-ui/src/main/res/drawable/ic_create_viewer_kanban.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_create_viewer_list.xml b/core-ui/src/main/res/drawable/ic_create_viewer_list.xml index 81c20cd692..cb2ade64ea 100644 --- a/core-ui/src/main/res/drawable/ic_create_viewer_list.xml +++ b/core-ui/src/main/res/drawable/ic_create_viewer_list.xml @@ -5,11 +5,11 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_data_view_grid_checkbox.xml b/core-ui/src/main/res/drawable/ic_data_view_grid_checkbox.xml index 85f0641896..b0893a77ca 100644 --- a/core-ui/src/main/res/drawable/ic_data_view_grid_checkbox.xml +++ b/core-ui/src/main/res/drawable/ic_data_view_grid_checkbox.xml @@ -7,5 +7,5 @@ android:strokeWidth="1" android:pathData="M5.5,1.5L14.5,1.5A4,4 0,0 1,18.5 5.5L18.5,14.5A4,4 0,0 1,14.5 18.5L5.5,18.5A4,4 0,0 1,1.5 14.5L1.5,5.5A4,4 0,0 1,5.5 1.5z" android:fillColor="#00000000" - android:strokeColor="#ACA996"/> + android:strokeColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_default_plus.xml b/core-ui/src/main/res/drawable/ic_default_plus.xml index bd5c4229d4..9a2e3006fe 100644 --- a/core-ui/src/main/res/drawable/ic_default_plus.xml +++ b/core-ui/src/main/res/drawable/ic_default_plus.xml @@ -5,8 +5,8 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_doc_search_delete.xml b/core-ui/src/main/res/drawable/ic_doc_search_delete.xml index 010dda8425..f81b0f095e 100644 --- a/core-ui/src/main/res/drawable/ic_doc_search_delete.xml +++ b/core-ui/src/main/res/drawable/ic_doc_search_delete.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_dv_customize_panel_filter.xml b/core-ui/src/main/res/drawable/ic_dv_customize_panel_filter.xml index fe301b2c62..5237441cbf 100644 --- a/core-ui/src/main/res/drawable/ic_dv_customize_panel_filter.xml +++ b/core-ui/src/main/res/drawable/ic_dv_customize_panel_filter.xml @@ -5,11 +5,11 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_dv_customize_panel_group.xml b/core-ui/src/main/res/drawable/ic_dv_customize_panel_group.xml index b5cb024356..b640a37abb 100644 --- a/core-ui/src/main/res/drawable/ic_dv_customize_panel_group.xml +++ b/core-ui/src/main/res/drawable/ic_dv_customize_panel_group.xml @@ -5,18 +5,18 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_dv_customize_panel_relations.xml b/core-ui/src/main/res/drawable/ic_dv_customize_panel_relations.xml index 717986aa8e..efdd8efbd1 100644 --- a/core-ui/src/main/res/drawable/ic_dv_customize_panel_relations.xml +++ b/core-ui/src/main/res/drawable/ic_dv_customize_panel_relations.xml @@ -5,20 +5,20 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_dv_customize_panel_sort.xml b/core-ui/src/main/res/drawable/ic_dv_customize_panel_sort.xml index 72d2e5eadb..4799449960 100644 --- a/core-ui/src/main/res/drawable/ic_dv_customize_panel_sort.xml +++ b/core-ui/src/main/res/drawable/ic_dv_customize_panel_sort.xml @@ -5,16 +5,16 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_dv_customize_view.xml b/core-ui/src/main/res/drawable/ic_dv_customize_view.xml index 47c3304c8e..5cddb1d8fe 100644 --- a/core-ui/src/main/res/drawable/ic_dv_customize_view.xml +++ b/core-ui/src/main/res/drawable/ic_dv_customize_view.xml @@ -5,18 +5,18 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active" /> + android:fillColor="@color/background_primary" + android:strokeColor="@color/glyph_active" /> + android:fillColor="@color/glyph_active" /> + android:fillColor="@color/background_primary" + android:strokeColor="@color/glyph_active" /> diff --git a/core-ui/src/main/res/drawable/ic_dv_modal_plus.xml b/core-ui/src/main/res/drawable/ic_dv_modal_plus.xml index 7e96b24213..14ed0b6db0 100644 --- a/core-ui/src/main/res/drawable/ic_dv_modal_plus.xml +++ b/core-ui/src/main/res/drawable/ic_dv_modal_plus.xml @@ -4,9 +4,9 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_file_light.xml b/core-ui/src/main/res/drawable/ic_file_light.xml index 1295c821f5..b35d0078e7 100644 --- a/core-ui/src/main/res/drawable/ic_file_light.xml +++ b/core-ui/src/main/res/drawable/ic_file_light.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_layout_basic.xml b/core-ui/src/main/res/drawable/ic_layout_basic.xml index b3fe5183aa..ae9deab8f6 100644 --- a/core-ui/src/main/res/drawable/ic_layout_basic.xml +++ b/core-ui/src/main/res/drawable/ic_layout_basic.xml @@ -6,15 +6,23 @@ + android:strokeColor="#ABA99B" + android:fillAlpha="0.4"/> + android:strokeAlpha="0.7" + android:fillColor="#FFB522" + android:fillAlpha="0.7"/> + android:strokeAlpha="0.4" + android:fillColor="#ABA99B" + android:fillAlpha="0.4"/> + android:strokeAlpha="0.4" + android:fillColor="#ABA99B" + android:fillAlpha="0.4"/> diff --git a/core-ui/src/main/res/drawable/ic_layout_note.xml b/core-ui/src/main/res/drawable/ic_layout_note.xml index 24467751cd..3e37ef51ef 100644 --- a/core-ui/src/main/res/drawable/ic_layout_note.xml +++ b/core-ui/src/main/res/drawable/ic_layout_note.xml @@ -6,18 +6,28 @@ + android:strokeColor="#ABA99B" + android:fillAlpha="0.4"/> + android:strokeAlpha="0.4" + android:fillColor="#ABA99B" + android:fillAlpha="0.4"/> + android:strokeAlpha="0.4" + android:fillColor="#ABA99B" + android:fillAlpha="0.4"/> + android:strokeAlpha="0.4" + android:fillColor="#ABA99B" + android:fillAlpha="0.4"/> + android:strokeAlpha="0.4" + android:fillColor="#ABA99B" + android:fillAlpha="0.4"/> diff --git a/core-ui/src/main/res/drawable/ic_layout_profile.xml b/core-ui/src/main/res/drawable/ic_layout_profile.xml index d3a9d9188d..d27513c5da 100644 --- a/core-ui/src/main/res/drawable/ic_layout_profile.xml +++ b/core-ui/src/main/res/drawable/ic_layout_profile.xml @@ -6,8 +6,10 @@ + android:strokeColor="#ABA99B" + android:fillAlpha="0.4"/> + android:strokeAlpha="0.4" + android:fillColor="#ABA99B" + android:fillAlpha="0.4"/> + android:strokeAlpha="0.4" + android:fillColor="#ABA99B" + android:fillAlpha="0.4"/> diff --git a/core-ui/src/main/res/drawable/ic_layout_task.xml b/core-ui/src/main/res/drawable/ic_layout_task.xml index 195af682d6..b2d2ed4392 100644 --- a/core-ui/src/main/res/drawable/ic_layout_task.xml +++ b/core-ui/src/main/res/drawable/ic_layout_task.xml @@ -6,20 +6,28 @@ + android:strokeColor="#ABA99B" + android:fillAlpha="0.4"/> + android:strokeAlpha="0.4" + android:fillColor="#ABA99B" + android:fillAlpha="0.4"/> + android:strokeAlpha="0.4" + android:fillColor="#ABA99B" + android:fillAlpha="0.4"/> + android:strokeAlpha="0.4" + android:fillColor="#ABA99B" + android:fillAlpha="0.4"/> diff --git a/core-ui/src/main/res/drawable/ic_main_toolbar_home.xml b/core-ui/src/main/res/drawable/ic_main_toolbar_home.xml index b1aa530268..6ed802c82b 100644 --- a/core-ui/src/main/res/drawable/ic_main_toolbar_home.xml +++ b/core-ui/src/main/res/drawable/ic_main_toolbar_home.xml @@ -7,20 +7,20 @@ android:pathData="M5,2.75L8,2.75A2.25,2.25 0,0 1,10.25 5L10.25,8A2.25,2.25 0,0 1,8 10.25L5,10.25A2.25,2.25 0,0 1,2.75 8L2.75,5A2.25,2.25 0,0 1,5 2.75z" android:strokeWidth="1.5" android:fillColor="#00000000" - android:strokeColor="#ACA996"/> + android:strokeColor="@color/glyph_active"/> + android:strokeColor="@color/glyph_active"/> + android:strokeColor="@color/glyph_active"/> + android:strokeColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_mention_loading_state.xml b/core-ui/src/main/res/drawable/ic_mention_loading_state.xml index 9d1d0d4859..b853d80e62 100644 --- a/core-ui/src/main/res/drawable/ic_mention_loading_state.xml +++ b/core-ui/src/main/res/drawable/ic_mention_loading_state.xml @@ -16,7 +16,7 @@ android:height="24dip" /> diff --git a/core-ui/src/main/res/drawable/ic_object_action_add_to_favorites.xml b/core-ui/src/main/res/drawable/ic_object_action_add_to_favorites.xml index 4ce8d15498..d4ba0da2d3 100644 --- a/core-ui/src/main/res/drawable/ic_object_action_add_to_favorites.xml +++ b/core-ui/src/main/res/drawable/ic_object_action_add_to_favorites.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_object_action_archive.xml b/core-ui/src/main/res/drawable/ic_object_action_archive.xml index d934cb9cec..e27394de2f 100644 --- a/core-ui/src/main/res/drawable/ic_object_action_archive.xml +++ b/core-ui/src/main/res/drawable/ic_object_action_archive.xml @@ -7,19 +7,19 @@ android:pathData="M8.75,3C8.75,2.3096 9.3096,1.75 10,1.75H14C14.6904,1.75 15.25,2.3096 15.25,3V5.25H8.75V3Z" android:strokeWidth="1.5" android:fillColor="#00000000" - android:strokeColor="#ACA996"/> + android:strokeColor="@color/glyph_active"/> + android:strokeColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_object_action_restore.xml b/core-ui/src/main/res/drawable/ic_object_action_restore.xml index 6d7c4bc94c..915ee9b121 100644 --- a/core-ui/src/main/res/drawable/ic_object_action_restore.xml +++ b/core-ui/src/main/res/drawable/ic_object_action_restore.xml @@ -5,12 +5,12 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_object_action_search.xml b/core-ui/src/main/res/drawable/ic_object_action_search.xml index b5fe5f880c..90cc2e03ab 100644 --- a/core-ui/src/main/res/drawable/ic_object_action_search.xml +++ b/core-ui/src/main/res/drawable/ic_object_action_search.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_object_action_template.xml b/core-ui/src/main/res/drawable/ic_object_action_template.xml index 7e9e1b6132..ab1c3f8b22 100644 --- a/core-ui/src/main/res/drawable/ic_object_action_template.xml +++ b/core-ui/src/main/res/drawable/ic_object_action_template.xml @@ -5,12 +5,12 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_object_action_undoredo.xml b/core-ui/src/main/res/drawable/ic_object_action_undoredo.xml index 4d5aab7e98..7f7d3db58f 100644 --- a/core-ui/src/main/res/drawable/ic_object_action_undoredo.xml +++ b/core-ui/src/main/res/drawable/ic_object_action_undoredo.xml @@ -5,18 +5,18 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_object_action_unfavorite.xml b/core-ui/src/main/res/drawable/ic_object_action_unfavorite.xml index f8c79fd08f..8a568104bd 100644 --- a/core-ui/src/main/res/drawable/ic_object_action_unfavorite.xml +++ b/core-ui/src/main/res/drawable/ic_object_action_unfavorite.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_object_menu_arrow_forward.xml b/core-ui/src/main/res/drawable/ic_object_menu_arrow_forward.xml index 69e60be670..151fb59615 100644 --- a/core-ui/src/main/res/drawable/ic_object_menu_arrow_forward.xml +++ b/core-ui/src/main/res/drawable/ic_object_menu_arrow_forward.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_object_menu_cover.xml b/core-ui/src/main/res/drawable/ic_object_menu_cover.xml index 3ed1a41d43..08d525b814 100644 --- a/core-ui/src/main/res/drawable/ic_object_menu_cover.xml +++ b/core-ui/src/main/res/drawable/ic_object_menu_cover.xml @@ -5,7 +5,9 @@ android:viewportHeight="44"> + android:strokeAlpha="0.2" + android:fillColor="#5DD400" + android:fillAlpha="0.2"/> + android:strokeAlpha="0.2" + android:fillColor="#2AA7EE" + android:fillAlpha="0.2"/> + android:strokeAlpha="0.2" + android:fillColor="#FFB522" + android:fillAlpha="0.2"/> + android:strokeAlpha="0.2" + android:fillColor="#3E58EB" + android:fillAlpha="0.2"/> + android:strokeAlpha="0.2" + android:fillColor="#AB50CC" + android:fillAlpha="0.2"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_option_checked_black.xml b/core-ui/src/main/res/drawable/ic_option_checked_black.xml index e2cb50b017..9970ba98f8 100644 --- a/core-ui/src/main/res/drawable/ic_option_checked_black.xml +++ b/core-ui/src/main/res/drawable/ic_option_checked_black.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_page_toolbar_search.xml b/core-ui/src/main/res/drawable/ic_page_toolbar_search.xml index 227371f02e..f053dd5bfc 100644 --- a/core-ui/src/main/res/drawable/ic_page_toolbar_search.xml +++ b/core-ui/src/main/res/drawable/ic_page_toolbar_search.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_paginator_arrow.xml b/core-ui/src/main/res/drawable/ic_paginator_arrow.xml index 8dabd8fb16..7933a131e2 100644 --- a/core-ui/src/main/res/drawable/ic_paginator_arrow.xml +++ b/core-ui/src/main/res/drawable/ic_paginator_arrow.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_picture.xml b/core-ui/src/main/res/drawable/ic_picture.xml index c278a1ee25..fec8ea5180 100644 --- a/core-ui/src/main/res/drawable/ic_picture.xml +++ b/core-ui/src/main/res/drawable/ic_picture.xml @@ -5,15 +5,15 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_relation_attachment_32.xml b/core-ui/src/main/res/drawable/ic_relation_attachment_32.xml index 0ef30e6d10..c3dae69c63 100644 --- a/core-ui/src/main/res/drawable/ic_relation_attachment_32.xml +++ b/core-ui/src/main/res/drawable/ic_relation_attachment_32.xml @@ -5,8 +5,8 @@ android:viewportHeight="32"> + android:fillColor="@color/shape_transparent"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_relation_attachment_48.xml b/core-ui/src/main/res/drawable/ic_relation_attachment_48.xml index efefe6f487..a5262e32b8 100644 --- a/core-ui/src/main/res/drawable/ic_relation_attachment_48.xml +++ b/core-ui/src/main/res/drawable/ic_relation_attachment_48.xml @@ -4,27 +4,27 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/core-ui/src/main/res/drawable/ic_relation_checkbox_32.xml b/core-ui/src/main/res/drawable/ic_relation_checkbox_32.xml index 6262d793fa..fcbff4df8c 100644 --- a/core-ui/src/main/res/drawable/ic_relation_checkbox_32.xml +++ b/core-ui/src/main/res/drawable/ic_relation_checkbox_32.xml @@ -5,13 +5,13 @@ android:viewportHeight="32"> + android:fillColor="@color/shape_transparent"/> diff --git a/core-ui/src/main/res/drawable/ic_relation_checkbox_48.xml b/core-ui/src/main/res/drawable/ic_relation_checkbox_48.xml index 34355a0782..5b41e73b97 100644 --- a/core-ui/src/main/res/drawable/ic_relation_checkbox_48.xml +++ b/core-ui/src/main/res/drawable/ic_relation_checkbox_48.xml @@ -4,14 +4,14 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/core-ui/src/main/res/drawable/ic_relation_date_32.xml b/core-ui/src/main/res/drawable/ic_relation_date_32.xml index 502f2c5ebe..afdd876b28 100644 --- a/core-ui/src/main/res/drawable/ic_relation_date_32.xml +++ b/core-ui/src/main/res/drawable/ic_relation_date_32.xml @@ -5,15 +5,15 @@ android:viewportHeight="32"> + android:fillColor="@color/shape_transparent"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_relation_date_48.xml b/core-ui/src/main/res/drawable/ic_relation_date_48.xml index 116bff91c1..56b7b46414 100644 --- a/core-ui/src/main/res/drawable/ic_relation_date_48.xml +++ b/core-ui/src/main/res/drawable/ic_relation_date_48.xml @@ -4,16 +4,16 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/core-ui/src/main/res/drawable/ic_relation_email_32.xml b/core-ui/src/main/res/drawable/ic_relation_email_32.xml index c030b830b5..3a9e490edf 100644 --- a/core-ui/src/main/res/drawable/ic_relation_email_32.xml +++ b/core-ui/src/main/res/drawable/ic_relation_email_32.xml @@ -5,13 +5,13 @@ android:viewportHeight="32"> + android:fillColor="@color/shape_transparent"/> diff --git a/core-ui/src/main/res/drawable/ic_relation_email_48.xml b/core-ui/src/main/res/drawable/ic_relation_email_48.xml index fa01bd1b80..d203e6a170 100644 --- a/core-ui/src/main/res/drawable/ic_relation_email_48.xml +++ b/core-ui/src/main/res/drawable/ic_relation_email_48.xml @@ -4,14 +4,14 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/core-ui/src/main/res/drawable/ic_relation_format_attachment_small.xml b/core-ui/src/main/res/drawable/ic_relation_format_attachment_small.xml index 8e0c7d0ec4..65b67e1e65 100644 --- a/core-ui/src/main/res/drawable/ic_relation_format_attachment_small.xml +++ b/core-ui/src/main/res/drawable/ic_relation_format_attachment_small.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_relation_format_checkbox_small.xml b/core-ui/src/main/res/drawable/ic_relation_format_checkbox_small.xml index 4d52358a9c..74d5b446c1 100644 --- a/core-ui/src/main/res/drawable/ic_relation_format_checkbox_small.xml +++ b/core-ui/src/main/res/drawable/ic_relation_format_checkbox_small.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_relation_format_checked.xml b/core-ui/src/main/res/drawable/ic_relation_format_checked.xml index 7353dc67dd..a2a242a5c7 100644 --- a/core-ui/src/main/res/drawable/ic_relation_format_checked.xml +++ b/core-ui/src/main/res/drawable/ic_relation_format_checked.xml @@ -5,6 +5,6 @@ android:viewportHeight="25"> diff --git a/core-ui/src/main/res/drawable/ic_relation_format_date_small.xml b/core-ui/src/main/res/drawable/ic_relation_format_date_small.xml index d1e81d0f20..0b8bfd1fe2 100644 --- a/core-ui/src/main/res/drawable/ic_relation_format_date_small.xml +++ b/core-ui/src/main/res/drawable/ic_relation_format_date_small.xml @@ -5,12 +5,12 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_relation_format_email_small.xml b/core-ui/src/main/res/drawable/ic_relation_format_email_small.xml index 60f29e460b..9755978221 100644 --- a/core-ui/src/main/res/drawable/ic_relation_format_email_small.xml +++ b/core-ui/src/main/res/drawable/ic_relation_format_email_small.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_relation_format_number_small.xml b/core-ui/src/main/res/drawable/ic_relation_format_number_small.xml index a25ebf7534..3d648e5cfd 100644 --- a/core-ui/src/main/res/drawable/ic_relation_format_number_small.xml +++ b/core-ui/src/main/res/drawable/ic_relation_format_number_small.xml @@ -5,14 +5,14 @@ android:viewportHeight="25"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_relation_format_object_small.xml b/core-ui/src/main/res/drawable/ic_relation_format_object_small.xml index aa9ed9abd1..079af1d011 100644 --- a/core-ui/src/main/res/drawable/ic_relation_format_object_small.xml +++ b/core-ui/src/main/res/drawable/ic_relation_format_object_small.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_relation_format_phone_number_small.xml b/core-ui/src/main/res/drawable/ic_relation_format_phone_number_small.xml index 48d2a3b0ad..96e37865e5 100644 --- a/core-ui/src/main/res/drawable/ic_relation_format_phone_number_small.xml +++ b/core-ui/src/main/res/drawable/ic_relation_format_phone_number_small.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_relation_format_status_small.xml b/core-ui/src/main/res/drawable/ic_relation_format_status_small.xml index 556affa731..a2077f873e 100644 --- a/core-ui/src/main/res/drawable/ic_relation_format_status_small.xml +++ b/core-ui/src/main/res/drawable/ic_relation_format_status_small.xml @@ -5,14 +5,14 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_relation_format_tag_small.xml b/core-ui/src/main/res/drawable/ic_relation_format_tag_small.xml index b568b375ce..223bb897d4 100644 --- a/core-ui/src/main/res/drawable/ic_relation_format_tag_small.xml +++ b/core-ui/src/main/res/drawable/ic_relation_format_tag_small.xml @@ -5,9 +5,9 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_relation_format_text_small.xml b/core-ui/src/main/res/drawable/ic_relation_format_text_small.xml index 5bbdcb7afc..2b174e573e 100644 --- a/core-ui/src/main/res/drawable/ic_relation_format_text_small.xml +++ b/core-ui/src/main/res/drawable/ic_relation_format_text_small.xml @@ -5,11 +5,11 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_relation_format_url_small.xml b/core-ui/src/main/res/drawable/ic_relation_format_url_small.xml index dcdee8e300..5981f185df 100644 --- a/core-ui/src/main/res/drawable/ic_relation_format_url_small.xml +++ b/core-ui/src/main/res/drawable/ic_relation_format_url_small.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_relation_is_not_featured.xml b/core-ui/src/main/res/drawable/ic_relation_is_not_featured.xml index eb066e95b0..0837a396f6 100644 --- a/core-ui/src/main/res/drawable/ic_relation_is_not_featured.xml +++ b/core-ui/src/main/res/drawable/ic_relation_is_not_featured.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_relation_name_48.xml b/core-ui/src/main/res/drawable/ic_relation_name_48.xml index 2ca95ebf2a..6977cd38dc 100644 --- a/core-ui/src/main/res/drawable/ic_relation_name_48.xml +++ b/core-ui/src/main/res/drawable/ic_relation_name_48.xml @@ -4,15 +4,15 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/core-ui/src/main/res/drawable/ic_relation_number_32.xml b/core-ui/src/main/res/drawable/ic_relation_number_32.xml index 7bddca73c0..dd25d42dc2 100644 --- a/core-ui/src/main/res/drawable/ic_relation_number_32.xml +++ b/core-ui/src/main/res/drawable/ic_relation_number_32.xml @@ -5,17 +5,17 @@ android:viewportHeight="32"> + android:fillColor="@color/shape_transparent"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_relation_number_48.xml b/core-ui/src/main/res/drawable/ic_relation_number_48.xml index 2cc6a22117..adb20ba5d6 100644 --- a/core-ui/src/main/res/drawable/ic_relation_number_48.xml +++ b/core-ui/src/main/res/drawable/ic_relation_number_48.xml @@ -4,18 +4,18 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/core-ui/src/main/res/drawable/ic_relation_object_32.xml b/core-ui/src/main/res/drawable/ic_relation_object_32.xml index b2a916447d..419237ab9f 100644 --- a/core-ui/src/main/res/drawable/ic_relation_object_32.xml +++ b/core-ui/src/main/res/drawable/ic_relation_object_32.xml @@ -5,13 +5,13 @@ android:viewportHeight="33"> + android:fillColor="@color/shape_transparent"/> diff --git a/core-ui/src/main/res/drawable/ic_relation_object_48.xml b/core-ui/src/main/res/drawable/ic_relation_object_48.xml index 0af7f654a9..bdb3259b7b 100644 --- a/core-ui/src/main/res/drawable/ic_relation_object_48.xml +++ b/core-ui/src/main/res/drawable/ic_relation_object_48.xml @@ -4,14 +4,14 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/core-ui/src/main/res/drawable/ic_relation_phone_number_32.xml b/core-ui/src/main/res/drawable/ic_relation_phone_number_32.xml index ac0caf933d..5dd8ff86f6 100644 --- a/core-ui/src/main/res/drawable/ic_relation_phone_number_32.xml +++ b/core-ui/src/main/res/drawable/ic_relation_phone_number_32.xml @@ -5,9 +5,9 @@ android:viewportHeight="32"> + android:fillColor="@color/shape_transparent"/> diff --git a/core-ui/src/main/res/drawable/ic_relation_phone_number_48.xml b/core-ui/src/main/res/drawable/ic_relation_phone_number_48.xml index de94980385..83ec61d630 100644 --- a/core-ui/src/main/res/drawable/ic_relation_phone_number_48.xml +++ b/core-ui/src/main/res/drawable/ic_relation_phone_number_48.xml @@ -4,10 +4,10 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/core-ui/src/main/res/drawable/ic_relation_status_32.xml b/core-ui/src/main/res/drawable/ic_relation_status_32.xml index 0322071689..c20cfb8b16 100644 --- a/core-ui/src/main/res/drawable/ic_relation_status_32.xml +++ b/core-ui/src/main/res/drawable/ic_relation_status_32.xml @@ -5,17 +5,17 @@ android:viewportHeight="32"> + android:fillColor="@color/shape_transparent"/> diff --git a/core-ui/src/main/res/drawable/ic_relation_status_48.xml b/core-ui/src/main/res/drawable/ic_relation_status_48.xml index 011d2495ca..3f630a1097 100644 --- a/core-ui/src/main/res/drawable/ic_relation_status_48.xml +++ b/core-ui/src/main/res/drawable/ic_relation_status_48.xml @@ -4,18 +4,18 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/core-ui/src/main/res/drawable/ic_relation_tag_32.xml b/core-ui/src/main/res/drawable/ic_relation_tag_32.xml index 4f1c34d1ed..a9f0dac61f 100644 --- a/core-ui/src/main/res/drawable/ic_relation_tag_32.xml +++ b/core-ui/src/main/res/drawable/ic_relation_tag_32.xml @@ -5,12 +5,12 @@ android:viewportHeight="32"> + android:fillColor="@color/shape_transparent"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_relation_tag_48.xml b/core-ui/src/main/res/drawable/ic_relation_tag_48.xml index 50e6ad9dc2..8019634663 100644 --- a/core-ui/src/main/res/drawable/ic_relation_tag_48.xml +++ b/core-ui/src/main/res/drawable/ic_relation_tag_48.xml @@ -4,13 +4,13 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/core-ui/src/main/res/drawable/ic_relation_text_32.xml b/core-ui/src/main/res/drawable/ic_relation_text_32.xml index 3a1d128634..e2a27fe56c 100644 --- a/core-ui/src/main/res/drawable/ic_relation_text_32.xml +++ b/core-ui/src/main/res/drawable/ic_relation_text_32.xml @@ -5,14 +5,14 @@ android:viewportHeight="32"> + android:fillColor="@color/shape_transparent"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_relation_text_48.xml b/core-ui/src/main/res/drawable/ic_relation_text_48.xml index 54d993ea77..b31665105e 100644 --- a/core-ui/src/main/res/drawable/ic_relation_text_48.xml +++ b/core-ui/src/main/res/drawable/ic_relation_text_48.xml @@ -4,15 +4,15 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/core-ui/src/main/res/drawable/ic_relation_url_32.xml b/core-ui/src/main/res/drawable/ic_relation_url_32.xml index b8dae8e89d..7048fd3956 100644 --- a/core-ui/src/main/res/drawable/ic_relation_url_32.xml +++ b/core-ui/src/main/res/drawable/ic_relation_url_32.xml @@ -5,11 +5,11 @@ android:viewportHeight="32"> + android:fillColor="@color/shape_transparent"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_relation_url_48.xml b/core-ui/src/main/res/drawable/ic_relation_url_48.xml index ed043ad86d..ef9d240cc7 100644 --- a/core-ui/src/main/res/drawable/ic_relation_url_48.xml +++ b/core-ui/src/main/res/drawable/ic_relation_url_48.xml @@ -4,12 +4,12 @@ android:viewportWidth="48" android:viewportHeight="48"> diff --git a/core-ui/src/main/res/drawable/ic_search.xml b/core-ui/src/main/res/drawable/ic_search.xml index 58a7ed5387..1f0bcabcc7 100644 --- a/core-ui/src/main/res/drawable/ic_search.xml +++ b/core-ui/src/main/res/drawable/ic_search.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_search_delete.xml b/core-ui/src/main/res/drawable/ic_search_delete.xml index f0d68f5b0b..5d06c4902e 100644 --- a/core-ui/src/main/res/drawable/ic_search_delete.xml +++ b/core-ui/src/main/res/drawable/ic_search_delete.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_search_next_result.xml b/core-ui/src/main/res/drawable/ic_search_next_result.xml index 0e599626f2..7b7d7cf92e 100644 --- a/core-ui/src/main/res/drawable/ic_search_next_result.xml +++ b/core-ui/src/main/res/drawable/ic_search_next_result.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_search_previous_result.xml b/core-ui/src/main/res/drawable/ic_search_previous_result.xml index 6602f6a94e..437a3b6008 100644 --- a/core-ui/src/main/res/drawable/ic_search_previous_result.xml +++ b/core-ui/src/main/res/drawable/ic_search_previous_result.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_settings_arrow_forward.xml b/core-ui/src/main/res/drawable/ic_settings_arrow_forward.xml new file mode 100644 index 0000000000..f0e3df9a3a --- /dev/null +++ b/core-ui/src/main/res/drawable/ic_settings_arrow_forward.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/core-ui/src/main/res/drawable/ic_slash_style_bold.xml b/core-ui/src/main/res/drawable/ic_slash_style_bold.xml index f8b36eb4a9..26522337ea 100644 --- a/core-ui/src/main/res/drawable/ic_slash_style_bold.xml +++ b/core-ui/src/main/res/drawable/ic_slash_style_bold.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_slash_style_breakthrough.xml b/core-ui/src/main/res/drawable/ic_slash_style_breakthrough.xml index cf20d2dbf1..20379bd954 100644 --- a/core-ui/src/main/res/drawable/ic_slash_style_breakthrough.xml +++ b/core-ui/src/main/res/drawable/ic_slash_style_breakthrough.xml @@ -5,12 +5,12 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_slash_style_bulleted.xml b/core-ui/src/main/res/drawable/ic_slash_style_bulleted.xml index eb703585dc..31d15e7844 100644 --- a/core-ui/src/main/res/drawable/ic_slash_style_bulleted.xml +++ b/core-ui/src/main/res/drawable/ic_slash_style_bulleted.xml @@ -5,5 +5,5 @@ android:viewportHeight="6"> + android:fillColor="@color/text_primary"/> diff --git a/core-ui/src/main/res/drawable/ic_slash_style_code.xml b/core-ui/src/main/res/drawable/ic_slash_style_code.xml index e1bcadb46f..2d7d6a2a75 100644 --- a/core-ui/src/main/res/drawable/ic_slash_style_code.xml +++ b/core-ui/src/main/res/drawable/ic_slash_style_code.xml @@ -7,10 +7,10 @@ android:pathData="M9,6L3,12L9,18" android:strokeWidth="1.5" android:fillColor="#00000000" - android:strokeColor="#ACA996"/> + android:strokeColor="@color/glyph_active"/> + android:strokeColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_slash_style_heading.xml b/core-ui/src/main/res/drawable/ic_slash_style_heading.xml index dd91c6effa..feccc3721b 100644 --- a/core-ui/src/main/res/drawable/ic_slash_style_heading.xml +++ b/core-ui/src/main/res/drawable/ic_slash_style_heading.xml @@ -5,5 +5,5 @@ android:viewportHeight="17"> + android:fillColor="@color/text_primary"/> diff --git a/core-ui/src/main/res/drawable/ic_slash_style_highlighted.xml b/core-ui/src/main/res/drawable/ic_slash_style_highlighted.xml index dbf12b8677..15abca7ddf 100644 --- a/core-ui/src/main/res/drawable/ic_slash_style_highlighted.xml +++ b/core-ui/src/main/res/drawable/ic_slash_style_highlighted.xml @@ -5,7 +5,7 @@ android:viewportHeight="28"> + android:fillColor="@color/text_primary"/> diff --git a/core-ui/src/main/res/drawable/ic_slash_style_italic.xml b/core-ui/src/main/res/drawable/ic_slash_style_italic.xml index 0d70c70eae..37d80b39d8 100644 --- a/core-ui/src/main/res/drawable/ic_slash_style_italic.xml +++ b/core-ui/src/main/res/drawable/ic_slash_style_italic.xml @@ -5,8 +5,8 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_slash_style_link.xml b/core-ui/src/main/res/drawable/ic_slash_style_link.xml index 04bf451243..7817a1cbac 100644 --- a/core-ui/src/main/res/drawable/ic_slash_style_link.xml +++ b/core-ui/src/main/res/drawable/ic_slash_style_link.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_slash_style_numbered.xml b/core-ui/src/main/res/drawable/ic_slash_style_numbered.xml index a16617b67d..9a0fae78cd 100644 --- a/core-ui/src/main/res/drawable/ic_slash_style_numbered.xml +++ b/core-ui/src/main/res/drawable/ic_slash_style_numbered.xml @@ -5,5 +5,5 @@ android:viewportHeight="12"> + android:fillColor="@color/text_primary"/> diff --git a/core-ui/src/main/res/drawable/ic_slash_style_subheading.xml b/core-ui/src/main/res/drawable/ic_slash_style_subheading.xml index 8a0dc11da1..88f91d9b52 100644 --- a/core-ui/src/main/res/drawable/ic_slash_style_subheading.xml +++ b/core-ui/src/main/res/drawable/ic_slash_style_subheading.xml @@ -5,5 +5,5 @@ android:viewportHeight="14"> + android:fillColor="@color/text_primary"/> diff --git a/core-ui/src/main/res/drawable/ic_slash_style_text.xml b/core-ui/src/main/res/drawable/ic_slash_style_text.xml index 030b59efd8..eb8bf98bfb 100644 --- a/core-ui/src/main/res/drawable/ic_slash_style_text.xml +++ b/core-ui/src/main/res/drawable/ic_slash_style_text.xml @@ -5,5 +5,5 @@ android:viewportHeight="12"> + android:fillColor="@color/text_primary"/> diff --git a/core-ui/src/main/res/drawable/ic_slash_style_title.xml b/core-ui/src/main/res/drawable/ic_slash_style_title.xml index 33c80c4e01..c88e756293 100644 --- a/core-ui/src/main/res/drawable/ic_slash_style_title.xml +++ b/core-ui/src/main/res/drawable/ic_slash_style_title.xml @@ -5,5 +5,5 @@ android:viewportHeight="22"> + android:fillColor="@color/text_primary"/> diff --git a/core-ui/src/main/res/drawable/ic_slash_style_toggle.xml b/core-ui/src/main/res/drawable/ic_slash_style_toggle.xml index 639fb5ead8..4769f73117 100644 --- a/core-ui/src/main/res/drawable/ic_slash_style_toggle.xml +++ b/core-ui/src/main/res/drawable/ic_slash_style_toggle.xml @@ -7,6 +7,6 @@ android:pathData="M1.5,1.5L6.5,6.4416L1.5584,11.5" android:strokeWidth="1.25" android:fillColor="#00000000" - android:strokeColor="#2C2B27" + android:strokeColor="@color/text_primary" android:strokeLineCap="round"/> diff --git a/core-ui/src/main/res/drawable/ic_slash_widget.xml b/core-ui/src/main/res/drawable/ic_slash_widget.xml index 295ad687fb..8504cb70fb 100644 --- a/core-ui/src/main/res/drawable/ic_slash_widget.xml +++ b/core-ui/src/main/res/drawable/ic_slash_widget.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:strokeColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_bullet.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_bullet.xml index 55da47e570..67ad8714e1 100644 --- a/core-ui/src/main/res/drawable/ic_style_toolbar_bullet.xml +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_bullet.xml @@ -5,14 +5,14 @@ android:viewportHeight="16"> + android:fillColor="@color/glyph_selected"/> + android:fillColor="@color/glyph_selected"/> + android:fillColor="@color/glyph_selected"/> + android:fillColor="@color/text_primary"/> diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_button_background.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_button_background.xml index d763ff86be..dca5a8d8f9 100644 --- a/core-ui/src/main/res/drawable/ic_style_toolbar_button_background.xml +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_button_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_button_background_active.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_button_background_active.xml index 054c436164..f1cbf6da2e 100644 --- a/core-ui/src/main/res/drawable/ic_style_toolbar_button_background_active.xml +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_button_background_active.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_callout_background.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_callout_background.xml index fc7d3477fe..9d8bd4d96d 100644 --- a/core-ui/src/main/res/drawable/ic_style_toolbar_callout_background.xml +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_callout_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_checkbox.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_checkbox.xml index b1b295a713..c37e227903 100644 --- a/core-ui/src/main/res/drawable/ic_style_toolbar_checkbox.xml +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_checkbox.xml @@ -5,15 +5,15 @@ android:viewportHeight="16"> + android:fillColor="@color/glyph_selected"/> + android:fillColor="@color/glyph_selected"/> + android:fillColor="@color/glyph_selected"/> diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_highlight_cursor.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_highlight_cursor.xml index cae6f840f9..b85362a79c 100644 --- a/core-ui/src/main/res/drawable/ic_style_toolbar_highlight_cursor.xml +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_highlight_cursor.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_more.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_more.xml index bcc6b829bf..4fe4f35625 100644 --- a/core-ui/src/main/res/drawable/ic_style_toolbar_more.xml +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_more.xml @@ -5,11 +5,11 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_numbered.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_numbered.xml index 7288ccc143..eb77b5d2d7 100644 --- a/core-ui/src/main/res/drawable/ic_style_toolbar_numbered.xml +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_numbered.xml @@ -5,17 +5,17 @@ android:viewportHeight="16"> + android:fillColor="@color/glyph_selected"/> + android:fillColor="@color/glyph_selected"/> + android:fillColor="@color/glyph_selected"/> + android:fillColor="@color/text_primary"/> + android:fillColor="@color/text_primary"/> diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_text_style_background_active.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_text_style_background_active.xml index 054c436164..f1cbf6da2e 100644 --- a/core-ui/src/main/res/drawable/ic_style_toolbar_text_style_background_active.xml +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_text_style_background_active.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_toogle.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_toogle.xml index 51245bb77c..b88fbd67d2 100644 --- a/core-ui/src/main/res/drawable/ic_style_toolbar_toogle.xml +++ b/core-ui/src/main/res/drawable/ic_style_toolbar_toogle.xml @@ -5,15 +5,15 @@ android:viewportHeight="16"> + android:fillColor="@color/glyph_selected"/> + android:fillColor="@color/glyph_selected"/> + android:fillColor="@color/glyph_selected"/> diff --git a/core-ui/src/main/res/drawable/ic_tag_not_selected.xml b/core-ui/src/main/res/drawable/ic_tag_not_selected.xml index 8d58ee1727..4d5d6bd42a 100644 --- a/core-ui/src/main/res/drawable/ic_tag_not_selected.xml +++ b/core-ui/src/main/res/drawable/ic_tag_not_selected.xml @@ -7,5 +7,5 @@ android:fillColor="#00000000" android:pathData="M12,12m-11.25,0a11.25,11.25 0,1 1,22.5 0a11.25,11.25 0,1 1,-22.5 0" android:strokeWidth="1.5" - android:strokeColor="#DFDDD0" /> + android:strokeColor="@color/shape_primary" /> diff --git a/core-ui/src/main/res/drawable/ic_three_dots.xml b/core-ui/src/main/res/drawable/ic_three_dots.xml index f4d800e363..b123e3b51f 100644 --- a/core-ui/src/main/res/drawable/ic_three_dots.xml +++ b/core-ui/src/main/res/drawable/ic_three_dots.xml @@ -5,11 +5,11 @@ android:viewportHeight="3"> + android:fillColor="@color/text_primary"/> + android:fillColor="@color/text_primary"/> + android:fillColor="@color/text_primary"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_markup_bold.xml b/core-ui/src/main/res/drawable/ic_toolbar_markup_bold.xml index d58fa47b82..aa26ea88de 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_markup_bold.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_markup_bold.xml @@ -5,8 +5,8 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_markup_bold_active.xml b/core-ui/src/main/res/drawable/ic_toolbar_markup_bold_active.xml index 6bc0ab0445..ba939602c8 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_markup_bold_active.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_markup_bold_active.xml @@ -5,8 +5,8 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_selected"/> + android:fillColor="@color/glyph_selected"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_markup_bold_disabled.xml b/core-ui/src/main/res/drawable/ic_toolbar_markup_bold_disabled.xml index de004a7200..e4fdf49505 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_markup_bold_disabled.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_markup_bold_disabled.xml @@ -5,8 +5,8 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_inactive"/> + android:fillColor="@color/glyph_inactive"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_markup_code.xml b/core-ui/src/main/res/drawable/ic_toolbar_markup_code.xml index e1bcadb46f..2d7d6a2a75 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_markup_code.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_markup_code.xml @@ -7,10 +7,10 @@ android:pathData="M9,6L3,12L9,18" android:strokeWidth="1.5" android:fillColor="#00000000" - android:strokeColor="#ACA996"/> + android:strokeColor="@color/glyph_active"/> + android:strokeColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_markup_code_active.xml b/core-ui/src/main/res/drawable/ic_toolbar_markup_code_active.xml index 7cc7508ed4..62cc92661e 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_markup_code_active.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_markup_code_active.xml @@ -7,10 +7,10 @@ android:pathData="M9,6L3,12L9,18" android:strokeWidth="1.5" android:fillColor="#00000000" - android:strokeColor="#2C2B27"/> + android:strokeColor="@color/glyph_selected"/> + android:strokeColor="@color/glyph_selected"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_markup_code_disabled.xml b/core-ui/src/main/res/drawable/ic_toolbar_markup_code_disabled.xml index c69d58bae2..50f82ce270 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_markup_code_disabled.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_markup_code_disabled.xml @@ -7,10 +7,10 @@ android:pathData="M9,6L3,12L9,18" android:strokeWidth="1.5" android:fillColor="#00000000" - android:strokeColor="#DFDDD0"/> + android:strokeColor="@color/glyph_inactive"/> + android:strokeColor="@color/glyph_inactive"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_markup_italic.xml b/core-ui/src/main/res/drawable/ic_toolbar_markup_italic.xml index 0d70c70eae..37d80b39d8 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_markup_italic.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_markup_italic.xml @@ -5,8 +5,8 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_markup_italic_active.xml b/core-ui/src/main/res/drawable/ic_toolbar_markup_italic_active.xml index b074acd90c..d9d6538233 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_markup_italic_active.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_markup_italic_active.xml @@ -5,8 +5,8 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_selected"/> + android:fillColor="@color/glyph_selected"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_markup_italic_disabled.xml b/core-ui/src/main/res/drawable/ic_toolbar_markup_italic_disabled.xml index fad9755453..31eb81437e 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_markup_italic_disabled.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_markup_italic_disabled.xml @@ -5,8 +5,8 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_inactive"/> + android:fillColor="@color/glyph_inactive"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_markup_link.xml b/core-ui/src/main/res/drawable/ic_toolbar_markup_link.xml index 04bf451243..7817a1cbac 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_markup_link.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_markup_link.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_markup_link_active.xml b/core-ui/src/main/res/drawable/ic_toolbar_markup_link_active.xml index 7b64c42158..48be27a7b0 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_markup_link_active.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_markup_link_active.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_markup_link_disabled.xml b/core-ui/src/main/res/drawable/ic_toolbar_markup_link_disabled.xml index 81f3454457..09d3c830ff 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_markup_link_disabled.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_markup_link_disabled.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_markup_strike_through.xml b/core-ui/src/main/res/drawable/ic_toolbar_markup_strike_through.xml index 45fceae72d..d1af4dbeda 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_markup_strike_through.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_markup_strike_through.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_active"/> + android:fillColor="@color/glyph_active" + android:strokeColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_markup_strike_through_active.xml b/core-ui/src/main/res/drawable/ic_toolbar_markup_strike_through_active.xml index ecd9d17a42..dbc9bac8ef 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_markup_strike_through_active.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_markup_strike_through_active.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_selected"/> + android:fillColor="@color/glyph_selected" + android:strokeColor="@color/glyph_selected"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_markup_strike_through_disabled.xml b/core-ui/src/main/res/drawable/ic_toolbar_markup_strike_through_disabled.xml index c98ce1552e..47464145ee 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_markup_strike_through_disabled.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_markup_strike_through_disabled.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_inactive"/> + android:strokeColor="@color/glyph_inactive"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_align_center.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_align_center.xml index bd0edd8947..b130eee368 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_style_align_center.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_style_align_center.xml @@ -7,20 +7,20 @@ android:pathData="M3.375,5.625h17.25v0.75h-17.25z" android:strokeWidth="0.75" android:fillColor="#00000000" - android:strokeColor="#2C2B27"/> + android:strokeColor="@color/glyph_selected"/> + android:strokeColor="@color/glyph_selected"/> + android:strokeColor="@color/glyph_selected"/> + android:strokeColor="@color/glyph_selected"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_align_center_disabled.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_align_center_disabled.xml index b16f6b8b70..e19a50cb37 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_style_align_center_disabled.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_style_align_center_disabled.xml @@ -7,20 +7,20 @@ android:pathData="M3.375,5.625h17.25v0.75h-17.25z" android:strokeWidth="0.75" android:fillColor="#00000000" - android:strokeColor="#ACA996"/> + android:strokeColor="@color/glyph_inactive"/> + android:strokeColor="@color/glyph_inactive"/> + android:strokeColor="@color/glyph_inactive"/> + android:strokeColor="@color/glyph_inactive"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_align_left.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_align_left.xml index a9bb9422bc..db5efe47cb 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_style_align_left.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_style_align_left.xml @@ -7,20 +7,20 @@ android:pathData="M3.375,5.625h17.25v0.75h-17.25z" android:strokeWidth="0.75" android:fillColor="#00000000" - android:strokeColor="#2C2B27"/> + android:strokeColor="@color/glyph_selected"/> + android:strokeColor="@color/glyph_selected"/> + android:strokeColor="@color/glyph_selected"/> + android:strokeColor="@color/glyph_selected"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_align_left_disabled.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_align_left_disabled.xml index c486ecf036..06d14b982f 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_style_align_left_disabled.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_style_align_left_disabled.xml @@ -7,20 +7,20 @@ android:pathData="M3.375,5.625h17.25v0.75h-17.25z" android:strokeWidth="0.75" android:fillColor="#00000000" - android:strokeColor="#ACA996"/> + android:strokeColor="@color/glyph_inactive"/> + android:strokeColor="@color/glyph_inactive"/> + android:strokeColor="@color/glyph_inactive"/> + android:strokeColor="@color/glyph_inactive"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_align_right.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_align_right.xml index a4fd6dd93b..5ba5554dff 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_style_align_right.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_style_align_right.xml @@ -7,20 +7,20 @@ android:pathData="M20.625,5.625l-17.25,0l-0,0.75l17.25,0z" android:strokeWidth="0.75" android:fillColor="#00000000" - android:strokeColor="#2C2B27"/> + android:strokeColor="@color/glyph_selected"/> + android:strokeColor="@color/glyph_selected"/> + android:strokeColor="@color/glyph_selected"/> + android:strokeColor="@color/glyph_selected"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_align_right_disabled.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_align_right_disabled.xml index 9f128ac7d9..88fd687d4a 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_style_align_right_disabled.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_style_align_right_disabled.xml @@ -7,20 +7,20 @@ android:pathData="M20.625,5.625l-17.25,0l-0,0.75l17.25,0z" android:strokeWidth="0.75" android:fillColor="#00000000" - android:strokeColor="#ACA996"/> + android:strokeColor="@color/glyph_inactive"/> + android:strokeColor="@color/glyph_inactive"/> + android:strokeColor="@color/glyph_inactive"/> + android:strokeColor="@color/glyph_inactive"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_bold.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_bold.xml index 6bc0ab0445..ba939602c8 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_style_bold.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_style_bold.xml @@ -5,8 +5,8 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_selected"/> + android:fillColor="@color/glyph_selected"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_bold_disabled.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_bold_disabled.xml index d58fa47b82..e4fdf49505 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_style_bold_disabled.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_style_bold_disabled.xml @@ -5,8 +5,8 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_inactive"/> + android:fillColor="@color/glyph_inactive"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_code.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_code.xml index 7cc7508ed4..62cc92661e 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_style_code.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_style_code.xml @@ -7,10 +7,10 @@ android:pathData="M9,6L3,12L9,18" android:strokeWidth="1.5" android:fillColor="#00000000" - android:strokeColor="#2C2B27"/> + android:strokeColor="@color/glyph_selected"/> + android:strokeColor="@color/glyph_selected"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_code_disabled.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_code_disabled.xml index e1bcadb46f..50f82ce270 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_style_code_disabled.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_style_code_disabled.xml @@ -7,10 +7,10 @@ android:pathData="M9,6L3,12L9,18" android:strokeWidth="1.5" android:fillColor="#00000000" - android:strokeColor="#ACA996"/> + android:strokeColor="@color/glyph_inactive"/> + android:strokeColor="@color/glyph_inactive"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_italic.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_italic.xml index b074acd90c..d9d6538233 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_style_italic.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_style_italic.xml @@ -5,8 +5,8 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_selected"/> + android:fillColor="@color/glyph_selected"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_italic_disabled.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_italic_disabled.xml index 0d70c70eae..31eb81437e 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_style_italic_disabled.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_style_italic_disabled.xml @@ -5,8 +5,8 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_inactive"/> + android:fillColor="@color/glyph_inactive"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_link.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_link.xml index 7b64c42158..48be27a7b0 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_style_link.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_style_link.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_link_disabled.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_link_disabled.xml index 04bf451243..09d3c830ff 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_style_link_disabled.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_style_link_disabled.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_strike_through.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_strike_through.xml index ecd9d17a42..dbc9bac8ef 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_style_strike_through.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_style_strike_through.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_selected"/> + android:fillColor="@color/glyph_selected" + android:strokeColor="@color/glyph_selected"/> diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_strike_through_disabled.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_strike_through_disabled.xml index 45fceae72d..878c0ac8e6 100644 --- a/core-ui/src/main/res/drawable/ic_toolbar_style_strike_through_disabled.xml +++ b/core-ui/src/main/res/drawable/ic_toolbar_style_strike_through_disabled.xml @@ -5,10 +5,10 @@ android:viewportHeight="24"> + android:fillColor="@color/glyph_inactive"/> + android:fillColor="@color/glyph_inactive" + android:strokeColor="@color/glyph_inactive"/> diff --git a/core-ui/src/main/res/drawable/ic_video.xml b/core-ui/src/main/res/drawable/ic_video.xml index 0b41501b04..e2f3d33c74 100644 --- a/core-ui/src/main/res/drawable/ic_video.xml +++ b/core-ui/src/main/res/drawable/ic_video.xml @@ -8,10 +8,10 @@ android:pathData="M0.5,0h24v24h-24z"/> + android:fillColor="@color/glyph_active"/> diff --git a/core-ui/src/main/res/drawable/item_block_code_multi_select_unselected.xml b/core-ui/src/main/res/drawable/item_block_code_multi_select_unselected.xml index 9098bc0872..9153b67ddb 100644 --- a/core-ui/src/main/res/drawable/item_block_code_multi_select_unselected.xml +++ b/core-ui/src/main/res/drawable/item_block_code_multi_select_unselected.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/object_in_list_background_basic_initial.xml b/core-ui/src/main/res/drawable/object_in_list_background_basic_initial.xml index 103e8cc726..0ad90f7207 100644 --- a/core-ui/src/main/res/drawable/object_in_list_background_basic_initial.xml +++ b/core-ui/src/main/res/drawable/object_in_list_background_basic_initial.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/object_in_list_background_profile_initial.xml b/core-ui/src/main/res/drawable/object_in_list_background_profile_initial.xml index 513f7b680d..da2159bebd 100644 --- a/core-ui/src/main/res/drawable/object_in_list_background_profile_initial.xml +++ b/core-ui/src/main/res/drawable/object_in_list_background_profile_initial.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/rect_block_action_button_background.xml b/core-ui/src/main/res/drawable/rect_block_action_button_background.xml index 40b6440c47..089b848869 100644 --- a/core-ui/src/main/res/drawable/rect_block_action_button_background.xml +++ b/core-ui/src/main/res/drawable/rect_block_action_button_background.xml @@ -5,7 +5,7 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/rect_bottom_sheet.xml b/core-ui/src/main/res/drawable/rect_bottom_sheet.xml index 0db4d8a5d7..7acd702f2e 100644 --- a/core-ui/src/main/res/drawable/rect_bottom_sheet.xml +++ b/core-ui/src/main/res/drawable/rect_bottom_sheet.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/rect_data_view_customize_view_button.xml b/core-ui/src/main/res/drawable/rect_data_view_customize_view_button.xml index 0d5ea24272..9b93bd290e 100644 --- a/core-ui/src/main/res/drawable/rect_data_view_customize_view_button.xml +++ b/core-ui/src/main/res/drawable/rect_data_view_customize_view_button.xml @@ -3,14 +3,14 @@ android:color="@color/gray"> - + - + diff --git a/core-ui/src/main/res/drawable/rect_object_icon_card_emoji_background.xml b/core-ui/src/main/res/drawable/rect_object_icon_card_emoji_background.xml index 9098bc0872..6dcfac90dd 100644 --- a/core-ui/src/main/res/drawable/rect_object_icon_card_emoji_background.xml +++ b/core-ui/src/main/res/drawable/rect_object_icon_card_emoji_background.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/rect_search_input.xml b/core-ui/src/main/res/drawable/rect_search_input.xml new file mode 100644 index 0000000000..6dcfac90dd --- /dev/null +++ b/core-ui/src/main/res/drawable/rect_search_input.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/rect_white_radius_12.xml b/core-ui/src/main/res/drawable/rect_white_radius_12.xml index 5f433614be..f160983de9 100644 --- a/core-ui/src/main/res/drawable/rect_white_radius_12.xml +++ b/core-ui/src/main/res/drawable/rect_white_radius_12.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/rectangle_avatar_initial_background_8.xml b/core-ui/src/main/res/drawable/rectangle_avatar_initial_background_8.xml index 255b5ade60..c7927ca43f 100644 --- a/core-ui/src/main/res/drawable/rectangle_avatar_initial_background_8.xml +++ b/core-ui/src/main/res/drawable/rectangle_avatar_initial_background_8.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/rectangle_bookmark_placeholder.xml b/core-ui/src/main/res/drawable/rectangle_bookmark_placeholder.xml index 05d4f9ddcf..16d5f7a2f2 100644 --- a/core-ui/src/main/res/drawable/rectangle_bookmark_placeholder.xml +++ b/core-ui/src/main/res/drawable/rectangle_bookmark_placeholder.xml @@ -2,7 +2,7 @@ + android:width="0.5dp" + android:color="@color/shape_primary" /> \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/rectangle_dashboard_text_skeleton.xml b/core-ui/src/main/res/drawable/rectangle_dashboard_text_skeleton.xml index f25795803d..209e3811d9 100644 --- a/core-ui/src/main/res/drawable/rectangle_dashboard_text_skeleton.xml +++ b/core-ui/src/main/res/drawable/rectangle_dashboard_text_skeleton.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/rectangle_doc_search.xml b/core-ui/src/main/res/drawable/rectangle_doc_search.xml index ee97351fe7..b27d4e8d32 100644 --- a/core-ui/src/main/res/drawable/rectangle_doc_search.xml +++ b/core-ui/src/main/res/drawable/rectangle_doc_search.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/rectangle_modify_viewer_relation_order_dnd.xml b/core-ui/src/main/res/drawable/rectangle_modify_viewer_relation_order_dnd.xml index e73036e8fc..c3e1fbe2c3 100644 --- a/core-ui/src/main/res/drawable/rectangle_modify_viewer_relation_order_dnd.xml +++ b/core-ui/src/main/res/drawable/rectangle_modify_viewer_relation_order_dnd.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/rectangle_object_icon_emoji_background_8.xml b/core-ui/src/main/res/drawable/rectangle_object_icon_emoji_background_8.xml index 255b5ade60..c7927ca43f 100644 --- a/core-ui/src/main/res/drawable/rectangle_object_icon_emoji_background_8.xml +++ b/core-ui/src/main/res/drawable/rectangle_object_icon_emoji_background_8.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/rectangle_object_in_list_emoji_icon.xml b/core-ui/src/main/res/drawable/rectangle_object_in_list_emoji_icon.xml index 501be59e64..2b0a152338 100644 --- a/core-ui/src/main/res/drawable/rectangle_object_in_list_emoji_icon.xml +++ b/core-ui/src/main/res/drawable/rectangle_object_in_list_emoji_icon.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/rectangle_object_menu_action_ripple.xml b/core-ui/src/main/res/drawable/rectangle_object_menu_action_ripple.xml index 8a8d0c5f2b..f4f8cdbfb7 100644 --- a/core-ui/src/main/res/drawable/rectangle_object_menu_action_ripple.xml +++ b/core-ui/src/main/res/drawable/rectangle_object_menu_action_ripple.xml @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/rounded_button_cancel.xml b/core-ui/src/main/res/drawable/rounded_button_cancel.xml index 872265e3a0..6ce89697c4 100644 --- a/core-ui/src/main/res/drawable/rounded_button_cancel.xml +++ b/core-ui/src/main/res/drawable/rounded_button_cancel.xml @@ -5,6 +5,6 @@ + android:color="@color/shape_transparent" /> \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/rounded_rectangle_block_style_toolbar_group.xml b/core-ui/src/main/res/drawable/rounded_rectangle_block_style_toolbar_group.xml index 1c08dddfe8..56ae73d285 100644 --- a/core-ui/src/main/res/drawable/rounded_rectangle_block_style_toolbar_group.xml +++ b/core-ui/src/main/res/drawable/rounded_rectangle_block_style_toolbar_group.xml @@ -3,6 +3,6 @@ android:shape="rectangle"> + android:color="@color/shape_primary" /> \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/sheet_top.xml b/core-ui/src/main/res/drawable/sheet_top.xml index 5de9aa6f45..72c1d311b1 100644 --- a/core-ui/src/main/res/drawable/sheet_top.xml +++ b/core-ui/src/main/res/drawable/sheet_top.xml @@ -5,5 +5,5 @@ android:viewportHeight="4"> + android:fillColor="@color/shape_primary"/> diff --git a/core-ui/src/main/res/drawable/tab_style_toolbar.xml b/core-ui/src/main/res/drawable/tab_style_toolbar.xml index dcfd1c24d9..b250d3b0bd 100644 --- a/core-ui/src/main/res/drawable/tab_style_toolbar.xml +++ b/core-ui/src/main/res/drawable/tab_style_toolbar.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/drawable/tab_style_toolbar_active.xml b/core-ui/src/main/res/drawable/tab_style_toolbar_active.xml index 4c47edf673..9f4bd0876b 100644 --- a/core-ui/src/main/res/drawable/tab_style_toolbar_active.xml +++ b/core-ui/src/main/res/drawable/tab_style_toolbar_active.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/core-ui/src/main/res/layout/block_style_toolbar_background.xml b/core-ui/src/main/res/layout/block_style_toolbar_background.xml index 802c082e3d..8494446983 100644 --- a/core-ui/src/main/res/layout/block_style_toolbar_background.xml +++ b/core-ui/src/main/res/layout/block_style_toolbar_background.xml @@ -8,67 +8,67 @@ diff --git a/core-ui/src/main/res/layout/item_block_title_profile.xml b/core-ui/src/main/res/layout/item_block_title_profile.xml index 6e6e8b34e7..a120edabef 100644 --- a/core-ui/src/main/res/layout/item_block_title_profile.xml +++ b/core-ui/src/main/res/layout/item_block_title_profile.xml @@ -39,10 +39,10 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:fontFamily="@font/inter_medium" + android:fontFamily="@font/inter_semibold" android:gravity="center" android:textColor="@color/white" - android:textSize="44sp" + android:textSize="64sp" tools:text="S" /> diff --git a/core-ui/src/main/res/layout/item_block_unsupported.xml b/core-ui/src/main/res/layout/item_block_unsupported.xml index 93c6e93dd2..7f9fd0961a 100644 --- a/core-ui/src/main/res/layout/item_block_unsupported.xml +++ b/core-ui/src/main/res/layout/item_block_unsupported.xml @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/inter_regular" android:text="@string/unsupported_block" - android:textColor="#CBC9BD" + android:textColor="@color/text_tertiary" android:textSize="15sp" /> \ No newline at end of file diff --git a/core-ui/src/main/res/layout/item_doc_cover_gallery_header.xml b/core-ui/src/main/res/layout/item_doc_cover_gallery_header.xml index aba02021bf..d1bf382386 100644 --- a/core-ui/src/main/res/layout/item_doc_cover_gallery_header.xml +++ b/core-ui/src/main/res/layout/item_doc_cover_gallery_header.xml @@ -10,7 +10,7 @@ android:layout_height="wrap_content" android:fontFamily="@font/inter_medium" android:layout_marginTop="18dp" - android:textColor="#929082" + android:textColor="@color/text_secondary" android:gravity="center_horizontal" android:textSize="13sp" tools:text="Color solid" /> diff --git a/core-ui/src/main/res/layout/item_document_relation_default.xml b/core-ui/src/main/res/layout/item_document_relation_default.xml index b94aaef333..3d553c47b2 100644 --- a/core-ui/src/main/res/layout/item_document_relation_default.xml +++ b/core-ui/src/main/res/layout/item_document_relation_default.xml @@ -25,8 +25,8 @@ android:maxLines="1" android:hint="@string/enter_value" android:singleLine="true" - android:textColorHint="@color/RelationPlaceholderTextColor" - android:textColor="@color/black" + android:textColorHint="@color/text_tertiary" + android:textColor="@color/text_primary" tools:text="@string/default_text_placeholder" /> \ No newline at end of file diff --git a/core-ui/src/main/res/layout/item_document_relation_status.xml b/core-ui/src/main/res/layout/item_document_relation_status.xml index 40e66430b5..bf61ff845e 100644 --- a/core-ui/src/main/res/layout/item_document_relation_status.xml +++ b/core-ui/src/main/res/layout/item_document_relation_status.xml @@ -22,10 +22,10 @@ android:layout_weight="0.6" android:ellipsize="end" android:hint="@string/select_status" - android:textColorHint="@color/RelationPlaceholderTextColor" + android:textColorHint="@color/text_tertiary" android:maxLines="1" android:singleLine="true" - android:textColor="@color/black" + android:textColor="@color/text_primary" tools:text="@string/default_text_placeholder" /> \ No newline at end of file diff --git a/core-ui/src/main/res/layout/item_dv_viewer_filter_condition.xml b/core-ui/src/main/res/layout/item_dv_viewer_filter_condition.xml index dbda277cee..b70a90d3ee 100644 --- a/core-ui/src/main/res/layout/item_dv_viewer_filter_condition.xml +++ b/core-ui/src/main/res/layout/item_dv_viewer_filter_condition.xml @@ -14,7 +14,7 @@ android:textSize="17sp" android:layout_weight="1" android:fontFamily="@font/inter_regular" - android:textColor="@color/black" + android:textColor="@color/text_primary" android:layout_gravity="center_vertical"/> diff --git a/core-ui/src/main/res/layout/item_edit_cell_tag_or_status_empty.xml b/core-ui/src/main/res/layout/item_edit_cell_tag_or_status_empty.xml index 079bb1f355..a1531f7e6e 100644 --- a/core-ui/src/main/res/layout/item_edit_cell_tag_or_status_empty.xml +++ b/core-ui/src/main/res/layout/item_edit_cell_tag_or_status_empty.xml @@ -9,6 +9,7 @@ android:layout_height="wrap_content" android:gravity="center" android:padding="12dp" + android:textColor="@color/text_tertiary" android:text="@string/empty" /> \ No newline at end of file diff --git a/core-ui/src/main/res/layout/item_featured_relation_default.xml b/core-ui/src/main/res/layout/item_featured_relation_default.xml index f7553a4b58..3b46402e45 100644 --- a/core-ui/src/main/res/layout/item_featured_relation_default.xml +++ b/core-ui/src/main/res/layout/item_featured_relation_default.xml @@ -9,7 +9,7 @@ android:layout_gravity="center_vertical" tools:text="Anytype" android:id="@+id/tvFeaturedRelationValue" - android:textColor="#929082" + android:textColor="@color/text_secondary" android:layout_width="wrap_content" android:layout_height="wrap_content"/> diff --git a/core-ui/src/main/res/layout/item_markup_color_background.xml b/core-ui/src/main/res/layout/item_markup_color_background.xml index 08686ef997..6a115086a3 100644 --- a/core-ui/src/main/res/layout/item_markup_color_background.xml +++ b/core-ui/src/main/res/layout/item_markup_color_background.xml @@ -9,6 +9,6 @@ android:layout_width="44dp" android:layout_height="44dp" android:layout_gravity="center" - app:outerStrokeColor="#DFDDD0" + app:outerStrokeColor="@color/shape_primary" app:innerRadius="18dp" /> \ No newline at end of file diff --git a/core-ui/src/main/res/layout/item_markup_color_text.xml b/core-ui/src/main/res/layout/item_markup_color_text.xml index 08686ef997..6a115086a3 100644 --- a/core-ui/src/main/res/layout/item_markup_color_text.xml +++ b/core-ui/src/main/res/layout/item_markup_color_text.xml @@ -9,6 +9,6 @@ android:layout_width="44dp" android:layout_height="44dp" android:layout_gravity="center" - app:outerStrokeColor="#DFDDD0" + app:outerStrokeColor="@color/shape_primary" app:innerRadius="18dp" /> \ No newline at end of file diff --git a/core-ui/src/main/res/layout/item_modify_viewer_relation_order.xml b/core-ui/src/main/res/layout/item_modify_viewer_relation_order.xml index 0296c9d1ae..f504facc90 100644 --- a/core-ui/src/main/res/layout/item_modify_viewer_relation_order.xml +++ b/core-ui/src/main/res/layout/item_modify_viewer_relation_order.xml @@ -34,7 +34,7 @@ android:fontFamily="@font/inter_regular" android:maxLines="1" android:singleLine="true" - android:textColor="#2C2B27" + android:textColor="@color/text_primary" android:textSize="17sp" tools:text="We need to render the bottom sheet layout with possibilities" /> diff --git a/core-ui/src/main/res/layout/item_object_menu_action.xml b/core-ui/src/main/res/layout/item_object_menu_action.xml index 558dadaad6..bbe92e8c1f 100644 --- a/core-ui/src/main/res/layout/item_object_menu_action.xml +++ b/core-ui/src/main/res/layout/item_object_menu_action.xml @@ -1,8 +1,8 @@ + tools:src="@drawable/ic_object_action_add_to_favorites" /> + tools:text="Favourite" /> \ No newline at end of file diff --git a/core-ui/src/main/res/layout/item_object_relation_text.xml b/core-ui/src/main/res/layout/item_object_relation_text.xml index 5e498649ef..e70a67846f 100644 --- a/core-ui/src/main/res/layout/item_object_relation_text.xml +++ b/core-ui/src/main/res/layout/item_object_relation_text.xml @@ -17,7 +17,8 @@ android:imeOptions="actionDone" android:gravity="start|center_vertical" android:hint="@string/dv_cell_description_hint" - android:textColor="@color/black" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_tertiary" android:textSize="15sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/btnAction" diff --git a/core-ui/src/main/res/layout/item_object_type_horizontal_item.xml b/core-ui/src/main/res/layout/item_object_type_horizontal_item.xml index 4462d4365b..ced0b9d0d4 100644 --- a/core-ui/src/main/res/layout/item_object_type_horizontal_item.xml +++ b/core-ui/src/main/res/layout/item_object_type_horizontal_item.xml @@ -11,7 +11,7 @@ android:layout_width="@dimen/dp_48" android:layout_height="@dimen/dp_48" app:emojiSize="28dp" - app:hasEmojiRounded8Background="true" + app:hasEmojiRounded12Background="true" app:hasInitialRounded8Background="true" app:initialTextSize="22sp" android:layout_gravity="center_horizontal" diff --git a/core-ui/src/main/res/layout/item_object_type_search.xml b/core-ui/src/main/res/layout/item_object_type_search.xml index a9aba9ad0d..5f9c890599 100644 --- a/core-ui/src/main/res/layout/item_object_type_search.xml +++ b/core-ui/src/main/res/layout/item_object_type_search.xml @@ -1,19 +1,16 @@ - diff --git a/core-ui/src/main/res/layout/item_viewer_container.xml b/core-ui/src/main/res/layout/item_viewer_container.xml index 9f47155875..1728795620 100644 --- a/core-ui/src/main/res/layout/item_viewer_container.xml +++ b/core-ui/src/main/res/layout/item_viewer_container.xml @@ -3,9 +3,9 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/horizontalScrollView" - android:scrollbars="none" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:scrollbars="none"> + android:background="@color/shape_primary" /> diff --git a/core-ui/src/main/res/layout/item_viewer_relation_list_section.xml b/core-ui/src/main/res/layout/item_viewer_relation_list_section.xml index fac6e0922d..6c5ab8d809 100644 --- a/core-ui/src/main/res/layout/item_viewer_relation_list_section.xml +++ b/core-ui/src/main/res/layout/item_viewer_relation_list_section.xml @@ -9,7 +9,7 @@ android:gravity="center" android:fontFamily="@font/inter_semibold" android:textSize="17sp" - android:textColor="@color/black" + android:textColor="@color/text_primary" android:layout_width="match_parent" android:layout_height="match_parent" tools:text="Relations"/> diff --git a/core-ui/src/main/res/layout/tab_item_style_toolbar.xml b/core-ui/src/main/res/layout/tab_item_style_toolbar.xml index 21171f1c1e..21f7cfcb74 100644 --- a/core-ui/src/main/res/layout/tab_item_style_toolbar.xml +++ b/core-ui/src/main/res/layout/tab_item_style_toolbar.xml @@ -17,7 +17,7 @@ android:paddingBottom="3dp" android:singleLine="true" android:maxLines="1" - android:textColor="@color/black" + android:textColor="@color/text_primary" android:textSize="15sp" tools:text="Text" /> diff --git a/core-ui/src/main/res/layout/widet_undo_redo_panel.xml b/core-ui/src/main/res/layout/widet_undo_redo_panel.xml index fad0118c7b..0157d0cb90 100644 --- a/core-ui/src/main/res/layout/widet_undo_redo_panel.xml +++ b/core-ui/src/main/res/layout/widet_undo_redo_panel.xml @@ -56,7 +56,7 @@ android:layout_marginBottom="13dp" android:fontFamily="@font/inter_regular" android:text="@string/undo" - android:textColor="#929082" + android:textColor="@color/text_secondary" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/btnUndo" @@ -72,7 +72,7 @@ android:layout_marginBottom="13dp" android:fontFamily="@font/inter_regular" android:text="@string/redo" - android:textColor="#929082" + android:textColor="@color/text_secondary" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/btnRedo" diff --git a/core-ui/src/main/res/layout/widget_block_style_toolbar_colors.xml b/core-ui/src/main/res/layout/widget_block_style_toolbar_colors.xml index 62e22b8356..4d3903a6c2 100644 --- a/core-ui/src/main/res/layout/widget_block_style_toolbar_colors.xml +++ b/core-ui/src/main/res/layout/widget_block_style_toolbar_colors.xml @@ -20,7 +20,10 @@ android:layout_width="wrap_content" android:layout_height="48dp" android:layout_gravity="center_horizontal" - app:tabIndicatorColor="@android:color/transparent" + android:background="@null" + app:tabBackground="@null" + app:tabIndicatorColor="@null" + app:tabIndicator="@null" app:tabMode="auto" app:tabPaddingTop="0dp" app:tabPaddingBottom="0dp" diff --git a/core-ui/src/main/res/layout/widget_data_view_customize_view.xml b/core-ui/src/main/res/layout/widget_data_view_customize_view.xml index 2c619c8482..0dfa7b90ea 100644 --- a/core-ui/src/main/res/layout/widget_data_view_customize_view.xml +++ b/core-ui/src/main/res/layout/widget_data_view_customize_view.xml @@ -4,6 +4,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" app:cardElevation="4dp" + app:cardBackgroundColor="@color/background_secondary" app:cardCornerRadius="12dp"> @@ -80,6 +81,8 @@ android:maxLines="1" android:singleLine="true" android:fontFamily="@font/inter_regular" + android:textColorHint="@color/text_tertiary" + android:textColor="@color/text_primary" android:hint="@string/your_search_query" android:imeOptions="actionSearch" android:textSize="15sp" 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 84efd2566a..418c652867 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 @@ -27,7 +27,7 @@ android:ellipsize="end" android:fontFamily="@font/inter_regular" android:textSize="12sp" - android:textColor="#929082" + android:textColor="@color/text_secondary" android:visibility="gone" tools:text="Favorites" tools:visibility="visible" /> @@ -43,7 +43,7 @@ android:paddingStart="4dp" android:paddingEnd="4dp" android:singleLine="true" - android:textColor="#929082" + android:textColor="@color/text_secondary" android:textSize="12sp" android:visibility="gone" tools:text="+2" diff --git a/core-ui/src/main/res/layout/widget_dv_list_view_relation_tag.xml b/core-ui/src/main/res/layout/widget_dv_list_view_relation_tag.xml index 7518b7ec6b..fbbb8ab42c 100644 --- a/core-ui/src/main/res/layout/widget_dv_list_view_relation_tag.xml +++ b/core-ui/src/main/res/layout/widget_dv_list_view_relation_tag.xml @@ -1,6 +1,5 @@ diff --git a/core-ui/src/main/res/layout/widget_mention_menu.xml b/core-ui/src/main/res/layout/widget_mention_menu.xml index c36b3daac9..96a1aa2edf 100644 --- a/core-ui/src/main/res/layout/widget_mention_menu.xml +++ b/core-ui/src/main/res/layout/widget_mention_menu.xml @@ -5,7 +5,6 @@ android:id="@+id/container" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" android:clickable="true" android:focusable="true"> @@ -15,7 +14,7 @@ android:layout_height="1dp" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" - android:background="#DFDDD0" + android:background="@color/shape_primary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/core-ui/src/main/res/layout/widget_object_menu_item.xml b/core-ui/src/main/res/layout/widget_object_menu_item.xml index 7dabc8d05b..77f7c484fe 100644 --- a/core-ui/src/main/res/layout/widget_object_menu_item.xml +++ b/core-ui/src/main/res/layout/widget_object_menu_item.xml @@ -21,7 +21,7 @@ + android:background="@drawable/rect_search_input"> diff --git a/core-ui/src/main/res/values-night/colors.xml b/core-ui/src/main/res/values-night/colors.xml new file mode 100644 index 0000000000..223249f102 --- /dev/null +++ b/core-ui/src/main/res/values-night/colors.xml @@ -0,0 +1,66 @@ + + + #F3F2EC + + #1F1E1D + + #F3F2EC + #908F86 + #64635B + #FFFFFF + + #000000 + #1F1E1D + #24DAD7CA + + #3A3935 + #302F2B + #1F1E1D + #24DAD7CA + + #7B7A72 + #F3F2EC + #494843 + #FFB522 + #FFFFFF + + #99000000 + #99252525 + + #000000 + #ECD91B + #F1A91A + #F55522 + #DD2EA1 + #B354D7 + #5871FF + #18A3F1 + #0CC3B5 + #70CD28 + #908F86 + + #000000 + #474108 + #483308 + #581F0C + #50113A + #411E4D + #20295C + #093B57 + #044641 + #294B0E + #343330 + + #000000 + #2A2705 + #2B1E05 + #311107 + #310A23 + #27122F + #131938 + #052130 + #022724 + #172A08 + #1D1D1B + + diff --git a/core-ui/src/main/res/values/colors.xml b/core-ui/src/main/res/values/colors.xml index 2556e7bf41..7cbe11f365 100644 --- a/core-ui/src/main/res/values/colors.xml +++ b/core-ui/src/main/res/values/colors.xml @@ -17,17 +17,6 @@ #0FC8BA #57C600 - #FFFFFF - #F3F2EC - #FEF9CC - #FEF3C5 - #FFEBE5 - #FEE3F5 - #F4E3FA - #E4E7FC - #D6EFFD - #D6F5F3 - #E3F7D0 #8C000000 #F44336 @@ -135,9 +124,79 @@ #FFB522 #CBC9BD - - #929082 - #0066C3 + #2C2B27 + #929082 + #CBC9BD + #FFFFFF + + #FFFFFF + #FFFFFF + #1450491C + + #DFDDD0 + #EAE9E0 + #F1F0ED + #1450491C + + #ABA99B + #2C2B27 + #DFDDD0 + #F09C0E + #FFFFFF + + #FFFFFF + #99F5F5F5 + + #FFFFFF + #AFA100 + #C38400 + #E9410B + #D20D8F + #9F43C1 + #3E58EB + #188DCF + #0BA599 + #4DAE00 + #929082 + + #FFFFFF + #F4EB91 + #FCDC9C + #FCD1C3 + #F8C2E5 + #E8D0F1 + #CBD2FA + #B2DFF9 + #A9EBE6 + #C5EFA3 + #DEDCCC + + #FFFFFF + #FCF8D6 + #FFF2D7 + #FEE7E0 + #FBDFF2 + #F3E7F8 + #E4E8FC + #DDF1FC + #D9F6F4 + #E5F8D6 + #F1F0ED + + #FFFFFF + #FCF8D6 + #FFF2D7 + #FEE7E0 + #FBDFF2 + #F3E7F8 + #E4E8FC + #DDF1FC + #D9F6F4 + #E5F8D6 + #F1F0ED + + #CC0066C3 + diff --git a/core-ui/src/main/res/values/styles.xml b/core-ui/src/main/res/values/styles.xml index 72d229caa9..b84dbef516 100644 --- a/core-ui/src/main/res/values/styles.xml +++ b/core-ui/src/main/res/values/styles.xml @@ -10,7 +10,7 @@ @@ -31,7 +31,7 @@ @font/graphik_semibold @null @color/editor_default_hint_text_color - @color/black + @color/text_primary 28sp 4dp 4sp @@ -64,7 +64,7 @@ 17sp 3sp @color/editor_default_hint_text_color - @color/black + @color/text_primary 4dp 3dp match_parent @@ -76,7 +76,7 @@ @font/inter_bold match_parent wrap_content - @color/black + @color/anytype_text_default @color/editor_default_hint_text_color 28sp @@ -95,7 +95,7 @@ 4dp 3dp 3dp - @color/black + @color/text_primary 17sp @font/inter_regular @@ -111,7 +111,7 @@ @font/inter_regular 3dp 3dp - #ACA996 + @color/text_secondary 17sp @@ -152,7 +152,7 @@ textMultiLine|textNoSuggestions @null 7sp - #2C2B27 + @color/text_primary 15sp @@ -161,48 +161,48 @@ 7sp 4dp @drawable/ic_turn_into_arrow - #ACA996 + @color/text_secondary 15sp @@ -228,7 +228,7 @@ 28dp 3dp 3dp - @color/black + @color/text_primary 15sp bold @@ -236,7 +236,7 @@ @@ -266,7 +266,7 @@ @@ -280,7 +280,7 @@ @font/graphik_medium true 13sp - #ACA996 + @color/text_secondary @@ -370,11 +370,11 @@ @@ -459,47 +458,47 @@ @@ -523,7 +522,7 @@ end 1 true - @color/black + @color/text_primary 15sp @font/inter_medium @@ -564,7 +563,7 @@ @drawable/rect_relation_tag 5dp 5dp - true + true 1 end center @@ -575,7 +574,7 @@ @@ -656,7 +656,7 @@ @@ -684,7 +684,7 @@ 10dp 10dp center_vertical - @color/black + @color/text_primary @@ -703,7 +703,7 @@ @font/inter_regular 1 true - #929082 + @color/text_secondary 13sp center_vertical @@ -714,26 +714,27 @@ end 1 @font/inter_medium - @color/black - #929082 + @color/text_primary + @color/text_secondary 15sp @@ -744,11 +745,11 @@ end 1 true - @color/RelationPlaceholderTextColor + @color/text_tertiary @@ -756,7 +757,7 @@ @@ -873,7 +878,7 @@