Merge branch 'develop' into motion-sensor

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/DisplayApp.h
#	src/displayapp/lv_pinetime_theme.c
#	src/displayapp/screens/ApplicationList.cpp
#	src/drivers/TwiMaster.cpp
#	src/systemtask/SystemTask.h

1 files changed, 62 insertions, 15 deletions

diff --git a/src/displayapp/lv_pinetime_theme.c b/src/displayapp/lv_pinetime_theme.c
index 1350b0d..99ea9c8 100644
--- a/src/displayapp/lv_pinetime_theme.c
+++ b/src/displayapp/lv_pinetime_theme.c
@@ -54,6 +54,8 @@ static lv_style_t style_pad_small;
 static lv_style_t style_bg_grad;
 static lv_style_t style_lmeter;
 static lv_style_t style_chart_serie;
+static lv_style_t style_cb_bg;
+static lv_style_t style_cb_bullet;
 
 static bool inited;
 
@@ -112,19 +114,34 @@ static void basic_init(void)
     style_init_reset(&style_btn);
     lv_style_set_radius(&style_btn, LV_STATE_DEFAULT, 10);
     lv_style_set_bg_opa(&style_btn, LV_STATE_DEFAULT, LV_OPA_COVER);
-    lv_style_set_bg_color(&style_btn, LV_STATE_DEFAULT, LV_PINETIME_GRAY);    
-    lv_style_set_text_color(&style_btn, LV_STATE_DEFAULT, LV_PINETIME_WHITE);
-    lv_style_set_value_color(&style_btn, LV_STATE_DEFAULT, LV_PINETIME_WHITE);
-    lv_style_set_pad_top(&style_btn, LV_STATE_DEFAULT, LV_VER_RES / 40);
-    lv_style_set_pad_bottom(&style_btn, LV_STATE_DEFAULT, LV_VER_RES / 40);
-
-    lv_style_set_pad_left(&style_btn, LV_STATE_DEFAULT, LV_DPX(15));
-    lv_style_set_pad_right(&style_btn, LV_STATE_DEFAULT, LV_DPX(15));
-    lv_style_set_pad_top(&style_btn, LV_STATE_DEFAULT, LV_DPX(10));
-    lv_style_set_pad_bottom(&style_btn, LV_STATE_DEFAULT, LV_DPX(10));
-    lv_style_set_pad_inner(&style_btn, LV_STATE_DEFAULT, LV_DPX(5));
+    lv_style_set_bg_color(&style_btn, LV_STATE_DEFAULT, lv_color_hex(0x2F3540));
+    lv_style_set_bg_color(&style_btn, LV_STATE_CHECKED, LV_COLOR_GREEN);
+    lv_style_set_bg_color(&style_btn, LV_STATE_DISABLED, lv_color_hex(0x2F3540));
+    lv_style_set_bg_color(&style_btn, LV_STATE_DISABLED | LV_STATE_CHECKED, lv_color_hex3(0x888));
+    lv_style_set_border_color(&style_btn, LV_STATE_DEFAULT, theme.color_primary);
+    lv_style_set_border_width(&style_btn, LV_STATE_DEFAULT, 0);
+    lv_style_set_border_opa(&style_btn, LV_STATE_CHECKED, LV_OPA_TRANSP);
+
+    lv_style_set_text_color(&style_btn, LV_STATE_DEFAULT, lv_color_hex(0xffffff));
+    lv_style_set_text_color(&style_btn, LV_STATE_CHECKED,  lv_color_hex(0xffffff));
+    lv_style_set_text_color(&style_btn, LV_STATE_CHECKED, lv_color_hex(0xffffff));
+    lv_style_set_text_color(&style_btn, LV_STATE_DISABLED, lv_color_hex(0x888888));
+
+    lv_style_set_value_color(&style_btn, LV_STATE_DEFAULT, lv_color_hex(0xffffff));
+    lv_style_set_value_color(&style_btn, LV_STATE_CHECKED,  lv_color_hex(0xffffff));
+    lv_style_set_value_color(&style_btn, LV_STATE_CHECKED, lv_color_hex(0xffffff));
+    lv_style_set_value_color(&style_btn, LV_STATE_DISABLED, lv_color_hex(0x888888));
+
+    lv_style_set_pad_left(&style_btn, LV_STATE_DEFAULT, LV_DPX(20));
+    lv_style_set_pad_right(&style_btn, LV_STATE_DEFAULT, LV_DPX(20));
+    lv_style_set_pad_top(&style_btn, LV_STATE_DEFAULT, LV_DPX(20));
+    lv_style_set_pad_bottom(&style_btn, LV_STATE_DEFAULT, LV_DPX(20));
+    lv_style_set_pad_inner(&style_btn, LV_STATE_DEFAULT, LV_DPX(15));
     lv_style_set_outline_width(&style_btn, LV_STATE_DEFAULT, LV_DPX(2));
-
+    lv_style_set_outline_opa(&style_btn, LV_STATE_DEFAULT, LV_OPA_0);
+    lv_style_set_outline_color(&style_btn, LV_STATE_DEFAULT, theme.color_primary);
+    lv_style_set_transition_time(&style_btn, LV_STATE_DEFAULT, 0);
+    lv_style_set_transition_delay(&style_btn, LV_STATE_DEFAULT, 0);
 
     style_init_reset(&style_btn_border);
     lv_style_set_radius(&style_btn_border, LV_STATE_DEFAULT, LV_RADIUS_CIRCLE);
@@ -266,6 +283,25 @@ static void basic_init(void)
     lv_style_set_line_width(&style_chart_serie, LV_STATE_DEFAULT, 4);
     lv_style_set_size(&style_chart_serie, LV_STATE_DEFAULT, 4);
     lv_style_set_bg_opa(&style_chart_serie, LV_STATE_DEFAULT, 0);
+
+    lv_style_reset(&style_cb_bg);
+    lv_style_set_radius(&style_cb_bg, LV_STATE_DEFAULT, LV_DPX(4));
+    lv_style_set_pad_inner(&style_cb_bg, LV_STATE_DEFAULT, LV_DPX(10));
+    lv_style_set_outline_color(&style_cb_bg, LV_STATE_DEFAULT, theme.color_primary);
+    lv_style_set_outline_width(&style_cb_bg, LV_STATE_DEFAULT, LV_DPX(2));
+    lv_style_set_outline_pad(&style_cb_bg, LV_STATE_DEFAULT, LV_DPX(20));
+    lv_style_set_transition_time(&style_cb_bg, LV_STATE_DEFAULT, 0);
+    lv_style_set_transition_prop_6(&style_cb_bg, LV_STATE_DEFAULT, LV_STYLE_OUTLINE_OPA);
+
+    lv_style_reset(&style_cb_bullet);
+    lv_style_set_outline_opa(&style_cb_bullet, LV_STATE_FOCUSED, LV_OPA_TRANSP);
+    lv_style_set_radius(&style_cb_bullet, LV_STATE_DEFAULT, LV_DPX(4));
+    lv_style_set_pattern_recolor(&style_cb_bullet, LV_STATE_CHECKED, LV_COLOR_WHITE);
+    lv_style_set_pad_left(&style_cb_bullet, LV_STATE_DEFAULT, LV_DPX(8));
+    lv_style_set_pad_right(&style_cb_bullet, LV_STATE_DEFAULT, LV_DPX(8));
+    lv_style_set_pad_top(&style_cb_bullet, LV_STATE_DEFAULT, LV_DPX(8));
+    lv_style_set_pad_bottom(&style_cb_bullet, LV_STATE_DEFAULT, LV_DPX(8));
+
 }
 
 
@@ -338,7 +374,7 @@ static void theme_apply(lv_obj_t * obj, lv_theme_style_t name)
             lv_obj_clean_style_list(obj, LV_BTN_PART_MAIN);
             list = lv_obj_get_style_list(obj, LV_BTN_PART_MAIN);
             _lv_style_list_add_style(list, &style_btn);
-            _lv_style_list_add_style(list, &style_bg_grad);
+            //_lv_style_list_add_style(list, &style_bg_grad);
             break;
 
         case LV_THEME_BTNMATRIX:
@@ -348,8 +384,8 @@ static void theme_apply(lv_obj_t * obj, lv_theme_style_t name)
 
             list = lv_obj_get_style_list(obj, LV_BTNMATRIX_PART_BTN);
             _lv_style_list_add_style(list, &style_btn);
-            _lv_style_list_add_style(list, &style_bg_grad);
-            //_lv_style_list_add_style(list, &styles->bg_click);
+            //_lv_style_list_add_style(list, &style_bg_grad);
+            //_lv_style_list_add_style(list, &style_bg_click);
             break;
 
         case LV_THEME_BAR:
@@ -477,6 +513,17 @@ static void theme_apply(lv_obj_t * obj, lv_theme_style_t name)
           list = lv_obj_get_style_list(obj, LV_CHART_PART_SERIES);
           _lv_style_list_add_style(list, &style_btn);
           _lv_style_list_add_style(list, &style_chart_serie);
+          break;
+
+        case LV_THEME_CHECKBOX:
+            list = lv_obj_get_style_list(obj, LV_CHECKBOX_PART_BG);
+            _lv_style_list_add_style(list, &style_cb_bg);
+
+            list = lv_obj_get_style_list(obj, LV_CHECKBOX_PART_BULLET);
+            _lv_style_list_add_style(list, &style_btn);
+            _lv_style_list_add_style(list, &style_cb_bullet);
+            break;
+
 
         default:
             break;