Temporarily backport app updates from apps repo

applications/external/game15/application.fam

@@ -6,8 +6,9 @@ App(
     requires=["gui"],
     stack_size=1 * 1024,
     fap_icon="game15_10px.png",
+    order=30,
     fap_category="Games",
     fap_author="@x27",
-    fap_version="1.0",
+    fap_version="1.1",
     fap_description="Logic Game",
 )

applications/external/game15/game15.c

@@ -12,7 +12,8 @@
 #define CELL_HEIGHT 8
 #define MOVE_TICKS 5
 #define KEY_STACK_SIZE 16
-#define SAVING_FILENAME APP_DATA_PATH("game15.save")
+#define SAVING_DIRECTORY STORAGE_APP_DATA_PATH_PREFIX
+#define SAVING_FILENAME SAVING_DIRECTORY "/game15.save"
 #define POPUP_MENU_ITEMS 2
 
 typedef enum {
@@ -219,7 +220,7 @@ static bool is_board_solved() {
 static void game_tick() {
     switch(game_state.scene) {
     case ScenePlay:
-        game_state.tick_count++;
+        if(game_state.move_count >= 1) game_state.tick_count++;
         if(loaded_saving_ticks) loaded_saving_ticks--;
         if(moving_cell.move_direction == DirectionNone && !key_stack_is_empty()) {
             set_moving_cell_by_direction(key_stack_pop());
@@ -358,7 +359,8 @@ static void render_callback(Canvas* const canvas) {
             canvas_draw_rbox(canvas, 20, 24, 88, 16, 4);
             canvas_set_color(canvas, ColorBlack);
             canvas_draw_rframe(canvas, 20, 24, 88, 16, 4);
-            canvas_draw_str_aligned(canvas, 64, 32, AlignCenter, AlignCenter, "Restore game ...");
+            canvas_draw_str_aligned(
+                canvas, 64, 32, AlignCenter, AlignCenter, "Restoring game ...");
         }
     }
 

applications/external/game15/sandbox.c

@@ -46,8 +46,8 @@ void sandbox_loop() {
 
         if(sandbox_user_event_handler) sandbox_user_event_handler(event);
 
-        view_port_update(sandbox_view_port);
         furi_mutex_release(sandbox_mutex);
+        view_port_update(sandbox_view_port);
     }
 }