Dynamic icons loading & other improvements (#119)

* icons are black, but it's a start

* after testing, info_buffer in load_smdh_icon is for some reason all 0

* working! same speed as pre-threading (I think)
but the icons lag behind a bit.
Still, should allow for infinite themes

* not needed anymore

* fix icons not being loaded when switching modes

* stop trying to load icons if there arent enough entries

* swapping logic almost there...

* only need to update when on the main screen

* fix blind spot and typo

* allow optimizations maybe?
maybe will break stuff. just revert if it's the case

* fix blind spot when going up after cycling

* add swapping when changing 1 screen at a time (left/right)

* not needed anymore, since icon ids are fixed

* simpler scrolling

* dont reload everything when cycling

* other method for storing ids, maybe better logic later

* fix crash

* attempt at better and clearer algorithm for swapping

* optimization, swapping still broken but this was needed

* fix cycling/using left resulting in reversed icons

* fix icons scrolling in reverse
and fix the bug that introduced (same as switch-case method): scroll not following the selected entry when using left/right

* don't break when using left/right near the top/end

* correctly return from failed realloc during entries load

* move freeing the entries and killing the icon updating thread to exit_function

* fix icons being shifted the wrong value when cycling

* only exit using the shutdown screen method when needed

* show simple loading screen for themes and splashes

* only have the thread when needed
should consume less battery for people with low amount of splashes and themes

* fix instructions showing over the "no X found" screen

* fix instructions showing over confirm text

* fix overlapping and going out of bounds with few entries

* add quitting preview and qr mode with B

* add touchscreen controls

* cleaner BETWEEN macro

* only allow changing screens with touchscreen when arrows are visible

* tabs vs spaces

* fix selecting an entry that's not there using the touchscreen
and allow holding for selecting individual entries (not using the arrows)

* fix crash when deleting all entries and downloading one with QR

* add indicator for already installed themes/splashes
threaded as not to slow down initial loading too much, and imo cool effect as they load

* optimization for theme installed check

* make icon swapping thread higher priority to prevent problems with searching the installed themes/splashes

* add indicator with number of themes and selected theme

* add X to reload icons if it breaks

* add touchscreen controls:
- toggle shuffle
- toggle preview
- reload icons
- switch modes
- enable QR

* more usable thread args

* fix crash when closing the application too close to launch

* add hack to solve the scrolling problem.
Warning: will cause some lag for about 1-2 seconds, so I recommend using the jump menu
this will be removed once the bug is figured out
This commit is contained in:
LiquidFenrir
2017-12-28 21:30:23 +01:00
committed by Alex Taber
parent c85d9d978d
commit 45349a4ba3
17 changed files with 865 additions and 107 deletions

View File

@@ -55,6 +55,10 @@ enum TextureID {
TEXTURE_FONT_RESERVED = 0, // used by pp2d for the font
TEXTURE_ARROW,
TEXTURE_SHUFFLE,
TEXTURE_INSTALLED,
TEXTURE_PREVIEW_ICON,
TEXTURE_DOWNLOAD,
TEXTURE_RELOAD,
TEXTURE_BATTERY_0,
TEXTURE_BATTERY_1,
TEXTURE_BATTERY_2,

View File

@@ -32,6 +32,10 @@
#include "colors.h"
typedef enum {
INSTALL_LOADING_THEMES,
INSTALL_LOADING_SPLASHES,
INSTALL_LOADING_ICONS,
INSTALL_SPLASH,
INSTALL_SPLASH_DELETE,
@@ -42,6 +46,8 @@ typedef enum {
INSTALL_DOWNLOAD,
INSTALL_ENTRY_DELETE,
INSTALL_NONE,
} InstallType;
typedef enum {
@@ -76,13 +82,12 @@ void init_screens(void);
void exit_screens(void);
void throw_error(char* error, ErrorLevel level);
bool draw_confirm(const char* conf_msg, Entry_List_s* list, EntryMode current_mode);
bool draw_confirm(const char* conf_msg, Entry_List_s* list);
void draw_preview(int preview_offset);
void draw_install(InstallType type);
void draw_instructions(Instructions_s instructions);
void draw_interface(Entry_List_s* list, EntryMode current_mode);
void draw_interface(Entry_List_s* list, Instructions_s instructions);
#endif

View File

@@ -39,7 +39,7 @@ Instructions_s normal_instructions[MODE_AMOUNT] = {
L"\uE001 Queue shuffle theme"
},
{
NULL,
L"\uE002 Reload broken icons",
L"\uE003 Preview theme"
},
{
@@ -60,7 +60,7 @@ Instructions_s normal_instructions[MODE_AMOUNT] = {
L"\uE001 Delete installed splash"
},
{
NULL,
L"\uE002 Reload broken icons",
L"\uE003 Preview splash"
},
{

View File

@@ -29,6 +29,14 @@
#include "common.h"
enum ICON_IDS_OFFSET {
ICONS_ABOVE = 0,
ICONS_VISIBLE,
ICONS_UNDER,
ICONS_OFFSET_AMOUNT,
};
typedef struct {
u8 _padding1[4 + 2 + 2];
@@ -48,29 +56,43 @@ typedef struct {
u16 author[0x41];
u32 placeholder_color;
ssize_t icon_id;
u16 path[0x106];
bool is_zip;
bool in_shuffle;
bool installed;
} Entry_s;
typedef struct {
Entry_s * entries;
int entries_count;
ssize_t icon_id_start;
ssize_t texture_id_offset;
ssize_t icons_ids[ICONS_OFFSET_AMOUNT][ENTRIES_PER_SCREEN];
ssize_t assoc_entry_ids[ICONS_OFFSET_AMOUNT][ENTRIES_PER_SCREEN];
int previous_scroll;
int scroll;
int previous_selected;
int selected_entry;
int shuffle_count;
EntryMode mode;
} Entry_List_s;
typedef struct {
void ** thread_arg;
volatile bool run_thread;
} Thread_Arg_s;
void delete_entry(Entry_s entry);
Result load_entries(const char * loading_path, Entry_List_s * list);
Result load_entries(const char * loading_path, Entry_List_s * list, EntryMode mode);
bool load_preview(Entry_List_s list, int * preview_offset);
void load_icons_first(Entry_List_s * current_list, bool silent);
void load_icons_thread(void * void_arg);
u32 load_data(char * filename, Entry_s entry, char ** buf);
#endif

View File

@@ -33,4 +33,6 @@
void splash_delete(void);
void splash_install(Entry_s splash);
void splash_check_installed(void * void_arg);
#endif

View File

@@ -75,4 +75,6 @@ Result bgm_install(Entry_s theme);
Result shuffle_install(Entry_List_s themes);
void themes_check_installed(void * void_arg);
#endif