-
-
Notifications
You must be signed in to change notification settings - Fork 952
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merged the Calendar app PR into the most recent upstream code: 'ecf2f…
…56'. Commented out the swipe up/down to increase/decrease the current calendar's year as this interferes with the built in swipe down to exit ability.
- Loading branch information
Showing
9 changed files
with
157 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,6 +23,7 @@ namespace Pinetime { | |
Twos, | ||
HeartRate, | ||
Navigation, | ||
Calendar, | ||
StopWatch, | ||
Metronome, | ||
Motion, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
#include "displayapp/screens/Calendar.h" | ||
#include "components/datetime/DateTimeController.h" | ||
|
||
using namespace Pinetime::Applications::Screens; | ||
|
||
Calendar::Calendar(Controllers::DateTime& dateTimeController) : dateTimeController {dateTimeController} { | ||
|
||
// Create calendar object | ||
calendar = lv_calendar_create(lv_scr_act(), NULL); | ||
// Set size | ||
lv_obj_set_size(calendar, LV_HOR_RES, LV_VER_RES); | ||
// Set alignment | ||
lv_obj_align(calendar, NULL, LV_ALIGN_IN_BOTTOM_MID, 0, -5); | ||
// Disable clicks | ||
lv_obj_set_click(calendar, false); | ||
|
||
// Set background of today's date | ||
//lv_obj_set_style_local_bg_opa(calendar, LV_CALENDAR_PART_DATE, LV_STATE_FOCUSED, LV_OPA_COVER); | ||
//lv_obj_set_style_local_bg_color(calendar, LV_CALENDAR_PART_DATE, LV_STATE_FOCUSED, LV_COLOR_WHITE); | ||
//lv_obj_set_style_local_radius(calendar, LV_CALENDAR_PART_DATE, LV_STATE_FOCUSED, 3); | ||
|
||
// Set style of today's date | ||
lv_obj_set_style_local_text_color(calendar, LV_CALENDAR_PART_DATE, LV_STATE_FOCUSED, LV_COLOR_RED); | ||
|
||
// Set style of inactive month's days | ||
lv_obj_set_style_local_text_color(calendar, LV_CALENDAR_PART_DATE, LV_STATE_DISABLED, lv_color_hex(0x505050)); | ||
|
||
// Get today's date | ||
today.year = static_cast<int>(dateTimeController.Year()); | ||
today.month = static_cast<int>(dateTimeController.Month()); | ||
today.day = static_cast<int>(dateTimeController.Day()); | ||
|
||
// Set today's date | ||
lv_calendar_set_today_date(calendar, &today); | ||
lv_calendar_set_showed_date(calendar, &today); | ||
|
||
// Use today's date as a reference for which month to show if moved | ||
current = today; | ||
|
||
} | ||
|
||
bool Calendar::OnTouchEvent(Pinetime::Applications::TouchEvents event) { | ||
switch (event) { | ||
case TouchEvents::SwipeLeft: { | ||
if (current.month == 12) { | ||
current.month = 1; | ||
current.year++; | ||
} | ||
else{ | ||
current.month++; | ||
} | ||
lv_calendar_set_showed_date(calendar, ¤t); | ||
return true; | ||
} | ||
case TouchEvents::SwipeRight: { | ||
if (current.month == 1) { | ||
current.month = 12; | ||
current.year--; | ||
} | ||
else{ | ||
current.month--; | ||
} | ||
lv_calendar_set_showed_date(calendar, ¤t); | ||
return true; | ||
} | ||
/* | ||
case TouchEvents::SwipeUp: { | ||
current.year++; | ||
lv_calendar_set_showed_date(calendar, ¤t); | ||
return true; | ||
} | ||
case TouchEvents::SwipeDown: { | ||
current.year--; | ||
lv_calendar_set_showed_date(calendar, ¤t); | ||
return true; | ||
} | ||
*/ | ||
default: { | ||
return false; | ||
} | ||
} | ||
} | ||
|
||
Calendar::~Calendar() { | ||
lv_obj_clean(lv_scr_act()); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
#pragma once | ||
|
||
#include "displayapp/apps/Apps.h" | ||
#include "displayapp/Controllers.h" | ||
#include "displayapp/screens/Screen.h" | ||
#include "components/datetime/DateTimeController.h" | ||
#include <lvgl/lvgl.h> | ||
|
||
#include "Symbols.h" | ||
|
||
namespace Pinetime { | ||
namespace Controllers { | ||
class Settings; | ||
} | ||
|
||
namespace Applications { | ||
namespace Screens { | ||
class Calendar : public Screen { | ||
public: | ||
Calendar(Controllers::DateTime& dateTimeController); | ||
~Calendar() override; | ||
private: | ||
bool OnTouchEvent(TouchEvents event); | ||
Controllers::DateTime& dateTimeController; | ||
lv_obj_t* label_time; | ||
lv_obj_t * calendar; | ||
lv_calendar_date_t today; | ||
lv_calendar_date_t current; | ||
}; | ||
} | ||
|
||
template <> | ||
struct AppTraits<Apps::Calendar> { | ||
static constexpr Apps app = Apps::Calendar; | ||
static constexpr const char* icon = Screens::Symbols::calendar; | ||
|
||
static Screens::Screen* Create(AppControllers& controllers) { | ||
return new Screens::Calendar(controllers.dateTimeController); | ||
}; | ||
}; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters