UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[escher] AlternateEmptyViewController: give the delegate the opportunity

Browse Source 
to choose the view to display when empty
This commit is contained in:
Émilie Feral
2018-10-08 16:21:41 +02:00
parent 1adefc3bc4
commit 4dda66e58d
10 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/regression/calculation_controller.h
View File

@@ -13,7 +13,7 @@
namespace Regression {
class CalculationController : public Shared::TabTableController, public TableViewDataSource, public SelectableTableViewDelegate, public ButtonRowDelegate, public AlternateEmptyViewDelegate {
class CalculationController : public Shared::TabTableController, public TableViewDataSource, public SelectableTableViewDelegate, public ButtonRowDelegate, public AlternateEmptyViewDefaultDelegate {
public:
CalculationController(Responder * parentResponder, ButtonRowController * header, Store * store);
@@ -28,7 +28,7 @@ public:
// SelectableTableViewDelegate
void tableViewDidChangeSelection(SelectableTableView * t, int previousSelectedCellX, int previousSelectedCellY) override;
// AlternateEmptyViewDelegate
// AlternateEmptyViewDefaultDelegate
bool isEmpty() const override;
I18n::Message emptyMessage() override;
Responder * defaultController() override;

2
apps/shared/interactive_curve_view_controller.h
View File

@@ -9,7 +9,7 @@
namespace Shared {
class InteractiveCurveViewController : public SimpleInteractiveCurveViewController, public InteractiveCurveViewRangeDelegate, public ButtonRowDelegate, public AlternateEmptyViewDelegate {
class InteractiveCurveViewController : public SimpleInteractiveCurveViewController, public InteractiveCurveViewRangeDelegate, public ButtonRowDelegate, public AlternateEmptyViewDefaultDelegate {
public:
InteractiveCurveViewController(Responder * parentResponder, ButtonRowController * header, InteractiveCurveViewRange * interactiveRange, CurveView * curveView, CurveViewCursor * cursor, uint32_t * modelVersion, uint32_t * rangeVersion);

2
apps/shared/values_controller.h
View File

@@ -13,7 +13,7 @@
namespace Shared {
class ValuesController : public EditableCellTableViewController, public ButtonRowDelegate, public AlternateEmptyViewDelegate {
class ValuesController : public EditableCellTableViewController, public ButtonRowDelegate, public AlternateEmptyViewDefaultDelegate {
public:
ValuesController(Responder * parentResponder, ButtonRowController * header, I18n::Message parameterTitle, IntervalParameterController * intervalParameterController, Interval * interval);
const char * title() override;

4
apps/solver/solutions_controller.h
View File

@@ -8,14 +8,14 @@
namespace Solver {
class SolutionsController : public ViewController, public AlternateEmptyViewDelegate, public SelectableTableViewDataSource, public TableViewDataSource {
class SolutionsController : public ViewController, public AlternateEmptyViewDefaultDelegate, public SelectableTableViewDataSource, public TableViewDataSource {
public:
SolutionsController(Responder * parentResponder, EquationStore * equationStore);
/* ViewController */
const char * title() override;
View * view() override;
void viewWillAppear() override;
/* AlternateEmptyViewDelegate */
/* AlternateEmptyViewDefaultDelegate */
bool isEmpty() const override;
virtual I18n::Message emptyMessage() override;
virtual Responder * defaultController() override;

2
apps/statistics/calculation_controller.cpp
View File

@@ -34,7 +34,7 @@ CalculationController::CalculationController(Responder * parentResponder, Button
m_hideableCell.setHide(true);
}
// AlternateEmptyViewDelegate
// AlternateEmptyViewDefaultDelegate
bool CalculationController::isEmpty() const {
return m_store->isEmpty();

4
apps/statistics/calculation_controller.h
View File

@@ -12,12 +12,12 @@
namespace Statistics {
class CalculationController : public Shared::TabTableController, public ButtonRowDelegate, public TableViewDataSource, public AlternateEmptyViewDelegate {
class CalculationController : public Shared::TabTableController, public ButtonRowDelegate, public TableViewDataSource, public AlternateEmptyViewDefaultDelegate {
public:
CalculationController(Responder * parentResponder, ButtonRowController * header, Store * store);
// AlternateEmptyViewDelegate
// AlternateEmptyViewDefaultDelegate
bool isEmpty() const override;
I18n::Message emptyMessage() override;
Responder * defaultController() override;

4
apps/statistics/multiple_data_view_controller.h
View File

@@ -7,13 +7,13 @@
namespace Statistics {
class MultipleDataViewController : public ViewController, public AlternateEmptyViewDelegate {
class MultipleDataViewController : public ViewController, public AlternateEmptyViewDefaultDelegate {
public:
MultipleDataViewController(Responder * parentResponder, Store * store, int * m_selectedBarIndex, int * selectedSeriesIndex);
virtual MultipleDataView * multipleDataView() = 0;
int selectedSeriesIndex() const { return *m_selectedSeriesIndex; }
// AlternateEmptyViewDelegate
// AlternateEmptyViewDefaultDelegate
bool isEmpty() const override;
I18n::Message emptyMessage() override;
Responder * defaultController() override;

2
escher/include/escher/alternate_empty_view_controller.h
View File

@@ -3,7 +3,6 @@
#include <escher/alternate_empty_view_delegate.h>
#include <escher/i18n.h>
#include <escher/message_text_view.h>
#include <escher/view_controller.h>
class AlternateEmptyViewController : public ViewController {
@@ -25,7 +24,6 @@ private:
private:
int numberOfSubviews() const override;
View * subviewAtIndex(int index) override;
MessageTextView m_message;
ViewController * m_mainViewController;
AlternateEmptyViewDelegate * m_delegate;
};

16
escher/include/escher/alternate_empty_view_delegate.h
View File

@@ -2,6 +2,8 @@
#define ESCHER_ALTERNATE_EMPTY_VIEW_DELEGATE_H
#include <escher/view_controller.h>
#include <escher/message_text_view.h>
#include <escher/palette.h>
#include <escher/i18n.h>
class AlternateEmptyViewController;
@@ -9,8 +11,20 @@ class AlternateEmptyViewController;
class AlternateEmptyViewDelegate {
public:
virtual bool isEmpty() const = 0;
virtual I18n::Message emptyMessage() = 0;
virtual View * emptyView() = 0;
virtual Responder * defaultController() = 0;
};
class AlternateEmptyViewDefaultDelegate : public AlternateEmptyViewDelegate {
public:
AlternateEmptyViewDefaultDelegate() : m_message(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, Palette::WallScreen) {}
virtual I18n::Message emptyMessage() = 0;
View * emptyView() override {
m_message.setMessage(emptyMessage());
return &m_message;
}
private:
MessageTextView m_message;
};
#endif

7
escher/src/alternate_empty_view_controller.cpp
View File

@@ -1,12 +1,10 @@
#include <escher/alternate_empty_view_controller.h>
#include <escher/app.h>
#include <escher/palette.h>
#include <assert.h>
/* ContentView */
AlternateEmptyViewController::ContentView::ContentView(ViewController * mainViewController, AlternateEmptyViewDelegate * delegate) :
m_message(KDFont::SmallFont, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, Palette::WallScreen),
m_mainViewController(mainViewController),
m_delegate(delegate)
{
@@ -19,15 +17,14 @@ int AlternateEmptyViewController::ContentView::numberOfSubviews() const {
View * AlternateEmptyViewController::ContentView::subviewAtIndex(int index) {
assert(index == 0);
if (m_delegate->isEmpty()) {
m_message.setMessage(m_delegate->emptyMessage());
return &m_message;
return m_delegate->emptyView();
}
return m_mainViewController->view();
}
void AlternateEmptyViewController::ContentView::layoutSubviews() {
if (alternateEmptyViewDelegate()->isEmpty()) {
m_message.setFrame(bounds());
m_delegate->emptyView()->setFrame(bounds());
} else {
m_mainViewController->view()->setFrame(bounds());
}