Implemented a theme switcher feature #62

NightlyFox · 2018-09-21T02:39:12Z

So after seeing friedkeenen on reddit implement theming and you guys accept it into your guys code i was inspired to modify and implement something myself!

I was able to modify the code and add a menu that will replace the homebrew menu with a theme switcher menu whenever the minus button is pressed on the switch. This allows the users the ability to download a large list of themes, placing them in the theme folder and change the theme of their homebrew menu whenever they would like instead of having to go on a pc, or use a separate homebrew application to change the theme.cfg file.

This is what the theme menu looks like

…le back to try and remove the file extension, forgot to remove it. Removed....

…ntation was used

…llocaded using calloc

…s users to modify the boxes that surrounds the menu entries

yellows8 · 2018-09-21T03:20:47Z

:)

Remove the *bin.h files.

yellows8 · 2018-09-21T03:49:10Z

Makefile

@@ -2,7 +2,7 @@ export APP_VERSION	:=	2.0.0

 .PHONY: clean all nx pc dist-bin

-all: nx pc
+all: nx pc 


NightlyFox · 2018-09-21T03:51:52Z

Also, have you guys though of using this?
https://github.com/marketplace/codecov/plan/MDIyOk1hcmtldHBsYWNlTGlzdGluZ1BsYW4xNg==#pricing-and-setup

it is completely free for open source and public repositories!

yellows8 · 2018-09-21T03:53:51Z

https://github.com/switchbrew/libnx/blob/master/.doozer.json

NightlyFox · 2018-09-21T03:56:36Z

https://github.com/switchbrew/libnx/blob/master/.doozer.json

is this meant for me? im confused lol

yellows8 · 2018-09-21T03:56:58Z

referring to "Also, have you guys though of using this?"

yellows8 · 2018-09-21T04:05:02Z

common/theme.c

@@ -74,10 +91,9 @@ void themeStartup(ThemePreset preset) {
        case THEME_PRESET_DARK:
            themeDefault = &themeDark;
            if (good_cfg)
-                theme = config_lookup(&cfg, "darkTheme");
+                theme = config_lookup(&cfg, "darkTheme");    


extra whitespace

yellows8 · 2018-09-21T04:06:54Z

Remove the "(old)" files.

NightlyFox · 2018-09-21T04:07:27Z

referring to "Also, have you guys though of using this?"
gotcha, i saw doxygen but that just documents the code... it doesnt actually tell you that your code might cause a memory leak lol. you wouldnt mind if i installed the free version on my github and used in on the opensource code just to see how it works would ya? wouldnt want to do it without your permission
https://github.com/marketplace/codefactor

yellows8 · 2018-09-21T04:12:50Z

Whatever, as long as no setup-commits are pushed to this branch.

yellows8 · 2018-09-21T04:13:46Z

common/menu-entry.c

+        //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?
+        free((void*)name);//This was allocated by calloc and copied over by strcpy


Don't free that here, do it in the caller.

IM AN IDIOT.... you mean free it in the area i created it.... gotcha

That really doesn't need to be on the heap, should be a stack buffer in themeMenuScan.

NightlyFox · 2018-09-21T04:13:55Z

Whatever, as long as no setup-commits are pushed to this branch.

coolio :) ill do that after this branched is fixed up and ready to merge

…that called it, now it is easier to track when its freed

NightlyFox · 2018-09-21T05:14:30Z

found a bug, you can enter the theme menu while in netloader without properly backing out... causing it to not properly exit.

…r menu, without properly exiting

fincs · 2018-09-21T10:35:23Z

common/theme.c

@@ -49,20 +67,19 @@ void themeStartup(ThemePreset preset) {
    char tmp_path[PATH_MAX] = {0};

    #ifdef __SWITCH__
-    tmp_path[0] = '/';
+    tmp_path[0] = '/';/*will this work on the windows version?*/


Yes it will. A common misconception is that Windows only accepts \. That is false, Windows accepts both \ and /.

fincs · 2018-09-21T10:35:38Z

common/theme.c

        .enableWaveBlending = 0,
-        .buttonAText = "\uE0E0",
-        .buttonBText = "\uE0E1",
+        .buttonAText = buttonAText,/*setting the buttonAText = "\uE0E0" directly allocates the literal on the stack */


The claim in this comment is false.

hmmmm, then what exactly does it do? when i googled it this was the conclusion that i came too... and i talked to my other coworkers about this as well and they thought the same thing.

NightlyFox · 2018-09-29T01:20:33Z

The minus button goes away when you press it and you enter the theme menu...
i was going to add the + button and language for "Exit" but then i read your comments... so i just have the code in place to display the + button

NightlyFox · 2018-09-29T01:22:02Z

and this is what the theme menu looks like. as you can see the menu is sorted except for the first menu entry, which is the Default Theme.

NightlyFox · 2018-09-29T01:23:17Z

i got the light theme minus and plus buttons wrong...

i thought A->B in dark would be E->F in light...

yellows8 · 2018-09-29T01:23:24Z

Don't add anything for +.

yellows8 · 2018-09-29T01:29:06Z

common/menu.c

+        if(hbmenu_state == HBMENU_THEME_MENU) {
+            DrawText(interuiregular18, getX, 0 + 47, themeCurrent.textColor, textGetString(StrId_ThemeMenu));
+        } else {
+            DrawText(interuiregular18, getX, 0 + 47, themeCurrent.textColor, textGetString(StrId_ThemeMenu));


Comment out these two lines.

you dont like it? :/

Yeah just disable for now, can figure out what to do with it later.

i cant find the minus button for the light theme.... weird. are we using the built in font for the switch?

ok, i am commenting them out and about to commit

is there a file that shows all of the characters and their unicode numbers? i might try creating one of those....

You have to load the shared-font with some font tool.

NightlyFox · 2018-09-29T01:29:25Z

Don't add anything for +.

do you want me to get rid of the plus button text in theme.c?

yellows8 · 2018-09-29T01:30:09Z

You can leave that.

NightlyFox · 2018-09-29T02:06:24Z

One more thing... is it just SX OS that keeps it from working? or is netloader just not fully implemented currently?

yellows8 · 2018-09-29T02:07:33Z

Wut, netloader works fine...

yellows8 · 2018-09-29T02:10:00Z

https://github.com/switchbrew/nx-hbmenu/pull/62/files#r221410644

NightlyFox · 2018-09-29T02:10:01Z

Wut, netloader works fine...

hmmmmm..... could you compile my code and see if netloader works on your switch? i dont think i modified anything to make netloader not work.... i use SX OS, and when i press Y, nothing happens... the screen just stays blank foreva

yellows8 · 2018-09-29T02:10:48Z

It's supposed to display a screen with no apps when netloader is active.

NightlyFox · 2018-09-29T02:11:39Z

It's supposed to display a screen with no apps when netloader is active.

oh.... then i am totally confused as to what it is used for LOL

yellows8 · 2018-09-29T02:12:26Z

https://switchbrew.org/wiki/Homebrew_Menu

NightlyFox · 2018-09-29T02:13:53Z

https://switchbrew.org/wiki/Homebrew_Menu

found a bug... pressing A while in netloader... crashes the switch (at least it crashed mine)
so i looked at the code, netloader is launched without clearing the previous menu, or disabling the A button... so when the user presses A, it tries to launch the menu entry that it is currently pointing too, without properly exiting netloader.

yellows8 · 2018-09-29T02:24:57Z

Can't repro, although button A handling could be disabled later for that.

Waiting on newline fix before merge...

NightlyFox · 2018-09-29T02:26:45Z

Can't repro, although button A handling could be disabled later for that.

Waiting on newline fix before merge...

what newline fix?

yellows8 · 2018-09-29T02:29:23Z

https://github.com/switchbrew/nx-hbmenu/pull/62/files#r221410644

NightlyFox · 2018-09-29T02:36:54Z

https://github.com/switchbrew/nx-hbmenu/pull/62/files#r221410644

it only showed one newline on my pc, but i got rid of the one.. now there is none... let me know if i need to add it back.....

yellows8 · 2018-09-29T02:38:43Z

Undo that, I mean this: https://github.com/switchbrew/nx-hbmenu/pull/62/files#diff-fddcee21e62e3b656dcc5fb9af2e7c9bR169

NightlyFox · 2018-09-29T02:41:48Z

Undo that, I mean this: https://github.com/switchbrew/nx-hbmenu/pull/62/files#diff-fddcee21e62e3b656dcc5fb9af2e7c9bR169

ok... so i keep clicking this link and i have no idea what you are talking about... you want me to add a newline or remove one? are you talking about a newline before the if in the menuAddEntryToFront?

yellows8 · 2018-09-29T02:43:19Z

Remove the newline right before themeMenuScan.

yellows8 · 2018-09-29T02:44:48Z

:)

NightlyFox · 2018-09-29T02:53:30Z

:)

Merge time!? 💃

yellows8 · 2018-09-29T02:54:23Z

yes

NightlyFox added 10 commits September 19, 2018 11:28

Implemented hbmenu Theme Switcher! Final changes will now be cosmetic

ed5c670

Merge branch 'master' of https://github.com/switchbrew/nx-hbmenu

afe968f

saw a potential bug, where i was changing the size of something a whi…

93ee023

…le back to try and remove the file extension, forgot to remove it. Removed....

added some minor touch ups to the Theme Switcher Menu

2f887cc

got rid of TODO comments that are no longer needed, different impleme…

bd23932

…ntation was used

added proper deallocation in places of the code for pointers that i a…

35a3c64

…llocaded using calloc

added two new theming attributes, borderColor, borderTextcolor, allow…

8e2a79c

…s users to modify the boxes that surrounds the menu entries

Added themeExit to pc main.cpp

981a60a

not sure how the highlight multiplier got removed, but i added it back

4369cbf

added config_destroy() after done applying theme.

df53f5f

yellows8 reviewed Sep 21, 2018

View reviewed changes

Makefile Outdated

@@ -2,7 +2,7 @@ export APP_VERSION := 2.0.0

.PHONY: clean all nx pc dist-bin

all: nx pc

all: nx pc

Copy link

Collaborator

yellows8 Sep 21, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revert

removed *bin.h files

af0278b

reverted make file

c877b65

yellows8 reviewed Sep 21, 2018

View reviewed changes

remmoved (old) files and got rid of extra whitespace

59ba53d

yellows8 reviewed Sep 21, 2018

View reviewed changes

removed the free from the menu-entry file and put it in the function …

9c8c395

…that called it, now it is easier to track when its freed

fixed bug that would take user from netloader screen to theme switche…

42df5cf

…r menu, without properly exiting

fincs reviewed Sep 21, 2018

View reviewed changes

yellows8 reviewed Sep 29, 2018

View reviewed changes

added correct unicode for switch characters + and - for light theme

de42849

commented out prompt to press - button to open theme menu

3c4f483

got rid of newline

c6716a0

got rid of extra newline before themeMenuScan

096b283

yellows8 merged commit 992c4c4 into switchbrew:master Sep 29, 2018

Implemented a theme switcher feature #62

Implemented a theme switcher feature #62

Conversation

NightlyFox commented Sep 21, 2018

yellows8 commented Sep 21, 2018

Choose a reason for hiding this comment

NightlyFox commented Sep 21, 2018

yellows8 commented Sep 21, 2018

NightlyFox commented Sep 21, 2018

yellows8 commented Sep 21, 2018

Choose a reason for hiding this comment

yellows8 commented Sep 21, 2018

NightlyFox commented Sep 21, 2018

yellows8 commented Sep 21, 2018

Choose a reason for hiding this comment

NightlyFox Sep 21, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NightlyFox commented Sep 21, 2018

NightlyFox commented Sep 21, 2018

fincs Sep 21, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NightlyFox commented Sep 29, 2018

NightlyFox commented Sep 29, 2018

NightlyFox commented Sep 29, 2018 • edited

yellows8 commented Sep 29, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NightlyFox Sep 29, 2018 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NightlyFox commented Sep 29, 2018

yellows8 commented Sep 29, 2018

NightlyFox commented Sep 29, 2018

yellows8 commented Sep 29, 2018

yellows8 commented Sep 29, 2018

NightlyFox commented Sep 29, 2018

yellows8 commented Sep 29, 2018

NightlyFox commented Sep 29, 2018

yellows8 commented Sep 29, 2018

NightlyFox commented Sep 29, 2018 • edited

yellows8 commented Sep 29, 2018

NightlyFox commented Sep 29, 2018

yellows8 commented Sep 29, 2018

NightlyFox commented Sep 29, 2018 • edited

yellows8 commented Sep 29, 2018

NightlyFox commented Sep 29, 2018

yellows8 commented Sep 29, 2018

yellows8 commented Sep 29, 2018

NightlyFox commented Sep 29, 2018

yellows8 commented Sep 29, 2018

NightlyFox Sep 21, 2018 •

edited

fincs Sep 21, 2018 •

edited

NightlyFox commented Sep 29, 2018 •

edited

NightlyFox Sep 29, 2018 •

edited

NightlyFox commented Sep 29, 2018 •

edited

NightlyFox commented Sep 29, 2018 •

edited