Merge branch 'develop' into infineat-external-resources

# Conflicts:
#	src/displayapp/screens/Symbols.h
#	src/displayapp/screens/settings/SettingWatchFace.cpp
#	src/displayapp/screens/settings/SettingWatchFace.h

1 files changed, 23 insertions, 0 deletions

diff --git a/src/displayapp/widgets/PageIndicator.h b/src/displayapp/widgets/PageIndicator.h
new file mode 100644
index 00000000..8484735e
--- /dev/null
+++ b/src/displayapp/widgets/PageIndicator.h
@@ -0,0 +1,23 @@
+#pragma once
+#include <lvgl/lvgl.h>
+
+namespace Pinetime {
+  namespace Applications {
+    namespace Widgets {
+      class PageIndicator {
+      public:
+        PageIndicator(uint8_t nCurrentScreen, uint8_t nScreens);
+        void Create();
+
+      private:
+        uint8_t nCurrentScreen;
+        uint8_t nScreens;
+
+        lv_point_t pageIndicatorBasePoints[2];
+        lv_point_t pageIndicatorPoints[2];
+        lv_obj_t* pageIndicatorBase;
+        lv_obj_t* pageIndicator;
+      };
+    }
+  }
+}