diff --git a/apps/apps_container.cpp b/apps/apps_container.cpp index acf3feb38..3963d8c7d 100644 --- a/apps/apps_container.cpp +++ b/apps/apps_container.cpp @@ -29,7 +29,7 @@ AppsContainer::AppsContainer() : m_globalContext(), m_variableBoxController(), m_examPopUpController(this), - m_promptController(k_promptMessages, k_promptColors, k_promptNumberOfMessages), + m_promptController(k_promptMessages, k_promptFGColors, k_promptBGColors, k_promptNumberOfMessages), m_batteryTimer(), m_suspendTimer(), m_backlightDimmingTimer(), diff --git a/apps/apps_container.h b/apps/apps_container.h index ab945b6ef..f52d50b6c 100644 --- a/apps/apps_container.h +++ b/apps/apps_container.h @@ -66,7 +66,8 @@ private: bool updateAlphaLock(); static I18n::Message k_promptMessages[]; - static KDColor k_promptColors[]; + static KDColor k_promptFGColors[]; + static KDColor k_promptBGColors[]; static int k_promptNumberOfMessages; AppsWindow m_window; EmptyBatteryWindow m_emptyBatteryWindow; diff --git a/apps/apps_container_prompt_beta.cpp b/apps/apps_container_prompt_beta.cpp index 613acc99d..729062c6a 100644 --- a/apps/apps_container_prompt_beta.cpp +++ b/apps/apps_container_prompt_beta.cpp @@ -10,7 +10,7 @@ I18n::Message AppsContainer::k_promptMessages[] = { I18n::Message::BetaVersionMessage5, I18n::Message::BetaVersionMessage6}; -KDColor AppsContainer::k_promptColors[] = { +KDColor AppsContainer::k_promptFGColors[] = { KDColorBlack, KDColorBlack, KDColorBlack, @@ -20,4 +20,14 @@ KDColor AppsContainer::k_promptColors[] = { KDColorBlack, Palette::AccentText}; +KDColor AppsContainer::k_promptBGColors[] = { + KDColorWhite, + KDColorWhite, + KDColorWhite, + KDColorWhite, + KDColorWhite, + KDColorWhite, + KDColorWhite, + KDColorWhite}; + int AppsContainer::k_promptNumberOfMessages = 8; diff --git a/apps/apps_container_prompt_none.cpp b/apps/apps_container_prompt_none.cpp index 65556d670..e750df2b6 100644 --- a/apps/apps_container_prompt_none.cpp +++ b/apps/apps_container_prompt_none.cpp @@ -2,7 +2,8 @@ I18n::Message AppsContainer::k_promptMessages[] = {}; -KDColor AppsContainer::k_promptColors[] = {}; +KDColor AppsContainer::k_promptFGColors[] = {}; +KDColor AppsContainer::k_promptBGColors[] = {}; int AppsContainer::k_promptNumberOfMessages = 0; diff --git a/apps/apps_container_prompt_update.cpp b/apps/apps_container_prompt_update.cpp index e837b592f..59c93f0f4 100644 --- a/apps/apps_container_prompt_update.cpp +++ b/apps/apps_container_prompt_update.cpp @@ -8,7 +8,7 @@ I18n::Message AppsContainer::k_promptMessages[] = { I18n::Message::UpdateMessage3, I18n::Message::UpdateMessage4}; -KDColor AppsContainer::k_promptColors[] = { +KDColor AppsContainer::k_promptFGColors[] = { KDColorBlack, KDColorBlack, KDColorBlack, @@ -16,4 +16,12 @@ KDColor AppsContainer::k_promptColors[] = { KDColorBlack, Palette::AccentText}; +KDColor AppsContainer::k_promptBGColors[] = { + KDColorWhite, + KDColorWhite, + KDColorWhite, + KDColorBlack, + KDColorWhite, + KDColorBlack}; + int AppsContainer::k_promptNumberOfMessages = 6; diff --git a/apps/on_boarding/prompt_controller.cpp b/apps/on_boarding/prompt_controller.cpp index e938a43a0..773a77041 100644 --- a/apps/on_boarding/prompt_controller.cpp +++ b/apps/on_boarding/prompt_controller.cpp @@ -4,8 +4,8 @@ namespace OnBoarding { -PromptController::MessageViewWithSkip::MessageViewWithSkip(I18n::Message * messages, KDColor * colors, uint8_t numberOfMessages) : - MessageView(messages, colors, numberOfMessages), +PromptController::MessageViewWithSkip::MessageViewWithSkip(I18n::Message * messages, KDColor * fgcolors, KDColor * bgcolors, uint8_t numberOfMessages) : + MessageView(messages, fgcolors, bgcolors, numberOfMessages), m_skipView(KDFont::SmallFont, I18n::Message::Skip, 1.0f, 0.5f), m_okView() { @@ -42,9 +42,9 @@ void PromptController::MessageViewWithSkip::layoutSubviews(bool force) { m_okView.setFrame(KDRect(width - okSize.width()-k_okMargin, height-okSize.height()-k_okMargin, okSize), force); } -PromptController::PromptController(I18n::Message * messages, KDColor * colors, uint8_t numberOfMessages) : +PromptController::PromptController(I18n::Message * messages, KDColor * fgcolors, KDColor * bgcolors, uint8_t numberOfMessages) : ViewController(nullptr), - m_messageViewWithSkip(messages, colors, numberOfMessages) + m_messageViewWithSkip(messages, fgcolors, bgcolors, numberOfMessages) { } diff --git a/apps/on_boarding/prompt_controller.h b/apps/on_boarding/prompt_controller.h index b0ce7b615..eb251868b 100644 --- a/apps/on_boarding/prompt_controller.h +++ b/apps/on_boarding/prompt_controller.h @@ -10,13 +10,13 @@ namespace OnBoarding { class PromptController : public ViewController { public: - PromptController(I18n::Message * messages, KDColor * colors, uint8_t numberOfMessages); + PromptController(I18n::Message * messages, KDColor * fgcolors, KDColor * bgcolors, uint8_t numberOfMessages); View * view() override { return &m_messageViewWithSkip; } bool handleEvent(Ion::Events::Event event) override; private: class MessageViewWithSkip : public MessageView { public: - MessageViewWithSkip(I18n::Message * messages, KDColor * colors, uint8_t numberOfMessages); + MessageViewWithSkip(I18n::Message * messages, KDColor * fgcolors, KDColor * bgcolors, uint8_t numberOfMessages); protected: int numberOfSubviews() const override; View * subviewAtIndex(int index) override; diff --git a/apps/shared/message_view.cpp b/apps/shared/message_view.cpp index 3bc257ab0..05975da8e 100644 --- a/apps/shared/message_view.cpp +++ b/apps/shared/message_view.cpp @@ -1,13 +1,14 @@ #include "message_view.h" #include -MessageView::MessageView(I18n::Message * messages, KDColor * colors, uint8_t numberOfMessages) { +MessageView::MessageView(I18n::Message * messages, KDColor * fgcolors, KDColor * bgcolors, uint8_t numberOfMessages) { m_numberOfMessages = numberOfMessages < k_maxNumberOfMessages ? numberOfMessages : k_maxNumberOfMessages; for (uint8_t i = 0; i < m_numberOfMessages; i++) { m_messageTextViews[i].setFont(i == 0 ? KDFont::LargeFont : KDFont::SmallFont); m_messageTextViews[i].setMessage(messages[i]); m_messageTextViews[i].setAlignment(0.5f, 0.5f); - m_messageTextViews[i].setTextColor(colors[i]); + m_messageTextViews[i].setTextColor(fgcolors[i]); + m_messageTextViews[i].setBackgroundColor(bgcolors[i]); } } diff --git a/apps/shared/message_view.h b/apps/shared/message_view.h index 41fb9e648..f6b773e95 100644 --- a/apps/shared/message_view.h +++ b/apps/shared/message_view.h @@ -5,7 +5,7 @@ class MessageView : public View { public: - MessageView(I18n::Message * messages, KDColor * colors, uint8_t numberOfMessages); + MessageView(I18n::Message * messages, KDColor * fgcolors, KDColor * bgcolors, uint8_t numberOfMessages); void drawRect(KDContext * ctx, KDRect rect) const override; protected: int numberOfSubviews() const override { return m_numberOfMessages; } diff --git a/apps/usb/usb_connected_controller.cpp b/apps/usb/usb_connected_controller.cpp index 5dafb088c..71a354c4a 100644 --- a/apps/usb/usb_connected_controller.cpp +++ b/apps/usb/usb_connected_controller.cpp @@ -13,7 +13,7 @@ static I18n::Message sUSBConnectedMessages[] = { I18n::Message::ConnectedMessage5, I18n::Message::ConnectedMessage6}; -static KDColor sUSBConnectedColors[] = { +static KDColor sUSBConnectedFGColors[] = { Palette::PrimaryText, Palette::PrimaryText, Palette::PrimaryText, @@ -23,9 +23,19 @@ static KDColor sUSBConnectedColors[] = { Palette::PrimaryText, Palette::PrimaryText}; +static KDColor sUSBConnectedBGColors[] = { + Palette::BackgroundHard, + Palette::BackgroundHard, + Palette::BackgroundHard, + Palette::BackgroundHard, + Palette::BackgroundHard, + Palette::BackgroundHard, + Palette::BackgroundHard, + Palette::BackgroundHard}; + USBConnectedController::USBConnectedController() : ViewController(nullptr), - m_messageView(sUSBConnectedMessages, sUSBConnectedColors, 8) + m_messageView(sUSBConnectedMessages, sUSBConnectedFGColors, sUSBConnectedBGColors, 8) { }