From 3f4dbb69785782f4c4b61553ac1a5e2992eba343 Mon Sep 17 00:00:00 2001 From: huanghongxun Date: Thu, 23 Sep 2021 16:17:26 +0800 Subject: [PATCH] feat: discord & kaiheila in AboutPage. --- .../main/java/org/jackhuang/hmcl/ui/SVG.java | 6 +++++ .../org/jackhuang/hmcl/ui/main/AboutPage.java | 22 +++++++++++++++++- .../src/main/resources/assets/img/discord.png | Bin 0 -> 4997 bytes .../main/resources/assets/img/kaiheila.jpeg | Bin 0 -> 2986 bytes .../resources/assets/lang/I18N.properties | 5 ++++ .../resources/assets/lang/I18N_zh.properties | 5 ++++ .../assets/lang/I18N_zh_CN.properties | 5 ++++ 7 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 HMCL/src/main/resources/assets/img/discord.png create mode 100644 HMCL/src/main/resources/assets/img/kaiheila.jpeg diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SVG.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SVG.java index 4ac981bb8..b4a9524a5 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SVG.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SVG.java @@ -498,4 +498,10 @@ public final class SVG { "M14,12H10V10H14M14,16H10V14H14M20,8H17.19C16.74,7.22 16.12,6.55 15.37,6.04L17,4.41L15.59,3L13.42,5.17C12.96,5.06 12.5,5 12,5C11.5,5 11.04,5.06 10.59,5.17L8.41,3L7,4.41L8.62,6.04C7.88,6.55 7.26,7.22 6.81,8H4V10H6.09C6.04,10.33 6,10.66 6,11V12H4V14H6V15C6,15.34 6.04,15.67 6.09,16H4V18H6.81C7.85,19.79 9.78,21 12,21C14.22,21 16.15,19.79 17.19,18H20V16H17.91C17.96,15.67 18,15.34 18,15V14H20V12H18V11C18,10.66 17.96,10.33 17.91,10H20V8Z", fill, width, height); } + + public static Node discord(ObjectBinding fill, double width, double height) { + return createSVGPath( + "M22,24L16.75,19L17.38,21H4.5A2.5,2.5 0 0,1 2,18.5V3.5A2.5,2.5 0 0,1 4.5,1H19.5A2.5,2.5 0 0,1 22,3.5V24M12,6.8C9.32,6.8 7.44,7.95 7.44,7.95C8.47,7.03 10.27,6.5 10.27,6.5L10.1,6.33C8.41,6.36 6.88,7.53 6.88,7.53C5.16,11.12 5.27,14.22 5.27,14.22C6.67,16.03 8.75,15.9 8.75,15.9L9.46,15C8.21,14.73 7.42,13.62 7.42,13.62C7.42,13.62 9.3,14.9 12,14.9C14.7,14.9 16.58,13.62 16.58,13.62C16.58,13.62 15.79,14.73 14.54,15L15.25,15.9C15.25,15.9 17.33,16.03 18.73,14.22C18.73,14.22 18.84,11.12 17.12,7.53C17.12,7.53 15.59,6.36 13.9,6.33L13.73,6.5C13.73,6.5 15.53,7.03 16.56,7.95C16.56,7.95 14.68,6.8 12,6.8M9.93,10.59C10.58,10.59 11.11,11.16 11.1,11.86C11.1,12.55 10.58,13.13 9.93,13.13C9.29,13.13 8.77,12.55 8.77,11.86C8.77,11.16 9.28,10.59 9.93,10.59M14.1,10.59C14.75,10.59 15.27,11.16 15.27,11.86C15.27,12.55 14.75,13.13 14.1,13.13C13.46,13.13 12.94,12.55 12.94,11.86C12.94,11.16 13.45,10.59 14.1,10.59Z", + fill, width, height); + } } diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/AboutPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/AboutPage.java index de588ab9f..3d0ed9181 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/AboutPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/AboutPage.java @@ -98,13 +98,30 @@ public class AboutPage extends StackPane { contributors.setSubtitle(i18n("about.thanks_to.contributors.statement")); contributors.setExternalLink("https://github.com/huanghongxun/HMCL/graphs/contributors"); + thanks.getContent().setAll(yushijinhun, bangbang93, mcbbs, mcmod, noin, gamerteam, redLnn, contributors); + } + + ComponentList community = new ComponentList(); + { IconedTwoLineListItem users = new IconedTwoLineListItem(); users.setImage(new Image("/assets/img/craft_table.png", 32, 32, false, true)); users.setTitle(i18n("about.thanks_to.users")); users.setSubtitle(i18n("about.thanks_to.users.statement")); users.setExternalLink("https://hmcl.huangyuhui.net/api/redirect/sponsor"); - thanks.getContent().setAll(yushijinhun, bangbang93, mcbbs, mcmod, noin, gamerteam, redLnn, users, contributors); + IconedTwoLineListItem discord = new IconedTwoLineListItem(); + discord.setImage(new Image("/assets/img/discord.png", 32, 32, false, true)); + discord.setTitle(i18n("about.community.discord")); + discord.setSubtitle(i18n("about.community.discord.statement")); + discord.setExternalLink("https://discord.gg/jVvC7HfM6U"); + + IconedTwoLineListItem kaiheila = new IconedTwoLineListItem(); + kaiheila.setImage(new Image("/assets/img/kaiheila.jpeg", 32, 32, false, true)); + kaiheila.setTitle(i18n("about.community.kaiheila")); + kaiheila.setSubtitle(i18n("about.community.kaiheila.statement")); + kaiheila.setExternalLink("https://kaihei.co/Kx7n3t"); + + community.getContent().setAll(users, discord, kaiheila); } ComponentList dep = new ComponentList(); @@ -176,6 +193,9 @@ public class AboutPage extends StackPane { ComponentList.createComponentListTitle(i18n("about.thanks_to")), thanks, + ComponentList.createComponentListTitle(i18n("about.community")), + community, + ComponentList.createComponentListTitle(i18n("about.dependency")), dep, diff --git a/HMCL/src/main/resources/assets/img/discord.png b/HMCL/src/main/resources/assets/img/discord.png new file mode 100644 index 0000000000000000000000000000000000000000..e2964bb6b6f580a06726793daa8609b9eec41506 GIT binary patch literal 4997 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 V#?k!>JH`Jt^tDYMf6#P@|34cNS~UOw literal 0 HcmV?d00001 diff --git a/HMCL/src/main/resources/assets/img/kaiheila.jpeg b/HMCL/src/main/resources/assets/img/kaiheila.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..5172f780d58921a59f6a85e0aa44f9407e8aff92 GIT binary patch literal 2986 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 DS-qV4 literal 0 HcmV?d00001 diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index 104c5c3f1..50324ad1a 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -24,6 +24,11 @@ about.author=Author about.author.statement=huanghongxun (hmcl@huangyuhui.net) about.claim=EULA about.claim.statement=Click the link for the whole text. +about.community=Community +about.community.discord=Discord +about.community.discord.statement=Join chat! +about.community.kaiheila=KaiHeiLa +about.community.kaiheila.statement=Join chat! about.dependency=Dependencies about.legal=Legal Acknowledgement about.thanks_to=Thanks to diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index 9018b45f0..05098185e 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -24,6 +24,11 @@ about.author=作者 about.author.statement=huanghongxun (hmcl@huangyuhui.net) about.claim=用戶協議 about.claim.statement=點擊連結以查看全文 +about.community=社區 +about.community.discord=Discord +about.community.discord.statement=歡迎加入 Discord 討論區,加入後請遵守討論區規定 +about.community.kaiheila=開黑啦 +about.community.kaiheila.statement=歡迎加入開黑啦討論區,加入後請遵守討論區規定 about.dependency=相依元件 about.legal=法律聲明 about.thanks_to=鳴謝 diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties index 99d45eb12..462cd6461 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -24,6 +24,11 @@ about.author=作者 about.author.statement=huanghongxun (hmcl@huangyuhui.net) about.claim=用户协议 about.claim.statement=点击链接以查看全文 +about.community=社区 +about.community.discord=Discord +about.community.discord.statement=欢迎加入 Discord 讨论区,加入后请遵守讨论区规定 +about.community.kaiheila=开黑啦 +about.community.kaiheila.statement=欢迎加入开黑啦讨论区,加入后请遵守讨论区规定 about.dependency=依赖 about.legal=法律声明 about.thanks_to=鸣谢