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

now I have the Meow Watchface AND the Infineat Watchface with alarm display

Browse source 
interactive rebase in progress; onto b7a353cf
 Last commands done (3 commands done):
    pick 9d04c32f recovering manually changes to original Infineat
    pick 70f9025f now I have the Meow Watchface AND the Infineat Watchface with alarm display
 No commands remaining.
 You are currently rebasing branch 'my-custom-infinitime' on 'b7a353cf'.

 Changes to be committed:
	modified:   src/components/settings/Settings.h
This commit is contained in:
ecarlett 2024-05-29 15:17:36 +02:00
parent 055b75d55d
commit 0ecfbee4b7
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,11 +48,14 @@ namespace Pinetime {
struct WatchFaceInfineat {
bool showSideCover = true;
bool showAlarmStatus = true;
<<<<<<< HEAD
int colorIndex = 0;
};
struct WatchFaceInfineatColors {
bool showSideCover = true;
=======
>>>>>>> 70f9025f (now I have the Meow Watchface AND the Infineat Watchface with alarm display)
int colorIndex = 0;
};
<<<<<<< HEAD