Reorganized application order, added the altimeter app with its icon

This commit is contained in:
anschrammh 2024-01-16 13:00:34 +01:00
parent 05e50c9eb2
commit dd1d1dfd79

View File

@ -4,6 +4,7 @@
#include "settings_screen.h"
#include "watch_face.h"
#include "compass_screen.h"
#include "altimeter_screen.h"
#include "find_my_phone_screen.h"
#include "music_player_screen.h"
#include "translation.h"
@ -77,13 +78,20 @@ static void simulate_menu_item_click(uint8_t menu_item_id)
}
break;
case 4:
{
extern AltimeterScreen_t altimeterScreen;
altimeter_screen_create(&altimeterScreen);
lv_scr_load_anim(altimeterScreen.display, LV_SCR_LOAD_ANIM_MOVE_LEFT, 400, 0, true);
}
break;
case 5:
{
extern FindMyPhoneScreen_t findMyPhoneScreen;
find_my_phone_screen_create(&findMyPhoneScreen);
lv_scr_load_anim(findMyPhoneScreen.display, LV_SCR_LOAD_ANIM_MOVE_LEFT, 400, 0, true);
}
break;
case 5:
case 6:
{
extern SettingsScreen_t settingsScreen;
settings_screen_create(&settingsScreen);
@ -193,15 +201,19 @@ void menu_screen_create(MenuScreen_t * const menuScreen)
// We declare all the needed assets by the menu screen:
LV_IMG_DECLARE(watch_menu_clock_icon)
LV_IMG_DECLARE(watch_menu_dialer_icon)
LV_IMG_DECLARE(watch_menu_lost_phone_icon)
LV_IMG_DECLARE(watch_menu_mail_icon)
LV_IMG_DECLARE(watch_menu_contacts_icon)
LV_IMG_DECLARE(watch_menu_alarm_icon)
LV_IMG_DECLARE(watch_menu_music_player_icon)
LV_IMG_DECLARE(watch_menu_settings_icon)
LV_IMG_DECLARE(watch_menu_messages_icon)
LV_IMG_DECLARE(watch_menu_compass_icon)
LV_IMG_DECLARE(watch_menu_altimeter_icon)
LV_IMG_DECLARE(watch_menu_lost_phone_icon)
LV_IMG_DECLARE(watch_menu_settings_icon)
// Just declared but not yet used icons
LV_IMG_DECLARE(watch_menu_dialer_icon)
LV_IMG_DECLARE(watch_menu_mail_icon)
LV_IMG_DECLARE(watch_menu_contacts_icon)
LV_IMG_DECLARE(watch_menu_messages_icon)
// We create our parent screen :
if(menuScreen->display)
@ -239,13 +251,14 @@ void menu_screen_create(MenuScreen_t * const menuScreen)
menu_screen_add_item(menuScreen, 1, &watch_menu_alarm_icon, translation_get_word(TRANSLATION_ALARM), &(menu_item_cb));
menu_screen_add_item(menuScreen, 2, &watch_menu_music_player_icon, translation_get_word(TRANSLATION_MUSIC), &(menu_item_cb));
menu_screen_add_item(menuScreen, 3, &watch_menu_compass_icon, translation_get_word(TRANSLATION_COMPASS), &(menu_item_cb));
menu_screen_add_item(menuScreen, 4, &watch_menu_lost_phone_icon, translation_get_word(TRANSLATION_FIND_MY_PHONE), &(menu_item_cb));
menu_screen_add_item(menuScreen, 4, &watch_menu_altimeter_icon, translation_get_word(TRANSLATION_ALTIMETER), &(menu_item_cb));
menu_screen_add_item(menuScreen, 5, &watch_menu_lost_phone_icon, translation_get_word(TRANSLATION_FIND_MY_PHONE), &(menu_item_cb));
/*
menu_screen_add_item(menuScreen, 3, &watch_menu_messages_icon, "Text messages", &(menu_item_cb));
menu_screen_add_item(menuScreen, 4, &watch_menu_mail_icon, "Mails", &(menu_item_cb));
menu_screen_add_item(menuScreen, 5, &watch_menu_dialer_icon, "Phone", &(menu_item_cb));
menu_screen_add_item(menuScreen, 6, &watch_menu_contacts_icon, "Contacts", &(menu_item_cb));*/
menu_screen_add_item(menuScreen, 5, &watch_menu_settings_icon, translation_get_word(TRANSLATION_SETTINGS), &(menu_item_cb));
menu_screen_add_item(menuScreen, 6, &watch_menu_settings_icon, translation_get_word(TRANSLATION_SETTINGS), &(menu_item_cb));
// We register the event callback to handle the right to left swipe gesture
lv_obj_add_event_cb(menuScreen->display, &(gesture_event_cb), LV_EVENT_GESTURE, menuScreen);