From fb8238ab0b06000e4375d231d3d0f60be3f66fe4 Mon Sep 17 00:00:00 2001 From: Dean Whillier Date: Fri, 3 Sep 2021 10:50:24 -0400 Subject: [PATCH] [MM-37553] Update default themes (#5648) * new themes and theme type updates * update theme processing port newer functionality from webapp * update theme UI including new svg-based thumbnail * lint fixes * update snapshots and tests * update theme tile border approach * remove unused path component * remove old variable typo * remove old variable type from theme type * lint and snapshot updates * update snapshots --- app/actions/navigation/index.js | 2 +- app/actions/navigation/index.test.js | 2 +- .../profile_picture_button.test.js.snap | 34 +- .../announcement_banner.test.js.snap | 68 +- .../announcement_banner.test.js | 2 +- .../__snapshots__/at_mention.test.js.snap | 4 +- app/components/at_mention/at_mention.test.js | 2 +- .../__snapshots__/index.test.js.snap | 2 +- .../attachment_button/index.test.js | 2 +- .../at_mention_item/at_mention_item.tsx | 2 +- .../channel_mention_item.tsx | 2 +- .../emoji_suggestion/emoji_suggestion.test.js | 2 +- .../app_slash_suggestion.test.tsx | 2 +- .../app_slash_suggestion.tsx | 2 +- .../slash_suggestion.test.tsx | 2 +- .../slash_suggestion/slash_suggestion.tsx | 2 +- .../slash_suggestion_item.tsx | 2 +- .../__snapshots__/avatars.test.tsx.snap | 140 +- app/components/avatars/avatars.stories.tsx | 2 +- app/components/avatars/avatars.test.tsx | 4 +- app/components/avatars/avatars.tsx | 2 +- app/components/channel_icon.tsx | 2 +- .../__snapshots__/channel_loader.test.js.snap | 104 +- .../channel_loader/channel_loader.test.js | 2 +- .../__snapshots__/index.test.js.snap | 6 +- app/components/custom_list/index.test.js | 2 +- .../__snapshots__/user_list_test.test.js.snap | 394 ++--- .../user_list_row/user_list_test.test.js | 2 +- .../__snapshots__/clear_button.test.tsx.snap | 2 +- .../custom_status_expiry.test.tsx.snap | 4 +- .../custom_status_text.test.tsx.snap | 4 +- .../custom_status/clear_button.test.tsx | 2 +- app/components/custom_status/clear_button.tsx | 2 +- .../custom_status_expiry.test.tsx | 2 +- .../custom_status/custom_status_expiry.tsx | 2 +- .../custom_status/custom_status_text.test.tsx | 2 +- .../custom_status/custom_status_text.tsx | 2 +- .../edit_channel_info.test.js.snap | 28 +- .../edit_channel_info.test.js | 2 +- .../__snapshots__/emoji_picker.test.js.snap | 38 +- .../emoji_picker/emoji_picker.test.js | 2 +- .../__snapshots__/error_text.test.js.snap | 2 +- app/components/error_text/error_text.test.js | 2 +- .../failed_network_action.test.js | 2 +- app/components/global_threads/empty_state.tsx | 2 +- .../global_threads/global_threads.tsx | 2 +- .../__snapshots__/thread_footer.test.tsx.snap | 10 +- .../thread_footer/thread_footer.test.tsx | 2 +- .../thread_footer/thread_footer.tsx | 2 +- .../__snapshots__/thread_item.test.tsx.snap | 100 +- .../thread_item/thread_item.test.tsx | 2 +- .../thread_item/thread_item.tsx | 2 +- .../__snapshots__/index.test.tsx.snap | 12 +- .../global_threads/thread_list/index.test.tsx | 2 +- .../global_threads/thread_list/index.tsx | 2 +- .../markdown_emoji/markdown_emoji.test.js | 2 +- .../__snapshots__/markdown_table.test.js.snap | 14 +- .../markdown_table/markdown_table.test.js | 2 +- .../__snapshots__/post_draft.test.js.snap | 58 +- .../__snapshots__/archived.test.js.snap | 34 +- .../post_draft/archived/archived.test.js | 2 +- .../draft_input/draft_input.test.js | 2 +- app/components/post_draft/post_draft.test.js | 2 +- .../__snapshots__/post_input.test.js.snap | 4 +- .../post_draft/post_input/post_input.test.js | 2 +- .../__snapshots__/quick_actions.test.js.snap | 170 +- .../camera_quick_action.test.js.snap | 2 +- .../camera_quick_action.test.js | 2 +- .../camera_quick_action/camera_type.tsx | 2 +- .../file_quick_action.test.js.snap | 2 +- .../file_quick_action.test.js | 2 +- .../image_quick_action.test.js.snap | 2 +- .../image_quick_action.test.js | 2 +- .../input_quick_action.test.js.snap | 2 +- .../input_quick_action.test.js | 2 +- .../quick_actions/quick_actions.test.js | 2 +- .../__snapshots__/read_only.test.js.snap | 8 +- app/components/post_draft/read_only/index.tsx | 2 +- .../post_draft/read_only/read_only.test.js | 2 +- .../__snapshots__/send.test.js.snap | 8 +- .../post_draft/send_action/send.test.js | 2 +- .../__snapshots__/upload_item.test.js.snap | 70 +- .../__snapshots__/upload_remove.test.js.snap | 2 +- .../uploads/upload_item/upload_item.test.js | 2 +- .../uploads/upload_item/upload_remove.test.js | 2 +- .../post_draft/uploads/uploads.test.js | 2 +- .../__snapshots__/post_list.test.js.snap | 34 +- .../combined_user_activity.tsx | 2 +- .../combined_user_activity/last_users.tsx | 2 +- .../__snapshots__/date_separator.test.js.snap | 200 +-- .../date_separator/date_separator.test.js | 2 +- .../date_separator/date_separator.tsx | 2 +- .../more_messages_button.test.js.snap | 6 +- .../more_messages_button.test.js | 2 +- .../more_messages_button.tsx | 2 +- .../post_list/new_message_line/index.tsx | 2 +- .../post_list/post/avatar/avatar.tsx | 2 +- app/components/post_list/post/avatar/index.ts | 2 +- .../post/body/add_members/add_members.tsx | 2 +- .../post_list/post/body/add_members/index.ts | 2 +- app/components/post_list/post/body/body.tsx | 2 +- .../button_binding/button_binding.tsx | 2 +- .../embedded_bindings/button_binding/index.ts | 2 +- .../content/embedded_bindings/embed_text.tsx | 2 +- .../content/embedded_bindings/embed_title.tsx | 2 +- .../embedded_bindings/embedded_binding.tsx | 2 +- .../embedded_sub_bindings.tsx | 2 +- .../body/content/embedded_bindings/index.tsx | 2 +- .../menu_binding/menu_binding.tsx | 2 +- .../content/image_preview/image_preview.tsx | 2 +- .../post_list/post/body/content/index.tsx | 2 +- .../attachment_footer.test.tsx.snap | 4 +- .../action_button/action_button.test.tsx | 18 +- .../action_button/action_button.tsx | 2 +- .../attachment_actions.tsx | 2 +- .../message_attachments/attachment_author.tsx | 2 +- .../message_attachments/attachment_fields.tsx | 2 +- .../attachment_footer.test.tsx | 2 +- .../message_attachments/attachment_footer.tsx | 2 +- .../attachment_image/index.tsx | 2 +- .../message_attachments/attachment_text.tsx | 2 +- .../message_attachments/attachment_title.tsx | 2 +- .../content/message_attachments/index.tsx | 2 +- .../message_attachment.tsx | 2 +- .../post/body/content/opengraph/index.ts | 2 +- .../post/body/content/opengraph/opengraph.tsx | 2 +- .../opengraph/opengraph_image/index.tsx | 2 +- .../post_list/post/body/failed/failed.tsx | 2 +- .../post/body/files/document_file.tsx | 2 +- .../post_list/post/body/files/file.tsx | 2 +- .../post_list/post/body/files/file_icon.tsx | 2 +- .../post_list/post/body/files/file_info.tsx | 2 +- .../post_list/post/body/files/files.tsx | 2 +- .../post_list/post/body/files/image_file.tsx | 2 +- .../post/body/files/image_file_overlay.tsx | 2 +- .../post_list/post/body/files/index.ts | 2 +- app/components/post_list/post/body/index.ts | 2 +- .../post_list/post/body/message/index.ts | 2 +- .../post_list/post/body/message/message.tsx | 2 +- .../post/body/message/show_more_button.tsx | 2 +- .../post_list/post/body/reactions/index.ts | 2 +- .../post/body/reactions/reaction.tsx | 2 +- .../post/body/reactions/reactions.tsx | 2 +- .../post/header/commented_on/index.tsx | 2 +- .../post/header/display_name/index.tsx | 2 +- .../post_list/post/header/header.tsx | 2 +- .../post_list/post/header/reply/index.tsx | 2 +- .../post_list/post/header/tag/index.tsx | 2 +- app/components/post_list/post/index.ts | 2 +- app/components/post_list/post/post.tsx | 2 +- .../post_list/post/pre_header/index.tsx | 2 +- .../system_message_helpers.test.js.snap | 30 +- .../post_list/post/system_message/index.ts | 2 +- .../post/system_message/system_message.tsx | 2 +- .../system_message_helpers.test.js | 2 +- app/components/post_list/post_list.test.js | 2 +- app/components/post_list/post_list.tsx | 2 +- .../post_list/post_list_refresh_control.tsx | 2 +- .../post_list/system_avatar/index.tsx | 2 +- .../post_list/system_header/system_header.tsx | 2 +- .../profile_picture/profile_picture.tsx | 2 +- app/components/profile_picture_button.test.js | 2 +- .../progressive_image.test.js.snap | 10 +- .../progressive_image.test.js | 10 +- .../radio_button_group.test.js.snap | 68 +- .../radio_button/radio_button_group.test.js | 4 +- .../reaction_picker.test.js.snap | 416 ++--- .../reaction_picker/reaction_picker.test.js | 2 +- app/components/safe_area_view/safe_area.tsx | 2 +- .../__snapshots__/channel_item.test.js.snap | 390 ++--- .../channel_item/channel_item.test.js | 2 +- .../__snapshots__/filtered_list.test.js.snap | 34 +- .../filtered_list/filtered_list.test.js | 2 +- .../list/__snapshots__/list.test.js.snap | 34 +- .../main/channels_list/list/list.test.js | 2 +- .../switch_teams_button.test.js.snap | 6 +- .../switch_teams_button.test.js | 2 +- .../sidebars/main/main_sidebar.test.js | 6 +- .../teams_list_item.test.js.snap | 6 +- .../teams_list_item/teams_list_item.test.js | 2 +- .../main/threads_entry/threads_entry.tsx | 2 +- .../__snapshots__/drawer_item.test.js.snap | 18 +- .../sidebars/settings/drawer_item.test.js | 2 +- .../settings/settings_sidebar.test.js | 2 +- .../__snapshots__/team_icon.test.js.snap | 2 +- app/components/team_icon/team_icon.test.js | 2 +- .../__snapshots__/user_status.test.js.snap | 6 +- .../user_status/user_status.test.js | 2 +- app/components/user_status/user_status.tsx | 2 +- .../__snapshots__/radio_setting.test.js.snap | 16 +- .../widgets/settings/bool_setting.test.tsx | 2 +- .../widgets/settings/bool_setting.tsx | 2 +- .../widgets/settings/radio_setting.test.js | 2 +- .../widgets/settings/text_setting.test.js | 2 +- app/mm-redux/constants/preferences.ts | 197 ++- .../selectors/entities/preferences.test.js | 22 +- .../selectors/entities/preferences.ts | 44 +- app/mm-redux/types/preferences.ts | 29 - app/mm-redux/types/theme.ts | 41 + app/mm-redux/utils/theme_utils.test.js | 2 +- app/mm-redux/utils/theme_utils.ts | 79 +- .../apps_form_component.test.tsx.snap | 206 +-- .../dialog_introduction_text.test.tsx.snap | 18 +- .../apps_form/apps_form_component.test.tsx | 2 +- app/screens/apps_form/apps_form_component.tsx | 2 +- app/screens/apps_form/apps_form_container.tsx | 2 +- app/screens/apps_form/apps_form_field.tsx | 2 +- .../dialog_introduction_text.test.tsx | 2 +- .../apps_form/dialog_introduction_text.tsx | 2 +- app/screens/channel/channel_base.test.js | 6 +- .../channel_nav_bar.test.js.snap | 34 +- .../channel_nav_bar/channel_nav_bar.test.js | 2 +- .../channel_search_button.test.js.snap | 2 +- .../channel_search_button.test.js | 2 +- .../main_sidebar_drawer_button.test.js.snap | 4 +- .../main_sidebar_drawer_button.test.js | 2 +- .../settings_sidebar_drawer_button.test.js | 2 +- .../channel_post_list.test.js.snap | 2 +- .../channel_post_list.test.js | 2 +- .../channel_add_members.test.js | 2 +- .../__snapshots__/channel_info.test.js.snap | 1462 ++++++++--------- .../channel_info_header.test.js.snap | 564 +++---- .../channel_info_row.test.js.snap | 4 +- .../__snapshots__/add_members.test.js.snap | 68 +- .../add_members/add_members.test.js | 2 +- .../channel_info/add_members/add_members.tsx | 2 +- .../__snapshots__/archive.test.js.snap | 136 +- .../channel_info/archive/archive.test.js | 2 +- app/screens/channel_info/archive/archive.tsx | 2 +- .../channel_info/bindings/bindings.tsx | 2 +- app/screens/channel_info/channel_info.test.js | 2 +- .../channel_info/channel_info_header.test.js | 2 +- .../channel_info/channel_info_row.test.js | 2 +- .../convert_private.test.js.snap | 68 +- .../convert_private/convert_private.test.js | 2 +- .../convert_private/convert_private.tsx | 2 +- .../__snapshots__/edit_channel.test.js.snap | 68 +- .../edit_channel/edit_channel.test.js | 2 +- .../edit_channel/edit_channel.tsx | 2 +- .../__snapshots__/favorite.test.js.snap | 68 +- .../channel_info/favorite/favorite.test.js | 2 +- .../channel_info/favorite/favorite.tsx | 2 +- .../ignore_mentions.test.js.snap | 68 +- .../ignore_mentions/ignore_mentions.test.js | 2 +- .../ignore_mentions/ignore_mentions.tsx | 2 +- .../leave/__snapshots__/leave.test.js.snap | 272 +-- app/screens/channel_info/leave/leave.test.js | 2 +- app/screens/channel_info/leave/leave.tsx | 2 +- .../__snapshots__/manage_members.test.js.snap | 170 +- .../manage_members/manage_members.test.js | 2 +- .../manage_members/manage_members.tsx | 2 +- .../mute/__snapshots__/mute.test.js.snap | 68 +- app/screens/channel_info/mute/mute.test.js | 2 +- app/screens/channel_info/mute/mute.tsx | 2 +- .../notification_preference.test.js.snap | 34 +- .../notification_preference.test.js | 2 +- .../notification_preference.tsx | 2 +- .../pinned/__snapshots__/pinned.test.js.snap | 34 +- .../channel_info/pinned/pinned.test.js | 2 +- app/screens/channel_info/pinned/pinned.tsx | 2 +- app/screens/channel_info/separator.tsx | 2 +- .../channel_members.test.js.snap | 46 +- .../channel_members/channel_members.test.js | 2 +- ...annel_notification_preference.test.js.snap | 152 +- .../channel_notification_preference.test.js | 2 +- .../custom_status_modal.test.tsx.snap | 102 +- .../custom_status_suggestion.test.tsx.snap | 78 +- .../custom_status_modal.test.tsx | 2 +- .../custom_status/custom_status_modal.tsx | 2 +- .../custom_status_suggestion.test.tsx | 2 +- .../custom_status_suggestion.tsx | 2 +- .../clear_after_menu_item.test.tsx.snap | 76 +- .../clear_after_modal.test.tsx.snap | 34 +- .../date_time_selector.test.tsx.snap | 4 +- .../clear_after_menu_item.test.tsx | 2 +- .../clear_after_menu_item.tsx | 2 +- .../clear_after_modal.test.tsx | 2 +- .../clear_after_modal.tsx | 2 +- .../date_time_selector.test.tsx | 2 +- .../date_time_selector.tsx | 2 +- .../__snapshots__/edit_post.test.js.snap | 10 +- app/screens/edit_post/edit_post.test.js | 2 +- app/screens/edit_profile/edit_profile.test.js | 2 +- .../error_teams_list.test.js.snap | 34 +- .../error_teams_list/error_teams_list.test.js | 2 +- .../footer/prepare_file/prepare_file.tsx | 2 +- app/screens/gallery/gallery.test.js.disabled | 2 +- .../dialog_introduction_text.test.js.snap | 18 +- .../interactive_dialog.test.js.snap | 36 +- .../interactive_dialog/dialog_element.test.js | 2 +- .../dialog_introduction_text.test.js | 2 +- .../interactive_dialog.test.js | 2 +- .../__snapshots__/more_channels.test.js.snap | 50 +- .../more_channels/more_channels.test.js | 2 +- .../__snapshots__/selected_users.test.js.snap | 140 +- .../selected_users/selected_users.test.js | 2 +- .../participant_row/index.tsx | 2 +- .../participants_list/participants_list.tsx | 2 +- app/screens/perf_metrics/index.tsx | 2 +- app/screens/perf_metrics/item.tsx | 2 +- .../__snapshots__/permalink.test.js.snap | 10 +- app/screens/permalink/permalink.test.js | 2 +- .../__snapshots__/pinned_posts.test.js.snap | 34 +- app/screens/pinned_posts/pinned_posts.test.js | 2 +- .../__snapshots__/post_options.test.js.snap | 578 +++---- .../post_options/bindings/bindings.tsx | 2 +- app/screens/post_options/post_options.test.js | 2 +- .../reaction_header.test.js.snap | 136 +- .../reaction_header_item.test.js.snap | 8 +- .../__snapshots__/reaction_list.test.js.snap | 178 +- .../reaction_list/reaction_header.test.js | 2 +- .../reaction_header_item.test.js | 2 +- .../reaction_list/reaction_list.test.js | 2 +- .../__snapshots__/reaction_row.test.js.snap | 4 +- .../reaction_row/reaction_row.test.js | 2 +- .../recent_mentions.test.js.snap | 34 +- .../recent_mentions/recent_mentions.test.js | 2 +- .../__snapshots__/saved_posts.test.js.snap | 34 +- app/screens/saved_posts/saved_posts.test.js | 2 +- .../__snapshots__/modifier.test.js.snap | 10 +- .../__snapshots__/recent_item.test.js.snap | 6 +- .../search/__snapshots__/search.test.js.snap | 2 +- app/screens/search/modifier.test.js | 2 +- app/screens/search/recent_item.test.js | 2 +- app/screens/search/search.test.js | 2 +- .../search_result_post.test.js.snap | 34 +- .../search_result_post.test.js | 2 +- .../__snapshots__/select_team.test.js.snap | 70 +- app/screens/select_team/select_team.test.js | 2 +- .../selector_screen.test.js.snap | 276 ++-- .../selector_screen/selector_screen.test.js | 2 +- .../display_settings.test.js.snap | 114 +- .../display_settings/display_settings.test.js | 2 +- .../notification_settings.test.js.snap | 352 ++-- .../notification_settings.test.js | 2 +- .../notification_settings_auto_responder.tsx | 2 +- ...cation_settings_email.android.test.js.snap | 68 +- ...tification_settings_email.ios.test.js.snap | 170 +- ...otification_settings_email.android.test.js | 2 +- .../notification_settings_email.ios.test.js | 2 +- ...on_settings_mentions_keywords.test.js.snap | 80 +- ...ication_settings_mentions_keywords.test.js | 2 +- .../__snapshots__/sidebar.test.js.snap | 74 +- app/screens/settings/sidebar/sidebar.test.js | 4 +- .../theme/__snapshots__/theme.test.js.snap | 365 ++-- app/screens/settings/theme/theme.js | 13 +- app/screens/settings/theme/theme.test.js | 4 +- .../settings/theme/theme_thumbnail.tsx | 296 ++++ app/screens/settings/theme/theme_tile.js | 54 +- .../select_timezone.test.js.snap | 2 +- .../select_timezone/select_timezone.test.js | 2 +- app/screens/slide_up/index.tsx | 2 +- .../sso/sso_with_redirect_url.test.tsx | 2 +- app/screens/sso/sso_with_redirect_url.tsx | 2 +- app/screens/sso/sso_with_webview.tsx | 2 +- .../terms_of_service.test.js.snap | 80 +- .../terms_of_service/terms_of_service.test.js | 2 +- .../__snapshots__/thread.ios.test.js.snap | 14 +- app/screens/thread/thread.ios.test.js | 2 +- app/screens/thread/thread_follow/index.tsx | 2 +- .../__snapshots__/user_profile.test.js.snap | 408 ++--- app/screens/user_profile/user_profile.test.js | 2 +- app/utils/message_attachment_colors.ts | 2 +- assets/base/images/themes/mattermost.png | Bin 988 -> 0 bytes assets/base/images/themes/mattermost@2x.png | Bin 2084 -> 0 bytes assets/base/images/themes/mattermost@3x.png | Bin 3524 -> 0 bytes assets/base/images/themes/mattermost_dark.png | Bin 899 -> 0 bytes .../base/images/themes/mattermost_dark@2x.png | Bin 1957 -> 0 bytes .../base/images/themes/mattermost_dark@3x.png | Bin 3344 -> 0 bytes assets/base/images/themes/organization.png | Bin 988 -> 0 bytes assets/base/images/themes/organization@2x.png | Bin 2094 -> 0 bytes assets/base/images/themes/organization@3x.png | Bin 3524 -> 0 bytes assets/base/images/themes/windows_dark.png | Bin 895 -> 0 bytes assets/base/images/themes/windows_dark@2x.png | Bin 1936 -> 0 bytes assets/base/images/themes/windows_dark@3x.png | Bin 3345 -> 0 bytes share_extension/components/body.tsx | 2 +- share_extension/components/channel_button.tsx | 2 +- share_extension/components/channel_item.tsx | 2 +- share_extension/components/channel_type.tsx | 2 +- .../components/chars_remaining.tsx | 2 +- .../components/close_header_button.tsx | 2 +- share_extension/components/error.tsx | 2 +- share_extension/components/files.tsx | 2 +- share_extension/components/other_file.tsx | 2 +- .../components/post_header_button.tsx | 2 +- share_extension/components/team_button.tsx | 2 +- share_extension/components/team_item.tsx | 2 +- share_extension/screens/channel_list.tsx | 2 +- share_extension/screens/navigation.tsx | 2 +- share_extension/screens/share.tsx | 2 +- share_extension/screens/team_list.tsx | 2 +- types/components/post_draft_quick_action.d.ts | 2 +- types/screens/gallery.d.ts | 2 +- 393 files changed, 5876 insertions(+), 5350 deletions(-) create mode 100644 app/mm-redux/types/theme.ts create mode 100644 app/screens/settings/theme/theme_thumbnail.tsx delete mode 100644 assets/base/images/themes/mattermost.png delete mode 100644 assets/base/images/themes/mattermost@2x.png delete mode 100644 assets/base/images/themes/mattermost@3x.png delete mode 100644 assets/base/images/themes/mattermost_dark.png delete mode 100644 assets/base/images/themes/mattermost_dark@2x.png delete mode 100644 assets/base/images/themes/mattermost_dark@3x.png delete mode 100644 assets/base/images/themes/organization.png delete mode 100644 assets/base/images/themes/organization@2x.png delete mode 100644 assets/base/images/themes/organization@3x.png delete mode 100644 assets/base/images/themes/windows_dark.png delete mode 100644 assets/base/images/themes/windows_dark@2x.png delete mode 100644 assets/base/images/themes/windows_dark@3x.png diff --git a/app/actions/navigation/index.js b/app/actions/navigation/index.js index 5a18edc24..80ddf2d5b 100644 --- a/app/actions/navigation/index.js +++ b/app/actions/navigation/index.js @@ -92,7 +92,7 @@ export function resetToChannel(passProps = {}) { } export function resetToSelectServer(allowOtherServers) { - const theme = Preferences.THEMES.default; + const theme = Preferences.THEMES.denim; EphemeralStore.clearNavigationComponents(); diff --git a/app/actions/navigation/index.test.js b/app/actions/navigation/index.test.js index 60f6fe45a..c199b16e7 100644 --- a/app/actions/navigation/index.test.js +++ b/app/actions/navigation/index.test.js @@ -37,7 +37,7 @@ describe('@actions/navigation', () => { const topComponentId = 'top-component-id'; const name = 'name'; const title = 'title'; - const theme = Preferences.THEMES.default; + const theme = Preferences.THEMES.denim; const passProps = { testProp: 'prop', }; diff --git a/app/components/__snapshots__/profile_picture_button.test.js.snap b/app/components/__snapshots__/profile_picture_button.test.js.snap index 713489f12..5dc9cf0d9 100644 --- a/app/components/__snapshots__/profile_picture_button.test.js.snap +++ b/app/components/__snapshots__/profile_picture_button.test.js.snap @@ -17,31 +17,31 @@ exports[`profile_picture_button should match snapshot 1`] = ` maxFileSize={20971520} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } uploadFiles={[MockFunction]} diff --git a/app/components/announcement_banner/__snapshots__/announcement_banner.test.js.snap b/app/components/announcement_banner/__snapshots__/announcement_banner.test.js.snap index e62ee7b9f..e8544069f 100644 --- a/app/components/announcement_banner/__snapshots__/announcement_banner.test.js.snap +++ b/app/components/announcement_banner/__snapshots__/announcement_banner.test.js.snap @@ -36,31 +36,31 @@ exports[`AnnouncementBanner should match snapshot 1`] = ` } theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -102,31 +102,31 @@ exports[`AnnouncementBanner should match snapshot 2`] = ` } theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/components/announcement_banner/announcement_banner.test.js b/app/components/announcement_banner/announcement_banner.test.js index 802ae6fd8..65e2be739 100644 --- a/app/components/announcement_banner/announcement_banner.test.js +++ b/app/components/announcement_banner/announcement_banner.test.js @@ -17,7 +17,7 @@ describe('AnnouncementBanner', () => { bannerEnabled: true, bannerText: 'Banner Text', bannerTextColor: '#fff', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/components/at_mention/__snapshots__/at_mention.test.js.snap b/app/components/at_mention/__snapshots__/at_mention.test.js.snap index 968931922..e0fff1ceb 100644 --- a/app/components/at_mention/__snapshots__/at_mention.test.js.snap +++ b/app/components/at_mention/__snapshots__/at_mention.test.js.snap @@ -33,8 +33,8 @@ exports[`AtMention should match snapshot, with highlight 1`] = ` "color": "#ff0000", }, Object { - "backgroundColor": "#ffe577", - "color": "#166de0", + "backgroundColor": "#ffd470", + "color": "#1b1d22", }, ] } diff --git a/app/components/at_mention/at_mention.test.js b/app/components/at_mention/at_mention.test.js index dd57e376d..00f5f2f93 100644 --- a/app/components/at_mention/at_mention.test.js +++ b/app/components/at_mention/at_mention.test.js @@ -16,7 +16,7 @@ describe('AtMention', () => { mentionName: 'John.Smith', mentionStyle: {color: '#ff0000'}, textStyle: {backgroundColor: 'yellow'}, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot, no highlight', () => { diff --git a/app/components/attachment_button/__snapshots__/index.test.js.snap b/app/components/attachment_button/__snapshots__/index.test.js.snap index 31cc82178..da312d2bc 100644 --- a/app/components/attachment_button/__snapshots__/index.test.js.snap +++ b/app/components/attachment_button/__snapshots__/index.test.js.snap @@ -14,7 +14,7 @@ exports[`AttachmentButton should match snapshot 1`] = ` type="opacity" > ({ describe('AttachmentButton', () => { const baseProps = { - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, maxFileSize: 10, uploadFiles: jest.fn(), }; diff --git a/app/components/autocomplete/at_mention_item/at_mention_item.tsx b/app/components/autocomplete/at_mention_item/at_mention_item.tsx index 5322f4fc1..0a8ebac7a 100644 --- a/app/components/autocomplete/at_mention_item/at_mention_item.tsx +++ b/app/components/autocomplete/at_mention_item/at_mention_item.tsx @@ -14,7 +14,7 @@ import TouchableWithFeedback from '@components/touchable_with_feedback'; import {General} from '@mm-redux/constants'; import {makeStyleSheetFromTheme, changeOpacity} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; interface AtMentionItemProps { firstName: string; diff --git a/app/components/autocomplete/channel_mention_item/channel_mention_item.tsx b/app/components/autocomplete/channel_mention_item/channel_mention_item.tsx index 7911a899a..e52124231 100644 --- a/app/components/autocomplete/channel_mention_item/channel_mention_item.tsx +++ b/app/components/autocomplete/channel_mention_item/channel_mention_item.tsx @@ -9,7 +9,7 @@ import CompassIcon from '@components/compass_icon'; import {BotTag, GuestTag} from '@components/tag'; import TouchableWithFeedback from '@components/touchable_with_feedback'; import {General} from '@mm-redux/constants'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {makeStyleSheetFromTheme, changeOpacity} from '@utils/theme'; const getStyleFromTheme = makeStyleSheetFromTheme((theme: Theme) => { diff --git a/app/components/autocomplete/emoji_suggestion/emoji_suggestion.test.js b/app/components/autocomplete/emoji_suggestion/emoji_suggestion.test.js index 4030fe87b..c462f9165 100644 --- a/app/components/autocomplete/emoji_suggestion/emoji_suggestion.test.js +++ b/app/components/autocomplete/emoji_suggestion/emoji_suggestion.test.js @@ -29,7 +29,7 @@ describe('components/autocomplete/emoji_suggestion', () => { customEmojisEnabled: false, emojis, isSearch: false, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, onChangeText: jest.fn(), onResultCountChange: jest.fn(), rootId: '', diff --git a/app/components/autocomplete/slash_suggestion/app_slash_suggestion/app_slash_suggestion.test.tsx b/app/components/autocomplete/slash_suggestion/app_slash_suggestion/app_slash_suggestion.test.tsx index fe1ebffdf..ae6e68886 100644 --- a/app/components/autocomplete/slash_suggestion/app_slash_suggestion/app_slash_suggestion.test.tsx +++ b/app/components/autocomplete/slash_suggestion/app_slash_suggestion/app_slash_suggestion.test.tsx @@ -42,7 +42,7 @@ describe('components/autocomplete/app_slash_suggestion', () => { currentTeamId: '', isSearch: false, maxListHeight: 50, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, onChangeText: jest.fn(), onResultCountChange: jest.fn(), value: '', diff --git a/app/components/autocomplete/slash_suggestion/app_slash_suggestion/app_slash_suggestion.tsx b/app/components/autocomplete/slash_suggestion/app_slash_suggestion/app_slash_suggestion.tsx index 76d11cca4..f2d40bf87 100644 --- a/app/components/autocomplete/slash_suggestion/app_slash_suggestion/app_slash_suggestion.tsx +++ b/app/components/autocomplete/slash_suggestion/app_slash_suggestion/app_slash_suggestion.tsx @@ -13,7 +13,7 @@ import AtMentionItem from '@components/autocomplete/at_mention_item'; import ChannelMentionItem from '@components/autocomplete/channel_mention_item'; import {analytics} from '@init/analytics'; import {AutocompleteSuggestion} from '@mm-redux/types/integrations'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {isMinimumServerVersion} from '@mm-redux/utils/helpers'; import {makeStyleSheetFromTheme} from '@utils/theme'; diff --git a/app/components/autocomplete/slash_suggestion/slash_suggestion.test.tsx b/app/components/autocomplete/slash_suggestion/slash_suggestion.test.tsx index 6fe2f13b0..19a7cfa64 100644 --- a/app/components/autocomplete/slash_suggestion/slash_suggestion.test.tsx +++ b/app/components/autocomplete/slash_suggestion/slash_suggestion.test.tsx @@ -55,7 +55,7 @@ describe('components/autocomplete/slash_suggestion', () => { commands: [sampleCommand], isSearch: false, maxListHeight: 50, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, onChangeText: jest.fn(), onResultCountChange: jest.fn(), value: '', diff --git a/app/components/autocomplete/slash_suggestion/slash_suggestion.tsx b/app/components/autocomplete/slash_suggestion/slash_suggestion.tsx index 29c26428f..4bf94e730 100644 --- a/app/components/autocomplete/slash_suggestion/slash_suggestion.tsx +++ b/app/components/autocomplete/slash_suggestion/slash_suggestion.tsx @@ -11,7 +11,7 @@ import { import {Client4} from '@client/rest'; import {analytics} from '@init/analytics'; import {Command, AutocompleteSuggestion, CommandArgs} from '@mm-redux/types/integrations'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {isMinimumServerVersion} from '@mm-redux/utils/helpers'; import {makeStyleSheetFromTheme} from '@utils/theme'; diff --git a/app/components/autocomplete/slash_suggestion/slash_suggestion_item.tsx b/app/components/autocomplete/slash_suggestion/slash_suggestion_item.tsx index 8348fc025..8268299e2 100644 --- a/app/components/autocomplete/slash_suggestion/slash_suggestion_item.tsx +++ b/app/components/autocomplete/slash_suggestion/slash_suggestion_item.tsx @@ -10,7 +10,7 @@ import {SvgXml} from 'react-native-svg'; import TouchableWithFeedback from '@components/touchable_with_feedback'; import {COMMAND_SUGGESTION_ERROR} from '@mm-redux/constants/apps'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; const slashIcon = require('@assets/images/autocomplete/slash_command.png'); diff --git a/app/components/avatars/__snapshots__/avatars.test.tsx.snap b/app/components/avatars/__snapshots__/avatars.test.tsx.snap index 2a73a19ab..585590876 100644 --- a/app/components/avatars/__snapshots__/avatars.test.tsx.snap +++ b/app/components/avatars/__snapshots__/avatars.test.tsx.snap @@ -32,31 +32,31 @@ exports[`Avatars should match snapshot for overflow 1`] = ` testID="avatars.profile_picture" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } userId="user1" @@ -83,31 +83,31 @@ exports[`Avatars should match snapshot for overflow 1`] = ` testID="avatars.profile_picture" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } userId="user2" @@ -134,31 +134,31 @@ exports[`Avatars should match snapshot for overflow 1`] = ` testID="avatars.profile_picture" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } userId="user3" @@ -183,7 +183,7 @@ exports[`Avatars should match snapshot for overflow 1`] = ` style={ Object { "alignItems": "center", - "backgroundColor": "rgba(61,60,64,0.08)", + "backgroundColor": "rgba(63,67,80,0.08)", "borderColor": "#ffffff", "borderRadius": 13.5, "borderWidth": 1, @@ -196,7 +196,7 @@ exports[`Avatars should match snapshot for overflow 1`] = ` ( )); diff --git a/app/components/avatars/avatars.test.tsx b/app/components/avatars/avatars.test.tsx index 53ea9faa7..d61616891 100644 --- a/app/components/avatars/avatars.test.tsx +++ b/app/components/avatars/avatars.test.tsx @@ -11,7 +11,7 @@ import Avatars from './avatars'; describe('Avatars', () => { test('should match snapshot for single avatar', () => { const baseProps = { - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, userIds: ['user1'], }; @@ -21,7 +21,7 @@ describe('Avatars', () => { test('should match snapshot for overflow', () => { const baseProps = { - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, userIds: ['user1', 'user2', 'user3', 'user4', 'user5', 'user6'], }; diff --git a/app/components/avatars/avatars.tsx b/app/components/avatars/avatars.tsx index 8eaed830d..fd5e9cb06 100644 --- a/app/components/avatars/avatars.tsx +++ b/app/components/avatars/avatars.tsx @@ -10,7 +10,7 @@ import TouchableWithFeedback from '@components/touchable_with_feedback'; import {ViewTypes} from '@constants'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { const size = ViewTypes.AVATAR_LIST_PICTURE_SIZE; diff --git a/app/components/channel_icon.tsx b/app/components/channel_icon.tsx index a019e6506..0df437510 100644 --- a/app/components/channel_icon.tsx +++ b/app/components/channel_icon.tsx @@ -9,7 +9,7 @@ import ProfilePicture from '@components/profile_picture'; import {General} from '@mm-redux/constants'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type Props = { hasDraft: boolean; diff --git a/app/components/channel_loader/__snapshots__/channel_loader.test.js.snap b/app/components/channel_loader/__snapshots__/channel_loader.test.js.snap index de5ce3745..7948e7b38 100644 --- a/app/components/channel_loader/__snapshots__/channel_loader.test.js.snap +++ b/app/components/channel_loader/__snapshots__/channel_loader.test.js.snap @@ -100,20 +100,20 @@ exports[`ChannelLoader should match snapshot 1`] = ` styles={ Object { "left": Object { - "color": "rgba(61,60,64,0.15)", + "color": "rgba(63,67,80,0.15)", }, } } > @@ -140,20 +140,20 @@ exports[`ChannelLoader should match snapshot 1`] = ` styles={ Object { "left": Object { - "color": "rgba(61,60,64,0.15)", + "color": "rgba(63,67,80,0.15)", }, } } > @@ -180,20 +180,20 @@ exports[`ChannelLoader should match snapshot 1`] = ` styles={ Object { "left": Object { - "color": "rgba(61,60,64,0.15)", + "color": "rgba(63,67,80,0.15)", }, } } > @@ -220,20 +220,20 @@ exports[`ChannelLoader should match snapshot 1`] = ` styles={ Object { "left": Object { - "color": "rgba(61,60,64,0.15)", + "color": "rgba(63,67,80,0.15)", }, } } > @@ -260,20 +260,20 @@ exports[`ChannelLoader should match snapshot 1`] = ` styles={ Object { "left": Object { - "color": "rgba(61,60,64,0.15)", + "color": "rgba(63,67,80,0.15)", }, } } > @@ -300,20 +300,20 @@ exports[`ChannelLoader should match snapshot 1`] = ` styles={ Object { "left": Object { - "color": "rgba(61,60,64,0.15)", + "color": "rgba(63,67,80,0.15)", }, } } > @@ -340,20 +340,20 @@ exports[`ChannelLoader should match snapshot 1`] = ` styles={ Object { "left": Object { - "color": "rgba(61,60,64,0.15)", + "color": "rgba(63,67,80,0.15)", }, } } > @@ -380,20 +380,20 @@ exports[`ChannelLoader should match snapshot 1`] = ` styles={ Object { "left": Object { - "color": "rgba(61,60,64,0.15)", + "color": "rgba(63,67,80,0.15)", }, } } > @@ -420,20 +420,20 @@ exports[`ChannelLoader should match snapshot 1`] = ` styles={ Object { "left": Object { - "color": "rgba(61,60,64,0.15)", + "color": "rgba(63,67,80,0.15)", }, } } > @@ -460,20 +460,20 @@ exports[`ChannelLoader should match snapshot 1`] = ` styles={ Object { "left": Object { - "color": "rgba(61,60,64,0.15)", + "color": "rgba(63,67,80,0.15)", }, } } > @@ -500,20 +500,20 @@ exports[`ChannelLoader should match snapshot 1`] = ` styles={ Object { "left": Object { - "color": "rgba(61,60,64,0.15)", + "color": "rgba(63,67,80,0.15)", }, } } > @@ -540,20 +540,20 @@ exports[`ChannelLoader should match snapshot 1`] = ` styles={ Object { "left": Object { - "color": "rgba(61,60,64,0.15)", + "color": "rgba(63,67,80,0.15)", }, } } > @@ -580,20 +580,20 @@ exports[`ChannelLoader should match snapshot 1`] = ` styles={ Object { "left": Object { - "color": "rgba(61,60,64,0.15)", + "color": "rgba(63,67,80,0.15)", }, } } > diff --git a/app/components/channel_loader/channel_loader.test.js b/app/components/channel_loader/channel_loader.test.js index 7d7396194..5e0420835 100644 --- a/app/components/channel_loader/channel_loader.test.js +++ b/app/components/channel_loader/channel_loader.test.js @@ -13,7 +13,7 @@ jest.useFakeTimers(); describe('ChannelLoader', () => { const baseProps = { channelIsLoading: true, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/components/custom_list/__snapshots__/index.test.js.snap b/app/components/custom_list/__snapshots__/index.test.js.snap index 79bcda2bf..e3db2924a 100644 --- a/app/components/custom_list/__snapshots__/index.test.js.snap +++ b/app/components/custom_list/__snapshots__/index.test.js.snap @@ -109,7 +109,7 @@ exports[`CustomList should match snapshot, renderSectionHeader 1`] = ` { listScrollRenderAheadDistance: 0, showSections: true, selectable: true, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot with FlatList', () => { diff --git a/app/components/custom_list/user_list_row/__snapshots__/user_list_test.test.js.snap b/app/components/custom_list/user_list_row/__snapshots__/user_list_test.test.js.snap index de04650e6..b53126b76 100644 --- a/app/components/custom_list/user_list_row/__snapshots__/user_list_test.test.js.snap +++ b/app/components/custom_list/user_list_row/__snapshots__/user_list_test.test.js.snap @@ -21,7 +21,7 @@ exports[`UserListRow should match snapshot 1`] = ` style={ Object { "alignItems": "center", - "color": "#3d3c40", + "color": "#3f4350", "flexDirection": "row", } } @@ -57,7 +57,7 @@ exports[`UserListRow should match snapshot 1`] = ` numberOfLines={1} style={ Object { - "color": "#3d3c40", + "color": "#3f4350", "fontSize": 15, } } @@ -69,31 +69,31 @@ exports[`UserListRow should match snapshot 1`] = ` show={false} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -101,31 +101,31 @@ exports[`UserListRow should match snapshot 1`] = ` show={false} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -157,7 +157,7 @@ exports[`UserListRow should match snapshot for currentUser with (you) populated style={ Object { "alignItems": "center", - "color": "#3d3c40", + "color": "#3f4350", "flexDirection": "row", } } @@ -193,7 +193,7 @@ exports[`UserListRow should match snapshot for currentUser with (you) populated numberOfLines={1} style={ Object { - "color": "#3d3c40", + "color": "#3f4350", "fontSize": 15, } } @@ -205,31 +205,31 @@ exports[`UserListRow should match snapshot for currentUser with (you) populated show={false} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -237,31 +237,31 @@ exports[`UserListRow should match snapshot for currentUser with (you) populated show={false} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -293,7 +293,7 @@ exports[`UserListRow should match snapshot for deactivated user 1`] = ` style={ Object { "alignItems": "center", - "color": "#3d3c40", + "color": "#3f4350", "flexDirection": "row", } } @@ -329,7 +329,7 @@ exports[`UserListRow should match snapshot for deactivated user 1`] = ` numberOfLines={1} style={ Object { - "color": "#3d3c40", + "color": "#3f4350", "fontSize": 15, } } @@ -341,31 +341,31 @@ exports[`UserListRow should match snapshot for deactivated user 1`] = ` show={false} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -373,31 +373,31 @@ exports[`UserListRow should match snapshot for deactivated user 1`] = ` show={false} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -442,7 +442,7 @@ exports[`UserListRow should match snapshot for guest user 1`] = ` style={ Object { "alignItems": "center", - "color": "#3d3c40", + "color": "#3f4350", "flexDirection": "row", } } @@ -478,7 +478,7 @@ exports[`UserListRow should match snapshot for guest user 1`] = ` numberOfLines={1} style={ Object { - "color": "#3d3c40", + "color": "#3f4350", "fontSize": 15, } } @@ -490,31 +490,31 @@ exports[`UserListRow should match snapshot for guest user 1`] = ` show={false} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -522,31 +522,31 @@ exports[`UserListRow should match snapshot for guest user 1`] = ` show={true} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -578,7 +578,7 @@ exports[`UserListRow should match snapshot for remote user 1`] = ` style={ Object { "alignItems": "center", - "color": "#3d3c40", + "color": "#3f4350", "flexDirection": "row", } } @@ -614,7 +614,7 @@ exports[`UserListRow should match snapshot for remote user 1`] = ` numberOfLines={1} style={ Object { - "color": "#3d3c40", + "color": "#3f4350", "fontSize": 15, } } @@ -626,31 +626,31 @@ exports[`UserListRow should match snapshot for remote user 1`] = ` show={false} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -658,31 +658,31 @@ exports[`UserListRow should match snapshot for remote user 1`] = ` show={false} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -707,31 +707,31 @@ exports[`UserListRow should match snapshot for remote user 1`] = ` } theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } type="D" diff --git a/app/components/custom_list/user_list_row/user_list_test.test.js b/app/components/custom_list/user_list_row/user_list_test.test.js index 7004821fc..f21668d3c 100644 --- a/app/components/custom_list/user_list_row/user_list_test.test.js +++ b/app/components/custom_list/user_list_row/user_list_test.test.js @@ -25,7 +25,7 @@ describe('UserListRow', () => { username: 'user', delete_at: 0, }, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, teammateNameDisplay: 'test', testID: 'custom_list.user_item', }; diff --git a/app/components/custom_status/__snapshots__/clear_button.test.tsx.snap b/app/components/custom_status/__snapshots__/clear_button.test.tsx.snap index 2d11d6d4f..e5b550f4d 100644 --- a/app/components/custom_status/__snapshots__/clear_button.test.tsx.snap +++ b/app/components/custom_status/__snapshots__/clear_button.test.tsx.snap @@ -23,7 +23,7 @@ exports[`components/custom_status/clear_button should match snapshot 1`] = ` style={ Object { "borderRadius": 1000, - "color": "rgba(61,60,64,0.52)", + "color": "rgba(63,67,80,0.52)", } } /> diff --git a/app/components/custom_status/__snapshots__/custom_status_expiry.test.tsx.snap b/app/components/custom_status/__snapshots__/custom_status_expiry.test.tsx.snap index 4ec31afe8..841fa8e40 100644 --- a/app/components/custom_status/__snapshots__/custom_status_expiry.test.tsx.snap +++ b/app/components/custom_status/__snapshots__/custom_status_expiry.test.tsx.snap @@ -5,7 +5,7 @@ exports[`components/custom_status/custom_status_expiry should match snapshot 1`] style={ Array [ Object { - "color": "#3d3c40", + "color": "#3f4350", "fontSize": 15, }, Object {}, @@ -24,7 +24,7 @@ exports[`components/custom_status/custom_status_expiry should match snapshot wit style={ Array [ Object { - "color": "#3d3c40", + "color": "#3f4350", "fontSize": 15, }, Object {}, diff --git a/app/components/custom_status/__snapshots__/custom_status_text.test.tsx.snap b/app/components/custom_status/__snapshots__/custom_status_text.test.tsx.snap index ac27e1a6e..dc146df19 100644 --- a/app/components/custom_status/__snapshots__/custom_status_text.test.tsx.snap +++ b/app/components/custom_status/__snapshots__/custom_status_text.test.tsx.snap @@ -5,7 +5,7 @@ exports[`components/custom_status/custom_status_text should match snapshot 1`] = style={ Array [ Object { - "color": "rgba(61,60,64,0.5)", + "color": "rgba(63,67,80,0.5)", "fontSize": 17, "includeFontPadding": false, "textAlignVertical": "center", @@ -23,7 +23,7 @@ exports[`components/custom_status/custom_status_text should match snapshot with style={ Array [ Object { - "color": "rgba(61,60,64,0.5)", + "color": "rgba(63,67,80,0.5)", "fontSize": 17, "includeFontPadding": false, "textAlignVertical": "center", diff --git a/app/components/custom_status/clear_button.test.tsx b/app/components/custom_status/clear_button.test.tsx index e8888307c..1326d6017 100644 --- a/app/components/custom_status/clear_button.test.tsx +++ b/app/components/custom_status/clear_button.test.tsx @@ -9,7 +9,7 @@ import Preferences from '@mm-redux/constants/preferences'; describe('components/custom_status/clear_button', () => { const baseProps = { - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, handlePress: jest.fn(), }; diff --git a/app/components/custom_status/clear_button.tsx b/app/components/custom_status/clear_button.tsx index 0719ce7eb..5898c1203 100644 --- a/app/components/custom_status/clear_button.tsx +++ b/app/components/custom_status/clear_button.tsx @@ -5,7 +5,7 @@ import React from 'react'; import {TouchableOpacity} from 'react-native'; import CompassIcon from '@components/compass_icon'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {preventDoubleTap} from '@utils/tap'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; diff --git a/app/components/custom_status/custom_status_expiry.test.tsx b/app/components/custom_status/custom_status_expiry.test.tsx index 12f7d3702..0d858e152 100644 --- a/app/components/custom_status/custom_status_expiry.test.tsx +++ b/app/components/custom_status/custom_status_expiry.test.tsx @@ -20,7 +20,7 @@ describe('components/custom_status/custom_status_expiry', () => { const date = moment().endOf('day'); const baseProps = { - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, time: date.toDate(), }; diff --git a/app/components/custom_status/custom_status_expiry.tsx b/app/components/custom_status/custom_status_expiry.tsx index f2a38596f..f72830ae5 100644 --- a/app/components/custom_status/custom_status_expiry.tsx +++ b/app/components/custom_status/custom_status_expiry.tsx @@ -12,8 +12,8 @@ import FormattedTime from '@components/formatted_time'; import Preferences from '@mm-redux/constants/preferences'; import {getBool} from '@mm-redux/selectors/entities/preferences'; import {getCurrentUserTimezone} from '@mm-redux/selectors/entities/timezone'; -import {Theme} from '@mm-redux/types/preferences'; import {GlobalState} from '@mm-redux/types/store'; +import {Theme} from '@mm-redux/types/theme'; import {makeStyleSheetFromTheme} from '@utils/theme'; import {getCurrentMomentForTimezone} from '@utils/timezone'; diff --git a/app/components/custom_status/custom_status_text.test.tsx b/app/components/custom_status/custom_status_text.test.tsx index ecbd5a6bf..7f41a112f 100644 --- a/app/components/custom_status/custom_status_text.test.tsx +++ b/app/components/custom_status/custom_status_text.test.tsx @@ -9,7 +9,7 @@ import Preferences from '@mm-redux/constants/preferences'; describe('components/custom_status/custom_status_text', () => { const baseProps = { text: 'In a meeting', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; it('should match snapshot', () => { diff --git a/app/components/custom_status/custom_status_text.tsx b/app/components/custom_status/custom_status_text.tsx index eb21a56d0..2a7532664 100644 --- a/app/components/custom_status/custom_status_text.tsx +++ b/app/components/custom_status/custom_status_text.tsx @@ -7,7 +7,7 @@ import {Text, TextStyle} from 'react-native'; import FormattedText from '@components/formatted_text'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; interface ComponentProps { text: string | typeof FormattedText; diff --git a/app/components/edit_channel_info/__snapshots__/edit_channel_info.test.js.snap b/app/components/edit_channel_info/__snapshots__/edit_channel_info.test.js.snap index 47138b7c6..9ce58b735 100644 --- a/app/components/edit_channel_info/__snapshots__/edit_channel_info.test.js.snap +++ b/app/components/edit_channel_info/__snapshots__/edit_channel_info.test.js.snap @@ -38,7 +38,7 @@ exports[`EditChannelInfo should match snapshot 1`] = ` { const baseProps = { testID: 'edit_channel_info', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, deviceWidth: 400, deviceHeight: 600, channelType: 'O', diff --git a/app/components/emoji_picker/__snapshots__/emoji_picker.test.js.snap b/app/components/emoji_picker/__snapshots__/emoji_picker.test.js.snap index b647cbedf..add5c7440 100644 --- a/app/components/emoji_picker/__snapshots__/emoji_picker.test.js.snap +++ b/app/components/emoji_picker/__snapshots__/emoji_picker.test.js.snap @@ -27,7 +27,7 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = ` @@ -12917,8 +12917,8 @@ exports[`components/emoji_picker/emoji_picker.ios should match snapshot 1`] = ` { emojisBySection, fuse, isLandscape: false, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; const testCases = [ diff --git a/app/components/error_text/__snapshots__/error_text.test.js.snap b/app/components/error_text/__snapshots__/error_text.test.js.snap index 21e70b2ff..4171a0af9 100644 --- a/app/components/error_text/__snapshots__/error_text.test.js.snap +++ b/app/components/error_text/__snapshots__/error_text.test.js.snap @@ -12,7 +12,7 @@ exports[`ErrorText should match snapshot 1`] = ` "textAlign": "left", }, Object { - "color": "#fd5960", + "color": "#d24b4e", }, Object { "fontSize": 14, diff --git a/app/components/error_text/error_text.test.js b/app/components/error_text/error_text.test.js index 7266b4f0c..4d1667469 100644 --- a/app/components/error_text/error_text.test.js +++ b/app/components/error_text/error_text.test.js @@ -15,7 +15,7 @@ describe('ErrorText', () => { fontSize: 14, marginHorizontal: 15, }, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, error: { message: 'Username must begin with a letter and contain between 3 and 22 characters including numbers, lowercase letters, and the symbols', }, diff --git a/app/components/failed_network_action/failed_network_action.test.js b/app/components/failed_network_action/failed_network_action.test.js index b55fee09e..4418afb80 100644 --- a/app/components/failed_network_action/failed_network_action.test.js +++ b/app/components/failed_network_action/failed_network_action.test.js @@ -13,7 +13,7 @@ import FailedNetworkAction from './failed_network_action'; describe('FailedNetworkAction', () => { const baseProps = { onRetry: jest.fn(), - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, isLandscape: false, errorMessage: 'Error Message', errorTitle: 'Error Title', diff --git a/app/components/global_threads/empty_state.tsx b/app/components/global_threads/empty_state.tsx index c3297adc6..b9218a9ed 100644 --- a/app/components/global_threads/empty_state.tsx +++ b/app/components/global_threads/empty_state.tsx @@ -14,8 +14,8 @@ import {useSelector} from 'react-redux'; import {getTheme} from '@mm-redux/selectors/entities/preferences'; import {makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; import type {GlobalState} from '@mm-redux/types/store'; +import type {Theme} from '@mm-redux/types/theme'; type Props = { intl: typeof intlShape; diff --git a/app/components/global_threads/global_threads.tsx b/app/components/global_threads/global_threads.tsx index e2c24594c..86b7f4284 100644 --- a/app/components/global_threads/global_threads.tsx +++ b/app/components/global_threads/global_threads.tsx @@ -8,8 +8,8 @@ import {Alert, FlatList} from 'react-native'; import ThreadList from './thread_list'; import type {ActionResult} from '@mm-redux/types/actions'; -import type {Theme} from '@mm-redux/types/preferences'; import type {Team} from '@mm-redux/types/teams'; +import type {Theme} from '@mm-redux/types/theme'; import type {ThreadsState, UserThread} from '@mm-redux/types/threads'; import type {UserProfile} from '@mm-redux/types/users'; import type {$ID} from '@mm-redux/types/utilities'; diff --git a/app/components/global_threads/thread_footer/__snapshots__/thread_footer.test.tsx.snap b/app/components/global_threads/thread_footer/__snapshots__/thread_footer.test.tsx.snap index ededd6917..a4f50606a 100644 --- a/app/components/global_threads/thread_footer/__snapshots__/thread_footer.test.tsx.snap +++ b/app/components/global_threads/thread_footer/__snapshots__/thread_footer.test.tsx.snap @@ -32,7 +32,7 @@ exports[`Global Thread Footer Should render for channel view and unfollow the th } > @@ -41,7 +41,7 @@ exports[`Global Thread Footer Should render for channel view and unfollow the th style={ Object { "alignSelf": "center", - "color": "rgba(61,60,64,0.64)", + "color": "rgba(63,67,80,0.64)", "fontSize": 12, "fontWeight": "600", "marginRight": 12, @@ -55,7 +55,7 @@ exports[`Global Thread Footer Should render for channel view and unfollow the th onPress={[Function]} style={ Object { - "backgroundColor": "rgba(22,109,224,0.08)", + "backgroundColor": "rgba(28,88,217,0.08)", "borderRadius": 4, "height": 32, "justifyContent": "center", @@ -67,7 +67,7 @@ exports[`Global Thread Footer Should render for channel view and unfollow the th { currentTeamId: 'team1', intl, testID, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, thread: { id: 'thread1', participants: [{ diff --git a/app/components/global_threads/thread_footer/thread_footer.tsx b/app/components/global_threads/thread_footer/thread_footer.tsx index bb74a338b..e75eb7f23 100644 --- a/app/components/global_threads/thread_footer/thread_footer.tsx +++ b/app/components/global_threads/thread_footer/thread_footer.tsx @@ -14,7 +14,7 @@ import {$ID} from '@mm-redux/types/utilities'; import {preventDoubleTap} from '@utils/tap'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; export type DispatchProps = { actions: { diff --git a/app/components/global_threads/thread_item/__snapshots__/thread_item.test.tsx.snap b/app/components/global_threads/thread_item/__snapshots__/thread_item.test.tsx.snap index 4b4be4c44..0b9c16495 100644 --- a/app/components/global_threads/thread_item/__snapshots__/thread_item.test.tsx.snap +++ b/app/components/global_threads/thread_item/__snapshots__/thread_item.test.tsx.snap @@ -4,12 +4,12 @@ exports[`Global Thread Item Should render thread item with unread messages dot 1 { } as Post, threadId: 'post1', testID, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, thread: { id: 'post1', unread_replies: 5, diff --git a/app/components/global_threads/thread_item/thread_item.tsx b/app/components/global_threads/thread_item/thread_item.tsx index d172f9c57..892b3a06f 100644 --- a/app/components/global_threads/thread_item/thread_item.tsx +++ b/app/components/global_threads/thread_item/thread_item.tsx @@ -19,7 +19,7 @@ import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; import ThreadFooter from '../thread_footer'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; export type DispatchProps = { actions: { diff --git a/app/components/global_threads/thread_list/__snapshots__/index.test.tsx.snap b/app/components/global_threads/thread_list/__snapshots__/index.test.tsx.snap index f49100a55..93a5fa5fe 100644 --- a/app/components/global_threads/thread_list/__snapshots__/index.test.tsx.snap +++ b/app/components/global_threads/thread_list/__snapshots__/index.test.tsx.snap @@ -14,7 +14,7 @@ exports[`Global Thread List Should render threads with functional tabs & mark al style={ Object { "borderBottom": Object { - "borderBottomColor": "rgba(61,60,64,0.08)", + "borderBottomColor": "rgba(63,67,80,0.08)", "borderBottomWidth": 1, }, "container": Object { @@ -31,7 +31,7 @@ exports[`Global Thread List Should render threads with functional tabs & mark al "paddingVertical": 12, }, "markAllReadIcon": Object { - "color": "rgba(61,60,64,0.56)", + "color": "rgba(63,67,80,0.56)", "fontSize": 28, "lineHeight": 28, }, @@ -50,7 +50,7 @@ exports[`Global Thread List Should render threads with functional tabs & mark al }, "menuItem": Object { "alignSelf": "center", - "color": "rgba(61,60,64,0.56)", + "color": "rgba(63,67,80,0.56)", "fontFamily": "Open Sans", "fontSize": 16, "fontWeight": "600", @@ -61,17 +61,17 @@ exports[`Global Thread List Should render threads with functional tabs & mark al "paddingVertical": 8, }, "menuItemContainerSelected": Object { - "backgroundColor": "rgba(22,109,224,0.08)", + "backgroundColor": "rgba(28,88,217,0.08)", "borderRadius": 4, }, "menuItemSelected": Object { - "color": "#166de0", + "color": "#1c58d9", }, "messagesContainer": Object { "flexGrow": 1, }, "unreadsDot": Object { - "backgroundColor": "#579eff", + "backgroundColor": "#5d89ea", "borderRadius": 3, "height": 6, "position": "absolute", diff --git a/app/components/global_threads/thread_list/index.test.tsx b/app/components/global_threads/thread_list/index.test.tsx index b3c74b79f..ba134be53 100644 --- a/app/components/global_threads/thread_list/index.test.tsx +++ b/app/components/global_threads/thread_list/index.test.tsx @@ -29,7 +29,7 @@ describe('Global Thread List', () => { loadMoreThreads: jest.fn(), markAllAsRead, testID, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, threadIds: ['thread1'], viewingUnreads: true, viewAllThreads, diff --git a/app/components/global_threads/thread_list/index.tsx b/app/components/global_threads/thread_list/index.tsx index cdf897f14..41d83180b 100644 --- a/app/components/global_threads/thread_list/index.tsx +++ b/app/components/global_threads/thread_list/index.tsx @@ -13,7 +13,7 @@ import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; import ThreadListHeader from './thread_list_header'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; import type {UserThread} from '@mm-redux/types/threads'; import type {$ID} from '@mm-redux/types/utilities'; diff --git a/app/components/markdown/markdown_emoji/markdown_emoji.test.js b/app/components/markdown/markdown_emoji/markdown_emoji.test.js index 798002023..f344e3e47 100644 --- a/app/components/markdown/markdown_emoji/markdown_emoji.test.js +++ b/app/components/markdown/markdown_emoji/markdown_emoji.test.js @@ -13,7 +13,7 @@ describe('MarkdownEmoji', () => { baseTextStyle: {color: '#3d3c40', fontSize: 15, lineHeight: 20}, isEdited: false, isJumboEmoji: true, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, value: ':smile:', }; diff --git a/app/components/markdown/markdown_table/__snapshots__/markdown_table.test.js.snap b/app/components/markdown/markdown_table/__snapshots__/markdown_table.test.js.snap index 131ad8d71..3e5bbaa42 100644 --- a/app/components/markdown/markdown_table/__snapshots__/markdown_table.test.js.snap +++ b/app/components/markdown/markdown_table/__snapshots__/markdown_table.test.js.snap @@ -26,7 +26,7 @@ exports[`MarkdownTable should match snapshot 1`] = ` style={ Array [ Object { - "borderColor": "rgba(61,60,64,0.2)", + "borderColor": "rgba(63,67,80,0.2)", "borderWidth": 1, "width": "100%", }, @@ -218,8 +218,8 @@ exports[`MarkdownTable should match snapshot 1`] = ` { const baseProps = { children, numColumns, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/components/post_draft/__snapshots__/post_draft.test.js.snap b/app/components/post_draft/__snapshots__/post_draft.test.js.snap index 427223cc1..749a9cde5 100644 --- a/app/components/post_draft/__snapshots__/post_draft.test.js.snap +++ b/app/components/post_draft/__snapshots__/post_draft.test.js.snap @@ -5,7 +5,7 @@ exports[`PostDraft Should render the Archived for channelIsArchived 1`] = ` style={ Object { "backgroundColor": "#ffffff", - "borderTopColor": "rgba(61,60,64,0.2)", + "borderTopColor": "rgba(63,67,80,0.2)", "borderTopWidth": 1, "paddingBottom": 10, "paddingLeft": 20, @@ -20,7 +20,7 @@ exports[`PostDraft Should render the Archived for channelIsArchived 1`] = ` style={ Array [ Object { - "color": "#3d3c40", + "color": "#3f4350", "textAlign": "center", }, Array [ @@ -35,7 +35,7 @@ exports[`PostDraft Should render the Archived for channelIsArchived 1`] = ` style={ Array [ Object { - "color": "#3d3c40", + "color": "#3f4350", "textAlign": "center", }, Array [ @@ -53,7 +53,7 @@ exports[`PostDraft Should render the Archived for channelIsArchived 1`] = ` style={ Array [ Object { - "color": "#3d3c40", + "color": "#3f4350", "textAlign": "center", }, Array [ @@ -79,7 +79,7 @@ exports[`PostDraft Should render the Archived for channelIsArchived 1`] = ` style={ Object { "alignItems": "center", - "backgroundColor": "#166de0", + "backgroundColor": "#1c58d9", "borderRadius": 4, "height": 40, "marginTop": 10, @@ -109,7 +109,7 @@ exports[`PostDraft Should render the Archived for deactivatedChannel 1`] = ` style={ Object { "backgroundColor": "#ffffff", - "borderTopColor": "rgba(61,60,64,0.2)", + "borderTopColor": "rgba(63,67,80,0.2)", "borderTopWidth": 1, "paddingBottom": 10, "paddingLeft": 20, @@ -124,7 +124,7 @@ exports[`PostDraft Should render the Archived for deactivatedChannel 1`] = ` style={ Array [ Object { - "color": "#3d3c40", + "color": "#3f4350", "textAlign": "center", }, Array [ @@ -139,7 +139,7 @@ exports[`PostDraft Should render the Archived for deactivatedChannel 1`] = ` style={ Array [ Object { - "color": "#3d3c40", + "color": "#3f4350", "textAlign": "center", }, Array [ @@ -157,7 +157,7 @@ exports[`PostDraft Should render the Archived for deactivatedChannel 1`] = ` style={ Array [ Object { - "color": "#3d3c40", + "color": "#3f4350", "textAlign": "center", }, Array [ @@ -183,7 +183,7 @@ exports[`PostDraft Should render the Archived for deactivatedChannel 1`] = ` style={ Object { "alignItems": "center", - "backgroundColor": "#166de0", + "backgroundColor": "#1c58d9", "borderRadius": 4, "height": 40, "marginTop": 10, @@ -225,7 +225,7 @@ exports[`PostDraft Should render the DraftInput 1`] = ` style={ Object { "backgroundColor": "transparent", - "color": "#3d3c40", + "color": "#3f4350", "fontSize": 11, "marginBottom": 2, "paddingLeft": 10, @@ -247,7 +247,7 @@ exports[`PostDraft Should render the DraftInput 1`] = ` Object { "alignItems": "flex-end", "backgroundColor": "#ffffff", - "borderTopColor": "rgba(61,60,64,0.2)", + "borderTopColor": "rgba(63,67,80,0.2)", "borderTopWidth": 1, "flexDirection": "row", "justifyContent": "center", @@ -291,12 +291,12 @@ exports[`PostDraft Should render the DraftInput 1`] = ` onPaste={[Function]} onSelectionChange={[Function]} placeholder="Write to " - placeholderTextColor="rgba(61,60,64,0.5)" + placeholderTextColor="rgba(63,67,80,0.5)" rejectResponderTermination={true} screenId="NavigationScreen1" style={ Object { - "color": "#3d3c40", + "color": "#3f4350", "fontSize": 15, "lineHeight": 20, "maxHeight": 150, @@ -410,7 +410,7 @@ exports[`PostDraft Should render the DraftInput 1`] = ` testID="post_draft.quick_actions.at_input_action" > @@ -436,7 +436,7 @@ exports[`PostDraft Should render the DraftInput 1`] = ` testID="post_draft.quick_actions.slash_input_action" > @@ -462,7 +462,7 @@ exports[`PostDraft Should render the DraftInput 1`] = ` testID="post_draft.quick_actions.file_action" > @@ -488,7 +488,7 @@ exports[`PostDraft Should render the DraftInput 1`] = ` testID="post_draft.quick_actions.image_action" > @@ -514,7 +514,7 @@ exports[`PostDraft Should render the DraftInput 1`] = ` testID="post_draft.quick_actions.camera_action" > @@ -534,14 +534,14 @@ exports[`PostDraft Should render the DraftInput 1`] = ` Array [ Object { "alignItems": "center", - "backgroundColor": "#166de0", + "backgroundColor": "#1c58d9", "borderRadius": 4, "height": 32, "justifyContent": "center", "width": 80, }, Object { - "backgroundColor": "rgba(22,109,224,0.3)", + "backgroundColor": "rgba(28,88,217,0.3)", }, ] } @@ -569,7 +569,7 @@ exports[`PostDraft Should render the ReadOnly for canPost 1`] = ` } style={ Object { - "backgroundColor": "rgba(61,60,64,0.04)", + "backgroundColor": "rgba(63,67,80,0.04)", } } > @@ -577,7 +577,7 @@ exports[`PostDraft Should render the ReadOnly for canPost 1`] = ` style={ Object { "alignItems": "center", - "borderTopColor": "rgba(61,60,64,0.2)", + "borderTopColor": "rgba(63,67,80,0.2)", "borderTopWidth": 1, "flexDirection": "row", "height": 50, @@ -587,7 +587,7 @@ exports[`PostDraft Should render the ReadOnly for canPost 1`] = ` testID="post_draft.read_only" > @@ -631,7 +631,7 @@ exports[`PostDraft Should render the ReadOnly for channelIsReadOnly 1`] = ` style={ Object { "alignItems": "center", - "borderTopColor": "rgba(61,60,64,0.2)", + "borderTopColor": "rgba(63,67,80,0.2)", "borderTopWidth": 1, "flexDirection": "row", "height": 50, @@ -641,7 +641,7 @@ exports[`PostDraft Should render the ReadOnly for channelIsReadOnly 1`] = ` testID="post_draft.read_only" > diff --git a/app/components/post_draft/archived/archived.test.js b/app/components/post_draft/archived/archived.test.js index ad2669fd6..97fc676db 100644 --- a/app/components/post_draft/archived/archived.test.js +++ b/app/components/post_draft/archived/archived.test.js @@ -15,7 +15,7 @@ describe('PostDraft Archived', () => { deactivated: false, rootId: 'root-id', teamId: 'team-id', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/components/post_draft/draft_input/draft_input.test.js b/app/components/post_draft/draft_input/draft_input.test.js index f01d0ffb1..5a21190b2 100644 --- a/app/components/post_draft/draft_input/draft_input.test.js +++ b/app/components/post_draft/draft_input/draft_input.test.js @@ -44,7 +44,7 @@ describe('DraftInput', () => { maxFileSize: 1024, maxMessageLength: 4000, rootId: '', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, uploadFileRequestStatus: 'NOT_STARTED', value: '', userIsOutOfOffice: false, diff --git a/app/components/post_draft/post_draft.test.js b/app/components/post_draft/post_draft.test.js index 79fef2d70..6923b0516 100644 --- a/app/components/post_draft/post_draft.test.js +++ b/app/components/post_draft/post_draft.test.js @@ -52,7 +52,7 @@ describe('PostDraft', () => { registerTypingAnimation: () => jest.fn(), rootId: '', screenId: 'NavigationScreen1', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('Should render the DraftInput', () => { diff --git a/app/components/post_draft/post_input/__snapshots__/post_input.test.js.snap b/app/components/post_draft/post_input/__snapshots__/post_input.test.js.snap index 73e383360..2842c1b2a 100644 --- a/app/components/post_draft/post_input/__snapshots__/post_input.test.js.snap +++ b/app/components/post_draft/post_input/__snapshots__/post_input.test.js.snap @@ -12,11 +12,11 @@ exports[`PostInput should match, full snapshot 1`] = ` onEndEditing={[Function]} onSelectionChange={[Function]} placeholder="Write to Test Channel" - placeholderTextColor="rgba(61,60,64,0.5)" + placeholderTextColor="rgba(63,67,80,0.5)" screenId="Channel" style={ Object { - "color": "#3d3c40", + "color": "#3f4350", "fontSize": 15, "lineHeight": 20, "maxHeight": 150, diff --git a/app/components/post_draft/post_input/post_input.test.js b/app/components/post_draft/post_input/post_input.test.js index 0b9606464..e8c326cf4 100644 --- a/app/components/post_draft/post_input/post_input.test.js +++ b/app/components/post_draft/post_input/post_input.test.js @@ -26,7 +26,7 @@ describe('PostInput', () => { readonly: false, rootId: '', screenId: 'Channel', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, updateInitialValue: jest.fn(), userTyping: jest.fn(), }; diff --git a/app/components/post_draft/quick_actions/__snapshots__/quick_actions.test.js.snap b/app/components/post_draft/quick_actions/__snapshots__/quick_actions.test.js.snap index ce5fb031d..2a6c516bd 100644 --- a/app/components/post_draft/quick_actions/__snapshots__/quick_actions.test.js.snap +++ b/app/components/post_draft/quick_actions/__snapshots__/quick_actions.test.js.snap @@ -18,31 +18,31 @@ exports[`QuickActions should match snapshot 1`] = ` testID="post_draft.quick_actions.at_input_action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } value="" @@ -54,31 +54,31 @@ exports[`QuickActions should match snapshot 1`] = ` testID="post_draft.quick_actions.slash_input_action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } value="" @@ -91,31 +91,31 @@ exports[`QuickActions should match snapshot 1`] = ` testID="post_draft.quick_actions.file_action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -127,31 +127,31 @@ exports[`QuickActions should match snapshot 1`] = ` testID="post_draft.quick_actions.image_action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -163,31 +163,31 @@ exports[`QuickActions should match snapshot 1`] = ` testID="post_draft.quick_actions.camera_action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/components/post_draft/quick_actions/camera_quick_action/__snapshots__/camera_quick_action.test.js.snap b/app/components/post_draft/quick_actions/camera_quick_action/__snapshots__/camera_quick_action.test.js.snap index 7ec3fc4a9..abefce3e0 100644 --- a/app/components/post_draft/quick_actions/camera_quick_action/__snapshots__/camera_quick_action.test.js.snap +++ b/app/components/post_draft/quick_actions/camera_quick_action/__snapshots__/camera_quick_action.test.js.snap @@ -22,7 +22,7 @@ exports[`CameraButton should match snapshot 1`] = ` testID="post_draft.quick_actions.camera_action" > diff --git a/app/components/post_draft/quick_actions/camera_quick_action/camera_quick_action.test.js b/app/components/post_draft/quick_actions/camera_quick_action/camera_quick_action.test.js index c9f83cb67..cd446471c 100644 --- a/app/components/post_draft/quick_actions/camera_quick_action/camera_quick_action.test.js +++ b/app/components/post_draft/quick_actions/camera_quick_action/camera_quick_action.test.js @@ -23,7 +23,7 @@ describe('CameraButton', () => { testID: 'post_draft.quick_actions.camera_action', fileCount: 0, maxFileCount: 5, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, onUploadFiles: jest.fn(), }; diff --git a/app/components/post_draft/quick_actions/camera_quick_action/camera_type.tsx b/app/components/post_draft/quick_actions/camera_quick_action/camera_type.tsx index 4fc130622..c297e3d09 100644 --- a/app/components/post_draft/quick_actions/camera_quick_action/camera_type.tsx +++ b/app/components/post_draft/quick_actions/camera_quick_action/camera_type.tsx @@ -10,7 +10,7 @@ import FormattedText from '@components/formatted_text'; import TouchableWithFeedback from '@components/touchable_with_feedback'; import {makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type Props = { onPress: (options: CameraOptions) => void; diff --git a/app/components/post_draft/quick_actions/file_quick_action/__snapshots__/file_quick_action.test.js.snap b/app/components/post_draft/quick_actions/file_quick_action/__snapshots__/file_quick_action.test.js.snap index f08b348f1..c14d49a38 100644 --- a/app/components/post_draft/quick_actions/file_quick_action/__snapshots__/file_quick_action.test.js.snap +++ b/app/components/post_draft/quick_actions/file_quick_action/__snapshots__/file_quick_action.test.js.snap @@ -22,7 +22,7 @@ exports[`FileQuickAction should match snapshot 1`] = ` testID="post_draft.quick_actions.file_action" > diff --git a/app/components/post_draft/quick_actions/file_quick_action/file_quick_action.test.js b/app/components/post_draft/quick_actions/file_quick_action/file_quick_action.test.js index e343bb8ec..6a8a62706 100644 --- a/app/components/post_draft/quick_actions/file_quick_action/file_quick_action.test.js +++ b/app/components/post_draft/quick_actions/file_quick_action/file_quick_action.test.js @@ -18,7 +18,7 @@ describe('FileQuickAction', () => { testID: 'post_draft.quick_actions.file_action', fileCount: 0, maxFileCount: 5, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, onUploadFiles: jest.fn(), }; diff --git a/app/components/post_draft/quick_actions/image_quick_action/__snapshots__/image_quick_action.test.js.snap b/app/components/post_draft/quick_actions/image_quick_action/__snapshots__/image_quick_action.test.js.snap index 145c13728..93036687c 100644 --- a/app/components/post_draft/quick_actions/image_quick_action/__snapshots__/image_quick_action.test.js.snap +++ b/app/components/post_draft/quick_actions/image_quick_action/__snapshots__/image_quick_action.test.js.snap @@ -22,7 +22,7 @@ exports[`ImageQuickAction should match snapshot 1`] = ` testID="post_draft.quick_actions.image_action" > diff --git a/app/components/post_draft/quick_actions/image_quick_action/image_quick_action.test.js b/app/components/post_draft/quick_actions/image_quick_action/image_quick_action.test.js index 39b90b08a..be8aa5eb9 100644 --- a/app/components/post_draft/quick_actions/image_quick_action/image_quick_action.test.js +++ b/app/components/post_draft/quick_actions/image_quick_action/image_quick_action.test.js @@ -23,7 +23,7 @@ describe('ImageQuickAction', () => { testID: 'post_draft.quick_actions.image_action', fileCount: 0, maxFileCount: 5, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, onUploadFiles: jest.fn(), }; diff --git a/app/components/post_draft/quick_actions/input_quick_action/__snapshots__/input_quick_action.test.js.snap b/app/components/post_draft/quick_actions/input_quick_action/__snapshots__/input_quick_action.test.js.snap index fc601c615..6b27afe2c 100644 --- a/app/components/post_draft/quick_actions/input_quick_action/__snapshots__/input_quick_action.test.js.snap +++ b/app/components/post_draft/quick_actions/input_quick_action/__snapshots__/input_quick_action.test.js.snap @@ -15,7 +15,7 @@ exports[`InputQuickAction should match snapshot 1`] = ` type="opacity" > diff --git a/app/components/post_draft/quick_actions/input_quick_action/input_quick_action.test.js b/app/components/post_draft/quick_actions/input_quick_action/input_quick_action.test.js index f88c69baa..083ec1334 100644 --- a/app/components/post_draft/quick_actions/input_quick_action/input_quick_action.test.js +++ b/app/components/post_draft/quick_actions/input_quick_action/input_quick_action.test.js @@ -14,7 +14,7 @@ describe('InputQuickAction', () => { testID: 'post_draft.quick_actions.input_action', disabled: false, inputType: 'at', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, value: 'value', }; diff --git a/app/components/post_draft/quick_actions/quick_actions.test.js b/app/components/post_draft/quick_actions/quick_actions.test.js index ce0707d2e..6e236f076 100644 --- a/app/components/post_draft/quick_actions/quick_actions.test.js +++ b/app/components/post_draft/quick_actions/quick_actions.test.js @@ -18,7 +18,7 @@ describe('QuickActions', () => { maxFileSize: 10, maxFileCount: 10, screenId: 'Channel', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/components/post_draft/read_only/__snapshots__/read_only.test.js.snap b/app/components/post_draft/read_only/__snapshots__/read_only.test.js.snap index 7a60c1cc6..6c11a7f3e 100644 --- a/app/components/post_draft/read_only/__snapshots__/read_only.test.js.snap +++ b/app/components/post_draft/read_only/__snapshots__/read_only.test.js.snap @@ -9,7 +9,7 @@ exports[`PostDraft ReadOnly should match snapshot 1`] = ` } style={ Object { - "backgroundColor": "rgba(61,60,64,0.04)", + "backgroundColor": "rgba(63,67,80,0.04)", } } > @@ -17,7 +17,7 @@ exports[`PostDraft ReadOnly should match snapshot 1`] = ` style={ Object { "alignItems": "center", - "borderTopColor": "rgba(61,60,64,0.2)", + "borderTopColor": "rgba(63,67,80,0.2)", "borderTopWidth": 1, "flexDirection": "row", "height": 50, @@ -27,7 +27,7 @@ exports[`PostDraft ReadOnly should match snapshot 1`] = ` testID="post_draft.read_only" > { const baseProps = { testID: 'post_draft.read_only', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/components/post_draft/send_action/__snapshots__/send.test.js.snap b/app/components/post_draft/send_action/__snapshots__/send.test.js.snap index eb284b1a4..d940e01e0 100644 --- a/app/components/post_draft/send_action/__snapshots__/send.test.js.snap +++ b/app/components/post_draft/send_action/__snapshots__/send.test.js.snap @@ -15,14 +15,14 @@ exports[`SendAction should change theme backgroundColor to 0.3 opacity 1`] = ` Array [ Object { "alignItems": "center", - "backgroundColor": "#166de0", + "backgroundColor": "#1c58d9", "borderRadius": 4, "height": 32, "justifyContent": "center", "width": 80, }, Object { - "backgroundColor": "rgba(22,109,224,0.3)", + "backgroundColor": "rgba(28,88,217,0.3)", }, ] } @@ -52,7 +52,7 @@ exports[`SendAction should match snapshot 1`] = ` style={ Object { "alignItems": "center", - "backgroundColor": "#166de0", + "backgroundColor": "#1c58d9", "borderRadius": 4, "height": 32, "justifyContent": "center", @@ -85,7 +85,7 @@ exports[`SendAction should render theme backgroundColor 1`] = ` style={ Object { "alignItems": "center", - "backgroundColor": "#166de0", + "backgroundColor": "#1c58d9", "borderRadius": 4, "height": 32, "justifyContent": "center", diff --git a/app/components/post_draft/send_action/send.test.js b/app/components/post_draft/send_action/send.test.js index 94dc848a2..8475b82a1 100644 --- a/app/components/post_draft/send_action/send.test.js +++ b/app/components/post_draft/send_action/send.test.js @@ -12,7 +12,7 @@ import SendAction from './index'; describe('SendAction', () => { const baseProps = { testID: 'post_draft.send_action', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, handleSendMessage: jest.fn(), disabled: false, }; diff --git a/app/components/post_draft/uploads/upload_item/__snapshots__/upload_item.test.js.snap b/app/components/post_draft/uploads/upload_item/__snapshots__/upload_item.test.js.snap index 28aed8abd..9a0c3f54c 100644 --- a/app/components/post_draft/uploads/upload_item/__snapshots__/upload_item.test.js.snap +++ b/app/components/post_draft/uploads/upload_item/__snapshots__/upload_item.test.js.snap @@ -30,7 +30,7 @@ exports[`UploadItem downloadAndUploadFile should match, full snapshot 1`] = ` } > @@ -75,31 +75,31 @@ exports[`UploadItem downloadAndUploadFile should match, full snapshot 1`] = ` onPress={[Function]} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/components/post_draft/uploads/upload_item/__snapshots__/upload_remove.test.js.snap b/app/components/post_draft/uploads/upload_item/__snapshots__/upload_remove.test.js.snap index fd4ba768a..fdc671959 100644 --- a/app/components/post_draft/uploads/upload_item/__snapshots__/upload_remove.test.js.snap +++ b/app/components/post_draft/uploads/upload_item/__snapshots__/upload_remove.test.js.snap @@ -28,7 +28,7 @@ exports[`UploadRemove should match, full snapshot 1`] = ` } > diff --git a/app/components/post_draft/uploads/upload_item/upload_item.test.js b/app/components/post_draft/uploads/upload_item/upload_item.test.js index e19c41ada..98cb7672c 100644 --- a/app/components/post_draft/uploads/upload_item/upload_item.test.js +++ b/app/components/post_draft/uploads/upload_item/upload_item.test.js @@ -20,7 +20,7 @@ describe('UploadItem', () => { file: { loading: false, }, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; describe('downloadAndUploadFile', () => { diff --git a/app/components/post_draft/uploads/upload_item/upload_remove.test.js b/app/components/post_draft/uploads/upload_item/upload_remove.test.js index 87366cfa3..c8f2cac47 100644 --- a/app/components/post_draft/uploads/upload_item/upload_remove.test.js +++ b/app/components/post_draft/uploads/upload_item/upload_remove.test.js @@ -13,7 +13,7 @@ describe('UploadRemove', () => { onPress: jest.fn(), channelId: 'channel-id', clientId: 'client-id', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match, full snapshot', () => { diff --git a/app/components/post_draft/uploads/uploads.test.js b/app/components/post_draft/uploads/uploads.test.js index e17f1b815..3ee9a7c81 100644 --- a/app/components/post_draft/uploads/uploads.test.js +++ b/app/components/post_draft/uploads/uploads.test.js @@ -18,7 +18,7 @@ describe('Uploads', () => { initUploadFiles: jest.fn(), maxFileSize: 100, screenId: 'Channel', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('handleUploadFiles should return early if screen is not the top screen', async () => { diff --git a/app/components/post_list/__snapshots__/post_list.test.js.snap b/app/components/post_list/__snapshots__/post_list.test.js.snap index d5dd5dc47..ac103ce4e 100644 --- a/app/components/post_list/__snapshots__/post_list.test.js.snap +++ b/app/components/post_list/__snapshots__/post_list.test.js.snap @@ -47,31 +47,31 @@ exports[`PostList should match snapshot 1`] = ` siteURL="https://site-url.fake" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/components/post_list/combined_user_activity/combined_user_activity.tsx b/app/components/post_list/combined_user_activity/combined_user_activity.tsx index 60ae408a1..012d93b5f 100644 --- a/app/components/post_list/combined_user_activity/combined_user_activity.tsx +++ b/app/components/post_list/combined_user_activity/combined_user_activity.tsx @@ -19,7 +19,7 @@ import LastUsers from './last_users'; import {postTypeMessages} from './messages'; import type {Post} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type Props = { canDelete: boolean; diff --git a/app/components/post_list/combined_user_activity/last_users.tsx b/app/components/post_list/combined_user_activity/last_users.tsx index 4e0d260e3..e94ce93db 100644 --- a/app/components/post_list/combined_user_activity/last_users.tsx +++ b/app/components/post_list/combined_user_activity/last_users.tsx @@ -13,7 +13,7 @@ import {makeStyleSheetFromTheme} from '@utils/theme'; import {postTypeMessages, systemMessages} from './messages'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type LastUsersProps = { actor: string; diff --git a/app/components/post_list/date_separator/__snapshots__/date_separator.test.js.snap b/app/components/post_list/date_separator/__snapshots__/date_separator.test.js.snap index 6b0a24a70..f1e29455d 100644 --- a/app/components/post_list/date_separator/__snapshots__/date_separator.test.js.snap +++ b/app/components/post_list/date_separator/__snapshots__/date_separator.test.js.snap @@ -17,7 +17,7 @@ exports[`DateHeader component should match snapshot when timezone is UserTimezon { const baseProps = { - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, timezone: null, }; diff --git a/app/components/post_list/date_separator/date_separator.tsx b/app/components/post_list/date_separator/date_separator.tsx index 3e94531ef..8da64e958 100644 --- a/app/components/post_list/date_separator/date_separator.tsx +++ b/app/components/post_list/date_separator/date_separator.tsx @@ -8,7 +8,7 @@ import FormattedDate from '@components/formatted_date'; import FormattedText from '@components/formatted_text'; import {makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; import type {UserTimezone} from '@mm-redux/types/users'; type DateSeparatorProps = { diff --git a/app/components/post_list/more_messages_button/__snapshots__/more_messages_button.test.js.snap b/app/components/post_list/more_messages_button/__snapshots__/more_messages_button.test.js.snap index 7cf44130f..903143459 100644 --- a/app/components/post_list/more_messages_button/__snapshots__/more_messages_button.test.js.snap +++ b/app/components/post_list/more_messages_button/__snapshots__/more_messages_button.test.js.snap @@ -5,7 +5,7 @@ exports[`MoreMessagesButton should match snapshot 1`] = ` style={ Array [ Object { - "backgroundColor": "#166de0", + "backgroundColor": "#1c58d9", "elevation": 1, "flex": 1, "margin": 8, @@ -33,7 +33,7 @@ exports[`MoreMessagesButton should match snapshot 1`] = ` } } type="native" - underlayColor="hsl(214, 50%, 38%)" + underlayColor="hsl(221, 50%, 38%)" > { const baseProps = { - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, postIds: [], channelId: 'channel-id', unreadCount: 10, diff --git a/app/components/post_list/more_messages_button/more_messages_button.tsx b/app/components/post_list/more_messages_button/more_messages_button.tsx index d3b1692dd..c5fa3846f 100644 --- a/app/components/post_list/more_messages_button/more_messages_button.tsx +++ b/app/components/post_list/more_messages_button/more_messages_button.tsx @@ -13,7 +13,7 @@ import {messageCount} from '@mm-redux/utils/post_list'; import {t} from '@utils/i18n'; import {makeStyleSheetFromTheme, hexToHue} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; const HIDDEN_TOP = -400; const SHOWN_TOP = 0; diff --git a/app/components/post_list/new_message_line/index.tsx b/app/components/post_list/new_message_line/index.tsx index 62dca5a01..35daaaa70 100644 --- a/app/components/post_list/new_message_line/index.tsx +++ b/app/components/post_list/new_message_line/index.tsx @@ -7,7 +7,7 @@ import {StyleProp, View, ViewStyle} from 'react-native'; import FormattedText from '@components/formatted_text'; import {makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type NewMessagesLineProps = { moreMessages: boolean; diff --git a/app/components/post_list/post/avatar/avatar.tsx b/app/components/post_list/post/avatar/avatar.tsx index 197eacc0e..12ca800cf 100644 --- a/app/components/post_list/post/avatar/avatar.tsx +++ b/app/components/post_list/post/avatar/avatar.tsx @@ -20,7 +20,7 @@ import {fromAutoResponder, isSystemMessage} from '@mm-redux/utils/post_utils'; import {preventDoubleTap} from '@utils/tap'; import type {Post} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; import type {ImageSource} from 'react-native-vector-icons/Icon'; type AvatarProps = { diff --git a/app/components/post_list/post/avatar/index.ts b/app/components/post_list/post/avatar/index.ts index 7b43df777..7de3f6f11 100644 --- a/app/components/post_list/post/avatar/index.ts +++ b/app/components/post_list/post/avatar/index.ts @@ -10,8 +10,8 @@ import {getUser} from '@mm-redux/selectors/entities/users'; import Avatar from './avatar'; import type {Post} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; import type {GlobalState} from '@mm-redux/types/store'; +import type {Theme} from '@mm-redux/types/theme'; type OwnProps = { pendingPostStyle?: StyleProp; diff --git a/app/components/post_list/post/body/add_members/add_members.tsx b/app/components/post_list/post/body/add_members/add_members.tsx index 33526fcf7..d1622abcc 100644 --- a/app/components/post_list/post/body/add_members/add_members.tsx +++ b/app/components/post_list/post/body/add_members/add_members.tsx @@ -13,7 +13,7 @@ import {getMarkdownTextStyles} from '@utils/markdown'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; import type {Post} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; import type {UserProfile} from '@mm-redux/types/users'; type AddMembersProps = { diff --git a/app/components/post_list/post/body/add_members/index.ts b/app/components/post_list/post/body/add_members/index.ts index abaf9852b..e5df3b88b 100644 --- a/app/components/post_list/post/body/add_members/index.ts +++ b/app/components/post_list/post/body/add_members/index.ts @@ -12,8 +12,8 @@ import {getCurrentUser} from '@mm-redux/selectors/entities/users'; import AddMembers from './add_members'; import type {Post} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; import type {GlobalState} from '@mm-redux/types/store'; +import type {Theme} from '@mm-redux/types/theme'; type OwnProps = { post: Post; diff --git a/app/components/post_list/post/body/body.tsx b/app/components/post_list/post/body/body.tsx index 66ee787fc..99517312c 100644 --- a/app/components/post_list/post/body/body.tsx +++ b/app/components/post_list/post/body/body.tsx @@ -19,7 +19,7 @@ import Message from './message'; import Reactions from './reactions'; import type {Post} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type BodyProps = { appsEnabled: boolean; diff --git a/app/components/post_list/post/body/content/embedded_bindings/button_binding/button_binding.tsx b/app/components/post_list/post/body/content/embedded_bindings/button_binding/button_binding.tsx index f00130837..8cb8e23d5 100644 --- a/app/components/post_list/post/body/content/embedded_bindings/button_binding/button_binding.tsx +++ b/app/components/post_list/post/body/content/embedded_bindings/button_binding/button_binding.tsx @@ -10,7 +10,7 @@ import {AppExpandLevels, AppBindingLocations, AppCallTypes, AppCallResponseTypes import {ActionResult} from '@mm-redux/types/actions'; import {AppBinding} from '@mm-redux/types/apps'; import {Post} from '@mm-redux/types/posts'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {DoAppCall, PostEphemeralCallResponseForPost} from '@mm-types/actions/apps'; import {createCallContext, createCallRequest} from '@utils/apps'; import {getStatusColors} from '@utils/message_attachment_colors'; diff --git a/app/components/post_list/post/body/content/embedded_bindings/button_binding/index.ts b/app/components/post_list/post/body/content/embedded_bindings/button_binding/index.ts index ddf3aaf8e..985a98a6d 100644 --- a/app/components/post_list/post/body/content/embedded_bindings/button_binding/index.ts +++ b/app/components/post_list/post/body/content/embedded_bindings/button_binding/index.ts @@ -12,8 +12,8 @@ import {getCurrentTeamId} from '@mm-redux/selectors/entities/teams'; import ButtonBinding from './button_binding'; import type {AppBinding} from '@mm-redux/types/apps'; -import type {Theme} from '@mm-redux/types/preferences'; import type {GlobalState} from '@mm-redux/types/store'; +import type {Theme} from '@mm-redux/types/theme'; type OwnProps = { binding: AppBinding; diff --git a/app/components/post_list/post/body/content/embedded_bindings/embed_text.tsx b/app/components/post_list/post/body/content/embedded_bindings/embed_text.tsx index 0f89eaad9..4449a565e 100644 --- a/app/components/post_list/post/body/content/embedded_bindings/embed_text.tsx +++ b/app/components/post_list/post/body/content/embedded_bindings/embed_text.tsx @@ -11,7 +11,7 @@ import {useShowMoreAnimatedStyle} from '@hooks/show_more'; import {getMarkdownBlockStyles, getMarkdownTextStyles} from '@utils/markdown'; import {makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type Props = { theme: Theme; diff --git a/app/components/post_list/post/body/content/embedded_bindings/embed_title.tsx b/app/components/post_list/post/body/content/embedded_bindings/embed_title.tsx index e71fb68a4..fad27bd3a 100644 --- a/app/components/post_list/post/body/content/embedded_bindings/embed_title.tsx +++ b/app/components/post_list/post/body/content/embedded_bindings/embed_title.tsx @@ -7,7 +7,7 @@ import {View} from 'react-native'; import Markdown from '@components/markdown'; import {makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type Props = { theme: Theme; diff --git a/app/components/post_list/post/body/content/embedded_bindings/embedded_binding.tsx b/app/components/post_list/post/body/content/embedded_bindings/embedded_binding.tsx index 664aed54d..b79ca98e7 100644 --- a/app/components/post_list/post/body/content/embedded_bindings/embedded_binding.tsx +++ b/app/components/post_list/post/body/content/embedded_bindings/embedded_binding.tsx @@ -12,7 +12,7 @@ import EmbedTitle from './embed_title'; import EmbedSubBindings from './embedded_sub_bindings'; import type {AppBinding} from '@mm-redux/types/apps'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type Props = { embed: AppBinding; diff --git a/app/components/post_list/post/body/content/embedded_bindings/embedded_sub_bindings.tsx b/app/components/post_list/post/body/content/embedded_bindings/embedded_sub_bindings.tsx index 6b83d65d2..77a6c1fec 100644 --- a/app/components/post_list/post/body/content/embedded_bindings/embedded_sub_bindings.tsx +++ b/app/components/post_list/post/body/content/embedded_bindings/embedded_sub_bindings.tsx @@ -7,7 +7,7 @@ import ButtonBinding from './button_binding'; import BindingMenu from './menu_binding'; import type {AppBinding} from '@mm-redux/types/apps'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type Props = { bindings: AppBinding[]; diff --git a/app/components/post_list/post/body/content/embedded_bindings/index.tsx b/app/components/post_list/post/body/content/embedded_bindings/index.tsx index dbdc283d8..99ac19db6 100644 --- a/app/components/post_list/post/body/content/embedded_bindings/index.tsx +++ b/app/components/post_list/post/body/content/embedded_bindings/index.tsx @@ -7,7 +7,7 @@ import {View} from 'react-native'; import EmbeddedBinding from './embedded_binding'; import type {AppBinding} from '@mm-redux/types/apps'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type Props = { embeds: AppBinding[]; diff --git a/app/components/post_list/post/body/content/embedded_bindings/menu_binding/menu_binding.tsx b/app/components/post_list/post/body/content/embedded_bindings/menu_binding/menu_binding.tsx index 425430058..0b32847a8 100644 --- a/app/components/post_list/post/body/content/embedded_bindings/menu_binding/menu_binding.tsx +++ b/app/components/post_list/post/body/content/embedded_bindings/menu_binding/menu_binding.tsx @@ -8,7 +8,7 @@ import {showAppForm} from '@actions/navigation'; import AutocompleteSelector from '@components/autocomplete_selector'; import {AppExpandLevels, AppBindingLocations, AppCallTypes, AppCallResponseTypes} from '@mm-redux/constants/apps'; import {ActionResult} from '@mm-redux/types/actions'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {createCallContext, createCallRequest} from '@utils/apps'; import type {AppBinding} from '@mm-redux/types/apps'; diff --git a/app/components/post_list/post/body/content/image_preview/image_preview.tsx b/app/components/post_list/post/body/content/image_preview/image_preview.tsx index cf0a9df40..50f926133 100644 --- a/app/components/post_list/post/body/content/image_preview/image_preview.tsx +++ b/app/components/post_list/post/body/content/image_preview/image_preview.tsx @@ -16,7 +16,7 @@ import {calculateDimensions, getViewPortWidth, isGifTooLarge} from '@utils/image import {isImageLink, isValidUrl} from '@utils/url'; import type {Post} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type ImagePreviewProps = { expandedLink?: string; diff --git a/app/components/post_list/post/body/content/index.tsx b/app/components/post_list/post/body/content/index.tsx index 42bd16343..5cc8b9453 100644 --- a/app/components/post_list/post/body/content/index.tsx +++ b/app/components/post_list/post/body/content/index.tsx @@ -12,7 +12,7 @@ import Opengraph from './opengraph'; import YouTube from './youtube'; import type {Post} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type ContentProps = { isReplyPost: boolean; diff --git a/app/components/post_list/post/body/content/message_attachments/__snapshots__/attachment_footer.test.tsx.snap b/app/components/post_list/post/body/content/message_attachments/__snapshots__/attachment_footer.test.tsx.snap index 0a5f19c81..bee08d2fe 100644 --- a/app/components/post_list/post/body/content/message_attachments/__snapshots__/attachment_footer.test.tsx.snap +++ b/app/components/post_list/post/body/content/message_attachments/__snapshots__/attachment_footer.test.tsx.snap @@ -32,7 +32,7 @@ exports[`AttachmentFooter it matches snapshot when both footer and footer_icon a numberOfLines={1} style={ Object { - "color": "rgba(61,60,64,0.5)", + "color": "rgba(63,67,80,0.5)", "fontSize": 11, } } @@ -58,7 +58,7 @@ exports[`AttachmentFooter it matches snapshot when footer text is provided 1`] = numberOfLines={1} style={ Object { - "color": "rgba(61,60,64,0.5)", + "color": "rgba(63,67,80,0.5)", "fontSize": 11, } } diff --git a/app/components/post_list/post/body/content/message_attachments/action_button/action_button.test.tsx b/app/components/post_list/post/body/content/message_attachments/action_button/action_button.test.tsx index 4cdfd6957..3cad932c0 100644 --- a/app/components/post_list/post/body/content/message_attachments/action_button/action_button.test.tsx +++ b/app/components/post_list/post/body/content/message_attachments/action_button/action_button.test.tsx @@ -24,7 +24,7 @@ describe('ActionButton', () => { name: buttonConfig.name, postId: buttonConfig.id, buttonColor: buttonConfig.style, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, doPostActionWithCookie: jest.fn(), }; @@ -33,8 +33,8 @@ describe('ActionButton', () => { const buttonTextChild = wrapper.getElement().props.children; const dynamicButtonStyles = wrapper.getElement().props.containerStyle[1]; - expect(dynamicButtonStyles.borderColor).toBe(changeOpacity(Preferences.THEMES.default[buttonConfig.style], 0.25)); - expect(buttonTextChild.props.style.color).toBe(Preferences.THEMES.default[buttonConfig.style]); + expect(dynamicButtonStyles.borderColor).toBe(changeOpacity(Preferences.THEMES.denim[buttonConfig.style], 0.25)); + expect(buttonTextChild.props.style.color).toBe(Preferences.THEMES.denim[buttonConfig.style]); }); test('correct styles when a status color', () => { @@ -50,7 +50,7 @@ describe('ActionButton', () => { name: buttonConfig.name, postId: buttonConfig.id, buttonColor: buttonConfig.style, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, doPostActionWithCookie: jest.fn(), }; @@ -59,7 +59,7 @@ describe('ActionButton', () => { const buttonTextChild = wrapper.getElement().props.children; const dynamicButtonStyles = wrapper.getElement().props.containerStyle[1]; - const STATUS_COLORS = getStatusColors(Preferences.THEMES.default); + const STATUS_COLORS = getStatusColors(Preferences.THEMES.denim); expect(dynamicButtonStyles.borderColor).toBe(changeOpacity(STATUS_COLORS[buttonConfig.style], 0.25)); expect(buttonTextChild.props.style.color).toBe(STATUS_COLORS[buttonConfig.style]); }); @@ -77,7 +77,7 @@ describe('ActionButton', () => { name: buttonConfig.name, postId: buttonConfig.id, buttonColor: buttonConfig.style, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, doPostActionWithCookie: jest.fn(), }; @@ -101,7 +101,7 @@ describe('ActionButton', () => { cookie: '', name: buttonConfig.name, postId: buttonConfig.id, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, doPostActionWithCookie: jest.fn(), }; @@ -111,10 +111,10 @@ describe('ActionButton', () => { const baseButtonStyles = wrapper.getElement().props.containerStyle[0]; const dynamicButtonStyles = wrapper.getElement().props.containerStyle[1]; - expect(baseButtonStyles.borderColor).toBe(changeOpacity(Preferences.THEMES.default.centerChannelColor, 0.25)); + expect(baseButtonStyles.borderColor).toBe(changeOpacity(Preferences.THEMES.denim.centerChannelColor, 0.25)); expect(baseButtonStyles.borderWidth).toBe(2); expect(baseButtonStyles.borderRadius).toBe(4); expect(dynamicButtonStyles).toBe(undefined); - expect(buttonTextChild.props.style.color).toBe(Preferences.THEMES.default.centerChannelColor); + expect(buttonTextChild.props.style.color).toBe(Preferences.THEMES.denim.centerChannelColor); }); }); diff --git a/app/components/post_list/post/body/content/message_attachments/action_button/action_button.tsx b/app/components/post_list/post/body/content/message_attachments/action_button/action_button.tsx index cdc2bc24a..303518c44 100644 --- a/app/components/post_list/post/body/content/message_attachments/action_button/action_button.tsx +++ b/app/components/post_list/post/body/content/message_attachments/action_button/action_button.tsx @@ -5,7 +5,7 @@ import React, {useCallback, useRef} from 'react'; import Button from 'react-native-button'; import {ActionResult} from '@mm-redux/types/actions'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {getStatusColors} from '@utils/message_attachment_colors'; import {preventDoubleTap} from '@utils/tap'; import {makeStyleSheetFromTheme, changeOpacity} from '@utils/theme'; diff --git a/app/components/post_list/post/body/content/message_attachments/attachment_actions.tsx b/app/components/post_list/post/body/content/message_attachments/attachment_actions.tsx index 7b740e809..1b66777f9 100644 --- a/app/components/post_list/post/body/content/message_attachments/attachment_actions.tsx +++ b/app/components/post_list/post/body/content/message_attachments/attachment_actions.tsx @@ -8,7 +8,7 @@ import {PostAction} from '@mm-redux/types/integration_actions'; import ActionButton from './action_button'; import ActionMenu from './action_menu'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type Props = { actions: PostAction[]; diff --git a/app/components/post_list/post/body/content/message_attachments/attachment_author.tsx b/app/components/post_list/post/body/content/message_attachments/attachment_author.tsx index e5cc06970..d2088f260 100644 --- a/app/components/post_list/post/body/content/message_attachments/attachment_author.tsx +++ b/app/components/post_list/post/body/content/message_attachments/attachment_author.tsx @@ -6,7 +6,7 @@ import {intlShape, injectIntl} from 'react-intl'; import {Alert, Text, View} from 'react-native'; import FastImage from 'react-native-fast-image'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; import {tryOpenURL} from '@utils/url'; diff --git a/app/components/post_list/post/body/content/message_attachments/attachment_fields.tsx b/app/components/post_list/post/body/content/message_attachments/attachment_fields.tsx index 480cc9041..1cdad0778 100644 --- a/app/components/post_list/post/body/content/message_attachments/attachment_fields.tsx +++ b/app/components/post_list/post/body/content/message_attachments/attachment_fields.tsx @@ -7,7 +7,7 @@ import {StyleProp, Text, TextStyle, View, ViewStyle} from 'react-native'; import Markdown from '@components/markdown'; import {MessageAttachmentField} from '@mm-redux/types/message_attachments'; import {PostMetadata} from '@mm-redux/types/posts'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {makeStyleSheetFromTheme} from '@utils/theme'; type Props = { diff --git a/app/components/post_list/post/body/content/message_attachments/attachment_footer.test.tsx b/app/components/post_list/post/body/content/message_attachments/attachment_footer.test.tsx index 80cd8b03c..9e3b10441 100644 --- a/app/components/post_list/post/body/content/message_attachments/attachment_footer.test.tsx +++ b/app/components/post_list/post/body/content/message_attachments/attachment_footer.test.tsx @@ -12,7 +12,7 @@ describe('AttachmentFooter', () => { const baseProps = { text: 'This is the footer!', icon: 'https://images.com/image.png', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('it matches snapshot when footer text is provided', () => { diff --git a/app/components/post_list/post/body/content/message_attachments/attachment_footer.tsx b/app/components/post_list/post/body/content/message_attachments/attachment_footer.tsx index 336e65425..640f5435d 100644 --- a/app/components/post_list/post/body/content/message_attachments/attachment_footer.tsx +++ b/app/components/post_list/post/body/content/message_attachments/attachment_footer.tsx @@ -7,7 +7,7 @@ import FastImage from 'react-native-fast-image'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type Props = { icon?: string; diff --git a/app/components/post_list/post/body/content/message_attachments/attachment_image/index.tsx b/app/components/post_list/post/body/content/message_attachments/attachment_image/index.tsx index a1e830f82..9a1a5cce1 100644 --- a/app/components/post_list/post/body/content/message_attachments/attachment_image/index.tsx +++ b/app/components/post_list/post/body/content/message_attachments/attachment_image/index.tsx @@ -15,7 +15,7 @@ import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; import {isValidUrl} from '@utils/url'; import type {PostImage} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { return { diff --git a/app/components/post_list/post/body/content/message_attachments/attachment_text.tsx b/app/components/post_list/post/body/content/message_attachments/attachment_text.tsx index ce2d2b2c1..d861368ae 100644 --- a/app/components/post_list/post/body/content/message_attachments/attachment_text.tsx +++ b/app/components/post_list/post/body/content/message_attachments/attachment_text.tsx @@ -9,7 +9,7 @@ import Markdown from '@components/markdown'; import ShowMoreButton from '@components/post_list/post/body/message/show_more_button'; import {useShowMoreAnimatedStyle} from '@hooks/show_more'; import {PostMetadata} from '@mm-redux/types/posts'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; type Props = { baseTextStyle: StyleProp; diff --git a/app/components/post_list/post/body/content/message_attachments/attachment_title.tsx b/app/components/post_list/post/body/content/message_attachments/attachment_title.tsx index 6acc441fe..07b3c3100 100644 --- a/app/components/post_list/post/body/content/message_attachments/attachment_title.tsx +++ b/app/components/post_list/post/body/content/message_attachments/attachment_title.tsx @@ -6,7 +6,7 @@ import {intlShape, injectIntl} from 'react-intl'; import {Alert, Text, View} from 'react-native'; import Markdown from '@components/markdown'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {makeStyleSheetFromTheme} from '@utils/theme'; import {tryOpenURL} from '@utils/url'; diff --git a/app/components/post_list/post/body/content/message_attachments/index.tsx b/app/components/post_list/post/body/content/message_attachments/index.tsx index bda021a2e..0b6c09b8e 100644 --- a/app/components/post_list/post/body/content/message_attachments/index.tsx +++ b/app/components/post_list/post/body/content/message_attachments/index.tsx @@ -6,7 +6,7 @@ import {StyleSheet, View} from 'react-native'; import {MessageAttachment as MessageAttachmentType} from '@mm-redux/types/message_attachments'; import {PostMetadata} from '@mm-redux/types/posts'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import MessageAttachment from './message_attachment'; diff --git a/app/components/post_list/post/body/content/message_attachments/message_attachment.tsx b/app/components/post_list/post/body/content/message_attachments/message_attachment.tsx index 6d718f2d5..60f5869ed 100644 --- a/app/components/post_list/post/body/content/message_attachments/message_attachment.tsx +++ b/app/components/post_list/post/body/content/message_attachments/message_attachment.tsx @@ -21,7 +21,7 @@ import AttachmentTitle from './attachment_title'; import type {MessageAttachment as MessageAttachmentType} from '@mm-redux/types/message_attachments'; import type {PostMetadata} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type Props = { attachment: MessageAttachmentType; diff --git a/app/components/post_list/post/body/content/opengraph/index.ts b/app/components/post_list/post/body/content/opengraph/index.ts index b823a110e..6628790ae 100644 --- a/app/components/post_list/post/body/content/opengraph/index.ts +++ b/app/components/post_list/post/body/content/opengraph/index.ts @@ -11,8 +11,8 @@ import {getBool} from '@mm-redux/selectors/entities/preferences'; import Opengraph from './opengraph'; import type {Post, PostMetadata} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; import type {GlobalState} from '@mm-redux/types/store'; +import type {Theme} from '@mm-redux/types/theme'; type OwnProps = { isReplyPost: boolean; diff --git a/app/components/post_list/post/body/content/opengraph/opengraph.tsx b/app/components/post_list/post/body/content/opengraph/opengraph.tsx index cf4c3d57a..92da9dc72 100644 --- a/app/components/post_list/post/body/content/opengraph/opengraph.tsx +++ b/app/components/post_list/post/body/content/opengraph/opengraph.tsx @@ -12,7 +12,7 @@ import {tryOpenURL} from '@utils/url'; import OpengraphImage from './opengraph_image'; import type {Post} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type OpengraphProps = { intl: typeof intlShape; diff --git a/app/components/post_list/post/body/content/opengraph/opengraph_image/index.tsx b/app/components/post_list/post/body/content/opengraph/opengraph_image/index.tsx index ca980cc69..b07931609 100644 --- a/app/components/post_list/post/body/content/opengraph/opengraph_image/index.tsx +++ b/app/components/post_list/post/body/content/opengraph/opengraph_image/index.tsx @@ -16,7 +16,7 @@ import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; import {isValidUrl} from '@utils/url'; import type {Post} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type BestImage = { secure_url?: string; diff --git a/app/components/post_list/post/body/failed/failed.tsx b/app/components/post_list/post/body/failed/failed.tsx index 332872611..e5c524cbc 100644 --- a/app/components/post_list/post/body/failed/failed.tsx +++ b/app/components/post_list/post/body/failed/failed.tsx @@ -12,7 +12,7 @@ import EventEmitter from '@mm-redux/utils/event_emitter'; import {t} from '@utils/i18n'; import type {Post} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type FailedProps = { createPost: (post: Post) => void; diff --git a/app/components/post_list/post/body/files/document_file.tsx b/app/components/post_list/post/body/files/document_file.tsx index 8e3533f78..77e424abf 100644 --- a/app/components/post_list/post/body/files/document_file.tsx +++ b/app/components/post_list/post/body/files/document_file.tsx @@ -18,7 +18,7 @@ import {getLocalFilePathFromFile} from '@utils/file'; import FileIcon from './file_icon'; import type {FileInfo} from '@mm-redux/types/files'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type DocumentFileRef = { handlePreviewPress: () => void; diff --git a/app/components/post_list/post/body/files/file.tsx b/app/components/post_list/post/body/files/file.tsx index 03e0c7cd7..3ca36b998 100644 --- a/app/components/post_list/post/body/files/file.tsx +++ b/app/components/post_list/post/body/files/file.tsx @@ -15,7 +15,7 @@ import ImageFile from './image_file'; import ImageFileOverlay from './image_file_overlay'; import type {FileInfo as FileInfoType} from '@mm-redux/types/files'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type FileProps = { canDownloadFiles: boolean; diff --git a/app/components/post_list/post/body/files/file_icon.tsx b/app/components/post_list/post/body/files/file_icon.tsx index 701e231e9..1d74ee051 100644 --- a/app/components/post_list/post/body/files/file_icon.tsx +++ b/app/components/post_list/post/body/files/file_icon.tsx @@ -8,7 +8,7 @@ import CompassIcon from '@components/compass_icon'; import {getFileType} from '@mm-redux/utils/file_utils'; import type {FileInfo} from '@mm-redux/types/files'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type FileIconProps = { backgroundColor?: string; diff --git a/app/components/post_list/post/body/files/file_info.tsx b/app/components/post_list/post/body/files/file_info.tsx index fec58517d..94734a3e3 100644 --- a/app/components/post_list/post/body/files/file_info.tsx +++ b/app/components/post_list/post/body/files/file_info.tsx @@ -9,7 +9,7 @@ import {getFormattedFileSize} from '@mm-redux/utils/file_utils'; import {makeStyleSheetFromTheme} from '@utils/theme'; import type {FileInfo as FileInfoType} from '@mm-redux/types/files'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type FileInfoProps = { file: FileInfoType; diff --git a/app/components/post_list/post/body/files/files.tsx b/app/components/post_list/post/body/files/files.tsx index 25378b9b7..90882a301 100644 --- a/app/components/post_list/post/body/files/files.tsx +++ b/app/components/post_list/post/body/files/files.tsx @@ -7,7 +7,7 @@ import {DeviceEventEmitter, StyleProp, StyleSheet, View, ViewStyle} from 'react- import {Client4} from '@client/rest'; import {usePermanentSidebar, useSplitView} from '@hooks/permanent_sidebar'; import {FileInfo} from '@mm-redux/types/files'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {isGif, isImage} from '@utils/file'; import {openGalleryAtIndex} from '@utils/gallery'; import {getViewPortWidth} from '@utils/images'; diff --git a/app/components/post_list/post/body/files/image_file.tsx b/app/components/post_list/post/body/files/image_file.tsx index 0025d06b4..a1287b629 100644 --- a/app/components/post_list/post/body/files/image_file.tsx +++ b/app/components/post_list/post/body/files/image_file.tsx @@ -12,7 +12,7 @@ import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; import FileIcon from './file_icon'; import type {FileInfo} from '@mm-redux/types/files'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type ImageFileProps = { backgroundColor?: string; diff --git a/app/components/post_list/post/body/files/image_file_overlay.tsx b/app/components/post_list/post/body/files/image_file_overlay.tsx index e6b9f4876..26be7851e 100644 --- a/app/components/post_list/post/body/files/image_file_overlay.tsx +++ b/app/components/post_list/post/body/files/image_file_overlay.tsx @@ -6,7 +6,7 @@ import {PixelRatio, StyleSheet, Text, useWindowDimensions, View} from 'react-nat import {makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type ImageFileOverlayProps = { theme: Theme; diff --git a/app/components/post_list/post/body/files/index.ts b/app/components/post_list/post/body/files/index.ts index c1371836d..87b09b70d 100644 --- a/app/components/post_list/post/body/files/index.ts +++ b/app/components/post_list/post/body/files/index.ts @@ -8,8 +8,8 @@ import {canDownloadFilesOnMobile} from '@mm-redux/selectors/entities/general'; import Files from './files'; -import type {Theme} from '@mm-redux/types/preferences'; import type {GlobalState} from '@mm-redux/types/store'; +import type {Theme} from '@mm-redux/types/theme'; type OwnProps = { fileIds: string[]; diff --git a/app/components/post_list/post/body/index.ts b/app/components/post_list/post/body/index.ts index 7ee12776a..14f8a818c 100644 --- a/app/components/post_list/post/body/index.ts +++ b/app/components/post_list/post/body/index.ts @@ -15,8 +15,8 @@ import {hasEmojisOnly} from '@utils/emoji_utils'; import Body from './body'; import type {Post} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; import type {GlobalState} from '@mm-redux/types/store'; +import type {Theme} from '@mm-redux/types/theme'; type OwnProps = { highlight: boolean; diff --git a/app/components/post_list/post/body/message/index.ts b/app/components/post_list/post/body/message/index.ts index 73fcd0f14..f3f07d084 100644 --- a/app/components/post_list/post/body/message/index.ts +++ b/app/components/post_list/post/body/message/index.ts @@ -9,8 +9,8 @@ import {makeGetMentionKeysForPost} from '@mm-redux/selectors/entities/search'; import Message from './message'; import type {Post as PostType} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; import type {GlobalState} from '@mm-redux/types/store'; +import type {Theme} from '@mm-redux/types/theme'; type OwnProps = { post: PostType; diff --git a/app/components/post_list/post/body/message/message.tsx b/app/components/post_list/post/body/message/message.tsx index 818513ef1..08653c18e 100644 --- a/app/components/post_list/post/body/message/message.tsx +++ b/app/components/post_list/post/body/message/message.tsx @@ -16,7 +16,7 @@ import ShowMoreButton from './show_more_button'; import type {UserMentionKey} from '@mm-redux/selectors/entities/users'; import type {Post} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type MessageProps = { highlight: boolean; diff --git a/app/components/post_list/post/body/message/show_more_button.tsx b/app/components/post_list/post/body/message/show_more_button.tsx index 16516fa2e..7fac727a9 100644 --- a/app/components/post_list/post/body/message/show_more_button.tsx +++ b/app/components/post_list/post/body/message/show_more_button.tsx @@ -9,7 +9,7 @@ import CompassIcon from '@components/compass_icon'; import TouchableWithFeedback from '@components/touchable_with_feedback'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type ShowMoreButtonProps = { highlight: boolean; diff --git a/app/components/post_list/post/body/reactions/index.ts b/app/components/post_list/post/body/reactions/index.ts index 50530f0bd..c58569f6b 100644 --- a/app/components/post_list/post/body/reactions/index.ts +++ b/app/components/post_list/post/body/reactions/index.ts @@ -16,8 +16,8 @@ import {selectEmojisCountFromReactions} from '@selectors/emojis'; import Reactions from './reactions'; import type {Post} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; import type{GlobalState} from '@mm-redux/types/store'; +import type {Theme} from '@mm-redux/types/theme'; type OwnProps = { post: Post; diff --git a/app/components/post_list/post/body/reactions/reaction.tsx b/app/components/post_list/post/body/reactions/reaction.tsx index a98309edf..b0c565266 100644 --- a/app/components/post_list/post/body/reactions/reaction.tsx +++ b/app/components/post_list/post/body/reactions/reaction.tsx @@ -8,7 +8,7 @@ import Emoji from '@components/emoji'; import TouchableWithFeedback from '@components/touchable_with_feedback'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type ReactionProps = { count: number; diff --git a/app/components/post_list/post/body/reactions/reactions.tsx b/app/components/post_list/post/body/reactions/reactions.tsx index 8d3511cfa..58f41e493 100644 --- a/app/components/post_list/post/body/reactions/reactions.tsx +++ b/app/components/post_list/post/body/reactions/reactions.tsx @@ -13,8 +13,8 @@ import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; import Reaction from './reaction'; -import type {Theme} from '@mm-redux/types/preferences'; import type {Reaction as ReactionType} from '@mm-redux/types/reactions'; +import type {Theme} from '@mm-redux/types/theme'; type ReactionsProps = { addReaction: (postId: string, emojiName: string) => void; diff --git a/app/components/post_list/post/header/commented_on/index.tsx b/app/components/post_list/post/header/commented_on/index.tsx index 3a128217d..ad9933a0d 100644 --- a/app/components/post_list/post/header/commented_on/index.tsx +++ b/app/components/post_list/post/header/commented_on/index.tsx @@ -6,7 +6,7 @@ import React from 'react'; import FormattedText from '@components/formatted_text'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type HeaderCommentedOnProps = { name: string; diff --git a/app/components/post_list/post/header/display_name/index.tsx b/app/components/post_list/post/header/display_name/index.tsx index d412f2d53..69380ebf1 100644 --- a/app/components/post_list/post/header/display_name/index.tsx +++ b/app/components/post_list/post/header/display_name/index.tsx @@ -12,7 +12,7 @@ import TouchableWithFeedback from '@components/touchable_with_feedback'; import {preventDoubleTap} from '@utils/tap'; import {makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; import type {ImageSource} from 'react-native-vector-icons/Icon'; type HeaderDisplayNameProps = { diff --git a/app/components/post_list/post/header/header.tsx b/app/components/post_list/post/header/header.tsx index 3774cab58..3dea6f7f8 100644 --- a/app/components/post_list/post/header/header.tsx +++ b/app/components/post_list/post/header/header.tsx @@ -17,7 +17,7 @@ import HeaderReply from './reply'; import HeaderTag from './tag'; import type {Post} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type HeaderProps = { commentCount: number; diff --git a/app/components/post_list/post/header/reply/index.tsx b/app/components/post_list/post/header/reply/index.tsx index d6622eb89..72b228861 100644 --- a/app/components/post_list/post/header/reply/index.tsx +++ b/app/components/post_list/post/header/reply/index.tsx @@ -12,7 +12,7 @@ import {preventDoubleTap} from '@utils/tap'; import {makeStyleSheetFromTheme} from '@utils/theme'; import type {Post} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type HeaderReplyProps = { commentCount: number; diff --git a/app/components/post_list/post/header/tag/index.tsx b/app/components/post_list/post/header/tag/index.tsx index a47672246..b91275889 100644 --- a/app/components/post_list/post/header/tag/index.tsx +++ b/app/components/post_list/post/header/tag/index.tsx @@ -7,7 +7,7 @@ import {StyleSheet} from 'react-native'; import Tag, {BotTag, GuestTag} from '@components/tag'; import {t} from '@utils/i18n'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type HeaderTagProps = { isAutomation?: boolean; diff --git a/app/components/post_list/post/index.ts b/app/components/post_list/post/index.ts index 0b94e9e85..de5f85ac8 100644 --- a/app/components/post_list/post/index.ts +++ b/app/components/post_list/post/index.ts @@ -21,8 +21,8 @@ import {areConsecutivePosts, postUserDisplayName} from '@utils/post'; import Post from './post'; import type {Post as PostType} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; import type {GlobalState} from '@mm-redux/types/store'; +import type {Theme} from '@mm-redux/types/theme'; import type {StyleProp, ViewStyle} from 'react-native'; type OwnProps = { diff --git a/app/components/post_list/post/post.tsx b/app/components/post_list/post/post.tsx index 8a32c5de1..130c892cc 100644 --- a/app/components/post_list/post/post.tsx +++ b/app/components/post_list/post/post.tsx @@ -26,7 +26,7 @@ import PreHeader from './pre_header'; import SystemMessage from './system_message'; import type {Post as PostType} from '@mm-redux/types/posts'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type PostProps = { canDelete: boolean; diff --git a/app/components/post_list/post/pre_header/index.tsx b/app/components/post_list/post/pre_header/index.tsx index 9eb108bf1..68deb3570 100644 --- a/app/components/post_list/post/pre_header/index.tsx +++ b/app/components/post_list/post/pre_header/index.tsx @@ -9,7 +9,7 @@ import FormattedText from '@components/formatted_text'; import {t} from '@utils/i18n'; import {makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type PreHeaderProps = { isConsecutivePost?: boolean; diff --git a/app/components/post_list/post/system_message/__snapshots__/system_message_helpers.test.js.snap b/app/components/post_list/post/system_message/__snapshots__/system_message_helpers.test.js.snap index 7f0b75b40..f9553fe58 100644 --- a/app/components/post_list/post/system_message/__snapshots__/system_message_helpers.test.js.snap +++ b/app/components/post_list/post/system_message/__snapshots__/system_message_helpers.test.js.snap @@ -17,7 +17,7 @@ exports[`renderSystemMessage uses renderer for Channel Display Name update 1`] = style={ Array [ Object { - "color": "rgba(61,60,64,0.6)", + "color": "rgba(63,67,80,0.6)", "fontSize": 15, "lineHeight": 20, }, @@ -36,7 +36,7 @@ exports[`renderSystemMessage uses renderer for Channel Display Name update 1`] = { diff --git a/app/components/post_list/post_list.test.js b/app/components/post_list/post_list.test.js index 6d0f3a89f..9806cd0d0 100644 --- a/app/components/post_list/post_list.test.js +++ b/app/components/post_list/post_list.test.js @@ -25,7 +25,7 @@ describe('PostList', () => { postIds: ['post-id-1', 'post-id-2'], serverURL, siteURL: 'https://site-url.fake', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; // const deeplinkRoot = 'mattermost://server-url.fake'; diff --git a/app/components/post_list/post_list.tsx b/app/components/post_list/post_list.tsx index 23aefea81..f46f4d67a 100644 --- a/app/components/post_list/post_list.tsx +++ b/app/components/post_list/post_list.tsx @@ -26,7 +26,7 @@ import {INITIAL_BATCH_TO_RENDER, SCROLL_POSITION_CONFIG, VIEWABILITY_CONFIG} fro import PostListRefreshControl from './post_list_refresh_control'; import type {ActionResult} from '@mm-redux/types/actions'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type PostListProps = { channelId?: string; diff --git a/app/components/post_list/post_list_refresh_control.tsx b/app/components/post_list/post_list_refresh_control.tsx index a15b220cb..cf6d47415 100644 --- a/app/components/post_list/post_list_refresh_control.tsx +++ b/app/components/post_list/post_list_refresh_control.tsx @@ -4,7 +4,7 @@ import React, {ReactElement} from 'react'; import {Platform, RefreshControl, StyleSheet} from 'react-native'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type Props = { children: ReactElement; diff --git a/app/components/post_list/system_avatar/index.tsx b/app/components/post_list/system_avatar/index.tsx index b6293adc1..37364ed3e 100644 --- a/app/components/post_list/system_avatar/index.tsx +++ b/app/components/post_list/system_avatar/index.tsx @@ -7,7 +7,7 @@ import {StyleSheet, View} from 'react-native'; import CompassIcon from '@components/compass_icon'; import {ViewTypes} from '@constants'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type Props = { theme: Theme; diff --git a/app/components/post_list/system_header/system_header.tsx b/app/components/post_list/system_header/system_header.tsx index 90c722ea2..e9d600c16 100644 --- a/app/components/post_list/system_header/system_header.tsx +++ b/app/components/post_list/system_header/system_header.tsx @@ -8,7 +8,7 @@ import FormattedText from '@components/formatted_text'; import FormattedTime from '@components/formatted_time'; import {makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; import type {UserTimezone} from '@mm-redux/types/users'; type Props = { diff --git a/app/components/profile_picture/profile_picture.tsx b/app/components/profile_picture/profile_picture.tsx index 15ec19a8e..9ae91f42a 100644 --- a/app/components/profile_picture/profile_picture.tsx +++ b/app/components/profile_picture/profile_picture.tsx @@ -11,7 +11,7 @@ import UserStatus from '@components/user_status'; import {useDidUpdate} from '@hooks'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; import type {UserProfile} from '@mm-redux/types/users'; const STATUS_BUFFER = Platform.select({ diff --git a/app/components/profile_picture_button.test.js b/app/components/profile_picture_button.test.js index 04fa578ba..6db2af6e9 100644 --- a/app/components/profile_picture_button.test.js +++ b/app/components/profile_picture_button.test.js @@ -10,7 +10,7 @@ import ProfilePictureButton from './profile_picture_button.js'; describe('profile_picture_button', () => { const baseProps = { - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, currentUser: { first_name: 'Dwight', last_name: 'Schrute', diff --git a/app/components/progressive_image/__snapshots__/progressive_image.test.js.snap b/app/components/progressive_image/__snapshots__/progressive_image.test.js.snap index b926c8bfc..1ca1fdf6b 100644 --- a/app/components/progressive_image/__snapshots__/progressive_image.test.js.snap +++ b/app/components/progressive_image/__snapshots__/progressive_image.test.js.snap @@ -6,7 +6,7 @@ exports[`ProgressiveImage should match snapshot for BackgroundImage 1`] = ` Array [ Object { "alignItems": "center", - "backgroundColor": "rgba(61,60,64,0.08)", + "backgroundColor": "rgba(63,67,80,0.08)", "justifyContent": "center", }, Object {}, @@ -42,7 +42,7 @@ exports[`ProgressiveImage should match snapshot for Default Image 1`] = ` Array [ Object { "alignItems": "center", - "backgroundColor": "rgba(61,60,64,0.08)", + "backgroundColor": "rgba(63,67,80,0.08)", "justifyContent": "center", }, Object {}, @@ -78,12 +78,12 @@ exports[`ProgressiveImage should match snapshot for Image 1`] = ` Array [ Object { "alignItems": "center", - "backgroundColor": "rgba(61,60,64,0.08)", + "backgroundColor": "rgba(63,67,80,0.08)", "justifyContent": "center", }, Object {}, Object { - "backgroundColor": "rgba(61,60,64,NaN)", + "backgroundColor": "rgba(63,67,80,NaN)", }, ] } @@ -102,7 +102,7 @@ exports[`ProgressiveImage should match snapshot for Image 1`] = ` undefined, Object { "opacity": 0.5, - "tintColor": "#3d3c40", + "tintColor": "#3f4350", }, ] } diff --git a/app/components/progressive_image/progressive_image.test.js b/app/components/progressive_image/progressive_image.test.js index dbd2c7775..6020c5b8b 100644 --- a/app/components/progressive_image/progressive_image.test.js +++ b/app/components/progressive_image/progressive_image.test.js @@ -18,7 +18,7 @@ describe('ProgressiveImage', () => { onError: jest.fn(), resizeMethod: 'auto', resizeMode: 'contain', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, tintDefaultSource: false, defaultSource: undefined, }; @@ -34,7 +34,7 @@ describe('ProgressiveImage', () => { onError: jest.fn(), resizeMethod: 'auto', resizeMode: 'contain', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, tintDefaultSource: false, }; @@ -49,7 +49,7 @@ describe('ProgressiveImage', () => { onError: jest.fn(), resizeMethod: 'auto', resizeMode: 'contain', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, tintDefaultSource: false, defaultSource: null, }; @@ -67,7 +67,7 @@ describe('MiniPreview', () => { onError: jest.fn(), resizeMethod: 'auto', resizeMode: 'contain', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, tintDefaultSource: false, defaultSource: null, inViewPort: false, @@ -84,7 +84,7 @@ describe('MiniPreview', () => { onError: jest.fn(), resizeMethod: 'auto', resizeMode: 'contain', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, tintDefaultSource: false, defaultSource: null, inViewPort: false, diff --git a/app/components/radio_button/__snapshots__/radio_button_group.test.js.snap b/app/components/radio_button/__snapshots__/radio_button_group.test.js.snap index 57e55cbc9..34207e049 100644 --- a/app/components/radio_button/__snapshots__/radio_button_group.test.js.snap +++ b/app/components/radio_button/__snapshots__/radio_button_group.test.js.snap @@ -11,31 +11,31 @@ exports[`RadioButtonGroup should match snapshot 1`] = ` testID="radio-1" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } value="value" @@ -49,31 +49,31 @@ exports[`RadioButtonGroup should match snapshot 1`] = ` testID="radio-2" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } value="value" diff --git a/app/components/radio_button/radio_button_group.test.js b/app/components/radio_button/radio_button_group.test.js index 39a6647d2..ef3459bab 100644 --- a/app/components/radio_button/radio_button_group.test.js +++ b/app/components/radio_button/radio_button_group.test.js @@ -18,14 +18,14 @@ describe('RadioButtonGroup', () => { const options = [{ testID: 'radio-1', label: 'label-1', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, value: 'value', checked: true, disabled: false, }, { testID: 'radio-2', label: 'label-2', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, value: 'value', checked: false, disabled: true, diff --git a/app/components/reaction_picker/__snapshots__/reaction_picker.test.js.snap b/app/components/reaction_picker/__snapshots__/reaction_picker.test.js.snap index 9cde6cacc..8373e9078 100644 --- a/app/components/reaction_picker/__snapshots__/reaction_picker.test.js.snap +++ b/app/components/reaction_picker/__snapshots__/reaction_picker.test.js.snap @@ -20,31 +20,31 @@ exports[`Reactions Should match snapshot with default emojis 1`] = ` iconSize={32} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -55,31 +55,31 @@ exports[`Reactions Should match snapshot with default emojis 1`] = ` iconSize={32} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -90,31 +90,31 @@ exports[`Reactions Should match snapshot with default emojis 1`] = ` iconSize={32} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -125,31 +125,31 @@ exports[`Reactions Should match snapshot with default emojis 1`] = ` iconSize={32} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -160,31 +160,31 @@ exports[`Reactions Should match snapshot with default emojis 1`] = ` iconSize={32} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -195,31 +195,31 @@ exports[`Reactions Should match snapshot with default emojis 1`] = ` iconSize={32} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -232,7 +232,7 @@ exports[`Reactions Should match snapshot with default emojis 1`] = ` Array [ Object { "alignItems": "center", - "backgroundColor": "rgba(61,60,64,0.04)", + "backgroundColor": "rgba(63,67,80,0.04)", "borderRadius": 4, "justifyContent": "center", }, @@ -248,7 +248,7 @@ exports[`Reactions Should match snapshot with default emojis 1`] = ` size={31.2} style={ Object { - "color": "#3d3c40", + "color": "#3f4350", } } /> @@ -277,31 +277,31 @@ exports[`Reactions Should match snapshot with default emojis 2`] = ` iconSize={32} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -312,31 +312,31 @@ exports[`Reactions Should match snapshot with default emojis 2`] = ` iconSize={32} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -347,31 +347,31 @@ exports[`Reactions Should match snapshot with default emojis 2`] = ` iconSize={32} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -382,31 +382,31 @@ exports[`Reactions Should match snapshot with default emojis 2`] = ` iconSize={32} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -417,31 +417,31 @@ exports[`Reactions Should match snapshot with default emojis 2`] = ` iconSize={32} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -452,31 +452,31 @@ exports[`Reactions Should match snapshot with default emojis 2`] = ` iconSize={32} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -489,7 +489,7 @@ exports[`Reactions Should match snapshot with default emojis 2`] = ` Array [ Object { "alignItems": "center", - "backgroundColor": "rgba(61,60,64,0.04)", + "backgroundColor": "rgba(63,67,80,0.04)", "borderRadius": 4, "justifyContent": "center", }, @@ -505,7 +505,7 @@ exports[`Reactions Should match snapshot with default emojis 2`] = ` size={31.2} style={ Object { - "color": "#3d3c40", + "color": "#3f4350", } } /> diff --git a/app/components/reaction_picker/reaction_picker.test.js b/app/components/reaction_picker/reaction_picker.test.js index e5684b2b4..4319a3b40 100644 --- a/app/components/reaction_picker/reaction_picker.test.js +++ b/app/components/reaction_picker/reaction_picker.test.js @@ -13,7 +13,7 @@ describe('Reactions', () => { addReaction: jest.fn(), openReactionScreen: jest.fn(), recentEmojis: [], - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('Should match snapshot with default emojis', () => { diff --git a/app/components/safe_area_view/safe_area.tsx b/app/components/safe_area_view/safe_area.tsx index 04f96d8e5..faa28817d 100644 --- a/app/components/safe_area_view/safe_area.tsx +++ b/app/components/safe_area_view/safe_area.tsx @@ -5,7 +5,7 @@ import React, {useCallback} from 'react'; import {View} from 'react-native'; import {useSafeAreaInsets} from 'react-native-safe-area-context'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type SafeAreaProps = { backgroundColor?: string; diff --git a/app/components/sidebars/main/channels_list/channel_item/__snapshots__/channel_item.test.js.snap b/app/components/sidebars/main/channels_list/channel_item/__snapshots__/channel_item.test.js.snap index cf4ce307b..c7128fa71 100644 --- a/app/components/sidebars/main/channels_list/channel_item/__snapshots__/channel_item.test.js.snap +++ b/app/components/sidebars/main/channels_list/channel_item/__snapshots__/channel_item.test.js.snap @@ -3,7 +3,7 @@ exports[`ChannelItem should match snapshot 1`] = ` { onSelectChannel: () => true, shouldHideChannel: false, showUnreadForMsgs: true, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, unreadMsgs: 1, isSearchResult: false, isBot: false, diff --git a/app/components/sidebars/main/channels_list/filtered_list/__snapshots__/filtered_list.test.js.snap b/app/components/sidebars/main/channels_list/filtered_list/__snapshots__/filtered_list.test.js.snap index 694e31876..239315039 100644 --- a/app/components/sidebars/main/channels_list/filtered_list/__snapshots__/filtered_list.test.js.snap +++ b/app/components/sidebars/main/channels_list/filtered_list/__snapshots__/filtered_list.test.js.snap @@ -58,31 +58,31 @@ exports[`ChannelsList FilteredList should match snapshot 1`] = ` testID="main.sidebar.channels_list.filtered_list" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/components/sidebars/main/channels_list/filtered_list/filtered_list.test.js b/app/components/sidebars/main/channels_list/filtered_list/filtered_list.test.js index aa35c9a65..f1c8c9639 100644 --- a/app/components/sidebars/main/channels_list/filtered_list/filtered_list.test.js +++ b/app/components/sidebars/main/channels_list/filtered_list/filtered_list.test.js @@ -34,7 +34,7 @@ describe('ChannelsList FilteredList', () => { statuses: {}, styles: {}, term: 'term', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, isLandscape: false, }; diff --git a/app/components/sidebars/main/channels_list/list/__snapshots__/list.test.js.snap b/app/components/sidebars/main/channels_list/list/__snapshots__/list.test.js.snap index dd74d8a10..cc031f284 100644 --- a/app/components/sidebars/main/channels_list/list/__snapshots__/list.test.js.snap +++ b/app/components/sidebars/main/channels_list/list/__snapshots__/list.test.js.snap @@ -90,31 +90,31 @@ exports[`ChannelsList List should match snapshot with collapsed threads enabled } theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } visible={false} diff --git a/app/components/sidebars/main/channels_list/list/list.test.js b/app/components/sidebars/main/channels_list/list/list.test.js index 96a266153..1dbd8c7f5 100644 --- a/app/components/sidebars/main/channels_list/list/list.test.js +++ b/app/components/sidebars/main/channels_list/list/list.test.js @@ -19,7 +19,7 @@ describe('ChannelsList List', () => { favoriteChannelIds: [], unreadChannelIds: [], styles: {}, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, orderedChannelIds: [], isLandscape: false, }; diff --git a/app/components/sidebars/main/channels_list/switch_teams_button/__snapshots__/switch_teams_button.test.js.snap b/app/components/sidebars/main/channels_list/switch_teams_button/__snapshots__/switch_teams_button.test.js.snap index 1aec2b846..c468ffa95 100644 --- a/app/components/sidebars/main/channels_list/switch_teams_button/__snapshots__/switch_teams_button.test.js.snap +++ b/app/components/sidebars/main/channels_list/switch_teams_button/__snapshots__/switch_teams_button.test.js.snap @@ -6,7 +6,7 @@ exports[`SwitchTeamsButton should match snapshot 1`] = ` > { currentTeamId: 'current-team-id', mentionCount: 1, teamsCount: 2, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/components/sidebars/main/main_sidebar.test.js b/app/components/sidebars/main/main_sidebar.test.js index 4b9c7e526..f447354a5 100644 --- a/app/components/sidebars/main/main_sidebar.test.js +++ b/app/components/sidebars/main/main_sidebar.test.js @@ -24,7 +24,7 @@ describe('MainSidebar', () => { deviceWidth: 10, isLandscape: false, teamsCount: 2, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; const loadShallow = (props) => { @@ -60,8 +60,8 @@ describe('MainSidebar', () => { }); test('should re-render when the theme changes', () => { - const theme = Preferences.THEMES.default; - const newTheme = Preferences.THEMES.organization; + const theme = Preferences.THEMES.denim; + const newTheme = Preferences.THEMES.sapphire; const props = { ...baseProps, theme, diff --git a/app/components/sidebars/main/teams_list/teams_list_item/__snapshots__/teams_list_item.test.js.snap b/app/components/sidebars/main/teams_list/teams_list_item/__snapshots__/teams_list_item.test.js.snap index 33ee8fde2..eb6907cbb 100644 --- a/app/components/sidebars/main/teams_list/teams_list_item/__snapshots__/teams_list_item.test.js.snap +++ b/app/components/sidebars/main/teams_list/teams_list_item/__snapshots__/teams_list_item.test.js.snap @@ -11,7 +11,7 @@ exports[`TeamsListItem should match snapshot 1`] = ` > { mentionCount: 1, name: 'name', teamId: 'team-id', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/components/sidebars/main/threads_entry/threads_entry.tsx b/app/components/sidebars/main/threads_entry/threads_entry.tsx index 7d772da2e..b2be2e1f8 100644 --- a/app/components/sidebars/main/threads_entry/threads_entry.tsx +++ b/app/components/sidebars/main/threads_entry/threads_entry.tsx @@ -14,8 +14,8 @@ import {makeStyleFromTheme} from '@mm-redux/utils/theme_utils'; import {preventDoubleTap} from '@utils/tap'; import {changeOpacity} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; import type {Team} from '@mm-redux/types/teams'; +import type {Theme} from '@mm-redux/types/theme'; import type {ThreadsState} from '@mm-redux/types/threads'; import type {UserProfile} from '@mm-redux/types/users'; import type {$ID} from '@mm-redux/types/utilities'; diff --git a/app/components/sidebars/settings/__snapshots__/drawer_item.test.js.snap b/app/components/sidebars/settings/__snapshots__/drawer_item.test.js.snap index 4770ddb6a..c0a35ad25 100644 --- a/app/components/sidebars/settings/__snapshots__/drawer_item.test.js.snap +++ b/app/components/sidebars/settings/__snapshots__/drawer_item.test.js.snap @@ -30,11 +30,11 @@ exports[`DrawerItem should match snapshot 1`] = ` style={ Array [ Object { - "color": "rgba(61,60,64,0.64)", + "color": "rgba(63,67,80,0.64)", "fontSize": 24, }, Object { - "color": "#fd5960", + "color": "#d24b4e", }, ] } @@ -63,13 +63,13 @@ exports[`DrawerItem should match snapshot 1`] = ` style={ Array [ Object { - "color": "rgba(61,60,64,0.5)", + "color": "rgba(63,67,80,0.5)", "fontSize": 17, "includeFontPadding": false, "textAlignVertical": "center", }, Object { - "color": "#fd5960", + "color": "#d24b4e", }, Object { "textAlign": "center", @@ -82,7 +82,7 @@ exports[`DrawerItem should match snapshot 1`] = ` { iconName: 'icon-name', isDestructor: true, separator: true, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/components/sidebars/settings/settings_sidebar.test.js b/app/components/sidebars/settings/settings_sidebar.test.js index 8950f6c30..7b74c06b3 100644 --- a/app/components/sidebars/settings/settings_sidebar.test.js +++ b/app/components/sidebars/settings/settings_sidebar.test.js @@ -26,7 +26,7 @@ describe('SettingsSidebar', () => { id: 'user-id', }, status: 'offline', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, isCustomStatusEnabled: false, isCustomStatusExpired: false, isCustomStatusExpirySupported: false, diff --git a/app/components/team_icon/__snapshots__/team_icon.test.js.snap b/app/components/team_icon/__snapshots__/team_icon.test.js.snap index 3b5ce4fd2..94179dd0d 100644 --- a/app/components/team_icon/__snapshots__/team_icon.test.js.snap +++ b/app/components/team_icon/__snapshots__/team_icon.test.js.snap @@ -6,7 +6,7 @@ exports[`TeamIcon should match snapshot 1`] = ` Array [ Object { "alignItems": "center", - "backgroundColor": "#145dbf", + "backgroundColor": "#1e325c", "borderRadius": 2, "height": 30, "justifyContent": "center", diff --git a/app/components/team_icon/team_icon.test.js b/app/components/team_icon/team_icon.test.js index ca564ec56..064f5d156 100644 --- a/app/components/team_icon/team_icon.test.js +++ b/app/components/team_icon/team_icon.test.js @@ -17,7 +17,7 @@ describe('TeamIcon', () => { styleContainer: {}, styleText: {}, styleImage: {}, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/components/user_status/__snapshots__/user_status.test.js.snap b/app/components/user_status/__snapshots__/user_status.test.js.snap index 9a6c55a80..e89aed7e1 100644 --- a/app/components/user_status/__snapshots__/user_status.test.js.snap +++ b/app/components/user_status/__snapshots__/user_status.test.js.snap @@ -5,7 +5,7 @@ exports[`UserStatus should match snapshot, away status 1`] = ` name="clock" style={ Object { - "color": "#ffbc42", + "color": "#ffbc1f", "fontSize": 32, } } @@ -18,7 +18,7 @@ exports[`UserStatus should match snapshot, dnd status 1`] = ` name="minus-circle" style={ Object { - "color": "#f74343", + "color": "#d24b4e", "fontSize": 32, } } @@ -31,7 +31,7 @@ exports[`UserStatus should match snapshot, online status 1`] = ` name="check-circle" style={ Object { - "color": "#06d6a0", + "color": "#3db887", "fontSize": 32, } } diff --git a/app/components/user_status/user_status.test.js b/app/components/user_status/user_status.test.js index 5de12e3ff..09d58db4c 100644 --- a/app/components/user_status/user_status.test.js +++ b/app/components/user_status/user_status.test.js @@ -12,7 +12,7 @@ import UserStatus from './user_status'; describe('UserStatus', () => { const baseProps = { size: 32, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot, should default to offline status', () => { diff --git a/app/components/user_status/user_status.tsx b/app/components/user_status/user_status.tsx index 6c44da65b..2022131e5 100644 --- a/app/components/user_status/user_status.tsx +++ b/app/components/user_status/user_status.tsx @@ -7,7 +7,7 @@ import CompassIcon from '@components/compass_icon'; import {General} from '@mm-redux/constants'; import {changeOpacity} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type UserStatusProps = { size: number; diff --git a/app/components/widgets/settings/__snapshots__/radio_setting.test.js.snap b/app/components/widgets/settings/__snapshots__/radio_setting.test.js.snap index 40556fe61..1705a6384 100644 --- a/app/components/widgets/settings/__snapshots__/radio_setting.test.js.snap +++ b/app/components/widgets/settings/__snapshots__/radio_setting.test.js.snap @@ -14,7 +14,7 @@ exports[`components/widgets/settings/RadioSetting should match snapshot when err { - const theme = Preferences.THEMES.default; + const theme = Preferences.THEMES.denim; test('onChange', () => { const onChange = jest.fn(); const wrapper = shallow( diff --git a/app/components/widgets/settings/bool_setting.tsx b/app/components/widgets/settings/bool_setting.tsx index d19115e6b..3d400ac9e 100644 --- a/app/components/widgets/settings/bool_setting.tsx +++ b/app/components/widgets/settings/bool_setting.tsx @@ -10,7 +10,7 @@ import { import FormattedText from '@components/formatted_text'; import Markdown from '@components/markdown'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {getMarkdownBlockStyles, getMarkdownTextStyles} from '@utils/markdown'; import { changeOpacity, diff --git a/app/components/widgets/settings/radio_setting.test.js b/app/components/widgets/settings/radio_setting.test.js index edda95efb..94563e8aa 100644 --- a/app/components/widgets/settings/radio_setting.test.js +++ b/app/components/widgets/settings/radio_setting.test.js @@ -10,7 +10,7 @@ import Preferences from '@mm-redux/constants/preferences'; import RadioSetting from './radio_setting.js'; describe('components/widgets/settings/RadioSetting', () => { - const theme = Preferences.THEMES.default; + const theme = Preferences.THEMES.denim; const options = [ {text: 'this is engineering', value: 'Engineering'}, {text: 'this is sales', value: 'Sales'}, diff --git a/app/components/widgets/settings/text_setting.test.js b/app/components/widgets/settings/text_setting.test.js index fdf3a5d67..e2e76c46a 100644 --- a/app/components/widgets/settings/text_setting.test.js +++ b/app/components/widgets/settings/text_setting.test.js @@ -8,7 +8,7 @@ import Preferences from '@mm-redux/constants/preferences'; import TextSetting from './text_setting.js'; describe('components/widgets/settings/TextSetting', () => { - const theme = Preferences.THEMES.default; + const theme = Preferences.THEMES.denim; test('onChange', () => { const onChange = jest.fn(); const wrapper = shallow( diff --git a/app/mm-redux/constants/preferences.ts b/app/mm-redux/constants/preferences.ts index c22f30aa5..6da4bc4f9 100644 --- a/app/mm-redux/constants/preferences.ts +++ b/app/mm-redux/constants/preferences.ts @@ -1,7 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {Theme} from '@mm-redux/types/preferences'; +import {Theme, ThemeKey} from '@mm-redux/types/theme'; import {Dictionary} from '@mm-redux/types/utilities'; const Preferences: Dictionary = { @@ -55,115 +55,142 @@ const Preferences: Dictionary = { TEAMS_ORDER: 'teams_order', CATEGORY_THEME: 'theme', THEMES: { - default: { - type: 'Mattermost', - sidebarBg: '#145dbf', + denim: { + type: 'Denim', + sidebarBg: '#1e325c', sidebarText: '#ffffff', sidebarUnreadText: '#ffffff', - sidebarTextHoverBg: '#4578bf', - sidebarTextActiveBorder: '#579eff', + sidebarTextHoverBg: '#28427b', + sidebarTextActiveBorder: '#5d89ea', sidebarTextActiveColor: '#ffffff', - sidebarHeaderBg: '#1153ab', + sidebarHeaderBg: '#192a4d', sidebarHeaderTextColor: '#ffffff', - onlineIndicator: '#06d6a0', - awayIndicator: '#ffbc42', - dndIndicator: '#f74343', + sidebarTeamBarBg: '#14213e', + onlineIndicator: '#3db887', + awayIndicator: '#ffbc1f', + dndIndicator: '#d24b4e', mentionBg: '#ffffff', - mentionBj: '#ffffff', - mentionColor: '#145dbf', + mentionColor: '#1e325c', centerChannelBg: '#ffffff', - centerChannelColor: '#3d3c40', - newMessageSeparator: '#ff8800', - linkColor: '#2389d7', - buttonBg: '#166de0', + centerChannelColor: '#3f4350', + newMessageSeparator: '#cc8f00', + linkColor: '#386fe5', + buttonBg: '#1c58d9', buttonColor: '#ffffff', - errorTextColor: '#fd5960', - mentionHighlightBg: '#ffe577', - mentionHighlightLink: '#166de0', + errorTextColor: '#d24b4e', + mentionHighlightBg: '#ffd470', + mentionHighlightLink: '#1b1d22', codeTheme: 'github', - } as Theme, - organization: { - type: 'Organization', - sidebarBg: '#2071a7', + }, + sapphire: { + type: 'Sapphire', + sidebarBg: '#174ab5', sidebarText: '#ffffff', sidebarUnreadText: '#ffffff', - sidebarTextHoverBg: '#136197', - sidebarTextActiveBorder: '#7ab0d6', + sidebarTextHoverBg: '#2a58ba', + sidebarTextActiveBorder: '#57b5f0', sidebarTextActiveColor: '#ffffff', - sidebarHeaderBg: '#2f81b7', + sidebarHeaderBg: '#1542a2', sidebarHeaderTextColor: '#ffffff', - onlineIndicator: '#7dbe00', - awayIndicator: '#dcbd4e', - dndIndicator: '#ff6a6a', - mentionBg: '#fbfbfb', - mentionBj: '#fbfbfb', - mentionColor: '#2071f7', - centerChannelBg: '#f2f4f8', - centerChannelColor: '#333333', - newMessageSeparator: '#ff8800', - linkColor: '#2f81b7', - buttonBg: '#1dacfc', + sidebarTeamBarBg: '#133a91', + onlineIndicator: '#3db887', + awayIndicator: '#ffbc1f', + dndIndicator: '#d24b4e', + mentionBg: '#ffffff', + mentionColor: '#174ab5', + centerChannelBg: '#ffffff', + centerChannelColor: '#3f4350', + newMessageSeparator: '#15b7b7', + linkColor: '#1c58d9', + buttonBg: '#1c58d9', buttonColor: '#ffffff', - errorTextColor: '#a94442', - mentionHighlightBg: '#f3e197', - mentionHighlightLink: '#2f81b7', + errorTextColor: '#d24b4e', + mentionHighlightBg: '#7ff0f0', + mentionHighlightLink: '#0d6e6e', codeTheme: 'github', - } as Theme, - mattermostDark: { - type: 'Mattermost Dark', - sidebarBg: '#1b2c3e', + }, + quartz: { + type: 'Quartz', + sidebarBg: '#f4f4f6', + sidebarText: '#090a0b', + sidebarUnreadText: '#2d3039', + sidebarTextHoverBg: '#ebebed', + sidebarTextActiveBorder: '#32a4ec', + sidebarTextActiveColor: '#2d3039', + sidebarHeaderBg: '#e8e9ed', + sidebarHeaderTextColor: '#2d3039', + sidebarTeamBarBg: '#dddfe4', + onlineIndicator: '#3db887', + awayIndicator: '#f5ab07', + dndIndicator: '#d24b4e', + mentionBg: '#1c58d9', + mentionColor: '#ffffff', + centerChannelBg: '#ffffff', + centerChannelColor: '#3f4350', + newMessageSeparator: '#15b7b7', + linkColor: '#1c58d9', + buttonBg: '#1c58d9', + buttonColor: '#ffffff', + errorTextColor: '#d24b4e', + mentionHighlightBg: '#7ff0f0', + mentionHighlightLink: '#0d6e6e', + codeTheme: 'github', + }, + indigo: { + type: 'Indigo', + sidebarBg: '#0f1a2e', sidebarText: '#ffffff', sidebarUnreadText: '#ffffff', - sidebarTextHoverBg: '#4a5664', - sidebarTextActiveBorder: '#66b9a7', + sidebarTextHoverBg: '#222c3f', + sidebarTextActiveBorder: '#1279ba', sidebarTextActiveColor: '#ffffff', - sidebarHeaderBg: '#1b2c3e', - sidebarHeaderTextColor: '#ffffff', - onlineIndicator: '#65dcc8', - awayIndicator: '#c1b966', - dndIndicator: '#e81023', - mentionBg: '#b74a4a', - mentionBj: '#b74a4a', + sidebarHeaderBg: '#152231', + sidebarHeaderTextColor: '#dddfe4', + sidebarTeamBarBg: '#05080f', + onlineIndicator: '#3db887', + awayIndicator: '#f5ab00', + dndIndicator: '#d24b4e', + mentionBg: '#1c58d9', mentionColor: '#ffffff', - centerChannelBg: '#2f3e4e', - centerChannelColor: '#dddddd', - newMessageSeparator: '#5de5da', - linkColor: '#a4ffeb', - buttonBg: '#4cbba4', + centerChannelBg: '#0a111f', + centerChannelColor: '#dddfe4', + newMessageSeparator: '#81a3ef', + linkColor: '#5d89ea', + buttonBg: '#386fe5', buttonColor: '#ffffff', - errorTextColor: '#ff6461', - mentionHighlightBg: '#984063', - mentionHighlightLink: '#a4ffeb', - codeTheme: 'solarized-dark', - } as Theme, - windows10: { - type: 'Windows Dark', - sidebarBg: '#171717', + errorTextColor: '#d24b4e', + mentionHighlightBg: '#133a91', + mentionHighlightLink: '#a4f4f4', + codeTheme: 'github', + }, + onyx: { + type: 'Onyx', + sidebarBg: '#121317', sidebarText: '#ffffff', sidebarUnreadText: '#ffffff', - sidebarTextHoverBg: '#302e30', - sidebarTextActiveBorder: '#196caf', + sidebarTextHoverBg: '#25262a', + sidebarTextActiveBorder: '#1592e0', sidebarTextActiveColor: '#ffffff', - sidebarHeaderBg: '#1f1f1f', - sidebarHeaderTextColor: '#ffffff', - onlineIndicator: '#399fff', - awayIndicator: '#c1b966', - dndIndicator: '#e81023', - mentionBg: '#0177e7', - mentionBj: '#0177e7', + sidebarHeaderBg: '#1b1d22', + sidebarHeaderTextColor: '#dddfe4', + sidebarTeamBarBg: '#000000', + onlineIndicator: '#3db887', + awayIndicator: '#f5ab00', + dndIndicator: '#d24b4e', + mentionBg: '#1c58d9', mentionColor: '#ffffff', - centerChannelBg: '#1f1f1f', - centerChannelColor: '#dddddd', - newMessageSeparator: '#cc992d', - linkColor: '#0d93ff', - buttonBg: '#0177e7', + centerChannelBg: '#090a0b', + centerChannelColor: '#dddfe4', + newMessageSeparator: '#1adbdb', + linkColor: '#5d89ea', + buttonBg: '#386fe5', buttonColor: '#ffffff', - errorTextColor: '#ff6461', - mentionHighlightBg: '#784098', - mentionHighlightLink: '#a4ffeb', + errorTextColor: '#da6c6e', + mentionHighlightBg: '#0d6e6e', + mentionHighlightLink: '#a4f4f4', codeTheme: 'monokai', - } as Theme, - }, + }, + } as Record, }; export default Preferences; diff --git a/app/mm-redux/selectors/entities/preferences.test.js b/app/mm-redux/selectors/entities/preferences.test.js index 1ee61ef0b..cf3ab06d6 100644 --- a/app/mm-redux/selectors/entities/preferences.test.js +++ b/app/mm-redux/selectors/entities/preferences.test.js @@ -190,7 +190,7 @@ describe('Selectors.Preferences', () => { }, }, }, - }), Preferences.THEMES.default); + }), Preferences.THEMES.denim); }); it('custom theme', () => { @@ -415,13 +415,13 @@ describe('Selectors.Preferences', () => { }, }, }, - }).mentionHighlightLink, Preferences.THEMES.default.mentionHighlightLink); + }).mentionHighlightLink, Preferences.THEMES.denim.mentionHighlightLink); }); it('system theme with missing colours', () => { const currentTeamId = '1234'; const theme = { - type: Preferences.THEMES.mattermostDark.type, + type: Preferences.THEMES.indigo.type, sidebarBg: '#ff0000', }; @@ -443,13 +443,13 @@ describe('Selectors.Preferences', () => { }, }, }, - }).sidebarText, Preferences.THEMES.mattermostDark.sidebarText); + }).sidebarText, Preferences.THEMES.indigo.sidebarText); }); it('non-default system theme', () => { const currentTeamId = '1234'; const theme = { - type: Preferences.THEMES.windows10.type, + type: Preferences.THEMES.onyx.type, }; assert.equal(Selectors.getTheme({ @@ -470,7 +470,7 @@ describe('Selectors.Preferences', () => { }, }, }, - }).codeTheme, Preferences.THEMES.windows10.codeTheme); + }).codeTheme, Preferences.THEMES.onyx.codeTheme); }); it('should return the server-configured theme by default', () => { @@ -478,7 +478,7 @@ describe('Selectors.Preferences', () => { entities: { general: { config: { - DefaultTheme: 'mattermostDark', + DefaultTheme: 'indigo', }, }, teams: { @@ -490,14 +490,14 @@ describe('Selectors.Preferences', () => { }, }, }, - }).codeTheme, Preferences.THEMES.mattermostDark.codeTheme); + }).codeTheme, Preferences.THEMES.indigo.codeTheme); // Opposite case assert.notEqual(Selectors.getTheme({ entities: { general: { config: { - DefaultTheme: 'windows10', + DefaultTheme: 'onyx', }, }, teams: { @@ -509,7 +509,7 @@ describe('Selectors.Preferences', () => { }, }, }, - }).codeTheme, Preferences.THEMES.mattermostDark.codeTheme); + }).codeTheme, Preferences.THEMES.indigo.codeTheme); }); it('returns the "default" theme if the server-configured value is not present', () => { @@ -529,7 +529,7 @@ describe('Selectors.Preferences', () => { }, }, }, - }).codeTheme, Preferences.THEMES.default.codeTheme); + }).codeTheme, Preferences.THEMES.denim.codeTheme); }); }); diff --git a/app/mm-redux/selectors/entities/preferences.ts b/app/mm-redux/selectors/entities/preferences.ts index a84dd9628..f9ff6e07e 100644 --- a/app/mm-redux/selectors/entities/preferences.ts +++ b/app/mm-redux/selectors/entities/preferences.ts @@ -7,8 +7,10 @@ import {getConfig, getFeatureFlagValue, getLicense} from '@mm-redux/selectors/en import {getCurrentTeamId} from '@mm-redux/selectors/entities/teams'; import {PreferenceType} from '@mm-redux/types/preferences'; import {GlobalState} from '@mm-redux/types/store'; +import {Theme} from '@mm-redux/types/theme'; import {createShallowSelector} from '@mm-redux/utils/helpers'; import {getPreferenceKey} from '@mm-redux/utils/preference_utils'; +import {setThemeDefaults} from '@mm-redux/utils/theme_utils'; import {General, Preferences} from '../../constants'; @@ -133,52 +135,20 @@ const getDefaultTheme = reselect.createSelector(getConfig, (config) => { } // If no config.DefaultTheme or value doesn't refer to a valid theme name... - return Preferences.THEMES.default; + return Preferences.THEMES.denim; }); export const getTheme = createShallowSelector( getThemePreference, getDefaultTheme, (themePreference, defaultTheme) => { - let theme: any; - if (themePreference) { - theme = themePreference.value; - } else { - theme = defaultTheme; - } - - if (typeof theme === 'string') { - // A custom theme will be a JSON-serialized object stored in a preference - theme = JSON.parse(theme); - } + const themeValue: Theme | string = themePreference?.value ?? defaultTheme; + // A custom theme will be a JSON-serialized object stored in a preference // At this point, the theme should be a plain object + const theme: Theme = typeof themeValue === 'string' ? JSON.parse(themeValue) : themeValue; - // If this is a system theme, find it in case the user's theme is missing any fields - if (theme.type && theme.type !== 'custom') { - const match = Object.values(Preferences.THEMES).find((v: any) => v.type === theme.type) as any; - if (match) { - if (!match.mentionBg) { - match.mentionBg = match.mentionBj; - } - - return match; - } - } - - for (const key of Object.keys(defaultTheme)) { - if (theme[key]) { - // Fix a case where upper case theme colours are rendered as black - theme[key] = theme[key].toLowerCase(); - } - } - - // Backwards compatability with old name - if (!theme.mentionBg) { - theme.mentionBg = theme.mentionBj; - } - - return Object.assign({}, defaultTheme, theme); + return setThemeDefaults(theme); }, ); diff --git a/app/mm-redux/types/preferences.ts b/app/mm-redux/types/preferences.ts index aa1d4f2df..32c5e527f 100644 --- a/app/mm-redux/types/preferences.ts +++ b/app/mm-redux/types/preferences.ts @@ -10,32 +10,3 @@ export type PreferenceType = { export type PreferencesType = { [x: string]: PreferenceType; }; - -export type Theme = { - [key: string]: string | undefined; - type?: string; - sidebarBg: string; - sidebarText: string; - sidebarUnreadText: string; - sidebarTextHoverBg: string; - sidebarTextActiveBorder: string; - sidebarTextActiveColor: string; - sidebarHeaderBg: string; - sidebarHeaderTextColor: string; - onlineIndicator: string; - awayIndicator: string; - dndIndicator: string; - mentionBg: string; - mentionBj: string; - mentionColor: string; - centerChannelBg: string; - centerChannelColor: string; - newMessageSeparator: string; - linkColor: string; - buttonBg: string; - buttonColor: string; - errorTextColor: string; - mentionHighlightBg: string; - mentionHighlightLink: string; - codeTheme: string; -}; diff --git a/app/mm-redux/types/theme.ts b/app/mm-redux/types/theme.ts new file mode 100644 index 000000000..1b7c2d040 --- /dev/null +++ b/app/mm-redux/types/theme.ts @@ -0,0 +1,41 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +export type LegacyThemeKey = 'default' | 'organization' | 'mattermostDark' | 'windows10'; + +export type ThemeKey = 'denim' | 'sapphire' | 'quartz' | 'indigo' | 'onyx'; + +export type LegacyThemeType = 'Mattermost' | 'Organization' | 'Mattermost Dark' | 'Windows Dark'; + +export type ThemeType = 'Denim' | 'Sapphire' | 'Quartz' | 'Indigo' | 'Onyx'; + +export type Theme = { + [key: string]: string | undefined; + type?: ThemeType | 'custom'; + sidebarBg: string; + sidebarText: string; + sidebarUnreadText: string; + sidebarTextHoverBg: string; + sidebarTextActiveBorder: string; + sidebarTextActiveColor: string; + sidebarHeaderBg: string; + sidebarHeaderTextColor: string; + sidebarTeamBarBg: string; + onlineIndicator: string; + awayIndicator: string; + dndIndicator: string; + mentionBg: string; + mentionColor: string; + centerChannelBg: string; + centerChannelColor: string; + newMessageSeparator: string; + linkColor: string; + buttonBg: string; + buttonColor: string; + errorTextColor: string; + mentionHighlightBg: string; + mentionHighlightLink: string; + codeTheme: string; +}; + +export type ThemeTypeMap = Record; diff --git a/app/mm-redux/utils/theme_utils.test.js b/app/mm-redux/utils/theme_utils.test.js index f4cdec4b2..d8b2be085 100644 --- a/app/mm-redux/utils/theme_utils.test.js +++ b/app/mm-redux/utils/theme_utils.test.js @@ -71,7 +71,7 @@ describe('ThemeUtils', () => { describe('setThemeDefaults', () => { it('blank theme', () => { const input = {}; - const expected = {...Preferences.THEMES.default}; + const expected = {...Preferences.THEMES.denim}; delete expected.type; assert.deepEqual(ThemeUtils.setThemeDefaults(input), expected); diff --git a/app/mm-redux/utils/theme_utils.ts b/app/mm-redux/utils/theme_utils.ts index 9092a22d3..314685e98 100644 --- a/app/mm-redux/utils/theme_utils.ts +++ b/app/mm-redux/utils/theme_utils.ts @@ -1,7 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {Theme} from '@mm-redux/types/preferences'; +import {Theme, ThemeTypeMap} from '@mm-redux/types/theme'; import {Preferences} from '../constants'; @@ -71,7 +71,7 @@ function blendComponent(background: number, foreground: number, opacity: number) return ((1 - opacity) * background) + (opacity * foreground); } -export function blendColors(background: string, foreground: string, opacity: number): string { +export function blendColors(background: string, foreground: string, opacity: number, hex = false): string { const backgroundComponents = getComponents(background); const foregroundComponents = getComponents(foreground); @@ -96,21 +96,76 @@ export function blendColors(background: string, foreground: string, opacity: num opacity, ); + if (hex) { + let r = red.toString(16); + let g = green.toString(16); + let b = blue.toString(16); + + if (r.length === 1) { + r = '0' + r; + } + if (g.length === 1) { + g = '0' + g; + } + if (b.length === 1) { + b = '0' + b; + } + + return `#${r + g + b}`; + } + return `rgba(${red},${green},${blue},${alpha})`; } -// setThemeDefaults will set defaults on the theme for any unset properties. -export function setThemeDefaults(theme: Theme): Theme { - const defaultTheme = Preferences.THEMES.default; +// object mapping theme types to their respective keys for retrieving the source themes directly +// - supports mapping old themes to new themes +const themeTypeMap: ThemeTypeMap = { + Mattermost: 'denim', + Organization: 'sapphire', + 'Mattermost Dark': 'indigo', + 'Windows Dark': 'onyx', + Denim: 'denim', + Sapphire: 'sapphire', + Quartz: 'quartz', + Indigo: 'indigo', + Onyx: 'onyx', +}; - for (const property in defaultTheme) { - if (property === 'type') { - continue; - } - if (theme[property] == null) { - theme[property] = defaultTheme[property]; +// setThemeDefaults will set defaults on the theme for any unset properties. +export function setThemeDefaults(theme: Partial): Theme { + const defaultTheme = Preferences.THEMES.denim; + + const processedTheme = {...theme}; + + // If this is a system theme, return the source theme object matching the theme preference type + if (theme.type && theme.type !== 'custom' && Object.keys(themeTypeMap).includes(theme.type)) { + return Preferences.THEMES[themeTypeMap[theme.type]]; + } + + for (const key of Object.keys(defaultTheme)) { + if (theme[key]) { + // Fix a case where upper case theme colours are rendered as black + processedTheme[key] = theme[key]?.toLowerCase(); } } - return theme; + for (const property in defaultTheme) { + if (property === 'type' || (property === 'sidebarTeamBarBg' && theme.sidebarHeaderBg)) { + continue; + } + if (theme[property] == null) { + processedTheme[property] = defaultTheme[property]; + } + + // Backwards compatability with old name + if (!theme.mentionBg && theme.mentionBj) { + processedTheme.mentionBg = theme.mentionBj; + } + } + + if (!theme.sidebarTeamBarBg && theme.sidebarHeaderBg) { + processedTheme.sidebarTeamBarBg = blendColors(theme.sidebarHeaderBg, '#000000', 0.2, true); + } + + return processedTheme as Theme; } diff --git a/app/screens/apps_form/__snapshots__/apps_form_component.test.tsx.snap b/app/screens/apps_form/__snapshots__/apps_form_component.test.tsx.snap index 74a3b9b9c..d94e3875c 100644 --- a/app/screens/apps_form/__snapshots__/apps_form_component.test.tsx.snap +++ b/app/screens/apps_form/__snapshots__/apps_form_component.test.tsx.snap @@ -4,7 +4,7 @@ exports[`AppsForm should set match snapshot 1`] = ` { ], }, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should set match snapshot', () => { diff --git a/app/screens/apps_form/apps_form_component.tsx b/app/screens/apps_form/apps_form_component.tsx index 3191cf480..fc2a1a338 100644 --- a/app/screens/apps_form/apps_form_component.tsx +++ b/app/screens/apps_form/apps_form_component.tsx @@ -16,7 +16,7 @@ import {AppCallResponseTypes, AppFieldTypes} from '@mm-redux/constants/apps'; import {ActionResult} from '@mm-redux/types/actions'; import {AppCallRequest, AppField, AppForm, AppFormValue, AppFormValues, AppLookupResponse, AppSelectOption, FormResponseData} from '@mm-redux/types/apps'; import {DialogElement} from '@mm-redux/types/integrations'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {checkDialogElementForError, checkIfErrorsMatchElements} from '@mm-redux/utils/integration_utils'; import {getMarkdownBlockStyles, getMarkdownTextStyles} from '@utils/markdown'; import {preventDoubleTap} from '@utils/tap'; diff --git a/app/screens/apps_form/apps_form_container.tsx b/app/screens/apps_form/apps_form_container.tsx index 22838e3c6..1e39124ea 100644 --- a/app/screens/apps_form/apps_form_container.tsx +++ b/app/screens/apps_form/apps_form_container.tsx @@ -7,7 +7,7 @@ import {intlShape} from 'react-intl'; import {AppCallResponseTypes, AppCallTypes} from '@mm-redux/constants/apps'; import {ActionResult} from '@mm-redux/types/actions'; import {AppCallResponse, AppCallRequest, AppField, AppForm, AppFormValues, FormResponseData, AppLookupResponse} from '@mm-redux/types/apps'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {DoAppCall, DoAppCallResult, PostEphemeralCallResponseForContext} from '@mm-types/actions/apps'; import {makeCallErrorResponse} from '@utils/apps'; diff --git a/app/screens/apps_form/apps_form_field.tsx b/app/screens/apps_form/apps_form_field.tsx index f7eacb2dc..17557b9a1 100644 --- a/app/screens/apps_form/apps_form_field.tsx +++ b/app/screens/apps_form/apps_form_field.tsx @@ -12,7 +12,7 @@ import {ViewTypes} from '@constants/index'; import {AppFieldTypes} from '@mm-redux/constants/apps'; import {AppField, AppFormValue, AppSelectOption} from '@mm-redux/types/apps'; import {DialogOption} from '@mm-redux/types/integrations'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {getMarkdownBlockStyles, getMarkdownTextStyles} from '@utils/markdown'; import {makeStyleSheetFromTheme} from '@utils/theme'; diff --git a/app/screens/apps_form/dialog_introduction_text.test.tsx b/app/screens/apps_form/dialog_introduction_text.test.tsx index 5c3af6285..abc788b79 100644 --- a/app/screens/apps_form/dialog_introduction_text.test.tsx +++ b/app/screens/apps_form/dialog_introduction_text.test.tsx @@ -10,7 +10,7 @@ import DialogIntroductionText from './dialog_introduction_text'; describe('DialogIntroductionText', () => { const baseProps = { - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, value: '**bold** *italic* [link](https://mattermost.com/)
[link target blank](!https://mattermost.com/)', }; diff --git a/app/screens/apps_form/dialog_introduction_text.tsx b/app/screens/apps_form/dialog_introduction_text.tsx index 805987a37..b1ef71cd0 100644 --- a/app/screens/apps_form/dialog_introduction_text.tsx +++ b/app/screens/apps_form/dialog_introduction_text.tsx @@ -5,7 +5,7 @@ import React, {PureComponent} from 'react'; import {View} from 'react-native'; import Markdown from '@components/markdown'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {getMarkdownBlockStyles, getMarkdownTextStyles} from '@utils/markdown'; import {makeStyleSheetFromTheme} from '@utils/theme'; diff --git a/app/screens/channel/channel_base.test.js b/app/screens/channel/channel_base.test.js index 08ff3a8ac..ba0fb154f 100644 --- a/app/screens/channel/channel_base.test.js +++ b/app/screens/channel/channel_base.test.js @@ -25,7 +25,7 @@ describe('ChannelBase', () => { selectInitialChannel: jest.fn(), }, componentId: channelBaseComponentId, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; const optionsForTheme = (theme) => { return { @@ -63,9 +63,9 @@ describe('ChannelBase', () => { expect(mergeNavigationOptions.mock.calls).toEqual([]); mergeNavigationOptions.mockClear(); - wrapper.setProps({theme: Preferences.THEMES.mattermostDark}); + wrapper.setProps({theme: Preferences.THEMES.indigo}); - const newThemeOptions = optionsForTheme(Preferences.THEMES.mattermostDark); + const newThemeOptions = optionsForTheme(Preferences.THEMES.indigo); expect(mergeNavigationOptions.mock.calls).toEqual([ [baseProps.componentId, newThemeOptions], [componentIds[2], newThemeOptions], diff --git a/app/screens/channel/channel_nav_bar/__snapshots__/channel_nav_bar.test.js.snap b/app/screens/channel/channel_nav_bar/__snapshots__/channel_nav_bar.test.js.snap index 8bed6cc5c..8c223a978 100644 --- a/app/screens/channel/channel_nav_bar/__snapshots__/channel_nav_bar.test.js.snap +++ b/app/screens/channel/channel_nav_bar/__snapshots__/channel_nav_bar.test.js.snap @@ -39,31 +39,31 @@ exports[`ChannelNavBar should match, full snapshot 1`] = ` openSettingsSidebar={[MockFunction]} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/screens/channel/channel_nav_bar/channel_nav_bar.test.js b/app/screens/channel/channel_nav_bar/channel_nav_bar.test.js index c96fac76d..aa4760dd3 100644 --- a/app/screens/channel/channel_nav_bar/channel_nav_bar.test.js +++ b/app/screens/channel/channel_nav_bar/channel_nav_bar.test.js @@ -32,7 +32,7 @@ describe('ChannelNavBar', () => { openMainSidebar: jest.fn(), openSettingsSidebar: jest.fn(), onPress: jest.fn(), - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match, full snapshot', () => { diff --git a/app/screens/channel/channel_nav_bar/channel_search_button/__snapshots__/channel_search_button.test.js.snap b/app/screens/channel/channel_nav_bar/channel_search_button/__snapshots__/channel_search_button.test.js.snap index c8a7800d6..06317fc41 100644 --- a/app/screens/channel/channel_nav_bar/channel_search_button/__snapshots__/channel_search_button.test.js.snap +++ b/app/screens/channel/channel_nav_bar/channel_search_button/__snapshots__/channel_search_button.test.js.snap @@ -37,7 +37,7 @@ exports[`ChannelSearchButton should match, full snapshot 1`] = ` size={24} style={ Object { - "backgroundColor": "#1153ab", + "backgroundColor": "#192a4d", "color": "#ffffff", } } diff --git a/app/screens/channel/channel_nav_bar/channel_search_button/channel_search_button.test.js b/app/screens/channel/channel_nav_bar/channel_search_button/channel_search_button.test.js index 42fd14c78..f48cfab93 100644 --- a/app/screens/channel/channel_nav_bar/channel_search_button/channel_search_button.test.js +++ b/app/screens/channel/channel_nav_bar/channel_search_button/channel_search_button.test.js @@ -12,7 +12,7 @@ import ChannelSearchButton from './channel_search_button'; describe('ChannelSearchButton', () => { const baseProps = { actions: {clearSearch: jest.fn()}, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match, full snapshot', () => { diff --git a/app/screens/channel/channel_nav_bar/main_sidebar_drawer_button/__snapshots__/main_sidebar_drawer_button.test.js.snap b/app/screens/channel/channel_nav_bar/main_sidebar_drawer_button/__snapshots__/main_sidebar_drawer_button.test.js.snap index a6b540e18..a3ec8a461 100644 --- a/app/screens/channel/channel_nav_bar/main_sidebar_drawer_button/__snapshots__/main_sidebar_drawer_button.test.js.snap +++ b/app/screens/channel/channel_nav_bar/main_sidebar_drawer_button/__snapshots__/main_sidebar_drawer_button.test.js.snap @@ -76,7 +76,7 @@ exports[`MainSidebarDrawerButton should match, full snapshot 2`] = ` { const baseProps = { openSidebar: jest.fn(), badgeCount: 0, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, visible: false, }; diff --git a/app/screens/channel/channel_nav_bar/settings_sidebar_drawer_button.test.js b/app/screens/channel/channel_nav_bar/settings_sidebar_drawer_button.test.js index 7990889b4..66d693c22 100644 --- a/app/screens/channel/channel_nav_bar/settings_sidebar_drawer_button.test.js +++ b/app/screens/channel/channel_nav_bar/settings_sidebar_drawer_button.test.js @@ -11,7 +11,7 @@ import {SettingsSidebarDrawerButton} from './settings_sidebar_drawer_button'; describe('SettingsSidebarDrawerButton', () => { const baseProps = { openSidebar: jest.fn(), - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match, full snapshot', () => { diff --git a/app/screens/channel/channel_post_list/__snapshots__/channel_post_list.test.js.snap b/app/screens/channel/channel_post_list/__snapshots__/channel_post_list.test.js.snap index 4a07848ce..b752d46e9 100644 --- a/app/screens/channel/channel_post_list/__snapshots__/channel_post_list.test.js.snap +++ b/app/screens/channel/channel_post_list/__snapshots__/channel_post_list.test.js.snap @@ -16,7 +16,7 @@ exports[`ChannelPostList should match snapshot 1`] = ` { channelId: 'channel-id', loadMorePostsVisible: false, refreshing: false, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, registerTypingAnimation: jest.fn(() => { return jest.fn(); }), diff --git a/app/screens/channel_add_members/channel_add_members.test.js b/app/screens/channel_add_members/channel_add_members.test.js index 0112137e6..67da2d902 100644 --- a/app/screens/channel_add_members/channel_add_members.test.js +++ b/app/screens/channel_add_members/channel_add_members.test.js @@ -21,7 +21,7 @@ describe('ChannelAddMembers', () => { currentTeamId: 'current_team_id', currentUserId: 'current_user_id', profilesNotInChannel: [], - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, componentId: 'component-id', }; diff --git a/app/screens/channel_info/__snapshots__/channel_info.test.js.snap b/app/screens/channel_info/__snapshots__/channel_info.test.js.snap index 691fc7c38..015564c33 100644 --- a/app/screens/channel_info/__snapshots__/channel_info.test.js.snap +++ b/app/screens/channel_info/__snapshots__/channel_info.test.js.snap @@ -43,31 +43,31 @@ exports[`channelInfo should match snapshot 1`] = ` testID="channel_info.header" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } type="O" @@ -89,62 +89,62 @@ exports[`channelInfo should match snapshot 1`] = ` testID="channel_info.favorite.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -153,31 +153,31 @@ exports[`channelInfo should match snapshot 1`] = ` testID="channel_info.mute.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } userId="1234" @@ -185,31 +185,31 @@ exports[`channelInfo should match snapshot 1`] = ` @@ -218,62 +218,62 @@ exports[`channelInfo should match snapshot 1`] = ` testID="channel_info.ignore_mentions.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -282,62 +282,62 @@ exports[`channelInfo should match snapshot 1`] = ` testID="channel_info.notification_preference.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -347,31 +347,31 @@ exports[`channelInfo should match snapshot 1`] = ` testID="channel_info.pinned_messages.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -379,31 +379,31 @@ exports[`channelInfo should match snapshot 1`] = ` testID="channel_info.manage_members.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -411,31 +411,31 @@ exports[`channelInfo should match snapshot 1`] = ` testID="channel_info.add_members.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -443,31 +443,31 @@ exports[`channelInfo should match snapshot 1`] = ` testID="channel_info.convert_private.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -475,62 +475,62 @@ exports[`channelInfo should match snapshot 1`] = ` testID="channel_info.edit_channel.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -548,31 +548,31 @@ exports[`channelInfo should match snapshot 1`] = ` testID="channel_info.leave.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -581,31 +581,31 @@ exports[`channelInfo should match snapshot 1`] = ` testID="channel_info.archive.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -621,62 +621,62 @@ exports[`channelInfo should not include NotificationPreference for direct messag testID="channel_info.favorite.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -685,31 +685,31 @@ exports[`channelInfo should not include NotificationPreference for direct messag testID="channel_info.mute.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } userId="1234" @@ -717,31 +717,31 @@ exports[`channelInfo should not include NotificationPreference for direct messag @@ -750,62 +750,62 @@ exports[`channelInfo should not include NotificationPreference for direct messag testID="channel_info.ignore_mentions.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -814,62 +814,62 @@ exports[`channelInfo should not include NotificationPreference for direct messag testID="channel_info.notification_preference.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -879,31 +879,31 @@ exports[`channelInfo should not include NotificationPreference for direct messag testID="channel_info.pinned_messages.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -911,31 +911,31 @@ exports[`channelInfo should not include NotificationPreference for direct messag testID="channel_info.manage_members.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -943,31 +943,31 @@ exports[`channelInfo should not include NotificationPreference for direct messag testID="channel_info.add_members.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -975,31 +975,31 @@ exports[`channelInfo should not include NotificationPreference for direct messag testID="channel_info.convert_private.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -1007,62 +1007,62 @@ exports[`channelInfo should not include NotificationPreference for direct messag testID="channel_info.edit_channel.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -1076,62 +1076,62 @@ exports[`channelInfo should not include NotificationPreference for direct messag testID="channel_info.favorite.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -1140,31 +1140,31 @@ exports[`channelInfo should not include NotificationPreference for direct messag testID="channel_info.mute.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } userId="1234" @@ -1172,31 +1172,31 @@ exports[`channelInfo should not include NotificationPreference for direct messag @@ -1205,62 +1205,62 @@ exports[`channelInfo should not include NotificationPreference for direct messag testID="channel_info.ignore_mentions.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -1269,31 +1269,31 @@ exports[`channelInfo should not include NotificationPreference for direct messag testID="channel_info.pinned_messages.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -1301,31 +1301,31 @@ exports[`channelInfo should not include NotificationPreference for direct messag testID="channel_info.manage_members.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -1333,31 +1333,31 @@ exports[`channelInfo should not include NotificationPreference for direct messag testID="channel_info.add_members.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -1365,31 +1365,31 @@ exports[`channelInfo should not include NotificationPreference for direct messag testID="channel_info.convert_private.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -1397,62 +1397,62 @@ exports[`channelInfo should not include NotificationPreference for direct messag testID="channel_info.edit_channel.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/screens/channel_info/__snapshots__/channel_info_header.test.js.snap b/app/screens/channel_info/__snapshots__/channel_info_header.test.js.snap index 49325807b..0a4ca79dc 100644 --- a/app/screens/channel_info/__snapshots__/channel_info_header.test.js.snap +++ b/app/screens/channel_info/__snapshots__/channel_info_header.test.js.snap @@ -37,31 +37,31 @@ exports[`channel_info_header should match snapshot 1`] = ` testID="channel_info.header.channel_icon" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } type="O" @@ -71,7 +71,7 @@ exports[`channel_info_header should match snapshot 1`] = ` numberOfLines={1} style={ Object { - "color": "#3d3c40", + "color": "#3f4350", "flex": 1, "fontSize": 15, "fontWeight": "600", @@ -106,7 +106,7 @@ exports[`channel_info_header should match snapshot 1`] = ` style={ Object { "backgroundColor": "transparent", - "color": "#3d3c40", + "color": "#3f4350", "fontSize": 13, "marginBottom": 10, } @@ -115,7 +115,7 @@ exports[`channel_info_header should match snapshot 1`] = ` @@ -2129,7 +2129,7 @@ exports[`channel_info_header should match snapshot with custom status enabled 1` style={ Object { "backgroundColor": "transparent", - "color": "#3d3c40", + "color": "#3f4350", "fontSize": 13, "marginBottom": 10, } @@ -2138,7 +2138,7 @@ exports[`channel_info_header should match snapshot with custom status enabled 1` @@ -2502,31 +2502,31 @@ exports[`channel_info_header should match snapshot with custom status expiry 1`] } theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } time="2200-04-13T18:09:12.451Z" @@ -2556,7 +2556,7 @@ exports[`channel_info_header should match snapshot with custom status expiry 1`] style={ Object { "backgroundColor": "transparent", - "color": "#3d3c40", + "color": "#3f4350", "fontSize": 13, "marginBottom": 10, } @@ -2565,7 +2565,7 @@ exports[`channel_info_header should match snapshot with custom status expiry 1`] Add Members should match snapshot 1`] = ` @@ -42,31 +42,31 @@ exports[`ChannelInfo -> Add Members should match snapshot 1`] = ` textId="channel_header.addMembers" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={false} diff --git a/app/screens/channel_info/add_members/add_members.test.js b/app/screens/channel_info/add_members/add_members.test.js index a6d9d2732..f73430f6a 100644 --- a/app/screens/channel_info/add_members/add_members.test.js +++ b/app/screens/channel_info/add_members/add_members.test.js @@ -20,7 +20,7 @@ describe('ChannelInfo -> Add Members', () => { const baseProps = { canManageUsers: true, groupConstrained: false, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/screens/channel_info/add_members/add_members.tsx b/app/screens/channel_info/add_members/add_members.tsx index 15d153025..67c2641ac 100644 --- a/app/screens/channel_info/add_members/add_members.tsx +++ b/app/screens/channel_info/add_members/add_members.tsx @@ -5,7 +5,7 @@ import React, {PureComponent} from 'react'; import {intlShape} from 'react-intl'; import {goToScreen} from '@actions/navigation'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import ChannelInfoRow from '@screens/channel_info/channel_info_row'; import Separator from '@screens/channel_info/separator'; import {t} from '@utils/i18n'; diff --git a/app/screens/channel_info/archive/__snapshots__/archive.test.js.snap b/app/screens/channel_info/archive/__snapshots__/archive.test.js.snap index 82205648b..fe2690437 100644 --- a/app/screens/channel_info/archive/__snapshots__/archive.test.js.snap +++ b/app/screens/channel_info/archive/__snapshots__/archive.test.js.snap @@ -5,31 +5,31 @@ exports[`ChannelInfo -> Archive should match snapshot for Archive Channel 1`] = @@ -44,31 +44,31 @@ exports[`ChannelInfo -> Archive should match snapshot for Archive Channel 1`] = textId="mobile.routes.channelInfo.delete_channel" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={false} @@ -81,31 +81,31 @@ exports[`ChannelInfo -> Archive should match snapshot for Unarchive Channel 1`] @@ -118,31 +118,31 @@ exports[`ChannelInfo -> Archive should match snapshot for Unarchive Channel 1`] textId="mobile.routes.channelInfo.unarchive_channel" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={false} diff --git a/app/screens/channel_info/archive/archive.test.js b/app/screens/channel_info/archive/archive.test.js index ad2aba92a..e7ba2303a 100644 --- a/app/screens/channel_info/archive/archive.test.js +++ b/app/screens/channel_info/archive/archive.test.js @@ -30,7 +30,7 @@ describe('ChannelInfo -> Archive', () => { unarchiveChannel: jest.fn(), selectPenultimateChannel: jest.fn(), teamId: 'team-123', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, viewArchivedChannels: true, }; diff --git a/app/screens/channel_info/archive/archive.tsx b/app/screens/channel_info/archive/archive.tsx index 968b0b370..5123367fb 100644 --- a/app/screens/channel_info/archive/archive.tsx +++ b/app/screens/channel_info/archive/archive.tsx @@ -7,7 +7,7 @@ import {Alert} from 'react-native'; import {ActionResult} from '@mm-redux/types/actions'; import {FormattedMsg} from '@mm-redux/types/general'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import ChannelInfoRow from '@screens/channel_info/channel_info_row'; import Separator from '@screens/channel_info/separator'; import {alertErrorWithFallback} from '@utils/general'; diff --git a/app/screens/channel_info/bindings/bindings.tsx b/app/screens/channel_info/bindings/bindings.tsx index 86f76a8f7..9b2a6285d 100644 --- a/app/screens/channel_info/bindings/bindings.tsx +++ b/app/screens/channel_info/bindings/bindings.tsx @@ -10,7 +10,7 @@ import {AppCallResponseTypes, AppCallTypes} from '@mm-redux/constants/apps'; import {ActionResult} from '@mm-redux/types/actions'; import {AppBinding} from '@mm-redux/types/apps'; import {Channel} from '@mm-redux/types/channels'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {DoAppCall, PostEphemeralCallResponseForChannel} from '@mm-types/actions/apps'; import Separator from '@screens/channel_info/separator'; import {createCallContext, createCallRequest} from '@utils/apps'; diff --git a/app/screens/channel_info/channel_info.test.js b/app/screens/channel_info/channel_info.test.js index 6d4e2ca2a..dffa6a2ce 100644 --- a/app/screens/channel_info/channel_info.test.js +++ b/app/screens/channel_info/channel_info.test.js @@ -45,7 +45,7 @@ describe('channelInfo', () => { currentChannelMemberCount: 2, currentChannelGuestCount: 0, currentUserId: '1234', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, isTeammateGuest: false, isDirectMessage: false, isLandscape: false, diff --git a/app/screens/channel_info/channel_info_header.test.js b/app/screens/channel_info/channel_info_header.test.js index c2af06b8c..efe16c38c 100644 --- a/app/screens/channel_info/channel_info_header.test.js +++ b/app/screens/channel_info/channel_info_header.test.js @@ -36,7 +36,7 @@ describe('channel_info_header', () => { header: 'Header string', purpose: 'Purpose string', status: 'status', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, type: General.OPEN_CHANNEL, isArchived: false, isBot: false, diff --git a/app/screens/channel_info/channel_info_row.test.js b/app/screens/channel_info/channel_info_row.test.js index 25c519dc1..5f8055847 100644 --- a/app/screens/channel_info/channel_info_row.test.js +++ b/app/screens/channel_info/channel_info_row.test.js @@ -22,7 +22,7 @@ describe('ChannelInfoRow', () => { textId: 'text-id', togglable: false, textColor: '#000000', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/screens/channel_info/convert_private/__snapshots__/convert_private.test.js.snap b/app/screens/channel_info/convert_private/__snapshots__/convert_private.test.js.snap index 4d3de3cb3..eda593a68 100644 --- a/app/screens/channel_info/convert_private/__snapshots__/convert_private.test.js.snap +++ b/app/screens/channel_info/convert_private/__snapshots__/convert_private.test.js.snap @@ -5,31 +5,31 @@ exports[`ChannelInfo -> ConvertPrivate should match snapshot for Convert to Priv @@ -42,31 +42,31 @@ exports[`ChannelInfo -> ConvertPrivate should match snapshot for Convert to Priv textId="mobile.channel_info.convert" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={false} diff --git a/app/screens/channel_info/convert_private/convert_private.test.js b/app/screens/channel_info/convert_private/convert_private.test.js index 844ec8281..8a84cc104 100644 --- a/app/screens/channel_info/convert_private/convert_private.test.js +++ b/app/screens/channel_info/convert_private/convert_private.test.js @@ -22,7 +22,7 @@ describe('ChannelInfo -> ConvertPrivate', () => { channelId: '123', convertChannelToPrivate: jest.fn(), displayName: 'Test Channel', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot for Convert to Private Channel', () => { diff --git a/app/screens/channel_info/convert_private/convert_private.tsx b/app/screens/channel_info/convert_private/convert_private.tsx index 09ff662fd..16c08f88a 100644 --- a/app/screens/channel_info/convert_private/convert_private.tsx +++ b/app/screens/channel_info/convert_private/convert_private.tsx @@ -6,7 +6,7 @@ import {intlShape} from 'react-intl'; import {Alert} from 'react-native'; import {ActionResult} from '@mm-redux/types/actions'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import ChannelInfoRow from '@screens/channel_info/channel_info_row'; import Separator from '@screens/channel_info/separator'; import {alertErrorWithFallback} from '@utils/general'; diff --git a/app/screens/channel_info/edit_channel/__snapshots__/edit_channel.test.js.snap b/app/screens/channel_info/edit_channel/__snapshots__/edit_channel.test.js.snap index 8ec42abc2..99bb05f98 100644 --- a/app/screens/channel_info/edit_channel/__snapshots__/edit_channel.test.js.snap +++ b/app/screens/channel_info/edit_channel/__snapshots__/edit_channel.test.js.snap @@ -5,31 +5,31 @@ exports[`ChannelInfo -> EditChannel should match snapshot for Edit Channel 1`] = @@ -43,31 +43,31 @@ exports[`ChannelInfo -> EditChannel should match snapshot for Edit Channel 1`] = textId="mobile.channel_info.edit" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={false} diff --git a/app/screens/channel_info/edit_channel/edit_channel.test.js b/app/screens/channel_info/edit_channel/edit_channel.test.js index 5db511e85..5c0f2a7b1 100644 --- a/app/screens/channel_info/edit_channel/edit_channel.test.js +++ b/app/screens/channel_info/edit_channel/edit_channel.test.js @@ -20,7 +20,7 @@ describe('ChannelInfo -> EditChannel', () => { const baseProps = { testID: 'test-id', canEdit: true, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot for Edit Channel', () => { diff --git a/app/screens/channel_info/edit_channel/edit_channel.tsx b/app/screens/channel_info/edit_channel/edit_channel.tsx index a04f13dd2..54b9f7588 100644 --- a/app/screens/channel_info/edit_channel/edit_channel.tsx +++ b/app/screens/channel_info/edit_channel/edit_channel.tsx @@ -5,7 +5,7 @@ import React, {PureComponent} from 'react'; import {intlShape} from 'react-intl'; import {goToScreen} from '@actions/navigation'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import ChannelInfoRow from '@screens/channel_info/channel_info_row'; import Separator from '@screens/channel_info/separator'; import {t} from '@utils/i18n'; diff --git a/app/screens/channel_info/favorite/__snapshots__/favorite.test.js.snap b/app/screens/channel_info/favorite/__snapshots__/favorite.test.js.snap index bf4d08634..1219420e4 100644 --- a/app/screens/channel_info/favorite/__snapshots__/favorite.test.js.snap +++ b/app/screens/channel_info/favorite/__snapshots__/favorite.test.js.snap @@ -11,31 +11,31 @@ exports[`ChannelInfo -> Favorite should match snapshot for Favorite Channel 1`] textId="mobile.routes.channelInfo.favorite" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={true} @@ -53,31 +53,31 @@ exports[`ChannelInfo -> Favorite should match snapshot for Unfavorite Channel 1` textId="mobile.routes.channelInfo.favorite" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={true} diff --git a/app/screens/channel_info/favorite/favorite.test.js b/app/screens/channel_info/favorite/favorite.test.js index 990d65ab7..374fc31cd 100644 --- a/app/screens/channel_info/favorite/favorite.test.js +++ b/app/screens/channel_info/favorite/favorite.test.js @@ -22,7 +22,7 @@ describe('ChannelInfo -> Favorite', () => { favoriteChannel: jest.fn(), isFavorite: false, unfavoriteChannel: jest.fn(), - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot for Favorite Channel', () => { diff --git a/app/screens/channel_info/favorite/favorite.tsx b/app/screens/channel_info/favorite/favorite.tsx index 3b10fd381..01c9f6681 100644 --- a/app/screens/channel_info/favorite/favorite.tsx +++ b/app/screens/channel_info/favorite/favorite.tsx @@ -3,7 +3,7 @@ import React, {memo, useState} from 'react'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import ChannelInfoRow from '@screens/channel_info/channel_info_row'; import {t} from '@utils/i18n'; import {preventDoubleTap} from '@utils/tap'; diff --git a/app/screens/channel_info/ignore_mentions/__snapshots__/ignore_mentions.test.js.snap b/app/screens/channel_info/ignore_mentions/__snapshots__/ignore_mentions.test.js.snap index 8afc036c6..b22e161c8 100644 --- a/app/screens/channel_info/ignore_mentions/__snapshots__/ignore_mentions.test.js.snap +++ b/app/screens/channel_info/ignore_mentions/__snapshots__/ignore_mentions.test.js.snap @@ -11,31 +11,31 @@ exports[`ChannelInfo -> IgnoreMentions should match snapshot for Ignore Mentions textId="channel_notifications.ignoreChannelMentions.settings" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={true} @@ -53,31 +53,31 @@ exports[`ChannelInfo -> IgnoreMentions should match snapshot for Not Ignore Ment textId="channel_notifications.ignoreChannelMentions.settings" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={true} diff --git a/app/screens/channel_info/ignore_mentions/ignore_mentions.test.js b/app/screens/channel_info/ignore_mentions/ignore_mentions.test.js index 0d1ca7b1a..de3fcb1bb 100644 --- a/app/screens/channel_info/ignore_mentions/ignore_mentions.test.js +++ b/app/screens/channel_info/ignore_mentions/ignore_mentions.test.js @@ -20,7 +20,7 @@ describe('ChannelInfo -> IgnoreMentions', () => { const baseProps = { channelId: '123', ignore: false, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, updateChannelNotifyProps: jest.fn(), userId: 'user-123', }; diff --git a/app/screens/channel_info/ignore_mentions/ignore_mentions.tsx b/app/screens/channel_info/ignore_mentions/ignore_mentions.tsx index 123be1d3b..7621bac2e 100644 --- a/app/screens/channel_info/ignore_mentions/ignore_mentions.tsx +++ b/app/screens/channel_info/ignore_mentions/ignore_mentions.tsx @@ -4,7 +4,7 @@ import React, {memo, useState} from 'react'; import {Users} from '@mm-redux/constants'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import ChannelInfoRow from '@screens/channel_info/channel_info_row'; import {t} from '@utils/i18n'; import {preventDoubleTap} from '@utils/tap'; diff --git a/app/screens/channel_info/leave/__snapshots__/leave.test.js.snap b/app/screens/channel_info/leave/__snapshots__/leave.test.js.snap index 9995d302d..c2f298427 100644 --- a/app/screens/channel_info/leave/__snapshots__/leave.test.js.snap +++ b/app/screens/channel_info/leave/__snapshots__/leave.test.js.snap @@ -5,31 +5,31 @@ exports[`ChannelInfo -> Leave should match snapshot for Close DM 1`] = ` @@ -44,31 +44,31 @@ exports[`ChannelInfo -> Leave should match snapshot for Close DM 1`] = ` textId="mobile.channel_list.closeDM" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={false} @@ -81,31 +81,31 @@ exports[`ChannelInfo -> Leave should match snapshot for Close GM 1`] = ` @@ -120,31 +120,31 @@ exports[`ChannelInfo -> Leave should match snapshot for Close GM 1`] = ` textId="mobile.channel_list.closeGM" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={false} @@ -157,31 +157,31 @@ exports[`ChannelInfo -> Leave should match snapshot for Leave Private Channel 1` @@ -196,31 +196,31 @@ exports[`ChannelInfo -> Leave should match snapshot for Leave Private Channel 1` textId="navbar.leave" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={false} @@ -233,31 +233,31 @@ exports[`ChannelInfo -> Leave should match snapshot for Leave Public Channel 1`] @@ -272,31 +272,31 @@ exports[`ChannelInfo -> Leave should match snapshot for Leave Public Channel 1`] textId="navbar.leave" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={false} diff --git a/app/screens/channel_info/leave/leave.test.js b/app/screens/channel_info/leave/leave.test.js index df4518f99..da801ec71 100644 --- a/app/screens/channel_info/leave/leave.test.js +++ b/app/screens/channel_info/leave/leave.test.js @@ -39,7 +39,7 @@ describe('ChannelInfo -> Leave', () => { isFavorite: false, isGroupMessage: false, isPublic: true, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot for Leave Public Channel', () => { diff --git a/app/screens/channel_info/leave/leave.tsx b/app/screens/channel_info/leave/leave.tsx index 0d5afb9de..526de293d 100644 --- a/app/screens/channel_info/leave/leave.tsx +++ b/app/screens/channel_info/leave/leave.tsx @@ -8,7 +8,7 @@ import {Alert} from 'react-native'; import {ActionResult} from '@mm-redux/types/actions'; import {Channel} from '@mm-redux/types/channels'; import {FormattedMsg} from '@mm-redux/types/general'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import ChannelInfoRow from '@screens/channel_info/channel_info_row'; import Separator from '@screens/channel_info/separator'; import {t} from '@utils/i18n'; diff --git a/app/screens/channel_info/manage_members/__snapshots__/manage_members.test.js.snap b/app/screens/channel_info/manage_members/__snapshots__/manage_members.test.js.snap index ae98206ac..359cfef38 100644 --- a/app/screens/channel_info/manage_members/__snapshots__/manage_members.test.js.snap +++ b/app/screens/channel_info/manage_members/__snapshots__/manage_members.test.js.snap @@ -5,31 +5,31 @@ exports[`ChannelInfo -> Manage Members should match snapshot for Manage Members @@ -43,31 +43,31 @@ exports[`ChannelInfo -> Manage Members should match snapshot for Manage Members textId="channel_header.manageMembers" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={false} @@ -80,31 +80,31 @@ exports[`ChannelInfo -> Manage Members should match snapshot for View Members 1` @@ -118,31 +118,31 @@ exports[`ChannelInfo -> Manage Members should match snapshot for View Members 1` textId="channel_header.viewMembers" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={false} @@ -162,31 +162,31 @@ exports[`ChannelInfo -> Manage Members should match snapshot without separator 1 textId="channel_header.manageMembers" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={false} diff --git a/app/screens/channel_info/manage_members/manage_members.test.js b/app/screens/channel_info/manage_members/manage_members.test.js index ff006c313..306b5bde7 100644 --- a/app/screens/channel_info/manage_members/manage_members.test.js +++ b/app/screens/channel_info/manage_members/manage_members.test.js @@ -22,7 +22,7 @@ describe('ChannelInfo -> Manage Members', () => { isDirectMessage: false, membersCount: 10, separator: true, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot for Manage Members', () => { diff --git a/app/screens/channel_info/manage_members/manage_members.tsx b/app/screens/channel_info/manage_members/manage_members.tsx index c35b1e237..e0ee8b1f2 100644 --- a/app/screens/channel_info/manage_members/manage_members.tsx +++ b/app/screens/channel_info/manage_members/manage_members.tsx @@ -5,7 +5,7 @@ import React, {PureComponent} from 'react'; import {intlShape} from 'react-intl'; import {goToScreen} from '@actions/navigation'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import ChannelInfoRow from '@screens/channel_info/channel_info_row'; import Separator from '@screens/channel_info/separator'; import {t} from '@utils/i18n'; diff --git a/app/screens/channel_info/mute/__snapshots__/mute.test.js.snap b/app/screens/channel_info/mute/__snapshots__/mute.test.js.snap index 0ef7c8016..543133002 100644 --- a/app/screens/channel_info/mute/__snapshots__/mute.test.js.snap +++ b/app/screens/channel_info/mute/__snapshots__/mute.test.js.snap @@ -11,31 +11,31 @@ exports[`ChannelInfo -> Mute should match snapshot for Muted 1`] = ` textId="channel_notifications.muteChannel.settings" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={true} @@ -53,31 +53,31 @@ exports[`ChannelInfo -> Mute should match snapshot for Not Muted 1`] = ` textId="channel_notifications.muteChannel.settings" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={true} diff --git a/app/screens/channel_info/mute/mute.test.js b/app/screens/channel_info/mute/mute.test.js index 984a0943c..1e48cdd2a 100644 --- a/app/screens/channel_info/mute/mute.test.js +++ b/app/screens/channel_info/mute/mute.test.js @@ -20,7 +20,7 @@ describe('ChannelInfo -> Mute', () => { const baseProps = { channelId: '123', isChannelMuted: false, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, updateChannelNotifyProps: jest.fn(), userId: 'user-123', }; diff --git a/app/screens/channel_info/mute/mute.tsx b/app/screens/channel_info/mute/mute.tsx index fa3cc65fa..c594da864 100644 --- a/app/screens/channel_info/mute/mute.tsx +++ b/app/screens/channel_info/mute/mute.tsx @@ -3,7 +3,7 @@ import React, {memo, useState} from 'react'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import ChannelInfoRow from '@screens/channel_info/channel_info_row'; import {t} from '@utils/i18n'; import {preventDoubleTap} from '@utils/tap'; diff --git a/app/screens/channel_info/notification_preference/__snapshots__/notification_preference.test.js.snap b/app/screens/channel_info/notification_preference/__snapshots__/notification_preference.test.js.snap index b4ea7f4bb..a1ab09b84 100644 --- a/app/screens/channel_info/notification_preference/__snapshots__/notification_preference.test.js.snap +++ b/app/screens/channel_info/notification_preference/__snapshots__/notification_preference.test.js.snap @@ -12,31 +12,31 @@ exports[`NotificationPreference should match snapshot 1`] = ` textId="channel_header.notificationPreference" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={false} diff --git a/app/screens/channel_info/notification_preference/notification_preference.test.js b/app/screens/channel_info/notification_preference/notification_preference.test.js index 0fc79dfaf..54295912b 100644 --- a/app/screens/channel_info/notification_preference/notification_preference.test.js +++ b/app/screens/channel_info/notification_preference/notification_preference.test.js @@ -16,7 +16,7 @@ describe('NotificationPreference', () => { notifyProps: { push: 'default', }, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/screens/channel_info/notification_preference/notification_preference.tsx b/app/screens/channel_info/notification_preference/notification_preference.tsx index df093e7a4..dc1ccca6c 100644 --- a/app/screens/channel_info/notification_preference/notification_preference.tsx +++ b/app/screens/channel_info/notification_preference/notification_preference.tsx @@ -7,7 +7,7 @@ import {intlShape} from 'react-intl'; import {goToScreen} from '@actions/navigation'; import {ViewTypes} from '@constants'; import {ChannelNotifyProps} from '@mm-redux/types/channels'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import ChannelInfoRow from '@screens/channel_info/channel_info_row'; import {t} from '@utils/i18n'; import {preventDoubleTap} from '@utils/tap'; diff --git a/app/screens/channel_info/pinned/__snapshots__/pinned.test.js.snap b/app/screens/channel_info/pinned/__snapshots__/pinned.test.js.snap index f280594b0..8a410d2d3 100644 --- a/app/screens/channel_info/pinned/__snapshots__/pinned.test.js.snap +++ b/app/screens/channel_info/pinned/__snapshots__/pinned.test.js.snap @@ -11,31 +11,31 @@ exports[`ChannelInfo -> Pinned should match snapshot 1`] = ` textId="channel_header.pinnedPosts" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } togglable={false} diff --git a/app/screens/channel_info/pinned/pinned.test.js b/app/screens/channel_info/pinned/pinned.test.js index 05639b9f6..fb5531390 100644 --- a/app/screens/channel_info/pinned/pinned.test.js +++ b/app/screens/channel_info/pinned/pinned.test.js @@ -20,7 +20,7 @@ describe('ChannelInfo -> Pinned', () => { const baseProps = { channelId: '123', pinnedCount: 0, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, userId: 'user-123', }; diff --git a/app/screens/channel_info/pinned/pinned.tsx b/app/screens/channel_info/pinned/pinned.tsx index 301b397ac..8d7cfaddb 100644 --- a/app/screens/channel_info/pinned/pinned.tsx +++ b/app/screens/channel_info/pinned/pinned.tsx @@ -5,7 +5,7 @@ import React, {PureComponent} from 'react'; import {intlShape} from 'react-intl'; import {goToScreen} from '@actions/navigation'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import ChannelInfoRow from '@screens/channel_info/channel_info_row'; import {t} from '@utils/i18n'; import {preventDoubleTap} from '@utils/tap'; diff --git a/app/screens/channel_info/separator.tsx b/app/screens/channel_info/separator.tsx index 81090758d..3b6b06b44 100644 --- a/app/screens/channel_info/separator.tsx +++ b/app/screens/channel_info/separator.tsx @@ -4,7 +4,7 @@ import React from 'react'; import {View} from 'react-native'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; interface SeparatorProps { diff --git a/app/screens/channel_members/__snapshots__/channel_members.test.js.snap b/app/screens/channel_members/__snapshots__/channel_members.test.js.snap index 1222ae79e..8e54530b4 100644 --- a/app/screens/channel_members/__snapshots__/channel_members.test.js.snap +++ b/app/screens/channel_members/__snapshots__/channel_members.test.js.snap @@ -38,8 +38,8 @@ exports[`ChannelMembers should match snapshot 1`] = ` inputHeight={33} inputStyle={ Object { - "backgroundColor": "rgba(61,60,64,0.2)", - "color": "#3d3c40", + "backgroundColor": "rgba(63,67,80,0.2)", + "color": "#3f4350", "fontSize": 15, } } @@ -52,16 +52,16 @@ exports[`ChannelMembers should match snapshot 1`] = ` onSearchButtonPress={[Function]} onSelectionChange={[Function]} placeholder="Search" - placeholderTextColor="rgba(61,60,64,0.5)" + placeholderTextColor="rgba(63,67,80,0.5)" returnKeyType="search" searchBarRightMargin={0} searchIconSize={24} showArrow={false} showCancel={true} testID="channel_members.search_bar" - tintColorDelete="rgba(61,60,64,0.5)" - tintColorSearch="rgba(61,60,64,0.5)" - titleCancelColor="#3d3c40" + tintColorDelete="rgba(63,67,80,0.5)" + tintColorSearch="rgba(63,67,80,0.5)" + titleCancelColor="#3f4350" value="" /> @@ -81,31 +81,31 @@ exports[`ChannelMembers should match snapshot 1`] = ` testID="channel_members.custom_list" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/screens/channel_members/channel_members.test.js b/app/screens/channel_members/channel_members.test.js index 627bf054c..4f7edf294 100644 --- a/app/screens/channel_members/channel_members.test.js +++ b/app/screens/channel_members/channel_members.test.js @@ -10,7 +10,7 @@ import ChannelMembers from './channel_members'; describe('ChannelMembers', () => { const baseProps = { - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, currentUserId: 'current-user-id', currentChannelId: 'current-channel-id', canManageUsers: false, diff --git a/app/screens/channel_notification_preference/__snapshots__/channel_notification_preference.test.js.snap b/app/screens/channel_notification_preference/__snapshots__/channel_notification_preference.test.js.snap index 9084cfa04..911dd5ac5 100644 --- a/app/screens/channel_notification_preference/__snapshots__/channel_notification_preference.test.js.snap +++ b/app/screens/channel_notification_preference/__snapshots__/channel_notification_preference.test.js.snap @@ -4,7 +4,7 @@ exports[`ChannelNotificationPreference should match snapshot 1`] = ` @@ -60,7 +60,7 @@ exports[`ChannelNotificationPreference should match snapshot 1`] = ` @@ -118,7 +118,7 @@ exports[`ChannelNotificationPreference should match snapshot 1`] = ` @@ -171,7 +171,7 @@ exports[`ChannelNotificationPreference should match snapshot 1`] = ` @@ -224,7 +224,7 @@ exports[`ChannelNotificationPreference should match snapshot 1`] = ` @@ -277,7 +277,7 @@ exports[`ChannelNotificationPreference should match snapshot 1`] = ` @@ -132,31 +132,31 @@ exports[`screens/custom_status_modal should match snapshot when user has no cust } theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -208,31 +208,31 @@ exports[`screens/custom_status_modal should match snapshot when user has no rece recentCustomStatuses={Array []} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/screens/custom_status/__snapshots__/custom_status_suggestion.test.tsx.snap b/app/screens/custom_status/__snapshots__/custom_status_suggestion.test.tsx.snap index 0ddc9e51e..66a4d2817 100644 --- a/app/screens/custom_status/__snapshots__/custom_status_suggestion.test.tsx.snap +++ b/app/screens/custom_status/__snapshots__/custom_status_suggestion.test.tsx.snap @@ -17,7 +17,7 @@ exports[`screens/custom_status_suggestion should match snapshot 1`] = ` @@ -111,7 +111,7 @@ exports[`screens/custom_status_suggestion should match snapshot with separator a @@ -186,7 +186,7 @@ exports[`screens/custom_status_suggestion should match snapshot with separator a { unsetCustomStatus: jest.fn(), removeRecentCustomStatus: jest.fn(), }, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, customStatus, recentCustomStatuses: [customStatus], }; diff --git a/app/screens/custom_status/custom_status_modal.tsx b/app/screens/custom_status/custom_status_modal.tsx index 593d9dda4..8eb37598e 100644 --- a/app/screens/custom_status/custom_status_modal.tsx +++ b/app/screens/custom_status/custom_status_modal.tsx @@ -18,7 +18,7 @@ import StatusBar from '@components/status_bar'; import {CustomStatus, DeviceTypes} from '@constants'; import {durationValues} from '@constants/custom_status'; import {ActionFunc, ActionResult} from '@mm-redux/types/actions'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {CustomStatusDuration, UserCustomStatus} from '@mm-redux/types/users'; import EventEmitter from '@mm-redux/utils/event_emitter'; import CustomStatusSuggestion from '@screens/custom_status/custom_status_suggestion'; diff --git a/app/screens/custom_status/custom_status_suggestion.test.tsx b/app/screens/custom_status/custom_status_suggestion.test.tsx index df76288c8..4788e3138 100644 --- a/app/screens/custom_status/custom_status_suggestion.test.tsx +++ b/app/screens/custom_status/custom_status_suggestion.test.tsx @@ -14,7 +14,7 @@ describe('screens/custom_status_suggestion', () => { handleSuggestionClick: jest.fn(), emoji: 'calendar', text: 'In a meeting', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, separator: false, duration: CustomStatusDuration.DONT_CLEAR, }; diff --git a/app/screens/custom_status/custom_status_suggestion.tsx b/app/screens/custom_status/custom_status_suggestion.tsx index 1fcafb8fe..3c305f73d 100644 --- a/app/screens/custom_status/custom_status_suggestion.tsx +++ b/app/screens/custom_status/custom_status_suggestion.tsx @@ -9,7 +9,7 @@ import ClearButton from '@components/custom_status/clear_button'; import CustomStatusText from '@components/custom_status/custom_status_text'; import Emoji from '@components/emoji'; import {durationValues} from '@constants/custom_status'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {CustomStatusDuration, UserCustomStatus} from '@mm-redux/types/users'; import {preventDoubleTap} from '@utils/tap'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; diff --git a/app/screens/custom_status_clear_after/__snapshots__/clear_after_menu_item.test.tsx.snap b/app/screens/custom_status_clear_after/__snapshots__/clear_after_menu_item.test.tsx.snap index 7d48130b6..23ac5fe5c 100644 --- a/app/screens/custom_status_clear_after/__snapshots__/clear_after_menu_item.test.tsx.snap +++ b/app/screens/custom_status_clear_after/__snapshots__/clear_after_menu_item.test.tsx.snap @@ -33,36 +33,36 @@ exports[`screens/clear_after_menu_item should match snapshot 1`] = ` text="Don't clear" textStyle={ Object { - "color": "#3d3c40", + "color": "#3f4350", } } theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -105,36 +105,36 @@ exports[`screens/clear_after_menu_item should match snapshot with separator and text="Don't clear" textStyle={ Object { - "color": "#3d3c40", + "color": "#3f4350", } } theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -152,7 +152,7 @@ exports[`screens/clear_after_menu_item should match snapshot with separator and style={ Object { "borderRadius": 1000, - "color": "#166de0", + "color": "#1c58d9", } } /> @@ -162,7 +162,7 @@ exports[`screens/clear_after_menu_item should match snapshot with separator and diff --git a/app/screens/custom_status_clear_after/__snapshots__/date_time_selector.test.tsx.snap b/app/screens/custom_status_clear_after/__snapshots__/date_time_selector.test.tsx.snap index bdb867bfe..7741eeca2 100644 --- a/app/screens/custom_status_clear_after/__snapshots__/date_time_selector.test.tsx.snap +++ b/app/screens/custom_status_clear_after/__snapshots__/date_time_selector.test.tsx.snap @@ -57,7 +57,7 @@ exports[`screens/date_time_selector should match snapshot 1`] = ` "textAlign": "center", }, Object { - "color": "#166de0", + "color": "#1c58d9", }, ] } @@ -102,7 +102,7 @@ exports[`screens/date_time_selector should match snapshot 1`] = ` "textAlign": "center", }, Object { - "color": "#166de0", + "color": "#1c58d9", }, ] } diff --git a/app/screens/custom_status_clear_after/clear_after_menu_item.test.tsx b/app/screens/custom_status_clear_after/clear_after_menu_item.test.tsx index fb776b23c..709dab8ea 100644 --- a/app/screens/custom_status_clear_after/clear_after_menu_item.test.tsx +++ b/app/screens/custom_status_clear_after/clear_after_menu_item.test.tsx @@ -11,7 +11,7 @@ import ClearAfterMenuItem from './clear_after_menu_item'; describe('screens/clear_after_menu_item', () => { const baseProps = { - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, duration: CustomStatusDuration.DONT_CLEAR, separator: false, isSelected: false, diff --git a/app/screens/custom_status_clear_after/clear_after_menu_item.tsx b/app/screens/custom_status_clear_after/clear_after_menu_item.tsx index 6fa22b4ca..f5588f611 100644 --- a/app/screens/custom_status_clear_after/clear_after_menu_item.tsx +++ b/app/screens/custom_status_clear_after/clear_after_menu_item.tsx @@ -10,7 +10,7 @@ import CompassIcon from '@components/compass_icon'; import CustomStatusExpiry from '@components/custom_status/custom_status_expiry'; import CustomStatusText from '@components/custom_status/custom_status_text'; import {durationValues} from '@constants/custom_status'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {CustomStatusDuration} from '@mm-redux/types/users'; import {preventDoubleTap} from '@utils/tap'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; diff --git a/app/screens/custom_status_clear_after/clear_after_modal.test.tsx b/app/screens/custom_status_clear_after/clear_after_modal.test.tsx index dbde77ee9..3a522b970 100644 --- a/app/screens/custom_status_clear_after/clear_after_modal.test.tsx +++ b/app/screens/custom_status_clear_after/clear_after_modal.test.tsx @@ -10,7 +10,7 @@ import {shallowWithIntl} from '@test/intl-test-helper'; describe('screens/clear_after_modal', () => { const baseProps = { - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, initialDuration: CustomStatusDuration.DONT_CLEAR, handleClearAfterClick: jest.fn(), }; diff --git a/app/screens/custom_status_clear_after/clear_after_modal.tsx b/app/screens/custom_status_clear_after/clear_after_modal.tsx index 1a4a2632a..f8b52b1cf 100644 --- a/app/screens/custom_status_clear_after/clear_after_modal.tsx +++ b/app/screens/custom_status_clear_after/clear_after_modal.tsx @@ -15,7 +15,7 @@ import { } from 'react-native-navigation'; import {mergeNavigationOptions, popTopScreen} from '@actions/navigation'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {CustomStatusDuration} from '@mm-redux/types/users'; import {makeStyleSheetFromTheme, changeOpacity} from '@utils/theme'; diff --git a/app/screens/custom_status_clear_after/date_time_selector.test.tsx b/app/screens/custom_status_clear_after/date_time_selector.test.tsx index 3a2c0a86a..ecb844cba 100644 --- a/app/screens/custom_status_clear_after/date_time_selector.test.tsx +++ b/app/screens/custom_status_clear_after/date_time_selector.test.tsx @@ -10,7 +10,7 @@ import DateTimeSelector from './date_time_selector'; describe('screens/date_time_selector', () => { const baseProps = { - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, handleChange: jest.fn(), }; diff --git a/app/screens/custom_status_clear_after/date_time_selector.tsx b/app/screens/custom_status_clear_after/date_time_selector.tsx index c9ef31a8e..c95882f00 100644 --- a/app/screens/custom_status_clear_after/date_time_selector.tsx +++ b/app/screens/custom_status_clear_after/date_time_selector.tsx @@ -11,8 +11,8 @@ import {useSelector} from 'react-redux'; import Preferences from '@mm-redux/constants/preferences'; import {getBool} from '@mm-redux/selectors/entities/preferences'; import {getCurrentUserTimezone} from '@mm-redux/selectors/entities/timezone'; -import {Theme} from '@mm-redux/types/preferences'; import {GlobalState} from '@mm-redux/types/store'; +import {Theme} from '@mm-redux/types/theme'; import {makeStyleSheetFromTheme} from '@utils/theme'; import {getCurrentMomentForTimezone, getUtcOffsetForTimeZone} from '@utils/timezone'; diff --git a/app/screens/edit_post/__snapshots__/edit_post.test.js.snap b/app/screens/edit_post/__snapshots__/edit_post.test.js.snap index 943e3f2dc..274592d82 100644 --- a/app/screens/edit_post/__snapshots__/edit_post.test.js.snap +++ b/app/screens/edit_post/__snapshots__/edit_post.test.js.snap @@ -14,7 +14,7 @@ exports[`EditPost should match snapshot 1`] = ` { editPost: jest.fn(), }, post: {}, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/screens/edit_profile/edit_profile.test.js b/app/screens/edit_profile/edit_profile.test.js index d371c5c09..cd4da36ef 100644 --- a/app/screens/edit_profile/edit_profile.test.js +++ b/app/screens/edit_profile/edit_profile.test.js @@ -29,7 +29,7 @@ describe('edit_profile', () => { nicknameDisabled: true, positionDisabled: true, profilePictureDisabled: true, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, currentUser: { first_name: 'Dwight', last_name: 'Schrute', diff --git a/app/screens/error_teams_list/__snapshots__/error_teams_list.test.js.snap b/app/screens/error_teams_list/__snapshots__/error_teams_list.test.js.snap index 3d9ea61eb..6d2fccd30 100644 --- a/app/screens/error_teams_list/__snapshots__/error_teams_list.test.js.snap +++ b/app/screens/error_teams_list/__snapshots__/error_teams_list.test.js.snap @@ -15,31 +15,31 @@ exports[`ErrorTeamsList should match snapshot 1`] = ` onRetry={[Function]} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/screens/error_teams_list/error_teams_list.test.js b/app/screens/error_teams_list/error_teams_list.test.js index 5764756fb..c1cf98cdb 100644 --- a/app/screens/error_teams_list/error_teams_list.test.js +++ b/app/screens/error_teams_list/error_teams_list.test.js @@ -24,7 +24,7 @@ describe('ErrorTeamsList', () => { selectDefaultTeam: () => true, }, componentId: 'component-id', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/screens/gallery/footer/prepare_file/prepare_file.tsx b/app/screens/gallery/footer/prepare_file/prepare_file.tsx index 79eaac4f1..bac9a7aff 100644 --- a/app/screens/gallery/footer/prepare_file/prepare_file.tsx +++ b/app/screens/gallery/footer/prepare_file/prepare_file.tsx @@ -12,7 +12,7 @@ import {Client4} from '@client/rest'; import CompassIcon from '@components/compass_icon'; import FormattedText from '@components/formatted_text'; import ProgressBar from '@components/progress_bar'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {getLocalPath} from '@utils/file'; import mattermostBucket from 'app/mattermost_bucket'; diff --git a/app/screens/gallery/gallery.test.js.disabled b/app/screens/gallery/gallery.test.js.disabled index 77d6e3b81..719b151c6 100644 --- a/app/screens/gallery/gallery.test.js.disabled +++ b/app/screens/gallery/gallery.test.js.disabled @@ -35,7 +35,7 @@ describe('Gallery', () => { {caption: 'Caption 2', source: 'source', data: 'data'}, ], index: 0, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, componentId: 'component-id', }; diff --git a/app/screens/interactive_dialog/__snapshots__/dialog_introduction_text.test.js.snap b/app/screens/interactive_dialog/__snapshots__/dialog_introduction_text.test.js.snap index 6fb67710b..b6ef8a5ac 100644 --- a/app/screens/interactive_dialog/__snapshots__/dialog_introduction_text.test.js.snap +++ b/app/screens/interactive_dialog/__snapshots__/dialog_introduction_text.test.js.snap @@ -13,7 +13,7 @@ exports[`DialogIntroductionText should render the introduction text correctly 1` { type: 'text', }; - const theme = Preferences.THEMES.default; + const theme = Preferences.THEMES.denim; test('secureTextEntry is true and multiline is false when subtype is password', () => { const wrapper = shallow( { const baseProps = { - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, value: '**bold** *italic* [link](https://mattermost.com/)
[link target blank](!https://mattermost.com/)', }; diff --git a/app/screens/interactive_dialog/interactive_dialog.test.js b/app/screens/interactive_dialog/interactive_dialog.test.js index 86bf567fa..2fff1ec60 100644 --- a/app/screens/interactive_dialog/interactive_dialog.test.js +++ b/app/screens/interactive_dialog/interactive_dialog.test.js @@ -19,7 +19,7 @@ describe('InteractiveDialog', () => { ], notifyOnCancel: false, state: 'somestate', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, actions: { submitInteractiveDialog: jest.fn(() => ({})), dismissModal: jest.fn(), diff --git a/app/screens/more_channels/__snapshots__/more_channels.test.js.snap b/app/screens/more_channels/__snapshots__/more_channels.test.js.snap index 14aa49b4e..2b5201869 100644 --- a/app/screens/more_channels/__snapshots__/more_channels.test.js.snap +++ b/app/screens/more_channels/__snapshots__/more_channels.test.js.snap @@ -32,8 +32,8 @@ exports[`MoreChannels should match snapshot 1`] = ` inputHeight={33} inputStyle={ Object { - "backgroundColor": "rgba(61,60,64,0.2)", - "color": "#3d3c40", + "backgroundColor": "rgba(63,67,80,0.2)", + "color": "#3f4350", "fontSize": 15, } } @@ -46,16 +46,16 @@ exports[`MoreChannels should match snapshot 1`] = ` onSearchButtonPress={[Function]} onSelectionChange={[Function]} placeholder="Search" - placeholderTextColor="rgba(61,60,64,0.5)" + placeholderTextColor="rgba(63,67,80,0.5)" returnKeyType="search" searchBarRightMargin={0} searchIconSize={24} showArrow={false} showCancel={true} testID="more_channels.search_bar" - tintColorDelete="rgba(61,60,64,0.5)" - tintColorSearch="rgba(61,60,64,0.5)" - titleCancelColor="#3d3c40" + tintColorDelete="rgba(63,67,80,0.5)" + tintColorSearch="rgba(63,67,80,0.5)" + titleCancelColor="#3f4350" value="" /> @@ -67,7 +67,7 @@ exports[`MoreChannels should match snapshot 1`] = ` onPress={[Function]} style={ Object { - "color": "#3d3c40", + "color": "#3f4350", "fontWeight": "bold", "marginBottom": 10, "marginLeft": 10, @@ -113,7 +113,7 @@ exports[`MoreChannels should match snapshot 1`] = ` id="mobile.loading_channels" style={ Object { - "color": "rgba(61,60,64,0.6)", + "color": "rgba(63,67,80,0.6)", } } /> @@ -128,31 +128,31 @@ exports[`MoreChannels should match snapshot 1`] = ` testID="more_channels.custom_list" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/screens/more_channels/more_channels.test.js b/app/screens/more_channels/more_channels.test.js index 830d93865..e60780d3e 100644 --- a/app/screens/more_channels/more_channels.test.js +++ b/app/screens/more_channels/more_channels.test.js @@ -29,7 +29,7 @@ describe('MoreChannels', () => { closeButton: {}, currentUserId: 'current_user_id', currentTeamId: 'current_team_id', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, componentId: 'component-id', canShowArchivedChannels: true, }; diff --git a/app/screens/more_dms/selected_users/__snapshots__/selected_users.test.js.snap b/app/screens/more_dms/selected_users/__snapshots__/selected_users.test.js.snap index 01e7a0517..1946579bb 100644 --- a/app/screens/more_dms/selected_users/__snapshots__/selected_users.test.js.snap +++ b/app/screens/more_dms/selected_users/__snapshots__/selected_users.test.js.snap @@ -24,31 +24,31 @@ exports[`SelectedUsers should match snapshot 1`] = ` testID="more_direct_messages.selected_user" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } user={ @@ -63,7 +63,7 @@ exports[`SelectedUsers should match snapshot 1`] = ` id="mobile.more_dms.add_more" style={ Object { - "color": "rgba(61,60,64,0.6)", + "color": "rgba(63,67,80,0.6)", "fontSize": 12, "marginBottom": 2, "marginRight": 5, @@ -103,31 +103,31 @@ exports[`SelectedUsers should match snapshot for no warning message 1`] = ` testID="more_direct_messages.selected_user" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } user={ @@ -164,31 +164,31 @@ exports[`SelectedUsers should match snapshot to show warning for ability to add testID="more_direct_messages.selected_user" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } user={ @@ -203,31 +203,31 @@ exports[`SelectedUsers should match snapshot to show warning for ability to add testID="more_direct_messages.selected_user" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } user={ @@ -242,7 +242,7 @@ exports[`SelectedUsers should match snapshot to show warning for ability to add id="mobile.more_dms.one_more" style={ Object { - "color": "rgba(61,60,64,0.6)", + "color": "rgba(63,67,80,0.6)", "fontSize": 12, "marginBottom": 2, "marginRight": 5, diff --git a/app/screens/more_dms/selected_users/selected_users.test.js b/app/screens/more_dms/selected_users/selected_users.test.js index 2d9481b69..44d757c55 100644 --- a/app/screens/more_dms/selected_users/selected_users.test.js +++ b/app/screens/more_dms/selected_users/selected_users.test.js @@ -26,7 +26,7 @@ describe('SelectedUsers', () => { selectedIds: { userId1: true, }, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, teammateNameDisplay: 'full_name', warnCount: 1, }; diff --git a/app/screens/participants_list/participant_row/index.tsx b/app/screens/participants_list/participant_row/index.tsx index e165a5203..aec623626 100644 --- a/app/screens/participants_list/participant_row/index.tsx +++ b/app/screens/participants_list/participant_row/index.tsx @@ -15,7 +15,7 @@ import {displayUsername} from '@mm-redux/utils/user_utils'; import {preventDoubleTap} from '@utils/tap'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type Props = { currentUserId: $ID; diff --git a/app/screens/participants_list/participants_list.tsx b/app/screens/participants_list/participants_list.tsx index 30aefdb2b..f749fb40d 100644 --- a/app/screens/participants_list/participants_list.tsx +++ b/app/screens/participants_list/participants_list.tsx @@ -10,7 +10,7 @@ import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; import ParticipantRow from './participant_row'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; import type {UserProfile} from '@mm-redux/types/users'; import type {$ID} from '@mm-redux/types/utilities'; diff --git a/app/screens/perf_metrics/index.tsx b/app/screens/perf_metrics/index.tsx index aa4ad4acf..a1fdc4c83 100644 --- a/app/screens/perf_metrics/index.tsx +++ b/app/screens/perf_metrics/index.tsx @@ -11,7 +11,7 @@ import telemetry, {PerfMetric} from '@telemetry'; import PerfItem from './item'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; const getStyleSheet = makeStyleFromTheme((theme: Theme) => { return { diff --git a/app/screens/perf_metrics/item.tsx b/app/screens/perf_metrics/item.tsx index 2bac7b4f8..06b09bf17 100644 --- a/app/screens/perf_metrics/item.tsx +++ b/app/screens/perf_metrics/item.tsx @@ -6,7 +6,7 @@ import {Text, View} from 'react-native'; import {makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; import type {PerfMetric} from '@telemetry'; type PerfItemProps = { diff --git a/app/screens/permalink/__snapshots__/permalink.test.js.snap b/app/screens/permalink/__snapshots__/permalink.test.js.snap index 6235211ca..7da06881e 100644 --- a/app/screens/permalink/__snapshots__/permalink.test.js.snap +++ b/app/screens/permalink/__snapshots__/permalink.test.js.snap @@ -62,7 +62,7 @@ exports[`Permalink should match snapshot 1`] = ` } > @@ -81,7 +81,7 @@ exports[`Permalink should match snapshot 1`] = ` numberOfLines={1} style={ Object { - "color": "#3d3c40", + "color": "#3f4350", "fontSize": 17, "fontWeight": "600", } @@ -101,7 +101,7 @@ exports[`Permalink should match snapshot 1`] = ` @@ -135,7 +135,7 @@ exports[`Permalink should match snapshot 2`] = ` style={ Array [ Object { - "color": "#3d3c40", + "color": "#3f4350", "fontSize": 16, "paddingRight": 20, }, diff --git a/app/screens/permalink/permalink.test.js b/app/screens/permalink/permalink.test.js index a3bd66692..ae36e4ef4 100644 --- a/app/screens/permalink/permalink.test.js +++ b/app/screens/permalink/permalink.test.js @@ -37,7 +37,7 @@ describe('Permalink', () => { myChannelMemberships: {}, onClose: jest.fn(), postIds: ['post_id_1', 'focused_post_id', 'post_id_3'], - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, componentId: 'component-id', }; diff --git a/app/screens/pinned_posts/__snapshots__/pinned_posts.test.js.snap b/app/screens/pinned_posts/__snapshots__/pinned_posts.test.js.snap index 98834ea6b..5acce527e 100644 --- a/app/screens/pinned_posts/__snapshots__/pinned_posts.test.js.snap +++ b/app/screens/pinned_posts/__snapshots__/pinned_posts.test.js.snap @@ -67,31 +67,31 @@ exports[`PinnedPosts should match snapshot when getPinnedPosts failed 1`] = ` onRetry={[Function]} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/screens/pinned_posts/pinned_posts.test.js b/app/screens/pinned_posts/pinned_posts.test.js index 399c036d8..776e36fec 100644 --- a/app/screens/pinned_posts/pinned_posts.test.js +++ b/app/screens/pinned_posts/pinned_posts.test.js @@ -17,7 +17,7 @@ describe('PinnedPosts', () => { showPermalink: jest.fn(), selectPost: jest.fn(), }, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, currentChannelId: 'channelId', }; diff --git a/app/screens/post_options/__snapshots__/post_options.test.js.snap b/app/screens/post_options/__snapshots__/post_options.test.js.snap index 643869556..a0c6fa9eb 100644 --- a/app/screens/post_options/__snapshots__/post_options.test.js.snap +++ b/app/screens/post_options/__snapshots__/post_options.test.js.snap @@ -16,31 +16,31 @@ exports[`PostOptions should match snapshot, no option for system message to user onRequestClose={[Function]} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } > @@ -57,31 +57,31 @@ exports[`PostOptions should match snapshot, no option for system message to user text="Reply" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -92,31 +92,31 @@ exports[`PostOptions should match snapshot, no option for system message to user text="Mark as Unread" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -128,31 +128,31 @@ exports[`PostOptions should match snapshot, no option for system message to user text="Pin to Channel" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -164,31 +164,31 @@ exports[`PostOptions should match snapshot, no option for system message to user text="Edit" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -224,31 +224,31 @@ exports[`PostOptions should match snapshot, showing Delete option only for syste onRequestClose={[Function]} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } > @@ -265,31 +265,31 @@ exports[`PostOptions should match snapshot, showing Delete option only for syste text="Reply" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -300,31 +300,31 @@ exports[`PostOptions should match snapshot, showing Delete option only for syste text="Mark as Unread" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -336,31 +336,31 @@ exports[`PostOptions should match snapshot, showing Delete option only for syste text="Pin to Channel" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -372,31 +372,31 @@ exports[`PostOptions should match snapshot, showing Delete option only for syste text="Edit" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -408,31 +408,31 @@ exports[`PostOptions should match snapshot, showing Delete option only for syste text="Delete" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -468,31 +468,31 @@ exports[`PostOptions should match snapshot, showing all possible options 1`] = ` onRequestClose={[Function]} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } > @@ -509,31 +509,31 @@ exports[`PostOptions should match snapshot, showing all possible options 1`] = ` text="Reply" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -544,31 +544,31 @@ exports[`PostOptions should match snapshot, showing all possible options 1`] = ` text="Mark as Unread" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -580,31 +580,31 @@ exports[`PostOptions should match snapshot, showing all possible options 1`] = ` text="Pin to Channel" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -616,31 +616,31 @@ exports[`PostOptions should match snapshot, showing all possible options 1`] = ` text="Edit" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -652,31 +652,31 @@ exports[`PostOptions should match snapshot, showing all possible options 1`] = ` text="Delete" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/screens/post_options/bindings/bindings.tsx b/app/screens/post_options/bindings/bindings.tsx index fcbd73f90..40eef437b 100644 --- a/app/screens/post_options/bindings/bindings.tsx +++ b/app/screens/post_options/bindings/bindings.tsx @@ -10,7 +10,7 @@ import {AppCallResponseTypes, AppCallTypes, AppExpandLevels} from '@mm-redux/con import {ActionResult} from '@mm-redux/types/actions'; import {AppBinding, AppCallResponse} from '@mm-redux/types/apps'; import {Post} from '@mm-redux/types/posts'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {UserProfile} from '@mm-redux/types/users'; import {isSystemMessage} from '@mm-redux/utils/post_utils'; import {DoAppCall, PostEphemeralCallResponseForPost} from '@mm-types/actions/apps'; diff --git a/app/screens/post_options/post_options.test.js b/app/screens/post_options/post_options.test.js index 86e3060ce..24795647c 100644 --- a/app/screens/post_options/post_options.test.js +++ b/app/screens/post_options/post_options.test.js @@ -51,7 +51,7 @@ describe('PostOptions', () => { post, showAddReaction: true, showAppOptions: true, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; function getWrapper(props = {}) { diff --git a/app/screens/reaction_list/__snapshots__/reaction_header.test.js.snap b/app/screens/reaction_list/__snapshots__/reaction_header.test.js.snap index c5683ef9d..2f6422ab7 100644 --- a/app/screens/reaction_list/__snapshots__/reaction_header.test.js.snap +++ b/app/screens/reaction_list/__snapshots__/reaction_header.test.js.snap @@ -27,31 +27,31 @@ exports[`ReactionHeader should match snapshot 1`] = ` onPress={[Function]} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -62,31 +62,31 @@ exports[`ReactionHeader should match snapshot 1`] = ` onPress={[Function]} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -104,31 +104,31 @@ Array [ onPress={[Function]} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } />, @@ -139,31 +139,31 @@ Array [ onPress={[Function]} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } />, diff --git a/app/screens/reaction_list/__snapshots__/reaction_header_item.test.js.snap b/app/screens/reaction_list/__snapshots__/reaction_header_item.test.js.snap index 904beea29..216c318e7 100644 --- a/app/screens/reaction_list/__snapshots__/reaction_header_item.test.js.snap +++ b/app/screens/reaction_list/__snapshots__/reaction_header_item.test.js.snap @@ -38,7 +38,7 @@ exports[`ReactionHeaderItem should match snapshot 1`] = ` @@ -57,31 +57,31 @@ exports[`ReactionList should match snapshot 1`] = ` teammateNameDisplay="username" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } user={ @@ -94,7 +94,7 @@ exports[`ReactionList should match snapshot 1`] = ` { selected: 'smile', onSelectReaction: jest.fn(), reactions: [{name: 'smile', count: 2}, {name: '+1', count: 1}], - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/screens/reaction_list/reaction_header_item.test.js b/app/screens/reaction_list/reaction_header_item.test.js index 6719cae4a..d67d73811 100644 --- a/app/screens/reaction_list/reaction_header_item.test.js +++ b/app/screens/reaction_list/reaction_header_item.test.js @@ -15,7 +15,7 @@ describe('ReactionHeaderItem', () => { emojiName: 'smile', highlight: false, onPress: jest.fn(), - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/screens/reaction_list/reaction_list.test.js b/app/screens/reaction_list/reaction_list.test.js index 5de09bae9..9e6dd7c27 100644 --- a/app/screens/reaction_list/reaction_list.test.js +++ b/app/screens/reaction_list/reaction_list.test.js @@ -16,7 +16,7 @@ describe('ReactionList', () => { }, allUserIds: ['user_id_1', 'user_id_2'], reactions: {'user_id_1-smile': {emoji_name: 'smile', user_id: 'user_id_1'}, 'user_id_2-+1': {emoji_name: '+1', user_id: 'user_id_2'}}, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, teammateNameDisplay: 'username', userProfiles: [{id: 'user_id_1', username: 'username_1'}, {id: 'user_id_2', username: 'username_2'}], componentId: 'component-id', diff --git a/app/screens/reaction_list/reaction_row/__snapshots__/reaction_row.test.js.snap b/app/screens/reaction_list/reaction_row/__snapshots__/reaction_row.test.js.snap index 3c7604bbc..9d667d439 100644 --- a/app/screens/reaction_list/reaction_row/__snapshots__/reaction_row.test.js.snap +++ b/app/screens/reaction_list/reaction_row/__snapshots__/reaction_row.test.js.snap @@ -54,7 +54,7 @@ exports[`ReactionRow should match snapshot, renderContent 1`] = ` { const baseProps = { emojiName: 'smile', teammateNameDisplay: 'username', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, user: {id: 'user_id', username: 'username'}, }; diff --git a/app/screens/recent_mentions/__snapshots__/recent_mentions.test.js.snap b/app/screens/recent_mentions/__snapshots__/recent_mentions.test.js.snap index 9daf267d7..e37a717fa 100644 --- a/app/screens/recent_mentions/__snapshots__/recent_mentions.test.js.snap +++ b/app/screens/recent_mentions/__snapshots__/recent_mentions.test.js.snap @@ -46,31 +46,31 @@ exports[`RecentMentions should match snapshot when getRecentMentions failed 1`] onRetry={[Function]} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/screens/recent_mentions/recent_mentions.test.js b/app/screens/recent_mentions/recent_mentions.test.js index 4ee31e1b1..00e32c5dd 100644 --- a/app/screens/recent_mentions/recent_mentions.test.js +++ b/app/screens/recent_mentions/recent_mentions.test.js @@ -17,7 +17,7 @@ describe('RecentMentions', () => { showPermalink: jest.fn(), selectPost: jest.fn(), }, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/screens/saved_posts/__snapshots__/saved_posts.test.js.snap b/app/screens/saved_posts/__snapshots__/saved_posts.test.js.snap index b0cfa3c64..55dfc1a78 100644 --- a/app/screens/saved_posts/__snapshots__/saved_posts.test.js.snap +++ b/app/screens/saved_posts/__snapshots__/saved_posts.test.js.snap @@ -46,31 +46,31 @@ exports[`SavedPosts should match snapshot when getFlaggedPosts failed 1`] = ` onRetry={[Function]} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/screens/saved_posts/saved_posts.test.js b/app/screens/saved_posts/saved_posts.test.js index 6a4e41226..58b9cd1c0 100644 --- a/app/screens/saved_posts/saved_posts.test.js +++ b/app/screens/saved_posts/saved_posts.test.js @@ -17,7 +17,7 @@ describe('SavedPosts', () => { showPermalink: jest.fn(), selectPost: jest.fn(), }, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/screens/search/__snapshots__/modifier.test.js.snap b/app/screens/search/__snapshots__/modifier.test.js.snap index d5e1afac0..1af19812d 100644 --- a/app/screens/search/__snapshots__/modifier.test.js.snap +++ b/app/screens/search/__snapshots__/modifier.test.js.snap @@ -3,7 +3,7 @@ exports[`Search RecentItem should match snapshot and respond to events 1`] = ` diff --git a/app/screens/search/__snapshots__/search.test.js.snap b/app/screens/search/__snapshots__/search.test.js.snap index 9a79d6fcc..3b6b26bc2 100644 --- a/app/screens/search/__snapshots__/search.test.js.snap +++ b/app/screens/search/__snapshots__/search.test.js.snap @@ -6,7 +6,7 @@ exports[`Search should match snapshot 1`] = ` { const baseProps = { item, setModifierValue: jest.fn(), - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot and respond to events', () => { diff --git a/app/screens/search/recent_item.test.js b/app/screens/search/recent_item.test.js index ee3e65e9f..13ffc31ba 100644 --- a/app/screens/search/recent_item.test.js +++ b/app/screens/search/recent_item.test.js @@ -17,7 +17,7 @@ describe('Search RecentItem', () => { item, removeSearchTerms: jest.fn(), setRecentValue: jest.fn(), - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot and respond to events', () => { diff --git a/app/screens/search/search.test.js b/app/screens/search/search.test.js index 494995210..b736896bc 100644 --- a/app/screens/search/search.test.js +++ b/app/screens/search/search.test.js @@ -30,7 +30,7 @@ describe('Search', () => { archivedPostIds: [], recent: [], isSearchGettingMore: true, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, enableDateSuggestion: true, timezoneOffsetInSeconds: 0, viewArchivedChannels: false, diff --git a/app/screens/search/search_result_post/__snapshots__/search_result_post.test.js.snap b/app/screens/search/search_result_post/__snapshots__/search_result_post.test.js.snap index da1115edd..91f48cc5c 100644 --- a/app/screens/search/search_result_post/__snapshots__/search_result_post.test.js.snap +++ b/app/screens/search/search_result_post/__snapshots__/search_result_post.test.js.snap @@ -13,31 +13,31 @@ exports[`SearchResultPost should match snapshot 1`] = ` testID="search_result_post.post" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/screens/search/search_result_post/search_result_post.test.js b/app/screens/search/search_result_post/search_result_post.test.js index 4dfea786c..dafe923de 100644 --- a/app/screens/search/search_result_post/search_result_post.test.js +++ b/app/screens/search/search_result_post/search_result_post.test.js @@ -15,7 +15,7 @@ describe('SearchResultPost', () => { highlightPinnedOrFlagged: false, skipFlaggedHeader: false, skipPinnedHeader: false, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', async () => { diff --git a/app/screens/select_team/__snapshots__/select_team.test.js.snap b/app/screens/select_team/__snapshots__/select_team.test.js.snap index e888f1564..6b1f90a41 100644 --- a/app/screens/select_team/__snapshots__/select_team.test.js.snap +++ b/app/screens/select_team/__snapshots__/select_team.test.js.snap @@ -5,31 +5,31 @@ exports[`SelectTeam should match snapshot for fail of teams 1`] = ` onRetry={[Function]} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -106,7 +106,7 @@ exports[`SelectTeam should match snapshot for teams 1`] = ` } > @@ -121,31 +121,31 @@ exports[`SelectTeam should match snapshot for teams 1`] = ` testID="select_team.custom_list" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/screens/select_team/select_team.test.js b/app/screens/select_team/select_team.test.js index 25b33491c..1d364eeb1 100644 --- a/app/screens/select_team/select_team.test.js +++ b/app/screens/select_team/select_team.test.js @@ -38,7 +38,7 @@ describe('SelectTeam', () => { currentUrl: 'test', userWithoutTeams: false, teams: [], - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, teamsRequest: { status: RequestStatus.FAILURE, }, diff --git a/app/screens/selector_screen/__snapshots__/selector_screen.test.js.snap b/app/screens/selector_screen/__snapshots__/selector_screen.test.js.snap index 19e531bc2..0c495aaa7 100644 --- a/app/screens/selector_screen/__snapshots__/selector_screen.test.js.snap +++ b/app/screens/selector_screen/__snapshots__/selector_screen.test.js.snap @@ -31,8 +31,8 @@ exports[`SelectorScreen should match snapshot for channels 1`] = ` inputHeight={33} inputStyle={ Object { - "backgroundColor": "rgba(61,60,64,0.2)", - "color": "#3d3c40", + "backgroundColor": "rgba(63,67,80,0.2)", + "color": "#3f4350", "fontSize": 15, } } @@ -45,16 +45,16 @@ exports[`SelectorScreen should match snapshot for channels 1`] = ` onSearchButtonPress={[Function]} onSelectionChange={[Function]} placeholder="Search" - placeholderTextColor="rgba(61,60,64,0.5)" + placeholderTextColor="rgba(63,67,80,0.5)" returnKeyType="search" searchBarRightMargin={0} searchIconSize={24} showArrow={false} showCancel={true} testID="selector.search_bar" - tintColorDelete="rgba(61,60,64,0.5)" - tintColorSearch="rgba(61,60,64,0.5)" - titleCancelColor="#3d3c40" + tintColorDelete="rgba(63,67,80,0.5)" + tintColorSearch="rgba(63,67,80,0.5)" + titleCancelColor="#3f4350" value="" /> @@ -72,31 +72,31 @@ exports[`SelectorScreen should match snapshot for channels 1`] = ` showNoResults={true} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -134,8 +134,8 @@ exports[`SelectorScreen should match snapshot for channels 2`] = ` inputHeight={33} inputStyle={ Object { - "backgroundColor": "rgba(61,60,64,0.2)", - "color": "#3d3c40", + "backgroundColor": "rgba(63,67,80,0.2)", + "color": "#3f4350", "fontSize": 15, } } @@ -148,16 +148,16 @@ exports[`SelectorScreen should match snapshot for channels 2`] = ` onSearchButtonPress={[Function]} onSelectionChange={[Function]} placeholder="Search" - placeholderTextColor="rgba(61,60,64,0.5)" + placeholderTextColor="rgba(63,67,80,0.5)" returnKeyType="search" searchBarRightMargin={0} searchIconSize={24} showArrow={false} showCancel={true} testID="selector.search_bar" - tintColorDelete="rgba(61,60,64,0.5)" - tintColorSearch="rgba(61,60,64,0.5)" - titleCancelColor="#3d3c40" + tintColorDelete="rgba(63,67,80,0.5)" + tintColorSearch="rgba(63,67,80,0.5)" + titleCancelColor="#3f4350" value="" /> @@ -175,31 +175,31 @@ exports[`SelectorScreen should match snapshot for channels 2`] = ` showNoResults={true} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -237,8 +237,8 @@ exports[`SelectorScreen should match snapshot for explicit options 1`] = ` inputHeight={33} inputStyle={ Object { - "backgroundColor": "rgba(61,60,64,0.2)", - "color": "#3d3c40", + "backgroundColor": "rgba(63,67,80,0.2)", + "color": "#3f4350", "fontSize": 15, } } @@ -251,16 +251,16 @@ exports[`SelectorScreen should match snapshot for explicit options 1`] = ` onSearchButtonPress={[Function]} onSelectionChange={[Function]} placeholder="Search" - placeholderTextColor="rgba(61,60,64,0.5)" + placeholderTextColor="rgba(63,67,80,0.5)" returnKeyType="search" searchBarRightMargin={0} searchIconSize={24} showArrow={false} showCancel={true} testID="selector.search_bar" - tintColorDelete="rgba(61,60,64,0.5)" - tintColorSearch="rgba(61,60,64,0.5)" - titleCancelColor="#3d3c40" + tintColorDelete="rgba(63,67,80,0.5)" + tintColorSearch="rgba(63,67,80,0.5)" + titleCancelColor="#3f4350" value="" /> @@ -285,31 +285,31 @@ exports[`SelectorScreen should match snapshot for explicit options 1`] = ` showNoResults={true} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -347,8 +347,8 @@ exports[`SelectorScreen should match snapshot for searching 1`] = ` inputHeight={33} inputStyle={ Object { - "backgroundColor": "rgba(61,60,64,0.2)", - "color": "#3d3c40", + "backgroundColor": "rgba(63,67,80,0.2)", + "color": "#3f4350", "fontSize": 15, } } @@ -361,16 +361,16 @@ exports[`SelectorScreen should match snapshot for searching 1`] = ` onSearchButtonPress={[Function]} onSelectionChange={[Function]} placeholder="Search" - placeholderTextColor="rgba(61,60,64,0.5)" + placeholderTextColor="rgba(63,67,80,0.5)" returnKeyType="search" searchBarRightMargin={0} searchIconSize={24} showArrow={false} showCancel={true} testID="selector.search_bar" - tintColorDelete="rgba(61,60,64,0.5)" - tintColorSearch="rgba(61,60,64,0.5)" - titleCancelColor="#3d3c40" + tintColorDelete="rgba(63,67,80,0.5)" + tintColorSearch="rgba(63,67,80,0.5)" + titleCancelColor="#3f4350" value="name2" /> @@ -388,31 +388,31 @@ exports[`SelectorScreen should match snapshot for searching 1`] = ` showNoResults={true} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -450,8 +450,8 @@ exports[`SelectorScreen should match snapshot for users 1`] = ` inputHeight={33} inputStyle={ Object { - "backgroundColor": "rgba(61,60,64,0.2)", - "color": "#3d3c40", + "backgroundColor": "rgba(63,67,80,0.2)", + "color": "#3f4350", "fontSize": 15, } } @@ -464,16 +464,16 @@ exports[`SelectorScreen should match snapshot for users 1`] = ` onSearchButtonPress={[Function]} onSelectionChange={[Function]} placeholder="Search" - placeholderTextColor="rgba(61,60,64,0.5)" + placeholderTextColor="rgba(63,67,80,0.5)" returnKeyType="search" searchBarRightMargin={0} searchIconSize={24} showArrow={false} showCancel={true} testID="selector.search_bar" - tintColorDelete="rgba(61,60,64,0.5)" - tintColorSearch="rgba(61,60,64,0.5)" - titleCancelColor="#3d3c40" + tintColorDelete="rgba(63,67,80,0.5)" + tintColorSearch="rgba(63,67,80,0.5)" + titleCancelColor="#3f4350" value="" /> @@ -491,31 +491,31 @@ exports[`SelectorScreen should match snapshot for users 1`] = ` showNoResults={true} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -553,8 +553,8 @@ exports[`SelectorScreen should match snapshot for users 2`] = ` inputHeight={33} inputStyle={ Object { - "backgroundColor": "rgba(61,60,64,0.2)", - "color": "#3d3c40", + "backgroundColor": "rgba(63,67,80,0.2)", + "color": "#3f4350", "fontSize": 15, } } @@ -567,16 +567,16 @@ exports[`SelectorScreen should match snapshot for users 2`] = ` onSearchButtonPress={[Function]} onSelectionChange={[Function]} placeholder="Search" - placeholderTextColor="rgba(61,60,64,0.5)" + placeholderTextColor="rgba(63,67,80,0.5)" returnKeyType="search" searchBarRightMargin={0} searchIconSize={24} showArrow={false} showCancel={true} testID="selector.search_bar" - tintColorDelete="rgba(61,60,64,0.5)" - tintColorSearch="rgba(61,60,64,0.5)" - titleCancelColor="#3d3c40" + tintColorDelete="rgba(63,67,80,0.5)" + tintColorSearch="rgba(63,67,80,0.5)" + titleCancelColor="#3f4350" value="" /> @@ -594,31 +594,31 @@ exports[`SelectorScreen should match snapshot for users 2`] = ` showNoResults={true} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/screens/selector_screen/selector_screen.test.js b/app/screens/selector_screen/selector_screen.test.js index ae176d38c..9b580b671 100644 --- a/app/screens/selector_screen/selector_screen.test.js +++ b/app/screens/selector_screen/selector_screen.test.js @@ -59,7 +59,7 @@ describe('SelectorScreen', () => { onSelect: jest.fn(), data: [{text: 'text', value: 'value'}], dataSource: null, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; beforeAll(() => { diff --git a/app/screens/settings/display_settings/__snapshots__/display_settings.test.js.snap b/app/screens/settings/display_settings/__snapshots__/display_settings.test.js.snap index 3a5d5bb28..865d66981 100644 --- a/app/screens/settings/display_settings/__snapshots__/display_settings.test.js.snap +++ b/app/screens/settings/display_settings/__snapshots__/display_settings.test.js.snap @@ -20,7 +20,7 @@ exports[`DisplaySettings should match snapshot 1`] = ` @@ -171,38 +171,38 @@ exports[`DisplaySettings should match snapshot on Tablet devices 1`] = ` testID="display_settings.clock_display.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> { const baseProps = { - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, enableTheme: false, enableTimezone: false, componentId: 'component-id', diff --git a/app/screens/settings/notification_settings/__snapshots__/notification_settings.test.js.snap b/app/screens/settings/notification_settings/__snapshots__/notification_settings.test.js.snap index 627a2703e..9773ba02c 100644 --- a/app/screens/settings/notification_settings/__snapshots__/notification_settings.test.js.snap +++ b/app/screens/settings/notification_settings/__snapshots__/notification_settings.test.js.snap @@ -71,31 +71,31 @@ NotificationSettings { }, "isCollapsedThreadsEnabled": false, "theme": Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", }, "updateMeRequest": Object {}, }, @@ -197,31 +197,31 @@ NotificationSettings { isCollapsedThreadsEnabled={false} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } updateMeRequest={Object {}} @@ -253,7 +253,7 @@ NotificationSettings { alwaysBounceVertical={false} contentContainerStyle={ Object { - "backgroundColor": "rgba(61,60,64,0.06)", + "backgroundColor": "rgba(63,67,80,0.06)", "flex": 1, "paddingTop": 35, } @@ -262,7 +262,7 @@ NotificationSettings { @@ -320,31 +320,31 @@ NotificationSettings { testID="notification_settings.mobile.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -360,38 +360,38 @@ NotificationSettings { testID="notification_settings.email.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -727,31 +727,31 @@ NotificationSettings { testID="notification_settings.mobile.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -767,38 +767,38 @@ NotificationSettings { testID="notification_settings.email.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> { }, componentId: 'component-id', currentUser, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, updateMeRequest: {}, currentUserStatus: 'status', enableAutoResponder: false, diff --git a/app/screens/settings/notification_settings_auto_responder/notification_settings_auto_responder.tsx b/app/screens/settings/notification_settings_auto_responder/notification_settings_auto_responder.tsx index 78810603d..8fb499ef6 100644 --- a/app/screens/settings/notification_settings_auto_responder/notification_settings_auto_responder.tsx +++ b/app/screens/settings/notification_settings_auto_responder/notification_settings_auto_responder.tsx @@ -11,7 +11,7 @@ import FormattedText from '@components/formatted_text'; import StatusBar from '@components/status_bar'; import TextInputWithLocalizedPlaceholder from '@components/text_input_with_localized_placeholder'; import {General} from '@mm-redux/constants'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {UserNotifyProps, UserProfile} from '@mm-redux/types/users'; import Section from '@screens/settings/section'; import SectionItem from '@screens/settings/section_item'; diff --git a/app/screens/settings/notification_settings_email/__snapshots__/notification_settings_email.android.test.js.snap b/app/screens/settings/notification_settings_email/__snapshots__/notification_settings_email.android.test.js.snap index c13b16b0e..6124b72f4 100644 --- a/app/screens/settings/notification_settings_email/__snapshots__/notification_settings_email.android.test.js.snap +++ b/app/screens/settings/notification_settings_email/__snapshots__/notification_settings_email.android.test.js.snap @@ -19,31 +19,31 @@ exports[`NotificationSettingsEmailAndroid should match snapshot 1`] = ` testID="notification_settings_email.send.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -168,31 +168,31 @@ exports[`NotificationSettingsEmailAndroid should match snapshot, renderEmailThre selected={true} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/screens/settings/notification_settings_email/__snapshots__/notification_settings_email.ios.test.js.snap b/app/screens/settings/notification_settings_email/__snapshots__/notification_settings_email.ios.test.js.snap index 1eae0a8ed..f7c78357b 100644 --- a/app/screens/settings/notification_settings_email/__snapshots__/notification_settings_email.ios.test.js.snap +++ b/app/screens/settings/notification_settings_email/__snapshots__/notification_settings_email.ios.test.js.snap @@ -9,31 +9,31 @@ exports[`NotificationSettingsEmailIos should match snapshot, renderEmailSection headerId="mobile.notification_settings.email.send" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } > @@ -52,31 +52,31 @@ exports[`NotificationSettingsEmailIos should match snapshot, renderEmailSection testID="notification_settings_email.immediately.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -104,31 +104,31 @@ exports[`NotificationSettingsEmailIos should match snapshot, renderEmailSection testID="notification_settings_email.never.action" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -144,31 +144,31 @@ exports[`NotificationSettingsEmailIos should match snapshot, renderEmailThreadsS headerId="user.settings.notifications.email_threads.title" theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } > @@ -185,31 +185,31 @@ exports[`NotificationSettingsEmailIos should match snapshot, renderEmailThreadsS selected={true} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> diff --git a/app/screens/settings/notification_settings_email/notification_settings_email.android.test.js b/app/screens/settings/notification_settings_email/notification_settings_email.android.test.js index 3289b502f..78839c982 100644 --- a/app/screens/settings/notification_settings_email/notification_settings_email.android.test.js +++ b/app/screens/settings/notification_settings_email/notification_settings_email.android.test.js @@ -23,7 +23,7 @@ describe('NotificationSettingsEmailAndroid', () => { savePreferences: jest.fn(), }, sendEmailNotifications: true, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, componentId: 'component-id', isCollapsedThreadsEnabled: false, }; diff --git a/app/screens/settings/notification_settings_email/notification_settings_email.ios.test.js b/app/screens/settings/notification_settings_email/notification_settings_email.ios.test.js index 8e97ad3b4..a8f02ebef 100644 --- a/app/screens/settings/notification_settings_email/notification_settings_email.ios.test.js +++ b/app/screens/settings/notification_settings_email/notification_settings_email.ios.test.js @@ -31,7 +31,7 @@ describe('NotificationSettingsEmailIos', () => { savePreferences: jest.fn(), }, sendEmailNotifications: true, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, componentId: 'component-id', isCollapsedThreadsEnabled: false, }; diff --git a/app/screens/settings/notification_settings_mentions_keywords/__snapshots__/notification_settings_mentions_keywords.test.js.snap b/app/screens/settings/notification_settings_mentions_keywords/__snapshots__/notification_settings_mentions_keywords.test.js.snap index 26e829fdb..4d0a9335a 100644 --- a/app/screens/settings/notification_settings_mentions_keywords/__snapshots__/notification_settings_mentions_keywords.test.js.snap +++ b/app/screens/settings/notification_settings_mentions_keywords/__snapshots__/notification_settings_mentions_keywords.test.js.snap @@ -39,31 +39,31 @@ NotificationSettingsMentionsKeywords { "keywords": "", "onBack": [MockFunction], "theme": Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", }, }, "refs": Object {}, @@ -125,31 +125,31 @@ NotificationSettingsMentionsKeywords { onBack={[MockFunction]} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } />, @@ -179,7 +179,7 @@ NotificationSettingsMentionsKeywords { alwaysBounceVertical={false} contentContainerStyle={ Object { - "backgroundColor": "rgba(61,60,64,0.06)", + "backgroundColor": "rgba(63,67,80,0.06)", "flex": 1, "paddingTop": 35, } @@ -189,9 +189,9 @@ NotificationSettingsMentionsKeywords { style={ Object { "backgroundColor": "#ffffff", - "borderBottomColor": "rgba(61,60,64,0.1)", + "borderBottomColor": "rgba(63,67,80,0.1)", "borderBottomWidth": 1, - "borderTopColor": "rgba(61,60,64,0.1)", + "borderTopColor": "rgba(63,67,80,0.1)", "borderTopWidth": 1, } } @@ -211,11 +211,11 @@ NotificationSettingsMentionsKeywords { "id": "mobile.notification_settings_mentions.keywordsDescription", } } - placeholderTextColor="rgba(61,60,64,0.4)" + placeholderTextColor="rgba(63,67,80,0.4)" returnKeyType="done" style={ Object { - "color": "#3d3c40", + "color": "#3f4350", "fontSize": 15, "height": 150, "paddingHorizontal": 15, @@ -238,7 +238,7 @@ NotificationSettingsMentionsKeywords { id="mobile.notification_settings_mentions.keywordsHelp" style={ Object { - "color": "rgba(61,60,64,0.4)", + "color": "rgba(63,67,80,0.4)", "fontSize": 13, } } diff --git a/app/screens/settings/notification_settings_mentions_keywords/notification_settings_mentions_keywords.test.js b/app/screens/settings/notification_settings_mentions_keywords/notification_settings_mentions_keywords.test.js index 6c008f3a4..3fa36ba84 100644 --- a/app/screens/settings/notification_settings_mentions_keywords/notification_settings_mentions_keywords.test.js +++ b/app/screens/settings/notification_settings_mentions_keywords/notification_settings_mentions_keywords.test.js @@ -13,7 +13,7 @@ describe('NotificationSettingsMentionsKeywords', () => { componentId: 'component-id', keywords: '', onBack: jest.fn(), - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/screens/settings/sidebar/__snapshots__/sidebar.test.js.snap b/app/screens/settings/sidebar/__snapshots__/sidebar.test.js.snap index 3f2b934d2..b2e0520b2 100644 --- a/app/screens/settings/sidebar/__snapshots__/sidebar.test.js.snap +++ b/app/screens/settings/sidebar/__snapshots__/sidebar.test.js.snap @@ -21,7 +21,7 @@ exports[`SidebarSettings should match, full snapshot 2`] = ` ({ describe('SidebarSettings', () => { const baseProps = { - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match, full snapshot', async () => { @@ -61,7 +61,7 @@ describe('SidebarSettings', () => { deviceWidth: 10, isLandscape: false, teamsCount: 2, - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; const mainSidebar = shallowWithIntl( diff --git a/app/screens/settings/theme/__snapshots__/theme.test.js.snap b/app/screens/settings/theme/__snapshots__/theme.test.js.snap index 191c96da5..3fbf49d8e 100644 --- a/app/screens/settings/theme/__snapshots__/theme.test.js.snap +++ b/app/screens/settings/theme/__snapshots__/theme.test.js.snap @@ -12,7 +12,7 @@ exports[`Theme should match snapshot 1`] = ` - Mattermost + Denim } selected={true} - theme={ + tileTheme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "key": "denim", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> - Organization + Sapphire } selected={false} - theme={ + tileTheme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "key": "sapphire", + "linkColor": "#1c58d9", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#174ab5", + "mentionHighlightBg": "#7ff0f0", + "mentionHighlightLink": "#0d6e6e", + "newMessageSeparator": "#15b7b7", + "onlineIndicator": "#3db887", + "sidebarBg": "#174ab5", + "sidebarHeaderBg": "#1542a2", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#133a91", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#57b5f0", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#2a58ba", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Sapphire", } } /> - Mattermost Dark + Quartz } selected={false} - theme={ + tileTheme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#f5ab07", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", - "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", - "sidebarHeaderTextColor": "#ffffff", - "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", - "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", - "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "key": "quartz", + "linkColor": "#1c58d9", + "mentionBg": "#1c58d9", + "mentionColor": "#ffffff", + "mentionHighlightBg": "#7ff0f0", + "mentionHighlightLink": "#0d6e6e", + "newMessageSeparator": "#15b7b7", + "onlineIndicator": "#3db887", + "sidebarBg": "#f4f4f6", + "sidebarHeaderBg": "#e8e9ed", + "sidebarHeaderTextColor": "#2d3039", + "sidebarTeamBarBg": "#dddfe4", + "sidebarText": "#090a0b", + "sidebarTextActiveBorder": "#32a4ec", + "sidebarTextActiveColor": "#2d3039", + "sidebarTextHoverBg": "#ebebed", + "sidebarUnreadText": "#2d3039", + "type": "Quartz", } } /> - Windows Dark + Indigo } selected={false} - theme={ + tileTheme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#f5ab00", + "buttonBg": "#386fe5", + "buttonColor": "#ffffff", + "centerChannelBg": "#0a111f", + "centerChannelColor": "#dddfe4", + "codeTheme": "github", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "key": "indigo", + "linkColor": "#5d89ea", + "mentionBg": "#1c58d9", + "mentionColor": "#ffffff", + "mentionHighlightBg": "#133a91", + "mentionHighlightLink": "#a4f4f4", + "newMessageSeparator": "#81a3ef", + "onlineIndicator": "#3db887", + "sidebarBg": "#0f1a2e", + "sidebarHeaderBg": "#152231", + "sidebarHeaderTextColor": "#dddfe4", + "sidebarTeamBarBg": "#05080f", + "sidebarText": "#ffffff", + "sidebarTextActiveBorder": "#1279ba", + "sidebarTextActiveColor": "#ffffff", + "sidebarTextHoverBg": "#222c3f", + "sidebarUnreadText": "#ffffff", + "type": "Indigo", + } + } + /> + + Onyx + + } + selected={false} + tileTheme={ + Object { + "awayIndicator": "#f5ab00", + "buttonBg": "#386fe5", + "buttonColor": "#ffffff", + "centerChannelBg": "#090a0b", + "centerChannelColor": "#dddfe4", + "codeTheme": "monokai", + "dndIndicator": "#d24b4e", + "errorTextColor": "#da6c6e", + "key": "onyx", + "linkColor": "#5d89ea", + "mentionBg": "#1c58d9", + "mentionColor": "#ffffff", + "mentionHighlightBg": "#0d6e6e", + "mentionHighlightLink": "#a4f4f4", + "newMessageSeparator": "#1adbdb", + "onlineIndicator": "#3db887", + "sidebarBg": "#121317", + "sidebarHeaderBg": "#1b1d22", + "sidebarHeaderTextColor": "#dddfe4", + "sidebarTeamBarBg": "#000000", + "sidebarText": "#ffffff", + "sidebarTextActiveBorder": "#1592e0", + "sidebarTextActiveColor": "#ffffff", + "sidebarTextHoverBg": "#25262a", + "sidebarUnreadText": "#ffffff", + "type": "Onyx", } } /> diff --git a/app/screens/settings/theme/theme.js b/app/screens/settings/theme/theme.js index c244d64f6..e847ddabf 100644 --- a/app/screens/settings/theme/theme.js +++ b/app/screens/settings/theme/theme.js @@ -16,13 +16,6 @@ import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; import ThemeTile from './theme_tile'; -const thumbnailImages = { - default: require('@assets/images/themes/mattermost.png'), - organization: require('@assets/images/themes/organization.png'), - mattermostDark: require('@assets/images/themes/mattermost_dark.png'), - windows10: require('@assets/images/themes/windows_dark.png'), -}; - export default class Theme extends React.PureComponent { static propTypes = { actions: PropTypes.shape({ @@ -86,8 +79,8 @@ export default class Theme extends React.PureComponent { action={this.setTheme} actionValue={allowedTheme.key} selected={allowedTheme.type.toLowerCase() === theme.type.toLowerCase()} - theme={theme} - imageSrc={thumbnailImages[allowedTheme.key]} + tileTheme={allowedTheme} + activeTheme={theme} isLandscape={isLandscape} isTablet={isTablet} /> @@ -156,9 +149,9 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => { }, tilesContainer: { marginBottom: 30, + paddingLeft: 8, flexDirection: 'row', flexWrap: 'wrap', - justifyContent: 'center', backgroundColor: theme.centerChannelBg, borderTopWidth: 1, borderBottomWidth: 1, diff --git a/app/screens/settings/theme/theme.test.js b/app/screens/settings/theme/theme.test.js index 59cf98d2f..04af274ad 100644 --- a/app/screens/settings/theme/theme.test.js +++ b/app/screens/settings/theme/theme.test.js @@ -23,7 +23,7 @@ describe('Theme', () => { isLandscape: false, isTablet: false, teamId: 'test-team', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, userId: 'test-user', }; @@ -33,6 +33,6 @@ describe('Theme', () => { ); expect(wrapper.getElement()).toMatchSnapshot(); - expect(wrapper.find(ThemeTile)).toHaveLength(4); + expect(wrapper.find(ThemeTile)).toHaveLength(5); }); }); diff --git a/app/screens/settings/theme/theme_thumbnail.tsx b/app/screens/settings/theme/theme_thumbnail.tsx new file mode 100644 index 000000000..26154977e --- /dev/null +++ b/app/screens/settings/theme/theme_thumbnail.tsx @@ -0,0 +1,296 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +import React from 'react'; +import Svg, {Rect, G, Circle} from 'react-native-svg'; + +type ThemeThumbnailProps = { + width: number; + borderColorBase: string; + borderColorMix: string; + sidebarBg: string; + sidebarText: string; + sidebarUnreadText: string; + onlineIndicator: string; + awayIndicator: string; + dndIndicator: string; + centerChannelColor: string; + centerChannelBg: string; + newMessageSeparator: string; + buttonBg: string; +} + +function ThemeThumbnail({ + width = 180, + borderColorBase = '#E0E1E3', + borderColorMix = '#E0E1E3', + sidebarBg = '#174AB5', + sidebarText = '#86A1D9', + sidebarUnreadText = 'white', + onlineIndicator = '#3DB887', + awayIndicator = '#FFBC1F', + dndIndicator = '#D24B4E', + centerChannelColor = '#E0E1E3', + centerChannelBg = 'white', + newMessageSeparator = '#1C58D9', + buttonBg = '#15B7B7', +}: ThemeThumbnailProps): JSX.Element { + // the original height of the thumbnail + const baseWidth = 180; + const baseHeight = 134; + + // calculate actual height proportionally to base size + const height = Math.round((width * baseHeight) / baseWidth); + + // convenience values of various sub elements of the thumbnail + const sidebarWidth = 80; + const postsContainerWidth = 100; + const spacing = 8; + const rowHeight = 6; + const rowRadius = rowHeight / 2; + const postInputHeight = 10; + const postWidth = postsContainerWidth - (spacing * 2); + const channelNameWidth = sidebarWidth - (spacing * 3) - (rowHeight * 2); + const buttonWidth = postsContainerWidth - (spacing * 8); + + return ( + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +} + +export default ThemeThumbnail; diff --git a/app/screens/settings/theme/theme_tile.js b/app/screens/settings/theme/theme_tile.js index c8fb0471e..3ac90729f 100644 --- a/app/screens/settings/theme/theme_tile.js +++ b/app/screens/settings/theme/theme_tile.js @@ -5,29 +5,31 @@ import PropTypes from 'prop-types'; import React from 'react'; import { Dimensions, - Image, TouchableOpacity, View, } from 'react-native'; import CompassIcon from '@components/compass_icon'; +import {changeOpacity} from '@mm-redux/utils/theme_utils'; import {makeStyleSheetFromTheme} from '@utils/theme'; +import ThemeThumbnail from './theme_thumbnail'; + const tilePadding = 8; const ThemeTile = (props) => { const { action, actionValue, - imageSrc, isLandscape, isTablet, label, selected, - theme, + activeTheme, + tileTheme, } = props; - const style = getStyleSheet(theme); + const style = getStyleSheet(activeTheme); const labelComponent = React.cloneElement( label, @@ -42,7 +44,7 @@ const ThemeTile = (props) => { width: (fullWidth / tilesPerLine) - tilePadding, }, thumbnail: { - width: (fullWidth / tilesPerLine) - (tilePadding + 20), + width: (fullWidth / tilesPerLine) - (tilePadding + 16), }, }; @@ -52,16 +54,22 @@ const ThemeTile = (props) => { onPress={() => action(actionValue)} > - {imageSrc && ( - - )} + {selected && ( { ThemeTile.propTypes = { action: PropTypes.func, actionValue: PropTypes.string, - imageSrc: PropTypes.oneOfType([ - PropTypes.number, - PropTypes.object, - ]).isRequired, isLandscape: PropTypes.bool.isRequired, isTablet: PropTypes.bool.isRequired, label: PropTypes.node.isRequired, selected: PropTypes.bool, - theme: PropTypes.object.isRequired, + activeTheme: PropTypes.object.isRequired, + tileTheme: PropTypes.object.isRequired, }; ThemeTile.defaultProps = { @@ -108,14 +113,11 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => { thumbnail: { resizeMode: 'stretch', }, - selectedThumbnail: { - opacity: 0.5, - }, check: { position: 'absolute', - right: 10, - bottom: 10, - color: theme.buttonBg, + right: 5, + bottom: 5, + color: theme.sidebarTextActiveBorder, }, label: { color: theme.centerChannelColor, diff --git a/app/screens/settings/timezone/select_timezone/__snapshots__/select_timezone.test.js.snap b/app/screens/settings/timezone/select_timezone/__snapshots__/select_timezone.test.js.snap index 079ed2298..8c12a2a53 100644 --- a/app/screens/settings/timezone/select_timezone/__snapshots__/select_timezone.test.js.snap +++ b/app/screens/settings/timezone/select_timezone/__snapshots__/select_timezone.test.js.snap @@ -20,7 +20,7 @@ exports[`Settings SelectTimezone should match snapshot 1`] = ` { selectedTimezone: 'selected-timezone', initialScrollIndex: 1, timezones: [], - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, isLandscape: false, }; diff --git a/app/screens/slide_up/index.tsx b/app/screens/slide_up/index.tsx index fd0a81216..e5ad3dd32 100644 --- a/app/screens/slide_up/index.tsx +++ b/app/screens/slide_up/index.tsx @@ -9,7 +9,7 @@ import SlideUpPanel from '@components/slide_up_panel'; import {NavigationTypes} from '@constants'; import EventEmitter from '@mm-redux/utils/event_emitter'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; type Props = { allowStayMiddle?: boolean; diff --git a/app/screens/sso/sso_with_redirect_url.test.tsx b/app/screens/sso/sso_with_redirect_url.test.tsx index 0ec3a66f0..576a53021 100644 --- a/app/screens/sso/sso_with_redirect_url.test.tsx +++ b/app/screens/sso/sso_with_redirect_url.test.tsx @@ -18,7 +18,7 @@ describe('SSO with redirect url', () => { onCSRFToken: jest.fn(), onMMToken: jest.fn(), setLoginError: jest.fn(), - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should show message when user navigates to the page', () => { diff --git a/app/screens/sso/sso_with_redirect_url.tsx b/app/screens/sso/sso_with_redirect_url.tsx index 09b53f49c..940e1772a 100644 --- a/app/screens/sso/sso_with_redirect_url.tsx +++ b/app/screens/sso/sso_with_redirect_url.tsx @@ -10,7 +10,7 @@ import urlParse from 'url-parse'; import {setDeepLinkURL} from '@actions/views/root'; import FormattedText from '@components/formatted_text'; import Loading from '@components/loading'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import Store from '@store/store'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; import {tryOpenURL} from '@utils/url'; diff --git a/app/screens/sso/sso_with_webview.tsx b/app/screens/sso/sso_with_webview.tsx index b89b2cf11..272945d34 100644 --- a/app/screens/sso/sso_with_webview.tsx +++ b/app/screens/sso/sso_with_webview.tsx @@ -18,7 +18,7 @@ import StatusBar from '@components/status_bar'; import {ViewTypes} from '@constants'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; const HEADERS = { 'X-Mobile-App': 'mattermost', diff --git a/app/screens/terms_of_service/__snapshots__/terms_of_service.test.js.snap b/app/screens/terms_of_service/__snapshots__/terms_of_service.test.js.snap index d3200dfad..77b53a459 100644 --- a/app/screens/terms_of_service/__snapshots__/terms_of_service.test.js.snap +++ b/app/screens/terms_of_service/__snapshots__/terms_of_service.test.js.snap @@ -26,7 +26,7 @@ exports[`TermsOfService should enable/disable navigator buttons on setNavigatorB @@ -303,31 +303,31 @@ exports[`TermsOfService should match snapshot for fail of get terms 1`] = ` onRetry={[Function]} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -336,7 +336,7 @@ exports[`TermsOfService should match snapshot for fail of get terms 1`] = ` exports[`TermsOfService should match snapshot for get terms 1`] = ` @@ -368,7 +368,7 @@ exports[`TermsOfService should match snapshot on enableNavigatorLogout 1`] = ` { isSupportedServer: true, siteName: 'Mattermost', showUnsupportedServer: jest.fn(), - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, }; test('should match snapshot', () => { diff --git a/app/screens/thread/__snapshots__/thread.ios.test.js.snap b/app/screens/thread/__snapshots__/thread.ios.test.js.snap index 3d3c3caf7..78892087e 100644 --- a/app/screens/thread/__snapshots__/thread.ios.test.js.snap +++ b/app/screens/thread/__snapshots__/thread.ios.test.js.snap @@ -9,7 +9,7 @@ exports[`thread should match snapshot, has root post 1`] = ` @@ -87,14 +87,14 @@ exports[`thread should match snapshot, no root post, loading 1`] = ` @@ -130,7 +130,7 @@ exports[`thread should match snapshot, render footer 1`] = ` } renderFooter={ @@ -170,14 +170,14 @@ exports[`thread should match snapshot, render footer 3`] = ` diff --git a/app/screens/thread/thread.ios.test.js b/app/screens/thread/thread.ios.test.js index 8435df4ad..e08d84c99 100644 --- a/app/screens/thread/thread.ios.test.js +++ b/app/screens/thread/thread.ios.test.js @@ -23,7 +23,7 @@ describe('thread', () => { displayName: 'channel_display_name', myMember: {last_viewed_at: 0, user_id: 'member_user_id'}, rootId: 'root_id', - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, postIds: ['root_id', 'post_id_1', 'post_id_2'], channelIsArchived: false, threadLoadingStatus: {status: RequestStatus.STARTED}, diff --git a/app/screens/thread/thread_follow/index.tsx b/app/screens/thread/thread_follow/index.tsx index 8a4db5e10..ff9c08a41 100644 --- a/app/screens/thread/thread_follow/index.tsx +++ b/app/screens/thread/thread_follow/index.tsx @@ -5,7 +5,7 @@ import React from 'react'; import {IntlShape} from 'react-intl'; import {Platform, StyleSheet, Text, TouchableOpacity, View} from 'react-native'; -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {changeOpacity} from '@mm-redux/utils/theme_utils'; import {preventDoubleTap} from '@utils/tap'; import {makeStyleSheetFromTheme} from '@utils/theme'; diff --git a/app/screens/user_profile/__snapshots__/user_profile.test.js.snap b/app/screens/user_profile/__snapshots__/user_profile.test.js.snap index acc75b0ed..faae2ede8 100644 --- a/app/screens/user_profile/__snapshots__/user_profile.test.js.snap +++ b/app/screens/user_profile/__snapshots__/user_profile.test.js.snap @@ -44,7 +44,7 @@ exports[`user_profile should match snapshot 1`] = ` @@ -572,7 +572,7 @@ exports[`user_profile should match snapshot with custom status 1`] = ` @@ -811,31 +811,31 @@ exports[`user_profile should match snapshot with custom status and isMyUser true size={20} theme={ Object { - "awayIndicator": "#ffbc42", - "buttonBg": "#166de0", + "awayIndicator": "#ffbc1f", + "buttonBg": "#1c58d9", "buttonColor": "#ffffff", "centerChannelBg": "#ffffff", - "centerChannelColor": "#3d3c40", + "centerChannelColor": "#3f4350", "codeTheme": "github", - "dndIndicator": "#f74343", - "errorTextColor": "#fd5960", - "linkColor": "#2389d7", + "dndIndicator": "#d24b4e", + "errorTextColor": "#d24b4e", + "linkColor": "#386fe5", "mentionBg": "#ffffff", - "mentionBj": "#ffffff", - "mentionColor": "#145dbf", - "mentionHighlightBg": "#ffe577", - "mentionHighlightLink": "#166de0", - "newMessageSeparator": "#ff8800", - "onlineIndicator": "#06d6a0", - "sidebarBg": "#145dbf", - "sidebarHeaderBg": "#1153ab", + "mentionColor": "#1e325c", + "mentionHighlightBg": "#ffd470", + "mentionHighlightLink": "#1b1d22", + "newMessageSeparator": "#cc8f00", + "onlineIndicator": "#3db887", + "sidebarBg": "#1e325c", + "sidebarHeaderBg": "#192a4d", "sidebarHeaderTextColor": "#ffffff", + "sidebarTeamBarBg": "#14213e", "sidebarText": "#ffffff", - "sidebarTextActiveBorder": "#579eff", + "sidebarTextActiveBorder": "#5d89ea", "sidebarTextActiveColor": "#ffffff", - "sidebarTextHoverBg": "#4578bf", + "sidebarTextHoverBg": "#28427b", "sidebarUnreadText": "#ffffff", - "type": "Mattermost", + "type": "Denim", } } /> @@ -863,7 +863,7 @@ exports[`user_profile should match snapshot with custom status and isMyUser true @@ -1151,7 +1151,7 @@ exports[`user_profile should match snapshot with custom status expiry 1`] = ` { }, teammateNameDisplay: 'username', teams: [], - theme: Preferences.THEMES.default, + theme: Preferences.THEMES.denim, enableTimezone: false, isMilitaryTime: false, isMyUser: false, diff --git a/app/utils/message_attachment_colors.ts b/app/utils/message_attachment_colors.ts index c7c4710d6..4ef0605aa 100644 --- a/app/utils/message_attachment_colors.ts +++ b/app/utils/message_attachment_colors.ts @@ -1,7 +1,7 @@ // Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. // See LICENSE.txt for license information. -import {Theme} from '@mm-redux/types/preferences'; +import {Theme} from '@mm-redux/types/theme'; import {Dictionary} from '@mm-redux/types/utilities'; export function getStatusColors(theme: Theme) { diff --git a/assets/base/images/themes/mattermost.png b/assets/base/images/themes/mattermost.png deleted file mode 100644 index 18b816f32fe75c6ae25f35430508857b5a981665..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 988 zcmV<210(#2P)FK)vfV!;$$zt+~)*VotC+1c3G*w@$B+uPf4mC8+l$QE9}|NsB~{{H#- z`SSAe<>lqr*x1lq&L3zd4*w{mT%R+$4BdxRy&ZI|x%%{TU?DF{r z)}a5ICI5&38DG4SkbUQ~PXD|@gw0m*Urw)%*@RC`uf?~ z+1S|F@9*#A>v=A(0007WNklNKX_u8EPLK*%efjXTzUJ!pu`X#cWYC1e-n3nh(>|f%zo*#q}+=~+tu~LZA zEH8j6E0MKAR5vYs5Ca)2L|ua~8i~kaA*%BT08Ek1LX?F7CyV96G|=HJ68$iaLr>TA zIpfg3Ug*rr`XkHi*l5#W7l~oIF_86n!|R3f`eU<=yaRZVz~4r)K5u-za9MwBv5~8Q zz;>Y{gLvJ}S>QGh#Xz*o+=_aHFf%91+xuUq`I1v+ucg^)MikCd9Q)7GU|0F-PzYf= zMF?@H4GBp|LK2!2=4oQ%uX@{*VdadeiHJYs-zPr_I z$Q$IA$;93e*4k^;+^y!-&()MS$SspqZ$nsjgmrhT^$Wt5yg_c6I0t+}{3_#j3g;mS z4G8HENyz;+oo?3Z7;MpJEd5>)65>}`-zl6nB*Y=a-+ySo4^}Vx{n-DPkbBzcZT=#9 z8+sc$2NKfT(A&`4^!kHAzlZE?`op#Q$gAGK5e^j2frNNfR&)xz4GHOO=xyk2xZj5R zZAb`FW$w2jAqhw0$@D`_#v=^E@$^%TF$ia$6VCV>+W!ynCpNuJjtS{)=xslEu% z@9q>oO$$De3_sNkJ{b=_T@XH@5jy3v_#)*}l0r*RNulMZq|is>m$azzqD=_^0000< KMNUMnLSTY@8y5ut diff --git a/assets/base/images/themes/mattermost@2x.png b/assets/base/images/themes/mattermost@2x.png deleted file mode 100644 index 4372a59aa0bf82f4cd1572c14fb5055506a70d76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2084 zcmYjS3pmql8=oi>vOd0O9c<1L9at$X8J1OSp+qPYBBk=OvM6oE8zG^*UUSI1P}F*n zkW6eCm#A${Uq7k(^ z5aB1t*x1+;HsE`oWfIDe%jMs{e+PYk-hz(TvN~+8Hc2EBP}AGn8~&($ZfL{eAhpb#iK0wh9!vZGh-JYYZbn}2iIBKS4q zX&_LCVGTot>R*HoK#vV{mYAW@ct# zVL>XDe*5% zYKT8Z72=As>$Ph^-49XBk=Cv*l7suPU}b9&(7q`U0QP1n7JLonEC~?E8Y`TWgC|jm z{aHE7SV@Dz|2w1VNmT?ovj$jBrX3)@`yxau)C(S_e|#lOYBk@wU&$J6ZMV1Kr3>)# z?>c%LLZ!QJvBhM$mm^s>LfBawyQF&WFw?-47UDT0AAXo__OxtjQ+j`GY^gxNI;Hcu zC!IB~o>}L=Td!Fxv8vYh6nF>Oti8B^olL--b!h1aodyHl#P_m_WDb^IDzUbK%(ceA0lT@N@1z$i5@v^9Risw|XqRF9ul`_mQzv!mRh9}3D1;i(x8E`A6#E!cD@5;a8_ zyO2A7%r4-s)6~Z^Mxs^Fyx=XY&90IDV_~NzIHo7<)RrL$72Zp`k7h{K(zRz>HC&PL zEU7--u;+vHn~E&=8OtkrR;4msFLBklGbwxDE$(ycstjVQXaImJYhKuw*x^imJ9IPp zmEKlp$%)ZzWGmF|qpnB|{}+BQ)C;ugc&h$L5gUe&!;qot4V)5T$p7Dr;LG!T(emne zX=*n05p~#^;M_$t_cwnB3xg)@AtRDuReh{I^bsd~N*)}IIw&|`O)PQvABY^)k8tAc z`-RIG4XgLJY^aE+s%=gUt{(Jk5ZttE&j@#w3Zyn;!h+}MhVAgLqcVwZY2|h;0L3@6 zg=bZ+NhsoW?D!OZp$-4pDlUhfE8!I$-!rN^S!v|ll@oaa>UAc(|0KD8PF?Kt(4FM^ z#)>>uQR!#F@RLz)SRQtC$%O@w4EtG@soG4O+`N5g=Q(0*LO}R{M3;F>_kyXY=Gmjdm&pDFes{+SxfO_;R&!4o+Y3 znlxl?Z=SHNIUM>Cme7Tb&K)ngQu5KGh=yIQ^^2Ts_4tZL{*;DY?`iJu2*sdLV9q}j z2gloP)rv)<_+{e$CFbLWy=YXUR^9PPo8(NeSQ32?$?y3{h9mNTS@S(;Dn;-N2@=Rf zJjfvWh7IF>t8`1#(I;*xg#P}k=$}@eU8$rqp_r(Nyb%WLV}Wep*TUE(yJ%Qh>sh4{ zOAT*_#1)>8J%Zdo(`#Wm4q)HdGFQUqPmpTJ2Y|I|=Yk*aZY0UYm(KIW)vQfgcFltpQ)8=iKvi3|uzs&!WP<@F9< z>QUBR_u!3P@_Pz)L(Imd6X9B+>r@WGC>CzbRS|aHRI`JMK83F=RnRgxPbL2`bE$d| zn(T{5@fDGzD4x280zZ#AxS6`;0|#$9Z`-^1OoUNZ{^AbQo~6V6BV{k%Z}VUNyx&#z zxg<53>1B6YAM?pxuse!Tm`jLfrxmLQkE(me^D>JznT#@%6f6{8E4gh4YVi)Rs(vR~ zbmqlxTzpC(PgO;1FNn&{cf~?fL`;phKFO;Dref_<_)DFpdU71*#Of>|!k>$Oc7YMS zIyG!j&A6C0J%p>Qpc0PXZ?ei0PcEv7b6=quWkQU7LC!U+5MoFpx#zl+0Y-dVM8Gk?=(A3t=#E$nOODmy>Yjy#uA6P?J6*0DK? zf%i5qfpt7WkA6S@X`~UnNnZn-(HmHqWUMn3`F3Dyg%)*CX$nZl%@4TI1AajeoU@x# JIp%D_e*vO9D~G8pX+;le%F1U@9(<)xl?XhUf(YX zkQ5LQ*nh*+*jhk9kjCFx;=+7FA8`!gCu=v&ZA|!Sbv4ibdGDRHZ`MiJE76^r_c~5P zI*xmPk-O7&*cDCuYmNMS{YXh95+Cq*ywDdt&M93=UhRC&Cwv}}kMl_XW*E_V#I5be zAwHa#n24?*IHh1!ecSn`wzs#rTrP*h`TqSolgXT!nIV(OKW<j*3uxf0cR;T|TjigGQs2l%{A5s5h1T`4h87FI%P=wVDTIqMtSx=+6z zX{!+?x3_m_XlQeD)5@;6$Rcd`x*f~dRLimM^9>KqwQFYfWpgHGbUK~? z%lSB7*LmPK{@^RatSxT~2s;;d&8~BIc6q!_*2KWO6c3<~M$OJ*AVBIlb9V>jEG~=O z=1<_SMGxDz2f6hW2$ESPARsw%!}y9#q#$c##%|i^;N!{mQp0gdw;Wp};>DT*2gTEK77oi7_XO4U%FaQwGd7rmd zf^C?SlpqK!*#bP_L=t`19BA&m@6}Q#7?#y9LJ%sFOf;hc|`q&B(b1 zD}HIFo3Mqrn#eO z2LV9B_JMGNRO~YPXzf|l`6$s0cg!x?IRn7ZNBBeKx{)n>E@@ULykH&-xBR9yOI3n-4J-7Qrps^`q_JtY@;)_ z@6YCjJ&`aokby3ceZB7JAv>O3!k!PQUnTnek zhKIwF~>80~YHad|Jzybu`JS3!)w zI4lqK!BLJ3U|glyF;zQ#FML_-3NAEHt|e)K*Ch?c7}nI_ODA07pi$w~dhAi)9*^_L z-48zaf`^S?8MI;pmVDAVUF{WNuKo8pU>&?)Ca`D zOd;e7PQO|^VRZWxa^AniA^bOQl7w&5rG>4{vP^;=pI&V3o8e&DQ_J>HUJmPMbM8^nit+7CFD1S(IYd;cJxAovD&v8H&^mYMADbc% ztUu1SKKp-s^JbwLi)Oq8Y-s{v*-}4m2)D1=JTW`zvjmQv_ni zS6c9ej21gy+m^P=$>0mD3oW7uvj`%7zy;qg@u@dlw2UPhDc5@GUJJHTz9);Jmgxod ziGL^r{E;42tJ%_ru0{RZ4!+p9r1dKZy8a&ze|LqK=Nd-b z<&OI?q1ugjg%v}jG8Y#!4{WKz?`z^a-?rmK%`#TlL*Dz1!H|69rU%Le=QGQ)<*3*( zdxM$Jbzt4CUl)Q_MuH%HZcAxx44*0VGyB$-sy=S5wpA@f1FuyaC0P4SZWcsHeuDVhlNxd@CioX zXBaWY9k*D3Vn5+)pBMt~aB)ElU{W2w-{|4kVifn2-kPKEDP-=v^V+(KVazf0;yk1* z*?D{0>ywdppBpo+?cUaEPcoHa;}iS1WGaK5M+aPvH;4?fGp<`s9Z8b){yYRg#~4KV zh2O4Qt{F+PPmmAr18_F$*ekeUI;9E^FfD1s8Nv?5uFGt_l^Ktu;HT#FbP zf2p|dg~UrMY=>e0hmnow7W29A{h)fS&s6p7k9UOO&Tvk1PiN4U5zU6y;T4+vXQX+B zV*iW;uh7arBi1Wa3cjNNVet@{;+mRIN*qTz1L>x4ccS~houAMCa=epwi9w1XEY+`1 z+;_Y(qy!^4fB`^im$ldDNH>*#mhAA=mJRKGVyu^9B%1Ru*xhyu(8k{TcE@V(b*wIN zSzR$XI*pL_)5>A2?%c*@tZRGe(EJ9O_IrDk|G=^~mMLb$>QM%&y)R>(5Fl66GO))5 zVTFZyQ7yu!VlELwB87YJo>$nvbf6il>-N)yJZIrdVhdOyxUJ_HOpx4*NSAfLFe2uz zp>U`Al?EN~#vE&}OOk@JNu`A4=OT5ek*kBtj|8S?-42K-l++v_6E=QxKPKoQRq<8w zEi7F*XI((mSfQlw)w?~vxDPI)Y*F*5_zaj-%} z(P6y(PQYZVKGy{t&wqM|3dhwz=7ujFOL0qmXu*CofYg=ApgzU!WBU=b?Jp^|swp<1 zw1>Z;Z%^IkSw5Q+mWIM`T4GZfhEox1wc>EE*_q4g2V+(Kn9Wx&$o|DBXm=%X;CkYL zVoEvcYtZ|HI-B^tCQ1@Ikz$2J@zqR|uBLGZNNjYsho@tl9i-Py$uZHqXTrq^Mz+dT z?)Z+*CiY8ZdYLxsi^0#u9a=b0L-K?ip+FC{Plz4DCoG#OdjY+H( zy*cW6AO4{4XTMTpS^ub18en_V!N$ef$<8g|MUi05udmwbX4aYf QSGm9q6HDXztL};a0wrazv;Y7A diff --git a/assets/base/images/themes/mattermost_dark.png b/assets/base/images/themes/mattermost_dark.png deleted file mode 100644 index 74c2240063df147959e109f641eed39c821457f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 899 zcmV-}1AP36P)=n> zW6!=!S!b!Rw(aik|Ns9>RbzutR;^1+W!%WON=jDD#$DywA1^<1cT=&eV!^p)Jyc+Y z%fX`h=cNDZpY`KUTxnKga9CtKTWLH>Sw&J{AS*qH9WT@qCg>0&71BeP0000Q zbW%=J05qxU`Tqa^^Vzm*95L7a{F@qt{_;+&{cgG8oBsd+0!&FnK~#7F%+AFD#4rp1 zL4~BS!({Bg$zx_d&ugCx8;dXD$&lHG z*@lMsHk2%(p%EHZs}HG zaXIzmfm%+-dEbVHG@Q*B%a2*iXAp+- z<>$;H3|C(muJ{}J{SWacHnUCs4Vi72ZD?3rZ?=DAvo87@?#laMcm79q!M?onHY|td zCc?6_VR3(MWMA|(TnAReVC`$T*;x&Dn|Fp$oFs8%nAq-yajL}DQ_rEwPupXXR7s4< z!J$(w4o>WbuG8l7;MiVe*NJ^~aAfZk*HiBrf14KmMl$@ZZupz=@V5)%Z)n8da*4kw Z^adk*xzP!b>@ENR002ovPDHLkV1fsPo`wJb diff --git a/assets/base/images/themes/mattermost_dark@2x.png b/assets/base/images/themes/mattermost_dark@2x.png deleted file mode 100644 index 5f9a7fffa81d422d50fb8c8d3989d5ec7d7c3ecb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1957 zcmX|C2~d;C5)R0bV6udu;tOXWa;#{85aA)@2E2FN4EacUsL57_JL2AM|A%x(6rrgjVy8=BEhn!yf=fi+p*noJ6G-+mhM;X0X)&o#FnnVgA6&p22cTKCf{AyC;w zRydJJG_`j#+)1(dng`(VcxDbvBO4k7A<%hvdv_v@V@h;4u% z%UK1^UI8AyAuN6biyvve%j59L6gwK=&JFRscqyo{Can8uMs{&e|GO`Xi%O+3)|+3* z0&18{uh8hg$Cbjtwt(s zJql+=#hz_x$etazuAGUG=3H0Il&nuj=1PflA1XW0Cn(AlYwbV=2Cc-xm7hdXzI7k$WfaK+5J!(C%yKZP(OD?%(RCLFN6N7D3e|}t=`mUf0 ze*dYhPsTjlsdOa#Rf5{PU}kYEsDfyia%yO|{?FCn{q0kYwqq7*q>>~j-8HbhjInb2 zWffu`HF?EL+X43^F*o%VG7lYeF;!$xIwdYX6p?$vUtAej&{<=+m|`%HS#Iuqr{l+0 z4$65K;VIZqz4eGyOwdlpv|HX~jvip$Y2hg~Wes?Cqe(_8X4}5f92~39h*pm;9;a8i z@~-1=#}cn^A26Hz6<-?&zhAC(EhH;gjD$dAnPB?HCLLbE>t4jX?u2FXI&LhfEg)oe zOik%{b!fIfB~62dq>f}Bjh?Aoe{c+|sw`qg3x|Klkh8PGF2$^Rpo~fGlS{P|Z}-q(3A z7v22(4|bY4J&1VGL+;ajY~tKjqRq{--|@I>FEwzWh35CP=08bF(+02U3FUXQ+;%#= zWex1A+lOgy<264{T&noH1$#quzRdg1iGZa26K8DBH8q0rzyDy;9|7FKfdnSPJ(%ineqCD;vx+0*$y*AQs9&-)lXU-4!%h!ru&##Eo z5x|e2>20*Qg_fC?0W)J#2YIRXz5I>T*!h{ZQK*JF>ED9EpxMD^msBG~*Jom{QmG30`KGE}E*J?ZcmSEcMzwR^$DZ&o_b%)Ly!j^{pA z6Si&ysg~T(j0#;3)|o z2fiaTvrW|K$pS{VryyNgM zq-a4_Rk&$m`2(Ov75BBoE^f&UD3pWJ-2~mZ;kR#v-Z&AUEEg7-ti8Q|SH(~t9FnG! zu7{qRV}8cUkR!iJESuHoa8%9lPgl~VpJQY)N`=d#lS>g4TbfX`Z(bFL#)d(RI*RhT z?MURg?4oatxI5VCspE=6Qk#w~0KJG0)yc}$huOY~%*m}O{G%krpQ4>BSLr`L{Anen zIc&kUM?x7ml%8I?l%n3T*>X~R14$2_gSnt23)Cm0BidZTniN=e;d@ZQ&w%i2wxlnlRiip*{h}Eq`5+m@@A!| zy&>_|mNRxrO{344T8*L>=kQ^FO(2R%Kc27gg`Wuo>S?lAm|L$;Ib!$Fd5pXTi%g(B z7Q9z&j^Ira1?~QsosDwUcnP$jjI1H6P_Dt5km45@LBp*HrU<1&{>Wto^%qdtb>6I@ zC#r7S$l?5G?ZVB>@eBC1GX8CcIfkV{+8?6`&n4@uj<93Pss(?+;(QdV{VJ_bpBe@gq#r!@e_!=$5&!@I diff --git a/assets/base/images/themes/mattermost_dark@3x.png b/assets/base/images/themes/mattermost_dark@3x.png deleted file mode 100644 index 7384048af4b5fe31e36ff18afeecc31048f5082e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3344 zcmb_ec{p478n(4n(?u7hNiBo6Gt*ikiKR$_P$?2iW8Y&E5lht)lwf+REkbV%jVe); zp;b*|EsC}iZ4**OijvR_s*GrDtu6P=Ja^{KA9J7Q{&COqJLh}9^PS&$-|zj-ALptw z_VjKgkdlmy%x;W5+EqqIRt%ii73G0D({H>Yf#j33<5^oE#pChE;dZ)4Xl*037Q{-^ z5T&7yI--X>auNYPi7-H54G=g(r73PCzUY_Zx< zv^LaE)6nYojW|PKBMOT`1)emq0ZQunC<7$c5QRgb@VdGffDwWOs%ZebhJlp<5(h=O z=-b(SZDjKsDG~<=`v#8DFth^R4@bM{8ruV^0BmIKq74H`u{tm`a5b~{2n$h{UPfd6KsXVZS9Rfq4 z83n#wEkqlvePdk+(1l0ZrSxZQjJdbv8#5KsS%iBqeVBJsA}m{*2E0W$`e1#?t^wih zgma!D(H3XCOi#Pxe92~~Jpd~pC}$7CIa{|NsFjPWKgGe5XyY7U>EP{r)Z_+O|HZ-M zqW!vN-$bv8kEu1{W|6R51vnUj|j@zywAl3FdwS^V5n z^vHTbE^ClTHT8?!+cT~5a(b_V&4fKHW5=@tdrT%5ly2<0^SasLSP|FlU|sU1;OcB2 zd=311Qg}&H`Bk6#kx19v-IJ2oXnY;+1FLJhjju6iy1JWK(%`z7jz1rSld(vi!y&kinlW0ZVg8btmRi|1`k9;Z}L z^MEZd$nNIIWEvR@o-VJew#Mu=`%N9e<>p zIC4MqfqMlPOf8}B(eS&W%^y;c7i2mniiPYxZrhGW!NSj>$+$N>>0o!qT23TG2D3Qm25IEU~|2J@JdUw0Y5;5o{ z^Ae<=SlJUEHp8wa@_HC=Rb0C6E1CzKkvO!n#+=k=D6K5@aP=85fkSgw6?vq_d@15e zu|JdeB~WEj;T<5F@1$n^7ER=YYd>oKtp;vx^uWHqtvKXB#Qv#e}2%HU{q{b zJ`-Y*xwpum;O^jgNN!t==+)^9vpp+OMR9GECZ;8OQ(qWoTCx>yfo9i`g31~ezhCd* znmxSVG#u0Fr!%`{x+#gywZrr4ZGC3B#xoCd>{?06r01=nu?e@XYh1R!n`8_h83_kR zl=ab8HdgxHCxpdj*VmAE<#&X}cU3Xv!zW;w6<@xkXkhS?%qsoC@2> zwks7i)W>Lti=zq3n7kW?CFs{iCjNG=gRMnncY-1o6 zvvk!=0EYSNYX)?AKUI}RuV~I5>Vtbynm=hAm#|)N&ef8_Z&5}SV7{|(V=R1L?$rI| zq#6i#udMu=B%MJ9y(;Z0rTqmbe1jm-&;BK&Oh&PiNW@MS6!sgJHx5}07C#yI6{A@K zTk-j|kPG#=NUcIpv{D2{>uVSGgFIFa!Q<^vVg!91Hs9Zj`x6l8Phs<^IBW41H3$GA z3;;%8y{S;!A1yBu*L#25U#TSMM6lge;h8@ zI3U@WS;)RI>f?L=P(W?L)Z8|{BF{Zba*sG)xzfAFQ$;db2_+N@?_Jrv%%9*I2HQEr z#{(eTA^8LBqA+?@RysLwyU$Hd3hnN?Ma*&{^#gnRYmy$DUxH?~|BN6hz_5Sy?hoDk z!)pj?(Ap?@HpZlZufB+2Yp?N=XP~Xs{9TPeOMmt3rFUi2;M+X4(fGtI-mP|_@ZGpz zr0C7m+;Xqtu1MzN#Hq+I$vysJS5&$AR12r6ZU>a1vX7EHoz$6GXu#r7>vkM196Lx! zmVCHVkG!aNMvUkfOetwuYcpT=lAmE043ltWd|_}gR1QQ99j%IHa#BF6`bJ78G;RIYmz; z4`yI{U_uSr<%lZaq4@>#xl?p`y1`}9L>a4tK;J|PhGOChR>g=}-xR^!^*M7hn}8{O zN2Ym13SfH+K}d2(GYbt;h$hR0T>?On=mUc9n<6Y;yO+M?#hqgx?;}OAdJoIe&Hwl| z;rg#Xt6zvc_p`F{rJ(w>4#VD)-%xgGrd^Bd@3eoI5+jV5IKQxWE6a+p=?kS`OOs<|G$tCM!iXxbuP3ys{0J`&J5 z_`G6D&i~^&OLNC~ftQK$(k0Ei+k{4QyX%vtx(}S=)`J1d+xA>nx>mXv;1;y4rZg2f^p6X!QUrExJ=zKgKk{e^3KRGr-`-ys7TA7YBA>5DB z5;z^;4zz18=|R=P_>qy}MJ>}=TNt#mV#74dB%U|gijf{FXDBsH8=J)Uj9zr2CDRV91!r%JVJPq2)Q(EGmw7Q@c5(wEBY1xSU*^q#R2Nos zQ)Z!PO;kqYeI@e{{|+uUa-z&#AuW^0yXqvyd(p4cDBRkWp z(fY66J*?rN!#qO8r}1?10IjT+TMEj%;(PmIKNMbhj+UOYCwG9+`Elo?q2byZ*2K!n z-dAIsN)R}L0=BHZw|!v9v#%j;i4aM%qSNb}>$7S3FY{|a;7VglXjXbiYQTa@20^8(;27|eD}%AcqVHP={_rmgxvBa9 diff --git a/assets/base/images/themes/organization.png b/assets/base/images/themes/organization.png deleted file mode 100644 index 6b18cd0dd36f799a87feee4ed3215b38b62ef301..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 988 zcmV<210(#2P)lqr*x13x*>9?_xJbN+1c3G*!%nY zBXg)+m%fFu&yTp%@$vEJ=jY|+<>lq&NrsxJ{0;W~Wtnxe`#1xvRgw0m*Urw)%*@RC`uf?~ z+1S|F@9*#A1%NRYHHlc0D%Ai04{V=PE!Chsq6aw|Nr;mylfmW*#7_j z|Nr#$o*9My|M~Jzt^WV?Z~y=Q|NsC0|Ml#>>v=A(0007WNklNKX_u8EPLK*%efjXTzUJ!pu`X#cWYC1e-n3nh(>|f%zo*#q}+=~+tu~LZA zEH8j6E0MKAR5vYs5Ca)2L|ua~8i~kaA*%BT08Ek1LX?F7CyV96G|=HJ68$iaLr>TA zIpfg3Ug*rr`XkHi*l5#W7l~oIF_86n!|R3f`eU<=yaRZVz~4r)K5u-za9MwBv5~8Q zz;>Y{gLvJ}S>QGh#Xz*o+=_aHFf%91+xuUq`I1v+ucg^)MikCd9Q)7GU|0F-PzYf= zMF?@H4GBp|LK2!2=4oQ%uX@{*VdadeiHJYs-zPr_I z$Q$IA$;93e*4k^;+^y!-&()MS$SspqZ$nsjgmrhT^$Wt5yg_c6I0t+}{3_#j3g;mS z4G8HENyz;+oo?3Z7;MpJEd5>)65>}`-zl6nB*Y=a-+ySo4^}Vx{n-DPkbBzcZT=#9 z8+sc$2NKfT(A&`4^!kHAzlZE?`op#Q$gAGK5e^j2frNNfR&)xz4GHOO=xyk2xZj5R zZAb`FW$w2jAqhw0$@D`_#v=^E@$^%TF$ia$6VCV>+W!ynCpNuJjtS{)=xslEu% z@9q>oO$$De3_sNkJ{b=_T@XH@5jy3v_#)*}l0r*RNulMZq|is>m$azzqD=_^0000< KMNUMnLSTaUsu(%| diff --git a/assets/base/images/themes/organization@2x.png b/assets/base/images/themes/organization@2x.png deleted file mode 100644 index f54850da15b3e1955f199f15cbf23924ec24d25c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2094 zcmYjS3pf*MAKx;y$$g!#L#HxME+M(5%Mvlf=dzqc)2Q)z=DJ+k5jkmYb1O=@=9)Vv zEJ8~hNzJ8DVY$tiY-3|)neCe{-}C*S=e_)Y@BjaM|Cjf9-eeaiTR9n382|tvXK!bX z1OR|mk|7J0k{}5%=SGPV;Ns|JBT*B}yRmug7c*Pzk{Zo!*6HD^e-Eot!&Q9vCLce3 zl&q5Z(>I~fXo(Gj{yA-q#3rqX>i^ly%*-Uz_g&6v)rqVYi^W@8TLOWA$K!E0943=F zJv}X9_)aoEKc7RPU>-g*jH(q1h0Dv!65sEq5=VRy*&?oCeSKYmjE#+jJ|c6uTq>11 zK0fZB(|#zt>N^R8!CibbvG4Mn26iuM0L^Gs{Dt7{rhPUJuDbGfZ*KIdKv|T;mXsal5JR%5WRf z2wzxR?Mr>`G%&*suI#r?e_?Q|CBOUg(YRK_xYoSx&x?zTl8}anhX)1*C=^P6fB)yt zpIIyxpU>ae*jQLtzz3%f1mf2Mf=ok;djg}xSnSM>25(8Z;o(T9^8h76{};iQNGujG zCt5O`AZmGZ5wF2p3ED2fzKMt%EhAkjlR_ZZ}(jhi;rcC_$YO*z6$`b)70MD z(hU!!j7nu=fU?p<%~?-#o(A0~KND}IF5Gar$=}$Y=w@Ve!tAu+@t(6<-jDy|w=lo= zUyBE`v)wPK5YBjBn)*~`F)=>r^P7y{^$_v&3ghD3+*)dN0UBkb93LJLqjBxVb?09W z98gIqi8`VD=gs2Gj}ALaTPG*!>$hc22c#lyu_o=FyH={vT>bxj7bS-dNVR=JDic{I zCpzpbo6fzKC%m_6izs6R&j|`|wt3qTgZW-;Mq-^qLfOjX+ex!IW# zJN>607zFD&VEH|9(jnN-=+#Xs=IQQn9cyCapvbPND$#rRv)_N!yQ4mQAmpz4R${H1 zwZFzmr?0)`nuUZg><+^u6Pr`UKa-c63MimxsBLNq)ZUBiE#zBb8x?%nkD^OoZtf~h zqr%dm4{|}y^^p1xkOLy)*l8ULow&n20pNFvaYKm6d`1fQO$3WT)6&+?HN+la8N z0-@xlbNMXT3T|rFNc*SUuf^iG^^h>gp72;QlV4&i(e6{o}JPJE&A3<`u13HNJDghIJbbe&}+U;)IxRm4NU{P4b z@z;`QRl~59D#HqdpwAmf)0g$IOxlj~;rXjh64Nm39!tsNG4I(oxwg)_1x`H8;-$?_G_VHm zi@_mOxY)jRj2$_V*7=&}24ySs+9p2loEDoH%yo0dECaW~jWV+OIirXG$l*=o)uz~H zIC&gfH+u+OHyqxH75iV0CP6n~)>~2rXSMX+KzO~f9&O$i$ai>&UdP*fkT>%g8K~8@ z&PpM&)MCS6X!lt={-|f{)`)gO%o!KHlyfX(90NLY<~pUQp+_4Ki!?1J104*h4wafC z?%pa2vk~tIT+KlDl}gQA7q6%{@`Y}jxsXwkIdj&d;Yf}PRb@h>L)Bmp6nk>vTEg{t zBBZ?Fu5R>EG~>{o>|orpE-hLc%E~KCXTmu8-O`fQ$WiS(-AZKFy3tXnjK9exO#5&T ze>S-cYXv-(6L3-bE{*e8pQ9=j+PY{vAHV Vq_Ftf9?4Gxu(xrtuD9}z`!C^xJ$(QG diff --git a/assets/base/images/themes/organization@3x.png b/assets/base/images/themes/organization@3x.png deleted file mode 100644 index b0473b48a79943dab700a9a21355858e79bb0ba3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3524 zcmbVOc~p{l7sfR!%dsgJN-MLR%5niS*Q~M0#;wdX%}m^JNijun$*i;#HFeA-H66zV zmqOeK4buWm6b(fT!3k7c5H%MR7d~eCmic48bH4N4bKY~G`@Hx5-sio~Kffo}Y_9Ct z1>6My0QOw9Ft-B$#Mq)IQ$|9>aE4uiMa9ZBEBni$5`_}NUgCZ8aIVjqER!+D33cF@ zT1_}g9aeQDw1WC)4F4;>l{6YnL?R{3p6 zM2?M(JwkWg$!XD!t`SXbZf*($0zRMr_3PK!+1ZJS2|Atr?Sz?`nan1-XHLuf{QQ?M zU%s6n8VP&ZE)uq}vBBkXMdZlHND6kqDZTMXXyxeW=)c>d$~!J3zMh+#`=;>o=g)VG z-=2y&3hHTGG>of%F#2+S=OG z)YRnUq-PFR8&Mlx(PjCh-sk~38PjitY;nm;3P4%hYdVBzl|i6BwhXY?bIYsi8#l5G zL+j7Pz6E#}c6?&ZIpw89<76W$yO#I@;k#&IinK5pAWW0J{wU*FaTvbdjq=9MC?>xa zK>r`*e2La`Nncd#Py2>bGHboBn z8Juw09cU2>ll12cg`bRf_iqcgGo>#q3xy=Lux;VOC8W@y#QUG!eBVmiv`R^mxUK3`GcV}(Y}!!LI2HK?MH$KXs0 zeMV_bYiT{|O?gw=mfX)n`rvbV%?(YBlw;xHj`z^2*XnTCis!0jui`y291`Mw>^$~s z_-zRL`x@kL4o8%BT{%&)(78;~WDrMV&dfqiD!MtliQj)bao`PQ1_SsIwiVr#tI&OfwQiw1VwzbcLC%-`S`{;XG6>Lq=x2-<4OJ@D8pl*MpFO3Vj=E)U$fYEVI)N^_n^1 z$vZ7g6cEwuM_2U}G%rf}m7L1?khM4TP8E@58}g#a{#ek?4l|GgM)O&?g^Z<14m_Go zDg!E8ekYz^NdQwv&&z=AY9~V)*By7k~xKBQb7$o~j9=p?3UwC|mn3%l7?1)!k5a%%j!A!V2^ ziE&_na7&&SQ?=Fi+>gsE7r=6raEWumE_n#Sw7QyHGUgTsi;6%Q@kT&9JkMgbTYSm+ z4;w$su!~F(k~8UTrm4!qhyPB77F~v&-}(0%8Se4gQ~Wox^e=wK)7f2K#=tm)1(aUS z@7L&{jBK97Ob6hcBYyV5T0Cy}+!Uj5Lg($9BK)}ERFi&lVLi63`|*DIV{*fB0!4$R zF}`5qF3H;0mEvWA4q6Kg@H8&K_i$rz+-$P0vRxqE1X83F$vMhso_meiseIzcT|v0W z%j$$SzflA|?OX>uTlQqb9CJNWiT`V;Fvy50!w%Ig>u*9t-taU|CL}h`c^ymD=+3xA zA6E%XRo7s|_e=frNBTxuT8+2ik0G{dcNGcDQlp?gnU(_J z?`ctmF7mNHZJ4MqO4PsPkc-TV+dhC{tN+pPS5;(XfobF&!KnW% zOuvz=vSf-;6Odx2LAWZiY?Da&rXxRUa%PD)=(EQh0?os$dt%*4zLQ)BzPjUVZ^-N~ z28iyq4|Bmw!@HT@eoMZUYa01k zFls#qBes%jl1)Lk1*G5^P-3lU-}s@}BCMd*XvIb1BqnFtb!AoEH0F?2Q7%T2?z*|@ z-D>93=RTX-es^QJCyB|h_lfuDE1m!?~Ab-7C@sP!1$#5UP+bW>Z6|}%q#E31V3b|zD&AKxR(g*_4Dl3_;S9W~H05B3Ei;klvFM7qq^MRsVf5Pb)v`2eaVqr3V979_%e*lwm&v z*MDcQPTqa_@J<7`bOBXnIpcCy)2K5vHoDu>%O%bc+UtJU<$+btnA=SR-8M(9^D91! z+Ao*kZP9EjUD~Fd=wl!#H^kur& z7nwR_75XAf)!@;=UoioJWHGEZ(iL<%Ah35Qwka8rGepaEPj@56TDk@VejGi5#U$)F z#~-3)93JcLyk%Vfyn+z1PpG~-ZQ*@r7Vw}Bzc6t7fp1KsybBVsqkA$0PDMW=HUf*` zUhfoJJwk3HZ|O&xeO-{z`aEg}X%0fDM@B3@{cYlaUc~S#hfL_~K{$g{1H}0U$7OI7 z6c)<|&~ADWHsrPU>f{49)@+l{MutPQ0}PY4*e!{~RxsH30Us6O2VTWkZRES&q%R!( zC4Sqf8Vw4_Y`nMj&_4PnAIAurx<@7QK!EnVs%z@D+gS? MY-3(`$>YI40KsswtN;K2 diff --git a/assets/base/images/themes/windows_dark.png b/assets/base/images/themes/windows_dark.png deleted file mode 100644 index 5e3b84d58d2c1df943e4fe108346de83ba720196..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 895 zcmeAS@N?(olHy`uVBq!ia0vp^3xT+egBeIRsevVq1^9%x0=crXveMGhl3*YX2J&E_ z00xSRiYh89KmnjUL|k269jG2C36z2e0@+ehQlX)t4Gj(5-Q9+UhPJl04h{~kK;Z6a zU%J9-+8a+#&lM|Hym|BH|Ns9kZk~z>bJ&ZnTh9N_SpIx-yY`uxxbeU4c4*l#nG*>8^gMHCOpOS}l z&dIC~cFcQj^=oE6oBfZS1{{mqTO8-_Sk}o@P+RcTIQdZ&M2}UAIcQ!42xgfFP(J9Beg?~2N9I<}7dhX^8y%Jqb2@>8G84qrpxlkXN`0UQ- z$zj)WSe5IgE^m_O^Wadd<4`=GJ8kvB%`!jw?kRp-t|V~FJ+gl3hT9GrUMv3px$sH=JI_lnW?I4 zg5nRY*&rl#GyTxAx4X7&e1D^^CAWV1wW?Q^J)gX*eaiiBNS-;Exim&*&JB*c<+D#W zC*RiC{r*NcyZg4OkLq5n#I11s5M2W_N%e9RcTeZwuFXjX_Z>WR*KL; zX=g^!5<1P$C~B$E-ivAxOR43ChTN}l?>yh{d*5^3^PK0L_x$rRJlq|jQgA5{2n2O@ zvhxIiM2NsI0~P~LGEt; zo2+50DuJJ$-|+A-&cz2t=@GfUSW4A-RccU5)%Eu?|Ebu!vprN>TeT?vY+q*t&f6oY ztL5JERGnbuLUvl+;Y#fRHz+4vLqo&F#KgtL#nsgngTdI?*ccib0u2LKz+$nQnwn;2 zW)~Gzp2{QtEw8SBQu&cQVo6RNEz+$AjM5<9)7=XsPvda+4h{u^z15jt^W7oH@{fl* ztwHh%U0;%m!UO_`mc*~|$Qj&GOP^QGN=vAbu9v6gTWp7q1u z;Y}G#$}=)+%6A3YL}NyE&4{s&J9?xx)KgiYT7GY$0&nbeXc|Jh29ek)ova1F zR((tKNBx3`bJFt~GFS* zsx%&z$Tv**uDbm#Zu3>kDKbd09}lW%99e%JVBs`(zpqPPb?2Z9X?IHwMWlh{)c_+n zMGn~7)WPzSdVWPw)jU6b!=m<QI5?0YV)C5>l?1&tQfjlgIvQ#UTWl*>^d) zyzr_ZInceeSvpkpO!0MyGp6Gb zC|a&KiY7+{qi7+{!tH3`GN;$o9>)kwV=%1bUZeNTo@CMwsW7gA==ifR2_hKUP96I( zuPl8mk;47b>*}y%Dt4qIM{G=LZQ)C?cL$BsVp{o_cYqNd+sdbGn5T~*EefdfjS${K z*$w|=Nxb|UvyZAusvjn#$)(AC(^T{N(0H49n>ja206G%35>@Dy>jwSmT%QRU%vJ)Y zdDQ=o4A9Oi>)(vWsD@Dn8+P{Ml1D$D_VP-a#VRC)lRK*3lCoB^j=PP(SRb@m>iW-U z8{3Qx4LQ*o!tnyCXHji^OWPX^UPQM0myq;tHy741K_7i?9=_f9TW(OAKu)BTR0ElF*}?%PtnAMj?!1SxTHy_Iu^e?;)l-fw zVGGKVrP?~5q9M3Z;G4qiKb~VK#a4%nSNy*&aQksz8IVEo@E6iFd}IMIfO+8D5xL#_ z;eP|*v7r@;1jP)HqK&#%miGe4=qBG)S;=-YfY|(Go?m(|V*fUAjkdf`XK{HYQA1U0 z=&TRul$yRy*n(=?D*Z&Ic%sKurKT;7@qRQlc+siN_H|$*uPA70bb$VQ!DTVmz_%r^ z*fE&W$zoc--2wV=@nsc(Pn6Ozm?&P+PVifowahR~sZv0Fe?ab*lluHA1yX1>G$w8y z_p>LfTL*E%Drn;ZN4is|>O|^}mnK5nc~1{zK`Vb>{kcs70HU6^j+`n*&)XaQ5n=*U* zUUii7)h{J!m((v#&S@=JM{8buO=45WGb;K>PT`f?ODvKTb)vANpTu79PmECE)9mUS z{Qi+uRj{ZvVvWL~NOiKrf8B7x9aB%92cjAg)ke`kw0~zicZ*I{yF==0e(-s1_f!%w zwSTj&it{N)(-PH7>6zxrK1r;drd$t#i0o&~McR~dJFL$Ksx|B8wE@oo2;^+>Rv9+}YBZF(TwY3QZ0+`Oi!UD{ak&$6zW8>i9us@JwliYy0I&E3}nM5KrG&D?4 zPk;XWSs)OgJPB&JyOM-HQPS@RJVUIq2KL<)goK0)3=Cjg0_CHg3X!>X0YuBf6(W(i zva*8qh~9R3A~ASxPrg2*(4Z?%|G<8|ltjn7xBQzQ;gE(}1y?;gn3k;ObRiP6f?8#=eeu4Uqk%DGdVR) zXzL}(9nOYwhblfA&AE(-E50%+Fxt87`%9by^BBS_io|m$Pc%rbg11$hr3}wWz~`yK z8n!Sg+DSIs4C?+dea_{OUjajTePr;GS;RwsHVg(Iqo?C@j6P6L;*^@LH1wqJ0R=(59;$nvKV9TSxlBil~Wp8n+5;%C2Ztf`lTN~ zMInAPH@`8u=b5G6$cA2t7EX%*585a$f*Cnoa##-jU247_VH&hCM57&$hii|ZN^qsi z8D&wa6?H_HF#8vj^O9AMZ#+Exq2J7G*EN;rBLk!?QlG-*n$2baz{%shs>GV)SqX&X z9itlo2E6Ky^x{p9d`kSJ@Zk;e*YG8qV+wP(kq`kIttGVWgr`~7T=Ap!J4^hpxhA64 zhC;UIuA28da|borSZDf}nBkplDoPfwIc)J&f5`mI37n&2vc%I}it60W$wmVp< zGC#TVb?bfTd}scZ7=Vi6M#eXw3(y7ac{WLX*p^&yG?{d2%KNFY>C^zeA0|XNd;2+^ zh*kMc5wR>s75qga<$E^P+sW~%sqx7#YqJ;ApO^b7@3XX8f6YU6BktnycM;vLt}C#w zBx=8r;do$)QEp0G5vi~;x7V|V5Ia5*=*#B$(*-!*+^2U@HmMKFLpu6edPj|1Up6i^ z)_&nvL%E~%)v?Je`NkgZJKw-84A$`J%zS>6Lq`p;+;G1V77}PU6GmK(964K4lsPeB zI8y<=J4&yOZHxDN^!VXKQH-6EQgC{BboVuf^xx|Z|7pcbj z6i#BdN4A;UQkvv|i@kwvmCL8lGE0;7Ez2or)=drTF>!Wzgdu)-y$b5M7K&pq1J#kf z0r7tEZ!y~zN=wdJh-|lbbvl2}?OCZkXYzKd13|P+?of84&A(4n?l=R)c-3>^JGQ^P znT_vLdAvW}K7HyA0N5`d_MYGYC(R3~z9#(5`ANYIT@ z)Uj9e<&nXP`pai-8i2i5T=^W=`+~{R(d@&jU|zX6@k>S7*IOL`mN@dV^uN24&0BIp z_6ZE7Kn7#nCvby-jDbm?AXXP-G*Eql%lp_L)YxF}iGyWLkRj_8Z?7#t>NMIz8`k_>KS}LRNF(a)hFSM#Z z7`yrwS0ewNyTW=cW^W*cL&pet6#sUNmWW-=4z1!kV^?Fts>A}owl?z>>nh5rYd?xD zIfp!x?-x%Nd|Y4uDfMoD@cYuPp-;}m+`B#gD&(A0en%T;>E^FRW(3h2{?kfdoMIwb z0XMk?nO2p?xu}jLo#r7ut={zx=+yj|YZ1I7G>z5R!>E)hAeZvcIAX$yF-)y)77knL zVyYg(mV}#t*M1i{XLDtQlaXxM6-(#yjYoc2EpuQz+p z5=)4LV}o0jHreXWZB=Tek}tJYDa(KC`uk3RPDB{{qMmRhF10J*@R~xz{Fls9d&-0X z&s-~O+K7b> zdL5}|!>=|Xdg`U>*Tc<{&zYr9gqw?hW2%1=E>!GfG75wXC%c$ZW&m}G`?RQzYzTCe zN}Q0+sB2&dzs(DcCe+#Yi6d(i{%+W1n#$-BzLrH(&nQERD}P+uRt^!S$Pcanzo!sV z991w@j4%Go(Dr59y4s@!##-e2i{aqQH+YssM_Tz+r(U79Sgj;Bq{L)i^t{b7VDK^j_);+Gt4UxB#lhJ{Qt5^XY)CO`W4p(P!nq=~j?w-Kd( z-gWD|zXQvnvr3G<`+g6M{BTxCY1V6ohN_~ZDe}jfbGp3FBQLQP-4)0;n_9&}Y@aG6 zO*HE)%2Yc3lH$9b>z?`n)Ej$Ipl5`|9Tk z^?cj{uVrsGKE6*OOGs@j?sPZ3G}KF?Qx|yo^xR3M2x(lvn<*3Y(35r*YVHdTTzPK<)Z6@X@&Y#<@ZRw5kSJvKF=#BG~EYNQC!FihBYijYu9p2G+uLTw9 zGW$-BbYqzQTJOE}*?Y#N{pO|#=8-PIa^~JM<$xEb^yD8VkuF_v<_Beb z5Q-06?=vzSsBPaAc|Jv_k`hi+&qecijW4F?z!?f&`9KfV-Nntdp8*{KL^;Yz1^K={ eqay=;GR^FxMv?I*$>2{f#L2(({canPost, files, initialValue, placeholder}: BodyProps, ref) => { const scrollViewRef = useRef(null); diff --git a/share_extension/components/channel_button.tsx b/share_extension/components/channel_button.tsx index ea24271c7..1f6b615e6 100644 --- a/share_extension/components/channel_button.tsx +++ b/share_extension/components/channel_button.tsx @@ -20,7 +20,7 @@ interface ChannelButtonProps { teamId?: string; } -const theme = Preferences.THEMES.default; +const theme = Preferences.THEMES.denim; const ChannelButton = ({channel, intl, onSelect, teamId}: ChannelButtonProps) => { const navigation = useNavigation(); diff --git a/share_extension/components/channel_item.tsx b/share_extension/components/channel_item.tsx index dd78a68ec..a932c5598 100644 --- a/share_extension/components/channel_item.tsx +++ b/share_extension/components/channel_item.tsx @@ -17,7 +17,7 @@ interface ChannelItemProps { channel: Channel; } -const theme = Preferences.THEMES.default; +const theme = Preferences.THEMES.denim; const channelTypes: Record = { D: DirectChannel, diff --git a/share_extension/components/channel_type.tsx b/share_extension/components/channel_type.tsx index 81326d7ff..f3aa46f29 100644 --- a/share_extension/components/channel_type.tsx +++ b/share_extension/components/channel_type.tsx @@ -7,7 +7,7 @@ import {StyleSheet, View} from 'react-native'; import CompassIcon from '@components/compass_icon'; import {Preferences} from '@mm-redux/constants'; -const theme = Preferences.THEMES.default; +const theme = Preferences.THEMES.denim; export function PublicChannel() { return ( diff --git a/share_extension/components/chars_remaining.tsx b/share_extension/components/chars_remaining.tsx index 1ea233ba7..c57d05583 100644 --- a/share_extension/components/chars_remaining.tsx +++ b/share_extension/components/chars_remaining.tsx @@ -11,7 +11,7 @@ interface CharsRemainingProps { text?: string; } -const theme = Preferences.THEMES.default; +const theme = Preferences.THEMES.denim; const CharsRemaining = ({text}: CharsRemainingProps) => { const count = text?.trim().length || 0; diff --git a/share_extension/components/close_header_button.tsx b/share_extension/components/close_header_button.tsx index 66bb544cf..9726e969a 100644 --- a/share_extension/components/close_header_button.tsx +++ b/share_extension/components/close_header_button.tsx @@ -11,7 +11,7 @@ interface CloseHeaderButtonProps { onPress: () => void; } -const theme = Preferences.THEMES.default; +const theme = Preferences.THEMES.denim; const CloseHeaderButton = ({onPress}: CloseHeaderButtonProps) => { return ( diff --git a/share_extension/components/error.tsx b/share_extension/components/error.tsx index 229bcb2e5..518a7acc3 100644 --- a/share_extension/components/error.tsx +++ b/share_extension/components/error.tsx @@ -11,7 +11,7 @@ interface ShareErrorProps { message?: string; } -const theme = Preferences.THEMES.default; +const theme = Preferences.THEMES.denim; const ShareError = ({message}: ShareErrorProps) => { let error; diff --git a/share_extension/components/files.tsx b/share_extension/components/files.tsx index 95925247a..3d3148328 100644 --- a/share_extension/components/files.tsx +++ b/share_extension/components/files.tsx @@ -15,7 +15,7 @@ interface FilesProps { files: Array; } -const theme = Preferences.THEMES.default; +const theme = Preferences.THEMES.denim; const Files = ({files}: FilesProps) => { const elements = files.map((file, index) => { diff --git a/share_extension/components/other_file.tsx b/share_extension/components/other_file.tsx index 6045989e6..7e1286550 100644 --- a/share_extension/components/other_file.tsx +++ b/share_extension/components/other_file.tsx @@ -12,7 +12,7 @@ interface OtherFileProps { extension?: string; } -const theme = Preferences.THEMES.default; +const theme = Preferences.THEMES.denim; const iconForExtension: Record = { csv: 'jumbo-attachment-excel', pdf: 'jumbo-attachment-pdf', diff --git a/share_extension/components/post_header_button.tsx b/share_extension/components/post_header_button.tsx index 49047f7a3..411eedce8 100644 --- a/share_extension/components/post_header_button.tsx +++ b/share_extension/components/post_header_button.tsx @@ -12,7 +12,7 @@ import EventEmitter from '@mm-redux/utils/event_emitter'; import {preventDoubleTap} from '@utils/tap'; export const SHARE_EXTENSION_POST_EVENT = 'share-extesion-post-event'; -const theme = Preferences.THEMES.default; +const theme = Preferences.THEMES.denim; const PostHeaderButton = () => { const canUploadFiles = useSelector(canUploadFilesOnMobile); diff --git a/share_extension/components/team_button.tsx b/share_extension/components/team_button.tsx index 18bebe450..acd9ce992 100644 --- a/share_extension/components/team_button.tsx +++ b/share_extension/components/team_button.tsx @@ -24,7 +24,7 @@ interface TeamButtonProps { team?: Team | null; } -const theme = Preferences.THEMES.default; +const theme = Preferences.THEMES.denim; const TeamButton = ({intl, onSelect, team}: TeamButtonProps) => { const store = useStore(); diff --git a/share_extension/components/team_item.tsx b/share_extension/components/team_item.tsx index 5c33d02ad..3cfa07b59 100644 --- a/share_extension/components/team_item.tsx +++ b/share_extension/components/team_item.tsx @@ -17,7 +17,7 @@ interface TeamItemProps { team: Team; } -const theme = Preferences.THEMES.default; +const theme = Preferences.THEMES.denim; const TeamItem = ({onSelect, selected, team}: TeamItemProps) => { const onPress = preventDoubleTap(() => { diff --git a/share_extension/screens/channel_list.tsx b/share_extension/screens/channel_list.tsx index 7eefd7dc1..dcbbda86c 100644 --- a/share_extension/screens/channel_list.tsx +++ b/share_extension/screens/channel_list.tsx @@ -43,7 +43,7 @@ type SectionDataHeader = (info: {section: SectionListData}) => React.Re export type ChannelListRoute = RouteProp; -const theme = Preferences.THEMES.default; +const theme = Preferences.THEMES.denim; const ChannelList = ({intl}: ChannnelListProps) => { const navigation = useNavigation(); diff --git a/share_extension/screens/navigation.tsx b/share_extension/screens/navigation.tsx index 7b0ac8ef7..ea5e44854 100644 --- a/share_extension/screens/navigation.tsx +++ b/share_extension/screens/navigation.tsx @@ -12,7 +12,7 @@ import Channels from './channel_list'; import Share from './share'; import Teams from './team_list'; -const theme = Preferences.THEMES.default; +const theme = Preferences.THEMES.denim; const Stack = createStackNavigator(); const defaultNavigationOptions = { diff --git a/share_extension/screens/share.tsx b/share_extension/screens/share.tsx index 5462168c5..99903a00b 100644 --- a/share_extension/screens/share.tsx +++ b/share_extension/screens/share.tsx @@ -33,7 +33,7 @@ interface ShareProps { } const ShareExtension = NativeModules.MattermostShare; -const theme = Preferences.THEMES.default; +const theme = Preferences.THEMES.denim; const initialState: ShareState = { loading: true, diff --git a/share_extension/screens/team_list.tsx b/share_extension/screens/team_list.tsx index 9c92b9eb0..27b809b18 100644 --- a/share_extension/screens/team_list.tsx +++ b/share_extension/screens/team_list.tsx @@ -29,7 +29,7 @@ type TeamListRoute = RouteProp; type ListItem = (info: {item: Team}) => React.ReactElement; -const theme = Preferences.THEMES.default; +const theme = Preferences.THEMES.denim; const TeamList = () => { const navigation = useNavigation(); diff --git a/types/components/post_draft_quick_action.d.ts b/types/components/post_draft_quick_action.d.ts index d21c52568..318e92fb9 100644 --- a/types/components/post_draft_quick_action.d.ts +++ b/types/components/post_draft_quick_action.d.ts @@ -4,7 +4,7 @@ import {intlShape} from 'react-intl'; import {Asset} from 'react-native-image-picker'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; export interface QuickActionAttachmentProps { disabled: boolean; diff --git a/types/screens/gallery.d.ts b/types/screens/gallery.d.ts index 0271f9a69..4b2de333b 100644 --- a/types/screens/gallery.d.ts +++ b/types/screens/gallery.d.ts @@ -6,7 +6,7 @@ import {StyleProp, ViewStyle} from 'react-native'; import Animated from 'react-native-reanimated'; import type {FileInfo} from '@mm-redux/types/files'; -import type {Theme} from '@mm-redux/types/preferences'; +import type {Theme} from '@mm-redux/types/theme'; export interface ActionCallback { (callback: CallbackFunctionWithoutArguments): void;