diff --git a/apps/calculation/calculation_icon.png b/apps/calculation/calculation_icon.png index 3818c7bf1..06fcc45ba 100644 Binary files a/apps/calculation/calculation_icon.png and b/apps/calculation/calculation_icon.png differ diff --git a/apps/graph/graph_icon.png b/apps/graph/graph_icon.png index 3818c7bf1..593a35088 100644 Binary files a/apps/graph/graph_icon.png and b/apps/graph/graph_icon.png differ diff --git a/apps/home/app_cell.cpp b/apps/home/app_cell.cpp index 3f134885b..c35dbd681 100644 --- a/apps/home/app_cell.cpp +++ b/apps/home/app_cell.cpp @@ -20,9 +20,9 @@ View * AppCell::subviewAtIndex(int index) { } void AppCell::layoutSubviews() { - m_iconView.setFrame(KDRect(0,0,k_iconSize,k_iconSize)); - if (bounds().height() > k_iconSize) { - m_nameView.setFrame(KDRect(0, k_iconSize, bounds().width(), bounds().height()-k_iconSize)); + m_iconView.setFrame(KDRect(0,0,k_iconWidth,k_iconHeight)); + if (bounds().height() > k_iconHeight) { + m_nameView.setFrame(KDRect(0, k_iconHeight, bounds().width(), bounds().height()-k_iconHeight)); } } diff --git a/apps/home/app_cell.h b/apps/home/app_cell.h index c8b1da3e6..307e221eb 100644 --- a/apps/home/app_cell.h +++ b/apps/home/app_cell.h @@ -17,7 +17,8 @@ public: void reloadCell() override; void setApp(::App * app); private: - static constexpr KDCoordinate k_iconSize = 32; + static constexpr KDCoordinate k_iconWidth = 55; + static constexpr KDCoordinate k_iconHeight = 56; ImageView m_iconView; PointerTextView m_nameView; bool m_visible; diff --git a/apps/home/controller.cpp b/apps/home/controller.cpp index 68bc54ea1..727e1326c 100644 --- a/apps/home/controller.cpp +++ b/apps/home/controller.cpp @@ -43,11 +43,11 @@ int Controller::numberOfColumns() { } KDCoordinate Controller::cellHeight() { - return 50; + return 98; } KDCoordinate Controller::cellWidth() { - return 50; + return 104; } TableViewCell * Controller::reusableCell(int index) { diff --git a/apps/probability/Makefile b/apps/probability/Makefile index 2557b86c2..b8b370c2f 100644 --- a/apps/probability/Makefile +++ b/apps/probability/Makefile @@ -20,6 +20,8 @@ app_objs += $(addprefix apps/probability/,\ parameters_controller.o\ ) +app_images += apps/probability/probability_icon.png + app_images += $(addprefix apps/probability/images/,\ binomial_icon.png\ calcul1_icon.png\ @@ -36,6 +38,5 @@ app_images += $(addprefix apps/probability/images/,\ focused_uniform_icon.png\ normal_icon.png\ poisson_icon.png\ - probability_icon.png\ uniform_icon.png\ ) \ No newline at end of file diff --git a/apps/probability/app.cpp b/apps/probability/app.cpp index 28146ebfc..ea0267da9 100644 --- a/apps/probability/app.cpp +++ b/apps/probability/app.cpp @@ -1,5 +1,5 @@ #include "app.h" -#include "images/probability_icon.h" +#include "probability_icon.h" namespace Probability { diff --git a/apps/probability/probability_icon.png b/apps/probability/probability_icon.png index e8dbe4dc8..464db94e1 100644 Binary files a/apps/probability/probability_icon.png and b/apps/probability/probability_icon.png differ diff --git a/apps/regression/regression_icon.png b/apps/regression/regression_icon.png index 3818c7bf1..09552a31f 100644 Binary files a/apps/regression/regression_icon.png and b/apps/regression/regression_icon.png differ diff --git a/apps/statistics/stat_icon.png b/apps/statistics/stat_icon.png index 3818c7bf1..cd98d424f 100644 Binary files a/apps/statistics/stat_icon.png and b/apps/statistics/stat_icon.png differ diff --git a/escher/image/inliner.c b/escher/image/inliner.c index 8a9b45073..05ddcc757 100644 --- a/escher/image/inliner.c +++ b/escher/image/inliner.c @@ -23,6 +23,9 @@ void fileNameToSnakeCaseName(const char * fileName, char * snakeCaseName, size_t void snakeCaseNameToUpperSnakeName(const char * snakeCaseName, char * upperSnakeCaseName, size_t maxLength); void camelCaseNameFromSnakeCaseNames(const char * snakeCaseName, const char * upperSnakeCaseName, char * camelCaseName, size_t maxLength); +// TODO: fix inliner to handle any png file +// TODO: truncate the app image dimensions to 55x56 pixels + int main(int argc, char * argv[]) { ERROR_IF(argc != 2, "Usage: inliner source.png"); const char * inputPath = argv[1];