Implemented a theme switcher feature

Makefile.pc

@@ -78,6 +78,15 @@ build_pc/hbmenu_logo_dark.bin.o	:	data/hbmenu_logo_dark.bin
 	@echo $(notdir $<)
 	@$(bin2o)
 
+build_pc/hbmenu_logo_light.bin.o	:	data/theme_icon_light.bin
+	mkdir -p $(dir $@)
+	@echo $(notdir $<)
+	@$(bin2o)
+
+build_pc/hbmenu_logo_dark.bin.o	:	data/theme_icon_dark.bin
+	mkdir -p $(dir $@)
+	@echo $(notdir $<)
+	@$(bin2o)
 
 
 clean:

common/language.c

@@ -310,6 +310,24 @@ const char* const g_strings[StrId_Max][16] =
         STR_TW("確認"),
     },
 
+    [StrId_Actions_Apply] =
+    {
+        STR_EN("Apply"),
+        STR_ES("Aplicar"),
+        STR_JP("適用"),
+        STR_KO("대다"),
+        STR_TW("应用"),
+    },
+
+
+    [StrId_Actions_Theme_Menu] =
+    {
+        STR_EN("Theme Switcher V1.0"),
+        STR_ES("Versión 1,0 del cambiador de tema"),
+        STR_JP("テーマスイッチャー版1.0"),
+        STR_KO("테마 스위처 에디션 1.0"),
+        STR_TW("主题切换器版本1。0"),
+    },
     /*[StrId_Reboot] =
     {
         STR_EN(

common/language.h

@@ -21,6 +21,7 @@ typedef enum
     StrId_Actions_Launch,
     StrId_Actions_Open,
     StrId_Actions_Back,
+    StrId_Actions_Apply,
 
     StrId_MsgBox_OK,
 
@@ -42,6 +43,8 @@ typedef enum
     StrId_NetLoaderActive,
     StrId_NetLoaderTransferring,
 
+    StrId_Actions_Theme_Menu,
+
     StrId_Max,
 } StrId;
 

common/menu-entry.c

@@ -137,6 +137,7 @@ bool menuEntryLoad(menuEntry_s* me, const char* name, bool shortcut) {
 
     tempbuf[PATH_MAX] = 0;
     strcpy(me->name, name);
+
     if (me->type == ENTRY_TYPE_FOLDER)
     {
         //Check for <dirpath>/<dirname>.nro
@@ -182,7 +183,7 @@ bool menuEntryLoad(menuEntry_s* me, const char* name, bool shortcut) {
 
     if (me->type == ENTRY_TYPE_FILE)
     {
-        strcpy(me->name, name);
+        //strcpy(me->name, name);//This is already done before both if statements
         strcpy(me->author, textGetString(StrId_DefaultPublisher));
         strcpy(me->version, "1.0.0");
 
@@ -293,6 +294,12 @@ bool menuEntryLoad(menuEntry_s* me, const char* name, bool shortcut) {
         /*if (shortcut)
             shortcutFree(&sc);*/
     }
+    if (me->type == ENTRY_TYPE_THEME){
+
+        //Todo load in the data about the theme?
+        //Add a theme name property to each one?
+        //Ability to load the theme as you hover over?
+    }
 
     return true;
 }

common/menu-list.c

@@ -150,3 +150,53 @@ int menuScan(const char* target) {
     return 0;
 }
 
+
+int themeMenuScan(const char* target) {
+    menuClear();
+    if (chdir(target) < 0) return 1;
+    if (getcwd(s_menu[!s_curMenu].dirname, PATH_MAX+1) == NULL)
+        return 1;
+    DIR* dir;
+    struct dirent* dp;
+    char tmp_path[PATH_MAX+1];
+    dir = opendir(s_menu[!s_curMenu].dirname);
+    if (!dir) return 2;
+
+    while ((dp = readdir(dir)))
+    {
+        menuEntry_s* me = NULL;
+
+        bool shortcut = false;
+        if (dp->d_name[0]=='.')
+            continue;
+
+        memset(tmp_path, 0, sizeof(tmp_path));
+        snprintf(tmp_path, sizeof(tmp_path)-1, "%s/%s", s_menu[!s_curMenu].dirname, dp->d_name);
+
+        const char* ext = getExtension(dp->d_name);
+        char* name = removeExtension(dp->d_name);
+        replaceCharacter(name,'_',' ');
+        if(strcmp(dp->d_name,"theme.cfg")==0)//This theme is already the currently applied theme, dont load it
+            continue;
+        if (strcasecmp(ext, ".cfg")==0)
+            me = menuCreateEntry(ENTRY_TYPE_THEME);
+
+        if (!me)
+            continue;
+
+        strncpy(me->path, tmp_path, sizeof(me->path)-1);
+        me->path[sizeof(me->path)-1] = 0;
+        if (menuEntryLoad(me,(const char*)name, shortcut))
+            menuAddEntry(me);
+        else
+            menuDeleteEntry(me);
+        free((void*)name);//This was allocated by calloc and copied over by strcpy
+    }
+
+    closedir(dir);
+    menuSort();
+    // Swap the menu and clear the previous menu
+    s_curMenu = !s_curMenu;
+    menuClear();
+    return 0;
+}

common/menu.c

@@ -4,6 +4,8 @@
 
 #include "invalid_icon_bin.h"
 #include "folder_icon_bin.h"
+#include "theme_icon_dark_bin.h"
+#include "theme_icon_light_bin.h"
 
 char rootPath[PATH_MAX+8];
 
@@ -17,6 +19,8 @@ void launchMenuEntryTask(menuEntry_s* arg)
     if (me->type == ENTRY_TYPE_FOLDER)
         menuScan(me->path);
         //changeDirTask(me->path);
+    else if(me->type == ENTRY_TYPE_THEME)
+        launchApplyThemeTask(me);
     else
         launchMenuEntry(me);
 }
@@ -27,6 +31,7 @@ static enum
     HBMENU_NETLOADER_ACTIVE,
     HBMENU_NETLOADER_ERROR,
     HBMENU_NETLOADER_SUCCESS,
+    HBMENU_THEME_MENU,
 } hbmenu_state = HBMENU_DEFAULT;
 
 void launchMenuNetloaderTask() {
@@ -39,11 +44,41 @@ void launchMenuBackTask()
     if(hbmenu_state == HBMENU_NETLOADER_ACTIVE) {
         netloader_deactivate();
         hbmenu_state = HBMENU_DEFAULT;
-    } else {
+    }else if(hbmenu_state == HBMENU_THEME_MENU){
+        hbmenu_state = HBMENU_DEFAULT;
+        menuScan(rootPath);
+    }
+     else {
         menuScan("..");
     }
 
 }
+bool appliedTheme=false;
+void launchApplyThemeTask(menuEntry_s* arg){
+    if(appliedTheme){
+        menuCreateMsgBox(780, 300, "A new theme was already applied...\nYou must restart hbmenu before applying a different one");
+        return;
+    }
+    config_t cfg = {0};
+    config_init(&cfg);
+    if(!config_read_file(&cfg, arg->path)){
+        menuCreateMsgBox(780, 300, "Something went wrong, and the theme could not be loaded!");
+        return;
+    }
+     char tmp_path[PATH_MAX] = {0};
+    #ifdef __SWITCH__
+    tmp_path[0] = '/';
+    #endif
+
+    strncat(tmp_path, "config/nx-hbmenu/themes/theme.cfg", sizeof(tmp_path)-2);
+    if(!config_write_file(&cfg, tmp_path)){
+        menuCreateMsgBox(780, 300, "Something went wrong, and the theme could not be applied!");
+        return;
+    }
+    appliedTheme=true;
+    config_destroy(&cfg);
+    menuCreateMsgBox(780, 300, "Theme Applied! Restart hbmenu to see the changes");  
+}
 
 //Draws an RGB888 or RGBA8888 image.
 static void drawImage(int x, int y, int width, int height, const uint8_t *image, ImageMode mode) {
@@ -72,6 +107,7 @@ static void drawImage(int x, int y, int width, int height, const uint8_t *image,
 
 uint8_t *folder_icon_small;
 uint8_t *invalid_icon_small;
+uint8_t *theme_icon_small;
 
 static void drawEntry(menuEntry_s* me, int off_x, int is_active) {
     int x, y;
@@ -87,7 +123,7 @@ static void drawEntry(menuEntry_s* me, int off_x, int is_active) {
 
     int border_start_x, border_end_x;
     int border_start_y, border_end_y;
-    color_t border_color = MakeColor(255, 255, 255, 255);
+    color_t border_color = MakeColor(themeCurrent.borderColor.r, themeCurrent.borderColor.g, themeCurrent.borderColor.b, 255);
 
     int shadow_start_y, shadow_y;
     int shadow_inset;
@@ -166,7 +202,7 @@ static void drawEntry(menuEntry_s* me, int off_x, int is_active) {
 
     for (y=start_y; y<end_y; y++) {
         for (x=start_x; x<end_x; x+=4) {
-            Draw4PixelsRaw(x, y, MakeColor(255, 255, 255, 255));
+            Draw4PixelsRaw(x, y, MakeColor(themeCurrent.borderColor.r, themeCurrent.borderColor.g, themeCurrent.borderColor.b, 255));//add to theme
         }
     }
 
@@ -178,6 +214,12 @@ static void drawEntry(menuEntry_s* me, int off_x, int is_active) {
         smallimg = folder_icon_small;
         largeimg = folder_icon_bin;
     }
+    else if (me->type == ENTRY_TYPE_THEME){
+        smallimg = theme_icon_small;
+        if(globalPreset == THEME_PRESET_DARK)
+            largeimg = theme_icon_dark_bin;
+        else largeimg = theme_icon_light_bin;
+    }
     else {
         smallimg = invalid_icon_small;
         largeimg = invalid_icon_bin;
@@ -205,8 +247,7 @@ static void drawEntry(menuEntry_s* me, int off_x, int is_active) {
             }
         }
     }
-
-    DrawTextTruncate(interuiregular14, start_x + 4, start_y + 4 + 18, MakeColor(64, 64, 64, 255), me->name, 140 - 32, "...");
+    DrawTextTruncate(interuiregular14, start_x + 4, start_y + 4 + 18, MakeColor(themeCurrent.borderTextColor.r, themeCurrent.borderTextColor.g, themeCurrent.borderTextColor.b, 255), me->name, 140 - 32, "...");//Add to theme
 
     if (is_active) {
         start_x = 1280 - 790;
@@ -271,6 +312,23 @@ void menuStartup() {
     //menuCreateMsgBox(780, 300, "This is a test");
 }
 
+void themeMenuStartup() {
+    if(hbmenu_state != HBMENU_DEFAULT) return;
+    hbmenu_state = HBMENU_THEME_MENU;
+    char tmp_path[PATH_MAX];
+
+    snprintf(tmp_path, sizeof(tmp_path)-1, "%s%s%s%s%s%s",DIRECTORY_SEPARATOR, "config", DIRECTORY_SEPARATOR, "nx-hbmenu" , DIRECTORY_SEPARATOR, "themes");
+
+    themeMenuScan(tmp_path);
+    if(globalPreset == THEME_PRESET_DARK)
+        theme_icon_small = downscaleImg(theme_icon_dark_bin, 256, 256, 140, 140, IMAGE_MODE_RGB24);
+    else
+        theme_icon_small = downscaleImg(theme_icon_light_bin, 256, 256, 140, 140, IMAGE_MODE_RGB24);
+
+    computeFrontGradient(themeCurrent.frontWaveColor, 280);
+    //menuCreateMsgBox(780, 300, "This is a test");
+}
+
 color_t waveBlendAdd(color_t a, color_t b, float alpha) {
     return MakeColor(a.r+(b.r*alpha), a.g+b.g*alpha, a.b + b.b*alpha, 255);
 }
@@ -441,12 +499,20 @@ void menuLoop() {
         }
 
         if(active_entry != NULL) {
-            if (active_entry->type != ENTRY_TYPE_FOLDER) {
+            if(active_entry->type == ENTRY_TYPE_THEME){
+                int getX = getXCoordinate(interuiregular18,1180,textGetString(StrId_Actions_Theme_Menu),'r');
+                DrawText(interuiregular18, getX , 0 + 47, themeCurrent.textColor, textGetString(StrId_Actions_Theme_Menu));
+                DrawText(fontscale7, 1280 - 126 - 30 - 32, 720 - 47 + 24, themeCurrent.textColor, themeCurrent.buttonAText);
+                DrawText(interuiregular18, 1280 - 90 - 30 - 32, 720 - 47 + 24, themeCurrent.textColor, textGetString(StrId_Actions_Apply));
+            }
+            else if (active_entry->type != ENTRY_TYPE_FOLDER) {
+                //TODO: add minus button
                 //drawImage(1280 - 126 - 30 - 32, 720 - 48, 32, 32, themeCurrent.buttonAImage, IMAGE_MODE_RGBA32);
                 DrawText(fontscale7, 1280 - 126 - 30 - 32, 720 - 47 + 24, themeCurrent.textColor, themeCurrent.buttonAText);//Display the 'A' button from SharedFont.
                 DrawText(interuiregular18, 1280 - 90 - 30 - 32, 720 - 47 + 24, themeCurrent.textColor, textGetString(StrId_Actions_Launch));
             }
-            else {
+            else{
+                //TODO: add minus button
                 //drawImage(1280 - 126 - 30 - 32, 720 - 48, 32, 32, themeCurrent.buttonAImage, IMAGE_MODE_RGBA32);
                 DrawText(fontscale7, 1280 - 126 - 30 - 32, 720 - 47 + 24, themeCurrent.textColor, themeCurrent.buttonAText);
                 DrawText(interuiregular18, 1280 - 90 - 30 - 32, 720 - 47 + 24, themeCurrent.textColor, textGetString(StrId_Actions_Open));
@@ -457,4 +523,4 @@ void menuLoop() {
     }
 
     menuDrawMsgBox();
-}
+}

common/menu.h

@@ -19,6 +19,7 @@ typedef enum
 {
     ENTRY_TYPE_FILE,
     ENTRY_TYPE_FOLDER,
+    ENTRY_TYPE_THEME,
 } MenuEntryType;
 
 typedef struct menuEntry_s_tag menuEntry_s;
@@ -86,6 +87,7 @@ menu_s* menuGetCurrent(void);
 int menuScan(const char* target);
 
 void launchMenuEntryTask(menuEntry_s* arg);
+void launchApplyThemeTask(menuEntry_s* arg);
 void launchMenuBackTask();
 void launchMenuNetloaderTask();
 char *menuGetRootPath();
@@ -109,3 +111,19 @@ static inline char* getSlash(const char* str)
     return (char*)p;
 }
 
+static inline char* removeExtension(const char* str){
+     const char* p;
+     char* copy = calloc(strlen(str)+1,sizeof(char));
+     char *copyHead = copy;/*Get copy of the head of the char* to return, otherwise it will return copy->null */
+    for (p = str; p <= (str+strlen(str)) && *p != '.'; p++){
+        *copy = *p;
+        copy++;
+    }
+    return (char*)copyHead;
+}
+
+static inline void replaceCharacter(char* str, char orig, char repl){
+    char* p;
+    for (p = str; p <= (str+strlen(str)); p++) if(*p==orig) *p=repl;
+}
+