next: The custom theme allow to use external image, set font & color by config #378

zsalch · 2018-10-03T12:46:26Z

Base on #365

Add a new way to customize the theme by external images, setup font & color of the comment.

The configuration method is as following:
1) Change the 'theme' value to specify your theme name:
"theme": "",
for example:
"theme": "mylike",
3) Create subfolders in the lizzie folder
/theme/
for example:
/theme/mylike
4) The custom-theme folder must include the config file 'theme.txt', the format as followings(use default when option not be specified):
{
"background-image" : "background.png",
"board-image" : "board.png",
"black-stone-image" : "black.png",
"white-stone-image" : "white.png",
"font-name": "Wawati SC",
"solid-stone-indicator": false,
"comment-background-color": [0, 0, 0, 200],
"comment-font-color": [255, 255, 255, 255],
"winrate-line-color": [0, 255, 0, 255],
"winrate-miss-line-color": [0, 0, 178, 255],
"blunder-bar-color": [255, 0, 0, 150]
}
e) Will use default theme when not found related config item.
f) Run the Lizzie.

To be replaced by featurecat#378

ParmuzinAlexander · 2018-10-04T14:09:42Z

It is hard make random stone "white-stone-image" : "1.png,10.png" ?

zsalch · 2018-10-05T04:13:40Z

@ParmuzinAlexander
The random stone is not particularly difficult to implement, but I want to know more about the scenario, which is to randomly select a stone at each move, or choose one at the beginning of the game.
If each move is randomly chosen, it needs to cache more types of stones, performance may have a little impact and require more logic.

ParmuzinAlexander · 2018-10-05T06:27:32Z

@zsalch
Each move. Or maybe not random but in sequence 1.png,2.png,....10.png,1.png

OlivierBlanvillain · 2018-10-05T11:09:28Z

@zsalch Can you rebase this one now that #365 is merged?

zsalch · 2018-10-05T11:42:15Z

@OlivierBlanvillain
No problem. But now ITheme&DefaultTheme has been removed, does this mean that CustomTheme needs to be adjusted accordingly, after all, it is based on ITheme & DefaultTheme.

OlivierBlanvillain · 2018-10-05T11:52:39Z

Yes. My suggestion would be to always have custom theme on. Basically add a few options to the config JSON to change colors and the paths to the various images we use.

zsalch · 2018-10-05T12:49:42Z

Ok, I'll remove some redundant paths and use 'theme' instead of 'theme'+'custom-theme' in the config.txt file.

zsalch · 2018-10-05T15:52:44Z

@OlivierBlanvillain
I have updated the code and commit again.

OlivierBlanvillain · 2018-10-05T15:58:48Z

src/main/java/featurecat/lizzie/theme/Theme.java

+    private String path = null;
+    private JSONObject config = new JSONObject();
+
+    public Theme(String themeName) {


I would remove themeName altogether, from this class and from the JSON config, it's never used for anything.

OlivierBlanvillain · 2018-10-05T16:01:05Z

src/main/java/featurecat/lizzie/theme/Theme.java

+            FileInputStream fp;
+            try {
+                fp = new FileInputStream(file);
+                config = new JSONObject(new JSONTokener(fp));


I think having a theme.txt adds a lot of complexity in term for configuration for users. I would simply keep everything in the main config file. To have multiple themed Lizzie I would simply recommend having multiple config files with variations on the theme related configs.

As conversation, keep two ways.

OlivierBlanvillain · 2018-10-12T07:22:34Z

src/main/java/featurecat/lizzie/theme/Theme.java

+        fp = new FileInputStream(file);
+        config = new JSONObject(new JSONTokener(fp));
+        fp.close();
+      } catch (FileNotFoundException e) {


FileNotFoundException extends IOException, so you can remove that line.

OlivierBlanvillain · 2018-10-12T07:25:59Z

src/main/java/featurecat/lizzie/gui/LizzieFrame.java

@@ -137,6 +141,13 @@ public LizzieFrame() {
    JSONArray windowSize = Lizzie.config.uiConfig.getJSONArray("window-size");
    setSize(windowSize.getInt(0), windowSize.getInt(1)); // use config file window size

+    // Allow change font in the config
+    if (theme.fontName() != null) {
+      systemDefaultFontName = theme.fontName();


I think these name are obsolete if you start changing them. Instead I would use

fontName

regularFont

boldFont

Rename to fontName, uiFontName, winrateFontName.

OlivierBlanvillain · 2018-10-12T07:26:30Z

src/main/java/featurecat/lizzie/gui/LizzieFrame.java

+    if (theme.fontName() != null) {
+      systemDefaultFontName = theme.fontName();
+      OpenSansRegularBase = new Font(systemDefaultFontName, Font.PLAIN, 12);
+      OpenSansSemiboldBase = new Font(systemDefaultFontName, Font.BOLD, 12);


Should the front size also be configurable? I it often the case than it needs adjustment depending on the font...

Different areas have different font sizes. If need to configure them, you may need to add several different configurations.

@featurecat @OlivierBlanvillain

Currently the font usage is now as follows:

OpenSansSemiboldBase: winrate text on the stone
OpenSansRegularBase: some UI text
systemDefaultFontName: some prompt text

And now the font size is basically responsive with the window, if you want to use the configuration file to change, I think we need to take some time to design the font usage.

So now only three font configurations are defined. The font size option only supports comment.

OpenSansSemiboldBase: winrate-font-name
OpenSansRegularBase: ui-font-name
systemDefaultFontName: font-name

src/main/java/featurecat/lizzie/theme/Theme.java

OlivierBlanvillain · 2018-10-12T07:39:29Z

src/main/java/featurecat/lizzie/theme/Theme.java

+        blackStoneCached =
+            ImageIO.read(
+                new File(
+                    this.path


String p = this.path + /* File. */separator + config.optString("black-stone-image", "black.png");

OlivierBlanvillain · 2018-10-12T07:40:08Z

src/main/java/featurecat/lizzie/theme/Theme.java

+        whiteStoneCached =
+            ImageIO.read(
+                new File(
+                    this.path


Same, just to make it fit in the 100 char limit...

OlivierBlanvillain · 2018-10-12T07:40:39Z

src/main/java/featurecat/lizzie/theme/Theme.java

+
+  /** Use custom font */
+  public String fontName() {
+    return config.optString("font-name", null);


Default to null? Why not return the actual default font name?

Change fontName logic.

OlivierBlanvillain · 2018-10-12T07:42:42Z

src/main/java/featurecat/lizzie/theme/Theme.java

+  public Color commentBackgroundColor() {
+    JSONArray color = config.optJSONArray("comment-background-color");
+    if (color != null) {
+      return new Color(color.getInt(0), color.getInt(1), color.getInt(2), color.getInt(3));


Maybe we should give a nice error message in case somebody messes up the config file and color.length != 4. Same comment for the methods below.

Use new logic to process color.

zsalch · 2018-10-12T15:31:07Z

@OlivierBlanvillain
I still prefer to use the independent theme settings, so if you need to share a theme, just copy the corresponding directory file, and simply specify the theme name in the config.txt file.

However, I also agree that you can set theme-related options directly in the config.txt file, so that users can modify them without enabling the theme.

zsalch · 2018-10-13T11:49:44Z

@featurecat @OlivierBlanvillain
We've added some new configuration options, and we need to determine which ones are enabled by default.
Such as: show-blunder-bar, show-comment etc.

OlivierBlanvillain · 2018-10-13T12:17:04Z

@zsalch Alright, if you think the split in config.txt/theme.txt makes more sense, I'm OK with it.

I think we should turn both of these on by default for better discoverability.

OlivierBlanvillain

LGTM!

…ustom theme)

fix: #290 (modify alpha) was broken after #378 (custom theme)

OlivierBlanvillain added a commit to OlivierBlanvillain/lizzie that referenced this pull request Oct 3, 2018

Remove jar based theme infrastructure

7a109df

To be replaced by featurecat#378

OlivierBlanvillain added a commit to OlivierBlanvillain/lizzie that referenced this pull request Oct 3, 2018

Remove jar based theme infrastructure

8512ebc

To be replaced by featurecat#378

OlivierBlanvillain mentioned this pull request Oct 3, 2018

Remove jar based theme infrastructure #381

Merged

zsalch closed this Oct 5, 2018

zsalch force-pushed the next_theme branch from cb32f4f to f9086bb Compare October 5, 2018 15:41

zsalch reopened this Oct 5, 2018

The theme allow to use external image, set font & color by config

d9869d4

zsalch force-pushed the next_theme branch from e679b00 to d9869d4 Compare October 6, 2018 01:33

OlivierBlanvillain and others added 2 commits October 7, 2018 17:46

Merge branch 'next' into next_theme

5e3d297

Move theme to frame and add winrate & blunder bar color

d042ca1

zsalch mentioned this pull request Oct 11, 2018

next: Fixed display issues #398

Closed

OlivierBlanvillain reviewed Oct 12, 2018

View reviewed changes

OlivierBlanvillain mentioned this pull request Oct 16, 2018

New board and background #385

Merged

Change Theme Logic

d331672

zsalch force-pushed the next_theme branch from 046f9ab to d331672 Compare October 16, 2018 08:22

OlivierBlanvillain approved these changes Oct 18, 2018

View reviewed changes

Merge branch 'next' into next_theme

96480c6

OlivierBlanvillain merged commit 3eb8ec7 into featurecat:next Oct 18, 2018

kaorahi pushed a commit to kaorahi/lizzie that referenced this pull request Nov 12, 2018

fix: featurecat#290 (modify alpha) was broken after featurecat#378 (c…

a9cbfcb

…ustom theme)

featurecat added a commit that referenced this pull request Nov 12, 2018

Merge pull request #438 from kaorahi/fix290_378

fb8c0be

fix: #290 (modify alpha) was broken after #378 (custom theme)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

next: The custom theme allow to use external image, set font & color by config #378

next: The custom theme allow to use external image, set font & color by config #378

zsalch commented Oct 3, 2018 •

edited

Loading

ParmuzinAlexander commented Oct 4, 2018

zsalch commented Oct 5, 2018

ParmuzinAlexander commented Oct 5, 2018

OlivierBlanvillain commented Oct 5, 2018

zsalch commented Oct 5, 2018

OlivierBlanvillain commented Oct 5, 2018

zsalch commented Oct 5, 2018

zsalch commented Oct 5, 2018

OlivierBlanvillain Oct 5, 2018

zsalch Oct 14, 2018

OlivierBlanvillain Oct 5, 2018

zsalch Oct 14, 2018

OlivierBlanvillain Oct 12, 2018

zsalch Oct 14, 2018

OlivierBlanvillain Oct 12, 2018

zsalch Oct 14, 2018

OlivierBlanvillain Oct 12, 2018

zsalch Oct 13, 2018

zsalch Oct 14, 2018

OlivierBlanvillain Oct 12, 2018

zsalch Oct 14, 2018

OlivierBlanvillain Oct 12, 2018

zsalch Oct 14, 2018

OlivierBlanvillain Oct 12, 2018

zsalch Oct 14, 2018

OlivierBlanvillain Oct 12, 2018

zsalch Oct 14, 2018

zsalch commented Oct 12, 2018

zsalch commented Oct 13, 2018

OlivierBlanvillain commented Oct 13, 2018

OlivierBlanvillain left a comment

next: The custom theme allow to use external image, set font & color by config #378

next: The custom theme allow to use external image, set font & color by config #378

Conversation

zsalch commented Oct 3, 2018 • edited Loading

ParmuzinAlexander commented Oct 4, 2018

zsalch commented Oct 5, 2018

ParmuzinAlexander commented Oct 5, 2018

OlivierBlanvillain commented Oct 5, 2018

zsalch commented Oct 5, 2018

OlivierBlanvillain commented Oct 5, 2018

zsalch commented Oct 5, 2018

zsalch commented Oct 5, 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

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

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

Choose a reason for hiding this comment

zsalch commented Oct 12, 2018

zsalch commented Oct 13, 2018

OlivierBlanvillain commented Oct 13, 2018

OlivierBlanvillain left a comment

Choose a reason for hiding this comment

zsalch commented Oct 3, 2018 •

edited

Loading