From a4de61e1f5c7842d25bac0cfb22e4a9f0bff671c Mon Sep 17 00:00:00 2001
From: Stoian Minaiev <stoyan.minaev@gmail.com>
Date: Fri, 14 May 2021 01:09:40 +0300
Subject: git: show git short ref hash on SystemInfo(first screen) and
 FirmwareValidation screen alongside other information

---
 src/displayapp/screens/FirmwareValidation.cpp | 11 +++++++++++
 src/displayapp/screens/FirmwareValidation.h   |  3 +++
 src/displayapp/screens/SystemInfo.cpp         |  2 ++
 3 files changed, 16 insertions(+)

(limited to 'src/displayapp/screens')

diff --git a/src/displayapp/screens/FirmwareValidation.cpp b/src/displayapp/screens/FirmwareValidation.cpp
index 873a22f5..ad37a3df 100644
--- a/src/displayapp/screens/FirmwareValidation.cpp
+++ b/src/displayapp/screens/FirmwareValidation.cpp
@@ -27,6 +27,17 @@ FirmwareValidation::FirmwareValidation(Pinetime::Applications::DisplayApp* app,
   sprintf(version, "%ld.%ld.%ld", Version::Major(), Version::Minor(), Version::Patch());
   lv_label_set_text(labelVersionValue, version);
 
+  labelShortRefInfo = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_align(labelShortRefInfo, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 25);
+  lv_label_set_text(labelShortRefInfo, "ShortRef : ");
+  lv_label_set_align(labelShortRefInfo, LV_LABEL_ALIGN_LEFT);
+
+  labelShortRefValue = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_align(labelShortRefValue, labelShortRefInfo, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
+  lv_label_set_recolor(labelShortRefValue, true);
+  sprintf(shortref, "%s", Version::GitCommitHash());
+  lv_label_set_text(labelShortRefValue, shortref);
+
   labelIsValidated = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_align(labelIsValidated, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 50);
   lv_label_set_recolor(labelIsValidated, true);
diff --git a/src/displayapp/screens/FirmwareValidation.h b/src/displayapp/screens/FirmwareValidation.h
index 67662fd9..303c2154 100644
--- a/src/displayapp/screens/FirmwareValidation.h
+++ b/src/displayapp/screens/FirmwareValidation.h
@@ -25,7 +25,10 @@ namespace Pinetime {
 
         lv_obj_t* labelVersionInfo;
         lv_obj_t* labelVersionValue;
+        lv_obj_t* labelShortRefInfo;
+        lv_obj_t* labelShortRefValue;
         char version[9];
+        char shortref[9];
         lv_obj_t* labelIsValidated;
         lv_obj_t* buttonValidate;
         lv_obj_t* labelButtonValidate;
diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp
index ab349d7b..e4ef6911 100644
--- a/src/displayapp/screens/SystemInfo.cpp
+++ b/src/displayapp/screens/SystemInfo.cpp
@@ -69,12 +69,14 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen1() {
   lv_label_set_text_fmt(label,
                         "#FFFF00 InfiniTime#\n\n"
                         "#444444 Version# %ld.%ld.%ld\n\n"
+                        "#444444 Short Ref# %s\n\n"
                         "#444444 Build date#\n"
                         "%s\n"
                         "%s\n",
                         Version::Major(),
                         Version::Minor(),
                         Version::Patch(),
+                        Version::GitCommitHash(),
                         __DATE__,
                         __TIME__);
   lv_label_set_align(label, LV_LABEL_ALIGN_CENTER);
-- 
cgit v1.2.3