From a890f8568a0d0adfdd7118a21393d16c2423f941 Mon Sep 17 00:00:00 2001 From: Diego Miguel Date: Thu, 3 Mar 2022 01:57:42 +0100 Subject: [PATCH] Fixes in side cover toggling --- src/components/settings/Settings.h | 10 +-- src/displayapp/screens/WatchFaceInfineat.cpp | 67 ++++++++++---------- src/displayapp/screens/WatchFaceInfineat.h | 2 - 3 files changed, 39 insertions(+), 40 deletions(-) diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h index 686024b2..56248d02 100644 --- a/src/components/settings/Settings.h +++ b/src/components/settings/Settings.h @@ -99,18 +99,20 @@ namespace Pinetime { }; void SetInfineatShowSideCover(bool show) { - if (show != settings.watchFaceInfineat.showSideCover) + if (show != settings.watchFaceInfineat.showSideCover) { + settings.watchFaceInfineat.showSideCover = show; settingsChanged = true; - settings.watchFaceInfineat.showSideCover = show; + } }; bool GetInfineatShowSideCover() const { return settings.watchFaceInfineat.showSideCover; }; void SetInfineatColorIndex(int index) { - if (index != settings.watchFaceInfineat.colorIndex) + if (index != settings.watchFaceInfineat.colorIndex) { + settings.watchFaceInfineat.colorIndex = index; settingsChanged = true; - settings.watchFaceInfineat.colorIndex = index; + } }; int GetInfineatColorIndex() const { return settings.watchFaceInfineat.colorIndex; diff --git a/src/displayapp/screens/WatchFaceInfineat.cpp b/src/displayapp/screens/WatchFaceInfineat.cpp index 5ca7d70d..c21b8555 100644 --- a/src/displayapp/screens/WatchFaceInfineat.cpp +++ b/src/displayapp/screens/WatchFaceInfineat.cpp @@ -61,6 +61,7 @@ WatchFaceInfineat::WatchFaceInfineat(DisplayApp* app, line0Points[1] = {68, -8}; lv_line_set_points(line0, line0Points, 2); + lv_style_init(&line1Style); lv_style_set_line_width(&line1Style, LV_STATE_DEFAULT, 15); lv_style_set_line_color(&line1Style, LV_STATE_DEFAULT, lv_color_hex(infineatColors.orange[settingsController.GetInfineatColorIndex()*nLines + 1])); @@ -294,51 +295,65 @@ bool WatchFaceInfineat::OnButtonPushed() { void WatchFaceInfineat::UpdateSelected(lv_obj_t* object, lv_event_t event) { if (event == LV_EVENT_CLICKED) { + bool showSideCover = settingsController.GetInfineatShowSideCover(); + int colorIndex = settingsController.GetInfineatColorIndex(); + if (object == btnSettings) { lv_obj_set_hidden(btnSettings, true); lv_obj_set_hidden(btnClose, false); - lv_obj_set_hidden(btnNextColor, settingsController.GetInfineatShowSideCover()); - lv_obj_set_hidden(btnPrevColor, settingsController.GetInfineatShowSideCover()); + lv_obj_set_hidden(btnNextColor, !showSideCover); + lv_obj_set_hidden(btnPrevColor, !showSideCover); lv_obj_set_hidden(btnToggleCover, false); } if (object == btnClose) { CloseMenu(); } if (object == btnToggleCover) { - bool hidden = ToggleShowSideCover(); - lv_obj_set_hidden(btnNextColor, hidden); - lv_obj_set_hidden(btnPrevColor, hidden); - const char* labelToggle = hidden ? "OFF" : "ON"; + settingsController.SetInfineatShowSideCover(!showSideCover); + lv_obj_set_hidden(logoPine, showSideCover); + lv_obj_set_hidden(line0, showSideCover); + lv_obj_set_hidden(line1, showSideCover); + lv_obj_set_hidden(line2, showSideCover); + lv_obj_set_hidden(line3, showSideCover); + lv_obj_set_hidden(line4, showSideCover); + lv_obj_set_hidden(line5, showSideCover); + lv_obj_set_hidden(line6, showSideCover); + lv_obj_set_hidden(line7, showSideCover); + lv_obj_set_hidden(line8, showSideCover); + lv_obj_set_hidden(btnNextColor, showSideCover); + lv_obj_set_hidden(btnPrevColor, showSideCover); + const char* labelToggle = showSideCover ? "OFF" : "ON"; lv_obj_set_style_local_value_str(btnToggleCover, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, labelToggle); } if (object == btnNextColor) { - settingsController.SetInfineatColorIndex((settingsController.GetInfineatColorIndex() + 1) % nColors); + colorIndex = (colorIndex + 1) % nColors; + settingsController.SetInfineatColorIndex(colorIndex); } if (object == btnPrevColor) { - int colorIndex = settingsController.GetInfineatColorIndex() - 1; + colorIndex -= 1; if (colorIndex < 0) colorIndex = nColors - 1; settingsController.SetInfineatColorIndex(colorIndex); } if (object == btnNextColor || object == btnPrevColor) { lv_style_set_line_color(&line0Style, LV_STATE_DEFAULT, - lv_color_hex(infineatColors.orange[settingsController.GetInfineatColorIndex()*nLines])); + lv_color_hex(infineatColors.orange[colorIndex*nLines])); lv_style_set_line_color(&line1Style, LV_STATE_DEFAULT, - lv_color_hex(infineatColors.orange[settingsController.GetInfineatColorIndex()*nLines + 1])); + lv_color_hex(infineatColors.orange[colorIndex*nLines + 1])); lv_style_set_line_color(&line2Style, LV_STATE_DEFAULT, - lv_color_hex(infineatColors.orange[settingsController.GetInfineatColorIndex()*nLines + 2])); + lv_color_hex(infineatColors.orange[colorIndex*nLines + 2])); lv_style_set_line_color(&line3Style, LV_STATE_DEFAULT, - lv_color_hex(infineatColors.orange[settingsController.GetInfineatColorIndex()*nLines + 3])); + lv_color_hex(infineatColors.orange[colorIndex*nLines + 3])); lv_style_set_line_color(&line4Style, LV_STATE_DEFAULT, - lv_color_hex(infineatColors.orange[settingsController.GetInfineatColorIndex()*nLines + 4])); + lv_color_hex(infineatColors.orange[colorIndex*nLines + 4])); lv_style_set_line_color(&line5Style, LV_STATE_DEFAULT, - lv_color_hex(infineatColors.orange[settingsController.GetInfineatColorIndex()*nLines + 5])); + lv_color_hex(infineatColors.orange[colorIndex*nLines + 5])); lv_style_set_line_color(&line6Style, LV_STATE_DEFAULT, - lv_color_hex(infineatColors.orange[settingsController.GetInfineatColorIndex()*nLines + 6])); + lv_color_hex(infineatColors.orange[colorIndex*nLines + 6])); lv_style_set_line_color(&line7Style, LV_STATE_DEFAULT, - lv_color_hex(infineatColors.orange[settingsController.GetInfineatColorIndex()*nLines + 7])); + lv_color_hex(infineatColors.orange[colorIndex*nLines + 7])); lv_style_set_line_color(&line8Style, LV_STATE_DEFAULT, - lv_color_hex(infineatColors.orange[settingsController.GetInfineatColorIndex()*nLines + 8])); + lv_color_hex(infineatColors.orange[colorIndex*nLines + 8])); lv_obj_add_style(line0, LV_LINE_PART_MAIN, &line0Style); lv_obj_add_style(line1, LV_LINE_PART_MAIN, &line1Style); lv_obj_add_style(line2, LV_LINE_PART_MAIN, &line2Style); @@ -349,7 +364,7 @@ void WatchFaceInfineat::UpdateSelected(lv_obj_t* object, lv_event_t event) { lv_obj_add_style(line7, LV_LINE_PART_MAIN, &line7Style); lv_obj_add_style(line8, LV_LINE_PART_MAIN, &line8Style); lv_obj_set_style_local_bg_color(notificationIcon, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, - lv_color_hex(infineatColors.orange[settingsController.GetInfineatColorIndex()*nLines + 7])); + lv_color_hex(infineatColors.orange[colorIndex*nLines + 7])); } } } @@ -449,19 +464,3 @@ void WatchFaceInfineat::Refresh() { } } } - -bool WatchFaceInfineat::ToggleShowSideCover() { - bool visible = !settingsController.GetInfineatShowSideCover(); - settingsController.SetInfineatShowSideCover(visible); - lv_obj_set_hidden(logoPine, visible); - lv_obj_set_hidden(line0, visible); - lv_obj_set_hidden(line1, visible); - lv_obj_set_hidden(line2, visible); - lv_obj_set_hidden(line3, visible); - lv_obj_set_hidden(line4, visible); - lv_obj_set_hidden(line5, visible); - lv_obj_set_hidden(line6, visible); - lv_obj_set_hidden(line7, visible); - lv_obj_set_hidden(line8, visible); - return visible; -} diff --git a/src/displayapp/screens/WatchFaceInfineat.h b/src/displayapp/screens/WatchFaceInfineat.h index 77730062..afc25393 100644 --- a/src/displayapp/screens/WatchFaceInfineat.h +++ b/src/displayapp/screens/WatchFaceInfineat.h @@ -123,8 +123,6 @@ namespace Pinetime { Controllers::MotionController& motionController; lv_task_t* taskRefresh; - - bool ToggleShowSideCover(); }; } }