Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-13 03:18:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'dev' of https://github.com/ClaraCrazy/Flipper-Xtreme into dev"

Browse Source 
This reverts commit 708dd167c8.
This commit is contained in:
Willy-JL
2023-02-10 20:50:30 +00:00
parent 176c01c0da
commit 6555082e2a
2348 changed files with 216 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
applications/services/desktop/animations/animation_manager.c
View File

@@ -13,7 +13,7 @@
#include "animation_storage.h"
#include "animation_manager.h"
#include "../../../settings/xtreme_settings/xtreme_settings.h"
#include "../../../settings/xtreme_settings/xtreme_assets.h"
#define TAG "AnimationManager"
@@ -569,9 +569,6 @@ void animation_manager_load_and_continue_animation(AnimationManager* animation_m
static void animation_manager_switch_to_one_shot_view(AnimationManager* animation_manager) {
furi_assert(animation_manager);
furi_assert(!animation_manager->one_shot_view);
Dolphin* dolphin = furi_record_open(RECORD_DOLPHIN);
DolphinStats stats = dolphin_stats(dolphin);
furi_record_close(RECORD_DOLPHIN);
animation_manager->one_shot_view = one_shot_view_alloc();
one_shot_view_set_interact_callback(
@@ -580,19 +577,8 @@ static void animation_manager_switch_to_one_shot_view(AnimationManager* animatio
View* next_view = one_shot_view_get_view(animation_manager->one_shot_view);
view_stack_remove_view(animation_manager->view_stack, prev_view);
view_stack_add_view(animation_manager->view_stack, next_view);
if(XTREME_SETTINGS()->nsfw_mode) {
one_shot_view_start_animation(animation_manager->one_shot_view, &A_Levelup1_128x64);
} else {
if(stats.level <= 20) {
one_shot_view_start_animation(
animation_manager->one_shot_view, &A_Levelup1_128x64_sfw);
} else if(stats.level >= 21) {
one_shot_view_start_animation(
animation_manager->one_shot_view, &A_Levelup2_128x64_sfw);
} else {
furi_assert(0);
}
}
one_shot_view_start_animation(
animation_manager->one_shot_view, XTREME_ASSETS()->A_Levelup_128x64);
}
static void animation_manager_switch_to_animation_view(AnimationManager* animation_manager) {

10
applications/services/desktop/animations/animation_storage.c
View File

@@ -40,7 +40,7 @@ void animation_handler_select_manifest() {
furi_string_printf(manifest, "%s/manifest.txt", furi_string_get_cstr(anim_dir));
Storage* storage = furi_record_open(RECORD_STORAGE);
if(storage_common_stat(storage, furi_string_get_cstr(manifest), NULL) == FSE_OK) {
FURI_LOG_I(TAG, "Custom Manifest selected");
FURI_LOG_I(TAG, "Custom manifest selected");
} else {
use_asset_pack = false;
}
@@ -48,14 +48,8 @@ void animation_handler_select_manifest() {
}
if(!use_asset_pack) {
furi_string_set(anim_dir, BASE_ANIMATION_DIR);
if(xtreme_settings->nsfw_mode) {
furi_string_cat_str(anim_dir, "/nsfw");
FURI_LOG_I(TAG, "NSFW Manifest selected");
} else {
furi_string_cat_str(anim_dir, "/sfw");
FURI_LOG_I(TAG, "SFW Manifest selected");
}
furi_string_printf(manifest, "%s/manifest.txt", furi_string_get_cstr(anim_dir));
FURI_LOG_I(TAG, "Base manifest selected");
}
strlcpy(ANIMATION_DIR, furi_string_get_cstr(anim_dir), sizeof(ANIMATION_DIR));
strlcpy(

5
applications/services/desktop/desktop.c
View File

@@ -17,6 +17,8 @@
#include "helpers/pin_lock.h"
#include "helpers/slideshow_filename.h"
#include "../../settings/xtreme_settings/xtreme_assets.h"
static void desktop_auto_lock_arm(Desktop*);
static void desktop_auto_lock_inhibit(Desktop*);
static void desktop_start_auto_lock_timer(Desktop*);
@@ -305,6 +307,9 @@ static bool desktop_check_file_flag(const char* flag_path) {
int32_t desktop_srv(void* p) {
UNUSED(p);
// TODO: find a (working) way to run this at startup without hooking desktop
XTREME_ASSETS_LOAD();
if(furi_hal_rtc_get_boot_mode() != FuriHalRtcBootModeNormal) {
FURI_LOG_W("Desktop", "Desktop load skipped. Device is in special startup mode.");
} else {

4
applications/services/desktop/scenes/desktop_scene_fault.c
View File

@@ -1,7 +1,7 @@
#include <furi_hal.h>
#include "../desktop_i.h"
#include "../../../settings/xtreme_settings/xtreme_settings.h"
#include "../../../settings/xtreme_settings/xtreme_assets.h"
#define DesktopFaultEventExit 0x00FF00FF
@@ -15,7 +15,7 @@ void desktop_scene_fault_on_enter(void* context) {
Popup* popup = desktop->hw_mismatch_popup;
popup_set_context(popup, desktop);
if(XTREME_SETTINGS()->nsfw_mode) {
if(XTREME_ASSETS()->is_nsfw) {
popup_set_header(
popup,
"Slut passed out\n but is now back",