haui/InfiniTime_mirror
1
0
Fork 1
mirror of https://github.com/InfiniTimeOrg/InfiniTime.git synced 2024-10-22 15:11:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

test combiner tout

Browse source
This commit is contained in:
ecarlett 2024-05-29 15:22:16 +02:00 committed by Eve C
parent ee99e554f0
commit 6cb3b6060e
9 changed files with 73 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/CMakeLists.txt
View file

@ -371,11 +371,15 @@ list(APPEND SOURCE_FILES
displayapp/screens/StopWatch.cpp
displayapp/screens/BatteryIcon.cpp
displayapp/screens/BleIcon.cpp
<<<<<<< HEAD
<<<<<<< HEAD
displayapp/screens/AlarmIcon.cpp
=======
displayapp/screens/AlarmIcon.cpp
>>>>>>> f5dfbc44 (added symbols for alarm states, added alarm state and hour to watchface meow, changed steps to paw. Need to align everythign nicely and find where to change release number)
=======
displayapp/screens/AlarmIcon.cpp
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
displayapp/screens/NotificationIcon.cpp
displayapp/screens/SystemInfo.cpp
displayapp/screens/Label.cpp

10
src/components/settings/Settings.h
View file

@ -55,12 +55,20 @@ namespace Pinetime {
bool showSideCover = true;
int colorIndex = 0;
};
<<<<<<< HEAD
=======
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
struct WatchFaceMeow {
bool showSideCover = true;
int colorIndex = 0;
};
<<<<<<< HEAD
=======
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
Settings(Pinetime::Controllers::FS& fs);
Settings(const Settings&) = delete;
@ -328,6 +336,8 @@ namespace Pinetime {
WatchFaceInfineatColors watchFaceInfineatColors;
WatchFaceMeow watchFaceMeow;
WatchFaceMeow watchFaceMeow;
std::bitset<5> wakeUpMode {0};
uint16_t shakeWakeThreshold = 150;

3
src/displayapp/UserApps.h
View file

@ -12,7 +12,10 @@
#include "displayapp/screens/WatchFaceAnalog.h"
#include "displayapp/screens/WatchFaceCasioStyleG7710.h"
#include "displayapp/screens/WatchFaceInfineat.h"
<<<<<<< HEAD
#include "displayapp/screens/WatchFaceInfineatColors.h"
=======
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
#include "displayapp/screens/WatchFaceMeow.h"
#include "displayapp/screens/WatchFacePineTimeStyle.h"
#include "displayapp/screens/WatchFaceTerminal.h"

9
src/displayapp/fonts/fonts.json
View file

@ -7,15 +7,24 @@
},
{
"file": "FontAwesome5-Solid+Brands+Regular.woff",
<<<<<<< HEAD
<<<<<<< HEAD
"range": "0xf294, 0xf242, 0xf54b, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c, 0xf0f3, 0xf522, 0xf743, 0xf0f3, 0xf1f6, 0xf073"
=======
=======
>>>>>>> 055b75d5 (test combiner tout)
<<<<<<< HEAD
"range": "0xf294, 0xf242, 0xf54b, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c, 0xf0f3, 0xf522, 0xf743, 0xf0f3, 0xf1f6"
=======
"range": "0xf294, 0xf242, 0xf54b, 0xf1b0, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c, 0xf0f3, 0xf522, 0xf743, 0xf4ba, 0xf236"
>>>>>>> f5dfbc44 (added symbols for alarm states, added alarm state and hour to watchface meow, changed steps to paw. Need to align everythign nicely and find where to change release number)
<<<<<<< HEAD
>>>>>>> d7de641b (added symbols for alarm states, added alarm state and hour to watchface meow, changed steps to paw. Need to align everythign nicely and find where to change release number)
=======
=======
"range": "0xf294, 0xf242, 0xf54b, 0xf1b0, 0xf21e, 0xf1e6, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252, 0xf569, 0xf06e, 0xf015, 0xf00c, 0xf0f3, 0xf522, 0xf743, 0xf4ba, 0xf236"
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
>>>>>>> 055b75d5 (test combiner tout)
}
],
"bpp": 1,

6
src/displayapp/screens/AlarmIcon.cpp
View file

@ -4,15 +4,21 @@ using namespace Pinetime::Applications::Screens;
const char* AlarmIcon::GetIcon(bool isSet) {
if (isSet) {
<<<<<<< HEAD
<<<<<<< HEAD
return Symbols::bell;
}
return Symbols::notbell;
=======
=======
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
return Symbols::bird;
}
return Symbols::zzz;
<<<<<<< HEAD
>>>>>>> f5dfbc44 (added symbols for alarm states, added alarm state and hour to watchface meow, changed steps to paw. Need to align everythign nicely and find where to change release number)
=======
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
}

33
src/displayapp/screens/Symbols.h
View file

@ -10,11 +10,27 @@ namespace Pinetime {
static constexpr const char* bluetooth = "\xEF\x8A\x94";
static constexpr const char* plug = "\xEF\x87\xA6";
static constexpr const char* shoe = "\xEF\x95\x8B";
<<<<<<< HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 055b75d5 (test combiner tout)
static constexpr const char* paw = "\xEF\x86\xB0";
static constexpr const char* clock = "\xEF\x80\x97";
static constexpr const char* bell = "\xEF\x83\xB3";
static constexpr const char* notbell = "\xEF\x87\xB6";
static constexpr const char* info = "\xEF\x84\xA9";
<<<<<<< HEAD
=======
>>>>>>> 504f5774 (copy :( files from gitlab repo)
=======
static constexpr const char* paw = "\xEF\x86\xB0";
static constexpr const char* clock = "\xEF\x80\x97";
static constexpr const char* bell = "\xEF\x83\xB3";
static constexpr const char* notbell = "\xEF\x87\xB6";
static constexpr const char* info = "\xEF\x84\xA9";
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
>>>>>>> 055b75d5 (test combiner tout)
static constexpr const char* list = "\xEF\x80\xBA";
static constexpr const char* sun = "\xEF\x86\x85";
static constexpr const char* check = "\xEF\x95\xA0";
@ -41,11 +57,28 @@ namespace Pinetime {
static constexpr const char* eye = "\xEF\x81\xAE";
static constexpr const char* home = "\xEF\x80\x95";
static constexpr const char* sleep = "\xEE\xBD\x84";
<<<<<<< HEAD
static constexpr const char* calendar = "\xEF\x81\xB3";
static constexpr const char* bird = "\xEF\x92\xBA";
static constexpr const char* zzz = "\xEF\x88\xB6";
// fontawesome_weathericons.c
=======
<<<<<<< HEAD
<<<<<<< HEAD
static constexpr const char* bird = "\xEF\x92\xBA";
static constexpr const char* zzz = "\xEF\x88\xB6";
=======
static constexpr const char* bird = "\xEF\x92\xBA";
static constexpr const char* zzz = "\xEF\x88\xB6";
>>>>>>> 504f5774 (copy :( files from gitlab repo)
=======
static constexpr const char* bird = "\xEF\x92\xBA";
static constexpr const char* zzz = "\xEF\x88\xB6";
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
// fontawesome_weathericons.c
>>>>>>> 055b75d5 (test combiner tout)
// static constexpr const char* sun = "\xEF\x86\x85";
static constexpr const char* cloudSun = "\xEF\x9B\x84";
static constexpr const char* cloudSunRain = "\xEF\x9D\x83";

4
src/displayapp/screens/WatchFaceInfineat.cpp
View file

@ -259,7 +259,11 @@ WatchFaceInfineat::WatchFaceInfineat(Controllers::DateTime& dateTimeController,
lv_obj_set_hidden(alarmIcon, true);
lv_obj_set_hidden(labelTimeAmPmAlarm, true);
}
<<<<<<< HEAD
=======
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
stepValue = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_color(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, grayColor);
lv_obj_set_style_local_text_font(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font_teko);

2
src/displayapp/screens/WatchFaceMeow.cpp
View file

@ -199,7 +199,6 @@ WatchFaceMeow::WatchFaceMeow(Controllers::DateTime& dateTimeController,
lineBattery = lv_line_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_line_width(lineBattery, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 24);
lv_obj_set_style_local_line_color(lineBattery, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, (*colors)[4]);
lv_obj_set_style_local_line_color(lineBattery, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, (*colors)[4]);
lv_obj_set_style_local_line_opa(lineBattery, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 190);
lineBatteryPoints[0] = {27, 105};
lineBatteryPoints[1] = {27, 106};
@ -534,6 +533,7 @@ void WatchFaceMeow::Refresh() {
}
void WatchFaceMeow::SetBatteryLevel(uint8_t batteryPercent) {
// starting point (y) + Pine64 logo height * (100 - batteryPercent) / 100
lineBatteryPoints[1] = {27, static_cast<lv_coord_t>(105 + 32 * (100 - batteryPercent) / 100)};
lv_line_set_points(lineBattery, lineBatteryPoints, 2);
}

3
src/displayapp/screens/settings/SettingWatchFace.h
View file

@ -10,7 +10,10 @@
#include "displayapp/screens/Symbols.h"
#include "displayapp/screens/CheckboxList.h"
#include "displayapp/screens/WatchFaceInfineat.h"
<<<<<<< HEAD
#include "displayapp/screens/WatchFaceInfineatColors.h"
=======
>>>>>>> 9d04c32f (recovering manually changes to original Infineat)
#include "displayapp/screens/WatchFaceMeow.h"
#include "displayapp/screens/WatchFaceCasioStyleG7710.h"