mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-14 15:18:35 -07:00
Small bump in the road
- Update assets and references for new project - Revert DFU image and CLI motd - Remove NSFW text and flag - Remove credits animation (will be replaced with a setting menu soon) - New EvilPortal example HTML and better error message - Initial standalone naming for asset packs and mainmenu apps - File migration fixes/improvements - Remove hotfix workflow
This commit is contained in:
@@ -58,5 +58,5 @@ typedef enum {
|
||||
DesktopLockMenuEventSettings,
|
||||
DesktopLockMenuEventLockKeypad,
|
||||
DesktopLockMenuEventLockPinOff,
|
||||
DesktopLockMenuEventXtreme,
|
||||
DesktopLockMenuEventMomentum,
|
||||
} DesktopEvent;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#include <furi.h>
|
||||
#include <gui/elements.h>
|
||||
#include <assets_icons.h>
|
||||
#include <xtreme/xtreme.h>
|
||||
#include <momentum/momentum.h>
|
||||
#include <furi_hal_rtc.h>
|
||||
|
||||
#include "../desktop_i.h"
|
||||
@@ -20,7 +20,7 @@ typedef enum {
|
||||
DesktopLockMenuIndexDarkMode,
|
||||
DesktopLockMenuIndexLock,
|
||||
DesktopLockMenuIndexBluetooth,
|
||||
DesktopLockMenuIndexXtreme,
|
||||
DesktopLockMenuIndexMomentum,
|
||||
DesktopLockMenuIndexBrightness,
|
||||
DesktopLockMenuIndexVolume,
|
||||
|
||||
@@ -101,7 +101,7 @@ void desktop_lock_menu_draw_callback(Canvas* canvas, void* model) {
|
||||
break;
|
||||
case DesktopLockMenuIndexDarkMode:
|
||||
icon = &I_CC_DarkMode_16x16;
|
||||
enabled = xtreme_settings.dark_mode;
|
||||
enabled = momentum_settings.dark_mode;
|
||||
break;
|
||||
case DesktopLockMenuIndexLock:
|
||||
icon = &I_CC_Lock_16x16;
|
||||
@@ -110,8 +110,8 @@ void desktop_lock_menu_draw_callback(Canvas* canvas, void* model) {
|
||||
icon = &I_CC_Bluetooth_16x16;
|
||||
enabled = m->lock_menu->bt->bt_settings.enabled;
|
||||
break;
|
||||
case DesktopLockMenuIndexXtreme:
|
||||
icon = &I_CC_Xtreme_16x16;
|
||||
case DesktopLockMenuIndexMomentum:
|
||||
icon = &I_CC_Momentum_16x16;
|
||||
break;
|
||||
case DesktopLockMenuIndexBrightness:
|
||||
icon = &I_Pin_star_7x7;
|
||||
@@ -287,8 +287,8 @@ bool desktop_lock_menu_input_callback(InputEvent* event, void* context) {
|
||||
desktop_event = DesktopLockMenuEventSettings;
|
||||
break;
|
||||
case DesktopLockMenuIndexDarkMode:
|
||||
xtreme_settings.dark_mode = !xtreme_settings.dark_mode;
|
||||
lock_menu->save_xtreme = true;
|
||||
momentum_settings.dark_mode = !momentum_settings.dark_mode;
|
||||
lock_menu->save_momentum = true;
|
||||
break;
|
||||
case DesktopLockMenuIndexBluetooth:
|
||||
lock_menu->bt->bt_settings.enabled = !lock_menu->bt->bt_settings.enabled;
|
||||
@@ -299,8 +299,8 @@ bool desktop_lock_menu_input_callback(InputEvent* event, void* context) {
|
||||
}
|
||||
lock_menu->save_bt = true;
|
||||
break;
|
||||
case DesktopLockMenuIndexXtreme:
|
||||
desktop_event = DesktopLockMenuEventXtreme;
|
||||
case DesktopLockMenuIndexMomentum:
|
||||
desktop_event = DesktopLockMenuEventMomentum;
|
||||
break;
|
||||
case DesktopLockMenuIndexVolume:
|
||||
desktop_event = stealth_mode ? DesktopLockMenuEventStealthModeOff :
|
||||
|
||||
@@ -19,7 +19,7 @@ struct DesktopLockMenuView {
|
||||
NotificationApp* notification;
|
||||
Bt* bt;
|
||||
bool save_notification;
|
||||
bool save_xtreme;
|
||||
bool save_momentum;
|
||||
bool save_bt;
|
||||
};
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <gui/view.h>
|
||||
#include <assets_icons.h>
|
||||
#include <locale/locale.h>
|
||||
#include <xtreme/xtreme.h>
|
||||
#include <momentum/momentum.h>
|
||||
|
||||
#include <desktop/desktop_settings.h>
|
||||
#include "../desktop_i.h"
|
||||
@@ -92,14 +92,14 @@ void desktop_view_locked_draw_lockscreen(Canvas* canvas, void* m) {
|
||||
snprintf(date_str, 14, "%.2d-%.2d-%.4d", datetime.day, datetime.month, datetime.year);
|
||||
}
|
||||
|
||||
if(!xtreme_settings.lockscreen_transparent) {
|
||||
if(!momentum_settings.lockscreen_transparent) {
|
||||
canvas_draw_icon(canvas, 0, 0 + y, &I_Lockscreen);
|
||||
}
|
||||
if(xtreme_settings.lockscreen_time) {
|
||||
if(momentum_settings.lockscreen_time) {
|
||||
canvas_set_font(canvas, FontBigNumbers);
|
||||
canvas_draw_str(canvas, 0, 64 + y, time_str);
|
||||
int offset = canvas_string_width(canvas, time_str) + 2;
|
||||
if(xtreme_settings.lockscreen_seconds) {
|
||||
if(momentum_settings.lockscreen_seconds) {
|
||||
canvas_set_font(canvas, FontSecondary);
|
||||
canvas_draw_str(canvas, 0 + offset, 64 + y, second_str);
|
||||
offset += canvas_string_width(canvas, ":00") + 2;
|
||||
@@ -109,12 +109,12 @@ void desktop_view_locked_draw_lockscreen(Canvas* canvas, void* m) {
|
||||
canvas_draw_str(canvas, 0 + offset, 64 + y, meridian_str);
|
||||
}
|
||||
}
|
||||
if(xtreme_settings.lockscreen_date) {
|
||||
if(momentum_settings.lockscreen_date) {
|
||||
canvas_set_font(canvas, FontSecondary);
|
||||
canvas_draw_str(canvas, 0, 48 + y + 16 * !xtreme_settings.lockscreen_time, date_str);
|
||||
canvas_draw_str(canvas, 0, 48 + y + 16 * !momentum_settings.lockscreen_time, date_str);
|
||||
}
|
||||
if(model->view_state == DesktopViewLockedStateLockedHintShown &&
|
||||
xtreme_settings.lockscreen_prompt) {
|
||||
momentum_settings.lockscreen_prompt) {
|
||||
canvas_set_font(canvas, FontSecondary);
|
||||
if(model->pin_locked) {
|
||||
elements_bubble_str(
|
||||
|
||||
Reference in New Issue
Block a user