Implement Theming #57

friedkeenan · 2018-09-09T23:01:28Z

This fixes issue #6.

You can check out the binary and an example of a theme here.

Like the readme says, you just put the hbtheme.cfg file on the root of the SD card to use a theme. If there are any problems with that file or if it doesn't exist at all, it will just use the default themes.

My C knowledge is super shallow, and I'm not sure if my coding style matches up with yours all the time (I tried my best), so the code probably isn't that good, but it's something. You probably also want to move the theming info in the readme to http://switchbrew.org/index.php/Homebrew_Menu

Now requires libconfig "separator" was spelled "seperator"

yellows8 · 2018-09-09T23:11:49Z

:D

yellows8 · 2018-09-09T23:12:21Z

README.md

 #### Usage
 See [Homebrew_Applications](http://switchbrew.org/index.php?title=Homebrew_Applications) for SD layout and applications, etc. See [Switchbrew](http://switchbrew.org/index.php?title=Homebrew_Menu) for hbmenu docs.

 #### Download
-The latest release is available from the [releases](https://github.com/switchbrew/nx-hbmenu/releases/latest) page.
+The latest release is available from the [releases](https://github.com/friedkeenan/nx-hbmenu/releases/latest) page.


yellows8 · 2018-09-09T23:14:38Z

Use same spacing style as elsewhere, not tabs.

yellows8 · 2018-09-09T23:17:07Z

Settings not specified in the config should be loaded from the default theme config.

yellows8 · 2018-09-09T23:17:55Z

README.md

@@ -1,8 +1,11 @@
+#### Theming


Revert this too, can be moved to wiki later.

yellows8 · 2018-09-09T23:18:58Z

common/theme.c

+	if(rgba==NULL)
+		return MakeColor(128,0,128,255);
+	return MakeColor(config_setting_get_int_elem(rgba, 0), config_setting_get_int_elem(rgba, 1), config_setting_get_int_elem(rgba, 2), config_setting_get_int_elem(rgba, 3));
+}
 void themeStartup(ThemePreset preset) {


insert newline

yellows8 · 2018-09-09T23:21:15Z

common/theme.c

+		            //.buttonBImage = button_b_light_bin,
+		            .hbmenuLogoImage = hbmenu_logo_light_bin
+		        };
+            }
            break;

        case THEME_PRESET_DARK:


Duplicate code, same code should be used for light/dark.

I tried to remove as much duplicate code as I think I can Also missing settings in the hbtheme.cfg file will now be supplemented by the default values

friedkeenan · 2018-09-10T04:43:06Z

I'm sorry, I'm not sure what you mean. I get the colors and stuff from the default themes with the "{themename}." prefix, and I get the children from "theme" using the config functions because it's loaded from the config file. Do you want a default config file included?

EDIT: Wait no, I get what you mean. use config_setting_lookup so I don't have to hardcode lightTheme and darkTheme

yellows8 · 2018-09-10T06:02:43Z

README.md

@@ -11,3 +11,4 @@ Build with ```make nx``` or just run ```make```.

 * This uses code based on 3DS [new-hbmenu](https://github.com/fincs/new-hbmenu).
 * [nanojpeg](https://svn.emphy.de/nanojpeg/trunk/nanojpeg/nanojpeg.c) is used for handling JPEG icons. This library doesn't support lossless JPEG.
+


yellows8 · 2018-09-10T06:08:27Z

Looks better now. :)

yellows8 · 2018-09-10T06:11:55Z

common/theme.c

+        //.buttonBImage = button_b_light_bin,
+        .hbmenuLogoImage = hbmenu_logo_light_bin
+    };
+    theme_t themeDark = (theme_t) { 


insert newline

yellows8 · 2018-09-10T06:12:06Z

common/theme.c

+        //.buttonBImage = button_b_dark_bin,
+        .hbmenuLogoImage = hbmenu_logo_dark_bin
+    };
+    theme_t *themeDefault;


insert newline

yellows8 · 2018-09-10T06:12:59Z

common/theme.c

+    color_t text, frontWave, middleWave, backWave, background, highlight, separator;
+    int waveBlending;
+    const char *AText, *BText;
+    bool good_cfg=config_read_file(cfg, "/hbtheme.cfg");
    switch (preset) {


insert newline

yellows8 · 2018-09-10T06:16:46Z

common/theme.c

-                //.buttonBImage = button_b_light_bin,
-                .hbmenuLogoImage = hbmenu_logo_light_bin
-            };
+            themeDefault = &themeLight;


insert: "default:"

yellows8 · 2018-09-10T06:17:56Z

common/theme.c

+                theme = config_lookup(cfg, "darkTheme");
+            break;
+    }
+    if (good_cfg){


insert newline

common/theme.c

The default case acts like the system theme is the dark one, because who really use the light theme?

friedkeenan · 2018-09-11T01:29:27Z

Dang, didn't even know that was a thing

yellows8 · 2018-09-11T01:37:40Z

common/theme.c

+    };
+
+    theme_t *themeDefault;
+    config_t *cfg = NULL;


Store on stack. "config_t cfg = {0};"

Cleanup once finished using it via config_destory is also missing.

yellows8 · 2018-09-11T02:02:22Z

common/theme.c

+    color_t text, frontWave, middleWave, backWave, background, highlight, separator;
+    int waveBlending;
+    const char *AText, *BText;
+    bool good_cfg=config_read_file(&cfg, "/hbtheme.cfg");


Add spaces around =.

yellows8 · 2018-09-12T02:49:40Z

common/theme.c

+        //.buttonBImage = button_b_dark_bin,
+        .hbmenuLogoImage = hbmenu_logo_dark_bin
+    };
+


Add:

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);

Then use that string for config_read_file.

EDIT: code updated

yellows8 · 2018-09-12T02:52:50Z

Can you comment with a link to a gist which contains a sample cfg file, which can be moved to switchbrew later?

friedkeenan · 2018-09-13T01:00:38Z

https://gist.github.com/friedkeenan/14dec59d01410a7fcf40a324be70efcf

I can add comments to give more information if you want

yellows8 · 2018-09-13T01:12:11Z

ping @ code change

It will load from "config/nx-hbmenu/themes/theme.cfg" if you're using the PC version

friedkeenan · 2018-09-13T01:15:33Z

Yeah, I was just testing it and making sure I knew what the code was actually doing

yellows8 · 2018-09-13T21:39:46Z

http://switchbrew.org/index.php/Homebrew_Menu#Themes

friedkeenan · 2018-09-14T01:02:49Z

It looks good, except that if you comment out the enableWaveBlending line, it'll use the default, which is disabled, so you have to do enableWaveBlending=1; to enable it

yellows8 · 2018-09-14T01:17:07Z

fixed

friedkeenan · 2018-09-14T01:23:59Z

Looks fine now, thank you :)

friedkeenan added 2 commits September 9, 2018 16:33

Implement theming and fix spelling errors

d9ba481

Now requires libconfig "separator" was spelled "seperator"

Added theming info

20221d6

yellows8 reviewed Sep 9, 2018

View reviewed changes

README.md Outdated

@@ -1,8 +1,11 @@

#### Theming

Copy link

Collaborator

yellows8 Sep 9, 2018

Choose a reason for hiding this comment

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

Revert this too, can be moved to wiki later.

yellows8 reviewed Sep 9, 2018

View reviewed changes

friedkeenan added 3 commits September 9, 2018 21:28

Revert readme and fix formatting

43af1fc

Removed duplicate code and made missing settings better

a3ee372

I tried to remove as much duplicate code as I think I can Also missing settings in the hbtheme.cfg file will now be supplemented by the default values

Moved not-color settings to the proper place

ca6a2ad

Hopefully removed all the duplicate code

e42df31

yellows8 reviewed Sep 10, 2018

View reviewed changes

common/theme.c Outdated Show resolved Hide resolved

friedkeenan added 2 commits September 10, 2018 20:13

Fixed formatting and added default case

3ae331a

The default case acts like the system theme is the dark one, because who really use the light theme?

Better "default:"

6bcfbd6

yellows8 reviewed Sep 11, 2018

View reviewed changes

Store "cfg" on stack and destory it once finished

667ef44

yellows8 reviewed Sep 11, 2018

View reviewed changes

yellows8 mentioned this pull request Sep 11, 2018

[Request] Make the selection border a different color so it's clearer what folder/homebrew is selected #56

Closed

Formatting

65c7eee

yellows8 reviewed Sep 12, 2018

View reviewed changes

Load config from /config/nx-hbmenu/themes/theme.cfg

4799b84

It will load from "config/nx-hbmenu/themes/theme.cfg" if you're using the PC version

yellows8 approved these changes Sep 13, 2018

View reviewed changes

yellows8 merged commit 8909142 into switchbrew:master Sep 13, 2018

yellows8 mentioned this pull request Sep 29, 2018

Implemented a theme switcher feature #62

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement Theming #57

Implement Theming #57

friedkeenan commented Sep 9, 2018

yellows8 commented Sep 9, 2018

yellows8 Sep 9, 2018

yellows8 commented Sep 9, 2018

yellows8 commented Sep 9, 2018

yellows8 Sep 9, 2018

yellows8 Sep 9, 2018

yellows8 Sep 9, 2018 •

edited

Loading

friedkeenan commented Sep 10, 2018 •

edited

Loading

yellows8 Sep 10, 2018

yellows8 commented Sep 10, 2018

yellows8 Sep 10, 2018

yellows8 Sep 10, 2018

yellows8 Sep 10, 2018

yellows8 Sep 10, 2018

yellows8 Sep 10, 2018

yellows8 Sep 10, 2018

friedkeenan commented Sep 11, 2018

yellows8 Sep 11, 2018

yellows8 Sep 11, 2018

yellows8 Sep 12, 2018 •

edited

Loading

yellows8 commented Sep 12, 2018

friedkeenan commented Sep 13, 2018

yellows8 commented Sep 13, 2018

friedkeenan commented Sep 13, 2018

yellows8 commented Sep 13, 2018

friedkeenan commented Sep 14, 2018

yellows8 commented Sep 14, 2018

friedkeenan commented Sep 14, 2018

		@@ -11,3 +11,4 @@ Build with ```make nx``` or just run ```make```.

		* This uses code based on 3DS [new-hbmenu](https://github.com/fincs/new-hbmenu).
		* [nanojpeg](https://svn.emphy.de/nanojpeg/trunk/nanojpeg/nanojpeg.c) is used for handling JPEG icons. This library doesn't support lossless JPEG.

Implement Theming #57

Implement Theming #57

Conversation

friedkeenan commented Sep 9, 2018

yellows8 commented Sep 9, 2018

Choose a reason for hiding this comment

yellows8 commented Sep 9, 2018

yellows8 commented Sep 9, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yellows8 Sep 9, 2018 • edited Loading

Choose a reason for hiding this comment

friedkeenan commented Sep 10, 2018 • edited Loading

Choose a reason for hiding this comment

yellows8 commented Sep 10, 2018

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

Choose a reason for hiding this comment

friedkeenan commented Sep 11, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yellows8 Sep 12, 2018 • edited Loading

Choose a reason for hiding this comment

yellows8 commented Sep 12, 2018

friedkeenan commented Sep 13, 2018

yellows8 commented Sep 13, 2018

friedkeenan commented Sep 13, 2018

yellows8 commented Sep 13, 2018

friedkeenan commented Sep 14, 2018

yellows8 commented Sep 14, 2018

friedkeenan commented Sep 14, 2018

yellows8 Sep 9, 2018 •

edited

Loading

friedkeenan commented Sep 10, 2018 •

edited

Loading

yellows8 Sep 12, 2018 •

edited

Loading