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, 49 insertions, 0 deletions

diff --git a/src/displayapp/screens/BatteryInfo.h b/src/displayapp/screens/BatteryInfo.h
new file mode 100644
index 00000000..206f1ab0
--- /dev/null
+++ b/src/displayapp/screens/BatteryInfo.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include <cstdint>
+#include <FreeRTOS.h>
+#include <timers.h>
+#include "Screen.h"
+#include <lvgl/lvgl.h>
+
+
+namespace Pinetime {
+  namespace Controllers {
+    class Battery;
+  }
+
+  namespace Applications {
+    namespace Screens {
+
+      class BatteryInfo : public Screen{
+        public:
+          BatteryInfo(DisplayApp* app, 
+            Pinetime::Controllers::Battery& batteryController);
+          ~BatteryInfo() override;
+
+          bool Refresh() override;
+          
+
+          void UpdateScreen();
+          void UpdateAnim();
+
+        private:          
+
+          Pinetime::Controllers::Battery& batteryController;
+
+          lv_obj_t* voltage;
+          lv_obj_t* percent;
+          lv_obj_t* charging_bar;
+          lv_obj_t* status;
+
+          lv_task_t* taskUpdate;
+          lv_task_t* taskAnim;
+
+          int8_t animation = 0;
+          int8_t batteryPercent = -1;
+          float batteryVoltage = 0.0f;
+
+      };
+    }
+  }
+}