[apps] MessageView for OnBoarding update and USBConnected controllers

Change-Id: I3a775a81a62c408c9d02d98be25518d03fe5f9bf
This commit is contained in:
Léa Saviot
2018-04-05 14:57:36 +02:00
parent 3059f27c00
commit 50cc2a310b
11 changed files with 151 additions and 167 deletions

View File

@@ -2,34 +2,15 @@
#define SHARED_MESSAGE_CONTROLLER_H
#include <escher.h>
#include "ok_view.h"
#include "message_view_with_skip.h"
class MessageController : public ViewController {
public:
MessageController(I18n::Message * messages, KDColor * colors);
View * view() override;
MessageController(I18n::Message * messages, KDColor * colors, uint8_t numberOfMessages);
View * view() override { return &m_messageViewWithSkip; }
bool handleEvent(Ion::Events::Event event) override;
private:
class ContentView : public View {
public:
ContentView(I18n::Message * messages, KDColor * colors);
void drawRect(KDContext * ctx, KDRect rect) const override;
private:
constexpr static KDCoordinate k_bottomMargin = 13;
constexpr static KDCoordinate k_okMargin = 10;
constexpr static KDCoordinate k_skipMargin = 4;
int numberOfSubviews() const override;
View * subviewAtIndex(int index) override;
void layoutSubviews() override;
MessageTextView m_titleTextView;
MessageTextView m_messageTextView1;
MessageTextView m_messageTextView2;
MessageTextView m_messageTextView3;
MessageTextView m_messageTextView4;
MessageTextView m_skipView;
Shared::OkView m_okView;
};
ContentView m_contentView;
MessageViewWithSkip m_messageViewWithSkip;
};
#endif