Skip to content

Commit 39e8b6d

Browse files
committed
MacOS 图标大小调整 #10
1 parent 2dc462d commit 39e8b6d

26 files changed

+36
-24
lines changed

.github/workflows/build_windows_app.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ jobs:
2323
- name: Upload artifact
2424
uses: actions/upload-artifact@v2
2525
with:
26-
name: aferchat
26+
name: aidea
2727
path: build/windows/runner/Release

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ build-android:
1414
mv build/app/outputs/flutter-apk/app-release.apk /Users/mylxsw/ResilioSync/临时文件/
1515

1616
build-macos:
17-
flutter build macos --no-tree-shake-icons
17+
flutter build macos --no-tree-shake-icons --release
1818
open build/macos/Build/Products/Release/
1919

2020
build-web:

lib/helper/constant.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:flutter/material.dart';
22

3-
const VERSION = '1.0.3';
3+
const VERSION = '1.0.4';
44
const DB_VERSION = 23;
55

66
const maxRoomNumForNonVIP = 50;

lib/repo/api_server.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ class APIServer {
235235
return Future.error(resp.data['error']);
236236
}
237237

238-
Logger.instance.d(resp.data);
238+
// Logger.instance.d(resp.data);
239239

240240
return parser(resp);
241241
} catch (e) {
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
11
{
2-
"info": {
3-
"version": 1,
4-
"author": "xcode"
5-
},
62
"images": [
73
{
84
"size": "16x16",
95
"idiom": "mac",
10-
"filename": "app_icon_16.png",
6+
"filename": "icon-16.png",
117
"scale": "1x"
128
},
139
{
1410
"size": "16x16",
1511
"idiom": "mac",
16-
"filename": "app_icon_32.png",
12+
"filename": "icon-16@2x.png",
1713
"scale": "2x"
1814
},
1915
{
2016
"size": "32x32",
2117
"idiom": "mac",
22-
"filename": "app_icon_32.png",
18+
"filename": "icon-32.png",
2319
"scale": "1x"
2420
},
2521
{
2622
"size": "32x32",
2723
"idiom": "mac",
28-
"filename": "app_icon_64.png",
24+
"filename": "icon-32@2x.png",
2925
"scale": "2x"
3026
},
3127
{
3228
"size": "128x128",
3329
"idiom": "mac",
34-
"filename": "app_icon_128.png",
30+
"filename": "icon-128.png",
3531
"scale": "1x"
3632
},
3733
{
3834
"size": "128x128",
3935
"idiom": "mac",
40-
"filename": "app_icon_256.png",
36+
"filename": "icon-128@2x.png",
4137
"scale": "2x"
4238
},
4339
{
4440
"size": "256x256",
4541
"idiom": "mac",
46-
"filename": "app_icon_256.png",
42+
"filename": "icon-256.png",
4743
"scale": "1x"
4844
},
4945
{
5046
"size": "256x256",
5147
"idiom": "mac",
52-
"filename": "app_icon_512.png",
48+
"filename": "icon-256@2x.png",
5349
"scale": "2x"
5450
},
5551
{
5652
"size": "512x512",
5753
"idiom": "mac",
58-
"filename": "app_icon_512.png",
54+
"filename": "icon-512.png",
5955
"scale": "1x"
6056
},
6157
{
6258
"size": "512x512",
6359
"idiom": "mac",
64-
"filename": "app_icon_1024.png",
60+
"filename": "icon-512@2x.png",
6561
"scale": "2x"
6662
}
67-
]
63+
],
64+
"info": {
65+
"version": 1,
66+
"author": "ai.aicode.cc"
67+
}
6868
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

macos/Runner/Base.lproj/MainMenu.xib

+1-1
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@
333333
<window title="APP_NAME" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" titlebarAppearsTransparent="YES" titleVisibility="hidden" id="QvC-M9-y7g" customClass="MainFlutterWindow" customModule="AIdea" customModuleProvider="target">
334334
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
335335
<rect key="contentRect" x="335" y="390" width="800" height="600"/>
336-
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
336+
<rect key="screenRect" x="0.0" y="0.0" width="3440" height="1415"/>
337337
<view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
338338
<rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
339339
<autoresizingMask key="autoresizingMask"/>

pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1616
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
1717
# In Windows, build-name is used as the major, minor, and patch parts
1818
# of the product and file versions while build-number is used as the build suffix.
19-
version: 1.0.3+1
19+
version: 1.0.4+1
2020

2121
environment:
2222
sdk: '>=2.19.5 <3.0.0'

scripts/macos-icon-replace.sh

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
mv 16x16.png icon-16.png
2+
cp 32x32.png [email protected]
3+
mv 32x32.png icon-32.png
4+
mv 64x64.png [email protected]
5+
mv 128x128.png icon-128.png
6+
cp 256x256.png [email protected]
7+
mv 256x256.png icon-256.png
8+
cp 512x512.png [email protected]
9+
mv 512x512.png icon-512.png
10+
mv 1024x1024.png [email protected]

windows/runner/flutter_window.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@ bool FlutterWindow::OnCreate() {
2727
RegisterPlugins(flutter_controller_->engine());
2828
SetChildContent(flutter_controller_->view()->GetNativeWindow());
2929

30-
flutter_controller_->engine()->SetNextFrameCallback([&]() {
31-
this->Show();
32-
});
30+
// bugfix: https://github.com/flutter/flutter/issues/119415
31+
// flutter_controller_->engine()->SetNextFrameCallback([&]() {
32+
// this->Show();
33+
// });
34+
this->Show();
3335

3436
return true;
3537
}

0 commit comments

Comments
 (0)