Skip to content

Commit 00d83e4

Browse files
rememberberrememberber
authored
Merge pull request #26 from rememberber/dev
Dev
2 parents ebc63ed + 892baf6 commit 00d83e4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+225
-56
lines changed

‎assets/icons/android/play_store_512.png

19.5 KB

‎assets/icons/android/res/mipmap-anydpi-v26/ic_launcher.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@mipmap/ic_launcher_background"/>
4+
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
5+
<monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
6+
</adaptive-icon>

‎assets/icons/android/res/mipmap-hdpi/ic_launcher.png

5 KB

‎assets/icons/android/res/mipmap-hdpi/ic_launcher_background.png

852 Bytes

‎assets/icons/android/res/mipmap-hdpi/ic_launcher_foreground.png

3.46 KB

‎assets/icons/android/res/mipmap-hdpi/ic_launcher_monochrome.png

3.46 KB

‎assets/icons/android/res/mipmap-mdpi/ic_launcher.png

3.42 KB

‎assets/icons/android/res/mipmap-mdpi/ic_launcher_background.png

459 Bytes

‎assets/icons/android/res/mipmap-mdpi/ic_launcher_foreground.png

2.18 KB

‎assets/icons/android/res/mipmap-mdpi/ic_launcher_monochrome.png

2.18 KB

‎assets/icons/android/res/mipmap-xhdpi/ic_launcher.png

6.94 KB

‎assets/icons/android/res/mipmap-xhdpi/ic_launcher_background.png

1.29 KB

‎assets/icons/android/res/mipmap-xhdpi/ic_launcher_foreground.png

4.72 KB

‎assets/icons/android/res/mipmap-xhdpi/ic_launcher_monochrome.png

4.72 KB

‎assets/icons/android/res/mipmap-xxhdpi/ic_launcher.png

11.1 KB

‎assets/icons/android/res/mipmap-xxhdpi/ic_launcher_background.png

2.88 KB

‎assets/icons/android/res/mipmap-xxhdpi/ic_launcher_foreground.png

8.3 KB

‎assets/icons/android/res/mipmap-xxhdpi/ic_launcher_monochrome.png

8.3 KB

‎assets/icons/android/res/mipmap-xxxhdpi/ic_launcher.png

15 KB

‎assets/icons/android/res/mipmap-xxxhdpi/ic_launcher_background.png

4.13 KB

‎assets/icons/android/res/mipmap-xxxhdpi/ic_launcher_foreground.png

11.8 KB

‎assets/icons/android/res/mipmap-xxxhdpi/ic_launcher_monochrome.png

11.8 KB

‎assets/icons/ios/AppIcon-20@2x.png

1.43 KB

‎assets/icons/ios/AppIcon-20@2x~ipad.png

1.43 KB

‎assets/icons/ios/AppIcon-20@3x.png

1.8 KB

‎assets/icons/ios/AppIcon-20~ipad.png

686 Bytes

‎assets/icons/ios/AppIcon-29.png

913 Bytes

‎assets/icons/ios/AppIcon-29@2x.png

1.63 KB

‎assets/icons/ios/AppIcon-29@2x~ipad.png

1.63 KB

‎assets/icons/ios/AppIcon-29@3x.png

1.97 KB

‎assets/icons/ios/AppIcon-29~ipad.png

913 Bytes

‎assets/icons/ios/AppIcon-40@2x.png

2.27 KB

‎assets/icons/ios/AppIcon-40@2x~ipad.png

2.27 KB

‎assets/icons/ios/AppIcon-40@3x.png

3.6 KB

‎assets/icons/ios/AppIcon-40~ipad.png

1.43 KB

‎assets/icons/ios/AppIcon-60@2x~car.png

3.6 KB

‎assets/icons/ios/AppIcon-60@3x~car.png

5.41 KB

‎assets/icons/ios/AppIcon-83.5@2x~ipad.png

3.8 KB

‎assets/icons/ios/AppIcon@2x.png

3.6 KB

‎assets/icons/ios/AppIcon@2x~ipad.png

4.79 KB

‎assets/icons/ios/AppIcon@3x.png

5.41 KB

‎assets/icons/ios/AppIcon~ios-marketing.png

51.8 KB

‎assets/icons/ios/AppIcon~ipad.png

2.13 KB

‎assets/icons/ios/Contents.json

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
{
2+
"images": [
3+
{
4+
"filename": "AppIcon@2x.png",
5+
"idiom": "iphone",
6+
"scale": "2x",
7+
"size": "60x60"
8+
},
9+
{
10+
"filename": "AppIcon@3x.png",
11+
"idiom": "iphone",
12+
"scale": "3x",
13+
"size": "60x60"
14+
},
15+
{
16+
"filename": "AppIcon~ipad.png",
17+
"idiom": "ipad",
18+
"scale": "1x",
19+
"size": "76x76"
20+
},
21+
{
22+
"filename": "AppIcon@2x~ipad.png",
23+
"idiom": "ipad",
24+
"scale": "2x",
25+
"size": "76x76"
26+
},
27+
{
28+
"filename": "AppIcon-83.5@2x~ipad.png",
29+
"idiom": "ipad",
30+
"scale": "2x",
31+
"size": "83.5x83.5"
32+
},
33+
{
34+
"filename": "AppIcon-40@2x.png",
35+
"idiom": "iphone",
36+
"scale": "2x",
37+
"size": "40x40"
38+
},
39+
{
40+
"filename": "AppIcon-40@3x.png",
41+
"idiom": "iphone",
42+
"scale": "3x",
43+
"size": "40x40"
44+
},
45+
{
46+
"filename": "AppIcon-40~ipad.png",
47+
"idiom": "ipad",
48+
"scale": "1x",
49+
"size": "40x40"
50+
},
51+
{
52+
"filename": "AppIcon-40@2x~ipad.png",
53+
"idiom": "ipad",
54+
"scale": "2x",
55+
"size": "40x40"
56+
},
57+
{
58+
"filename": "AppIcon-20@2x.png",
59+
"idiom": "iphone",
60+
"scale": "2x",
61+
"size": "20x20"
62+
},
63+
{
64+
"filename": "AppIcon-20@3x.png",
65+
"idiom": "iphone",
66+
"scale": "3x",
67+
"size": "20x20"
68+
},
69+
{
70+
"filename": "AppIcon-20~ipad.png",
71+
"idiom": "ipad",
72+
"scale": "1x",
73+
"size": "20x20"
74+
},
75+
{
76+
"filename": "AppIcon-20@2x~ipad.png",
77+
"idiom": "ipad",
78+
"scale": "2x",
79+
"size": "20x20"
80+
},
81+
{
82+
"filename": "AppIcon-29.png",
83+
"idiom": "iphone",
84+
"scale": "1x",
85+
"size": "29x29"
86+
},
87+
{
88+
"filename": "AppIcon-29@2x.png",
89+
"idiom": "iphone",
90+
"scale": "2x",
91+
"size": "29x29"
92+
},
93+
{
94+
"filename": "AppIcon-29@3x.png",
95+
"idiom": "iphone",
96+
"scale": "3x",
97+
"size": "29x29"
98+
},
99+
{
100+
"filename": "AppIcon-29~ipad.png",
101+
"idiom": "ipad",
102+
"scale": "1x",
103+
"size": "29x29"
104+
},
105+
{
106+
"filename": "AppIcon-29@2x~ipad.png",
107+
"idiom": "ipad",
108+
"scale": "2x",
109+
"size": "29x29"
110+
},
111+
{
112+
"filename": "AppIcon-60@2x~car.png",
113+
"idiom": "car",
114+
"scale": "2x",
115+
"size": "60x60"
116+
},
117+
{
118+
"filename": "AppIcon-60@3x~car.png",
119+
"idiom": "car",
120+
"scale": "3x",
121+
"size": "60x60"
122+
},
123+
{
124+
"filename": "AppIcon~ios-marketing.png",
125+
"idiom": "ios-marketing",
126+
"scale": "1x",
127+
"size": "1024x1024"
128+
}
129+
],
130+
"info": {
131+
"author": "iconkitchen",
132+
"version": 1
133+
}
134+
}

‎assets/icons/macos/AppIcon.icns

174 KB
Binary file not shown.

‎assets/icons/web/README.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Add this to your HTML <head>:
2+
3+
<link rel="icon" href="/favicon.ico" sizes="any">
4+
<link rel="apple-touch-icon" href="/apple-touch-icon.png">
5+
6+
Add this to your app's manifest.json:
7+
8+
...
9+
{
10+
"icons": [
11+
{ "src": "/favicon.ico", "type": "image/x-icon", "sizes": "16x16 32x32" },
12+
{ "src": "/icon-192.png", "type": "image/png", "sizes": "192x192" },
13+
{ "src": "/icon-512.png", "type": "image/png", "sizes": "512x512" },
14+
{ "src": "/icon-192-maskable.png", "type": "image/png", "sizes": "192x192", "purpose": "maskable" },
15+
{ "src": "/icon-512-maskable.png", "type": "image/png", "sizes": "512x512", "purpose": "maskable" }
16+
]
17+
}
18+
...

‎assets/icons/web/apple-touch-icon.png

5.41 KB

‎assets/icons/web/favicon.ico

5.12 KB
Binary file not shown.

‎assets/icons/web/icon-192-maskable.png

6.13 KB

‎assets/icons/web/icon-192.png

7.41 KB

‎assets/icons/web/icon-512-maskable.png

19.5 KB

‎assets/icons/web/icon-512.png

23.1 KB

‎assets/mac/MooInfo.icns

117 KB
Binary file not shown.

‎pom.xml

Lines changed: 54 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.luoboduner.moo.info</groupId>
88
<artifactId>MooInfo</artifactId>
9-
<version>1.1.3</version>
9+
<version>1.1.4</version>
1010
<packaging>jar</packaging>
1111

1212
<name>MooInfo</name>
@@ -25,12 +25,12 @@
2525
<commons-lang3.version>3.12.0</commons-lang3.version>
2626
<guava.version>31.1-jre</guava.version>
2727
<okhttp.version>5.0.0-alpha.11</okhttp.version>
28-
<flatlaf.version>3.1.1</flatlaf.version>
29-
<flatlaf-extras.version>3.1.1</flatlaf-extras.version>
30-
<flatlaf-intellij-themes.version>3.1.1</flatlaf-intellij-themes.version>
28+
<flatlaf.version>3.5.2</flatlaf.version>
29+
<flatlaf-extras.version>3.5.2</flatlaf-extras.version>
30+
<flatlaf-intellij-themes.version>3.5.2</flatlaf-intellij-themes.version>
3131
<hutool-all.version>5.8.18</hutool-all.version>
3232
<fastjson.version>2.0.32</fastjson.version>
33-
<oshi-core.version>6.4.4</oshi-core.version>
33+
<oshi-core.version>6.6.5</oshi-core.version>
3434
<jfreechart.version>1.5.4</jfreechart.version>
3535
<imaging.version>1.0-alpha3</imaging.version>
3636
<xmlwise.version>1.2.11</xmlwise.version>
@@ -148,44 +148,44 @@
148148
<plugin>
149149
<groupId>io.github.fvarrui</groupId>
150150
<artifactId>javapackager</artifactId>
151-
<version>1.7.2</version>
151+
<version>1.7.5</version>
152152
<configuration>
153153
<bundleJre>true</bundleJre>
154154
<mainClass>com.luoboduner.moo.info.App</mainClass>
155155
<generateInstaller>true</generateInstaller>
156156
</configuration>
157157
<executions>
158-
<execution>
159-
<id>bundling-for-windows</id>
160-
<phase>package</phase>
161-
<goals>
162-
<goal>package</goal>
163-
</goals>
164-
<configuration>
165-
<platform>windows</platform>
166-
<createZipball>true</createZipball>
167-
<additionalModules>jdk.crypto.ec</additionalModules>
168-
<!-- <administratorRequired>true</administratorRequired>-->
169-
<winConfig>
170-
171-
<!-- general properties -->
172-
<generateSetup>true</generateSetup>
173-
<generateMsi>true</generateMsi>
174-
<generateMsm>true</generateMsm>
175-
176-
<!-- setup generation properties -->
177-
<setupMode>installForAllUsers</setupMode>
178-
<createDesktopIconTask>true</createDesktopIconTask>
179-
<disableDirPage>false</disableDirPage>
180-
<disableFinishedPage>false</disableFinishedPage>
181-
<removeOldLibs>true</removeOldLibs>
182-
<setupLanguages>
183-
<english>compiler:Default.isl</english>
184-
<!-- <spanish>compiler:Languages\Chinese.isl</spanish>-->
185-
</setupLanguages>
186-
</winConfig>
187-
</configuration>
188-
</execution>
158+
<!--<execution>-->
159+
<!-- <id>bundling-for-windows</id>-->
160+
<!-- <phase>package</phase>-->
161+
<!-- <goals>-->
162+
<!-- <goal>package</goal>-->
163+
<!-- </goals>-->
164+
<!-- <configuration>-->
165+
<!-- <platform>windows</platform>-->
166+
<!-- <createZipball>true</createZipball>-->
167+
<!-- <additionalModules>jdk.crypto.ec</additionalModules>-->
168+
<!-- &lt;!&ndash; <administratorRequired>true</administratorRequired>&ndash;&gt;-->
169+
<!-- <winConfig>-->
170+
171+
<!-- &lt;!&ndash; general properties &ndash;&gt;-->
172+
<!-- <generateSetup>true</generateSetup>-->
173+
<!-- <generateMsi>true</generateMsi>-->
174+
<!-- <generateMsm>true</generateMsm>-->
175+
176+
<!-- &lt;!&ndash; setup generation properties &ndash;&gt;-->
177+
<!-- <setupMode>installForAllUsers</setupMode>-->
178+
<!-- <createDesktopIconTask>true</createDesktopIconTask>-->
179+
<!-- <disableDirPage>false</disableDirPage>-->
180+
<!-- <disableFinishedPage>false</disableFinishedPage>-->
181+
<!-- <removeOldLibs>true</removeOldLibs>-->
182+
<!-- <setupLanguages>-->
183+
<!-- <english>compiler:Default.isl</english>-->
184+
<!-- &lt;!&ndash; <spanish>compiler:Languages\Chinese.isl</spanish>&ndash;&gt;-->
185+
<!-- </setupLanguages>-->
186+
<!-- </winConfig>-->
187+
<!-- </configuration>-->
188+
<!--</execution>-->
189189
<!-- <execution>-->
190190
<!-- <id>bundling-for-linux</id>-->
191191
<!-- <phase>package</phase>-->
@@ -199,19 +199,23 @@
199199
<!-- &lt;!&ndash; <jdkPath>X:\\path\to\linux\jdk</jdkPath>&ndash;&gt;-->
200200
<!-- </configuration>-->
201201
<!-- </execution>-->
202-
<!-- <execution>-->
203-
<!-- <id>bundling-for-mac</id>-->
204-
<!-- <phase>package</phase>-->
205-
<!-- <goals>-->
206-
<!-- <goal>package</goal>-->
207-
<!-- </goals>-->
208-
<!-- <configuration>-->
209-
<!-- <platform>mac</platform>-->
210-
<!-- <createTarball>true</createTarball>-->
211-
<!-- <additionalModules>jdk.crypto.ec</additionalModules>-->
212-
<!-- &lt;!&ndash; <jdkPath>X:\\path\to\mac\jdk</jdkPath>&ndash;&gt;-->
213-
<!-- </configuration>-->
214-
<!-- </execution>-->
202+
<execution>
203+
<id>bundling-for-mac</id>
204+
<phase>package</phase>
205+
<goals>
206+
<goal>package</goal>
207+
</goals>
208+
<configuration>
209+
<platform>mac</platform>
210+
<createTarball>true</createTarball>
211+
<macConfig>
212+
<macStartup>UNIVERSAL</macStartup>
213+
<developerId>rememberber@163.com</developerId>
214+
</macConfig>
215+
<additionalModules>jdk.crypto.ec</additionalModules>
216+
<!-- <jdkPath>X:\\path\to\mac\jdk</jdkPath>-->
217+
</configuration>
218+
</execution>
215219
</executions>
216220
</plugin>
217221
</plugins>

‎src/main/java/com/luoboduner/moo/info/App.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ public static void main(String[] args) {
4343
System.setProperty("apple.awt.application.name", "MooInfo");
4444
System.setProperty("com.apple.mrj.application.apple.menu.about.name", "MooInfo");
4545
System.setProperty("apple.awt.application.appearance", "system");
46+
System.setProperty("flatlaf.useRoundedPopupBorder", "true");
4647

47-
FlatDesktop.setAboutHandler(() -> {
48+
FlatDesktop.setAboutHandler(() -> {
4849
try {
4950
AboutDialog dialog = new AboutDialog();
5051

‎src/main/java/com/luoboduner/moo/info/ui/Init.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ public static void initGlobalFont() {
5555

5656
// Initialize high-resolution screen font sizes such as Macs
5757
if (SystemUtil.isMacOs()) {
58-
fontSize = 15;
58+
fontSize = 13;
5959
} else {
60-
fontSize = (int) (UIUtil.getScreenScale() * fontSize);
60+
fontSize = 12;
6161
}
6262
App.config.setFontSize(fontSize);
6363

‎src/main/java/com/luoboduner/moo/info/ui/UiConsts.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
public class UiConsts {
1212

1313
public static final String APP_NAME = "MooInfo";
14-
public static final String APP_VERSION = "1.1.3";
14+
public static final String APP_VERSION = "1.1.4";
1515

1616
public static final int TABLE_ROW_HEIGHT = 36;
1717

‎src/main/resources/version_summary.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
{
2-
"currentVersion": "1.1.3",
2+
"currentVersion": "1.1.4",
33
"versionIndex": {
44
"0.0.0": "0",
55
"1.0.0": "1",
66
"1.1.0": "2",
77
"1.1.1": "3",
88
"1.1.2": "4",
9-
"1.1.3": "5"
9+
"1.1.3": "5",
10+
"1.1.4": "6"
1011
},
1112
"versionDetailList": [
1213
{
@@ -38,6 +39,11 @@
3839
"version": "1.1.3",
3940
"title": "Optimize performance under macOS",
4041
"log": "● Optimize performance under macOS\n● update oshi to 6.4.4\n● new theme:Flat macOS,Xcode-Dark,Vuesion\n● update dependencies\n"
42+
},
43+
{
44+
"version": "1.1.4",
45+
"title": "fix startup issue in macOS 15",
46+
"log": "● fix startup issue in macOS 15\n● update dependencies\n"
4147
}
4248
]
4349
}

0 commit comments

Comments
 (0)