@ -61,6 +61,7 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
displayedChar [ 3 ] = 0 ;
displayedChar [ 3 ] = 0 ;
displayedChar [ 4 ] = 0 ;
displayedChar [ 4 ] = 0 ;
< < < < < < < HEAD
//Feels like a hack, but if all the colors are white, this is probably not what the user wants
//Feels like a hack, but if all the colors are white, this is probably not what the user wants
if ( settingsController . GetPTSColorTime ( ) + settingsController . GetPTSColorBar ( ) + settingsController . GetPTSColorBG ( ) = = 0 ) {
if ( settingsController . GetPTSColorTime ( ) + settingsController . GetPTSColorBar ( ) + settingsController . GetPTSColorBG ( ) = = 0 ) {
settingsController . SetPTSColorTime ( 11 ) ;
settingsController . SetPTSColorTime ( 11 ) ;
@ -72,6 +73,12 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
timebar = lv_obj_create ( lv_scr_act ( ) , nullptr ) ;
timebar = lv_obj_create ( lv_scr_act ( ) , nullptr ) ;
lv_obj_set_style_local_bg_color ( timebar , LV_BTN_PART_MAIN , LV_STATE_DEFAULT , pts_colors [ settingsController . GetPTSColorBG ( ) ] ) ;
lv_obj_set_style_local_bg_color ( timebar , LV_BTN_PART_MAIN , LV_STATE_DEFAULT , pts_colors [ settingsController . GetPTSColorBG ( ) ] ) ;
= = = = = = =
/* Create a 200px wide background rectangle */
timebar = lv_obj_create ( lv_scr_act ( ) , nullptr ) ;
lv_obj_set_style_local_bg_color ( timebar , LV_BTN_PART_MAIN , LV_STATE_DEFAULT , lv_color_hex ( 0x000000 ) ) ;
> > > > > > > upstream / develop
lv_obj_set_style_local_radius ( timebar , LV_BTN_PART_MAIN , LV_STATE_DEFAULT , 0 ) ;
lv_obj_set_style_local_radius ( timebar , LV_BTN_PART_MAIN , LV_STATE_DEFAULT , 0 ) ;
lv_obj_set_size ( timebar , 200 , 240 ) ;
lv_obj_set_size ( timebar , 200 , 240 ) ;
lv_obj_align ( timebar , lv_scr_act ( ) , LV_ALIGN_IN_TOP_LEFT , 5 , 0 ) ;
lv_obj_align ( timebar , lv_scr_act ( ) , LV_ALIGN_IN_TOP_LEFT , 5 , 0 ) ;
@ -80,18 +87,30 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
timeDD1 = lv_label_create ( lv_scr_act ( ) , nullptr ) ;
timeDD1 = lv_label_create ( lv_scr_act ( ) , nullptr ) ;
lv_obj_set_style_local_text_font ( timeDD1 , LV_LABEL_PART_MAIN , LV_STATE_DEFAULT , & open_sans_light ) ;
lv_obj_set_style_local_text_font ( timeDD1 , LV_LABEL_PART_MAIN , LV_STATE_DEFAULT , & open_sans_light ) ;
< < < < < < < HEAD
lv_obj_set_style_local_text_color ( timeDD1 , LV_LABEL_PART_MAIN , LV_STATE_DEFAULT , pts_colors [ settingsController . GetPTSColorTime ( ) ] ) ;
lv_obj_set_style_local_text_color ( timeDD1 , LV_LABEL_PART_MAIN , LV_STATE_DEFAULT , pts_colors [ settingsController . GetPTSColorTime ( ) ] ) ;
= = = = = = =
lv_obj_set_style_local_text_color ( timeDD1 , LV_LABEL_PART_MAIN , LV_STATE_DEFAULT , lv_color_hex ( 0x008080 ) ) ;
> > > > > > > upstream / develop
lv_label_set_text ( timeDD1 , " 12 " ) ;
lv_label_set_text ( timeDD1 , " 12 " ) ;
lv_obj_align ( timeDD1 , timebar , LV_ALIGN_IN_TOP_MID , 5 , 5 ) ;
lv_obj_align ( timeDD1 , timebar , LV_ALIGN_IN_TOP_MID , 5 , 5 ) ;
timeDD2 = lv_label_create ( lv_scr_act ( ) , nullptr ) ;
timeDD2 = lv_label_create ( lv_scr_act ( ) , nullptr ) ;
lv_obj_set_style_local_text_font ( timeDD2 , LV_LABEL_PART_MAIN , LV_STATE_DEFAULT , & open_sans_light ) ;
lv_obj_set_style_local_text_font ( timeDD2 , LV_LABEL_PART_MAIN , LV_STATE_DEFAULT , & open_sans_light ) ;
< < < < < < < HEAD
lv_obj_set_style_local_text_color ( timeDD2 , LV_LABEL_PART_MAIN , LV_STATE_DEFAULT , pts_colors [ settingsController . GetPTSColorTime ( ) ] ) ;
lv_obj_set_style_local_text_color ( timeDD2 , LV_LABEL_PART_MAIN , LV_STATE_DEFAULT , pts_colors [ settingsController . GetPTSColorTime ( ) ] ) ;
= = = = = = =
lv_obj_set_style_local_text_color ( timeDD2 , LV_LABEL_PART_MAIN , LV_STATE_DEFAULT , lv_color_hex ( 0x008080 ) ) ;
> > > > > > > upstream / develop
lv_label_set_text ( timeDD2 , " 34 " ) ;
lv_label_set_text ( timeDD2 , " 34 " ) ;
lv_obj_align ( timeDD2 , timebar , LV_ALIGN_IN_BOTTOM_MID , 5 , - 5 ) ;
lv_obj_align ( timeDD2 , timebar , LV_ALIGN_IN_BOTTOM_MID , 5 , - 5 ) ;
timeAMPM = lv_label_create ( lv_scr_act ( ) , nullptr ) ;
timeAMPM = lv_label_create ( lv_scr_act ( ) , nullptr ) ;
< < < < < < < HEAD
lv_obj_set_style_local_text_color ( timeAMPM , LV_LABEL_PART_MAIN , LV_STATE_DEFAULT , pts_colors [ settingsController . GetPTSColorTime ( ) ] ) ;
lv_obj_set_style_local_text_color ( timeAMPM , LV_LABEL_PART_MAIN , LV_STATE_DEFAULT , pts_colors [ settingsController . GetPTSColorTime ( ) ] ) ;
= = = = = = =
lv_obj_set_style_local_text_color ( timeAMPM , LV_LABEL_PART_MAIN , LV_STATE_DEFAULT , lv_color_hex ( 0x008080 ) ) ;
> > > > > > > upstream / develop
lv_obj_set_style_local_text_line_space ( timeAMPM , LV_LABEL_PART_MAIN , LV_STATE_DEFAULT , - 3 ) ;
lv_obj_set_style_local_text_line_space ( timeAMPM , LV_LABEL_PART_MAIN , LV_STATE_DEFAULT , - 3 ) ;
lv_label_set_text ( timeAMPM , " " ) ;
lv_label_set_text ( timeAMPM , " " ) ;
lv_obj_align ( timeAMPM , timebar , LV_ALIGN_IN_BOTTOM_LEFT , 2 , - 20 ) ;
lv_obj_align ( timeAMPM , timebar , LV_ALIGN_IN_BOTTOM_LEFT , 2 , - 20 ) ;
@ -99,7 +118,11 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
/* Create a 40px wide bar down the right side of the screen */
/* Create a 40px wide bar down the right side of the screen */
sidebar = lv_obj_create ( lv_scr_act ( ) , nullptr ) ;
sidebar = lv_obj_create ( lv_scr_act ( ) , nullptr ) ;
< < < < < < < HEAD
lv_obj_set_style_local_bg_color ( sidebar , LV_BTN_PART_MAIN , LV_STATE_DEFAULT , pts_colors [ settingsController . GetPTSColorBar ( ) ] ) ;
lv_obj_set_style_local_bg_color ( sidebar , LV_BTN_PART_MAIN , LV_STATE_DEFAULT , pts_colors [ settingsController . GetPTSColorBar ( ) ] ) ;
= = = = = = =
lv_obj_set_style_local_bg_color ( sidebar , LV_BTN_PART_MAIN , LV_STATE_DEFAULT , lv_color_hex ( 0x008080 ) ) ;
> > > > > > > upstream / develop
lv_obj_set_style_local_radius ( sidebar , LV_BTN_PART_MAIN , LV_STATE_DEFAULT , 0 ) ;
lv_obj_set_style_local_radius ( sidebar , LV_BTN_PART_MAIN , LV_STATE_DEFAULT , 0 ) ;
lv_obj_set_size ( sidebar , 40 , 240 ) ;
lv_obj_set_size ( sidebar , 40 , 240 ) ;
lv_obj_align ( sidebar , lv_scr_act ( ) , LV_ALIGN_IN_TOP_RIGHT , 0 , 0 ) ;
lv_obj_align ( sidebar , lv_scr_act ( ) , LV_ALIGN_IN_TOP_RIGHT , 0 , 0 ) ;
@ -198,7 +221,11 @@ PineTimeStyle::PineTimeStyle(DisplayApp* app,
lv_obj_set_style_local_line_width ( stepGauge , LV_GAUGE_PART_MAIN , LV_STATE_DEFAULT , 4 ) ;
lv_obj_set_style_local_line_width ( stepGauge , LV_GAUGE_PART_MAIN , LV_STATE_DEFAULT , 4 ) ;
lv_obj_set_style_local_line_color ( stepGauge , LV_GAUGE_PART_MAIN , LV_STATE_DEFAULT , LV_COLOR_BLACK ) ;
lv_obj_set_style_local_line_color ( stepGauge , LV_GAUGE_PART_MAIN , LV_STATE_DEFAULT , LV_COLOR_BLACK ) ;
lv_obj_set_style_local_line_opa ( stepGauge , LV_GAUGE_PART_NEEDLE , LV_STATE_DEFAULT , LV_OPA_COVER ) ;
lv_obj_set_style_local_line_opa ( stepGauge , LV_GAUGE_PART_NEEDLE , LV_STATE_DEFAULT , LV_OPA_COVER ) ;
< < < < < < < HEAD
lv_obj_set_style_local_line_width ( stepGauge , LV_GAUGE_PART_NEEDLE , LV_STATE_DEFAULT , 3 ) ;
lv_obj_set_style_local_line_width ( stepGauge , LV_GAUGE_PART_NEEDLE , LV_STATE_DEFAULT , 3 ) ;
= = = = = = =
lv_obj_set_style_local_line_width ( stepGauge , LV_GAUGE_PART_NEEDLE , LV_STATE_DEFAULT , 4 ) ;
> > > > > > > upstream / develop
lv_obj_set_style_local_pad_inner ( stepGauge , LV_GAUGE_PART_NEEDLE , LV_STATE_DEFAULT , 4 ) ;
lv_obj_set_style_local_pad_inner ( stepGauge , LV_GAUGE_PART_NEEDLE , LV_STATE_DEFAULT , 4 ) ;
backgroundLabel = lv_label_create ( lv_scr_act ( ) , nullptr ) ;
backgroundLabel = lv_label_create ( lv_scr_act ( ) , nullptr ) ;