Skip to content

Commit 8af233d

Browse files
author
李卓原
committed
beta3
1 parent c88f48c commit 8af233d

File tree

10 files changed

+107
-110
lines changed

10 files changed

+107
-110
lines changed

‎example/android/app/src/debug/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<!-- Flutter needs it to communicate with the running application
44
to allow setting breakpoints, to provide hot reload, etc.
55
-->
6-
<uses-permission android:name="android.permission.INTERNET"/>
6+
<uses-permission android:name="android.permission.INTERNET" />
77
</manifest>

‎example/android/app/src/main/AndroidManifest.xml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,19 @@
2121
while the Flutter UI initializes. After that, this theme continues
2222
to determine the Window background behind the Flutter UI. -->
2323
<meta-data
24-
android:name="io.flutter.embedding.android.NormalTheme"
25-
android:resource="@style/NormalTheme"
26-
/>
24+
android:name="io.flutter.embedding.android.NormalTheme"
25+
android:resource="@style/NormalTheme" />
2726
<!-- Displays an Android View that continues showing the launch screen
2827
Drawable until Flutter paints its first frame, then this splash
2928
screen fades out. A splash screen is useful to avoid any visual
3029
gap between the end of Android's launch screen and the painting of
3130
Flutter's first frame. -->
3231
<meta-data
33-
android:name="io.flutter.embedding.android.SplashScreenDrawable"
34-
android:resource="@drawable/launch_background"
35-
/>
32+
android:name="io.flutter.embedding.android.SplashScreenDrawable"
33+
android:resource="@drawable/launch_background" />
3634
<intent-filter>
37-
<action android:name="android.intent.action.MAIN"/>
38-
<category android:name="android.intent.category.LAUNCHER"/>
35+
<action android:name="android.intent.action.MAIN" />
36+
<category android:name="android.intent.category.LAUNCHER" />
3937
</intent-filter>
4038
</activity>
4139
<!-- Don't delete the meta-data below.

‎example/android/app/src/main/kotlin/li/zhuoyuan/example/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ package li.zhuoyuan.example
22

33
import io.flutter.embedding.android.FlutterActivity
44

5-
class MainActivity: FlutterActivity() {
5+
class MainActivity : FlutterActivity() {
66
}

‎example/android/app/src/main/res/drawable/launch_background.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- Modify this file to customize your launch splash screen -->
1+
<?xml version="1.0" encoding="utf-8"?><!-- Modify this file to customize your launch splash screen -->
32
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
43
<item android:drawable="@android:color/white" />
54

‎example/android/app/src/profile/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<!-- Flutter needs it to communicate with the running application
44
to allow setting breakpoints, to provide hot reload, etc.
55
-->
6-
<uses-permission android:name="android.permission.INTERNET"/>
6+
<uses-permission android:name="android.permission.INTERNET" />
77
</manifest>

‎example/ios/Flutter/flutter_export_environment.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ export "FLUTTER_TARGET=lib/main.dart"
66
export "FLUTTER_BUILD_DIR=build"
77
export "SYMROOT=${SOURCE_ROOT}/../build/ios"
88
export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
9-
export "FLUTTER_FRAMEWORK_DIR=/Users/lizhuoyuan/Development/flutter/bin/cache/artifacts/engine/ios-release"
9+
export "FLUTTER_FRAMEWORK_DIR=/Users/lizhuoyuan/Development/flutter/bin/cache/artifacts/engine/ios"
1010
export "FLUTTER_BUILD_NAME=1.0.0"
1111
export "FLUTTER_BUILD_NUMBER=1"
1212
export "DART_OBFUSCATION=false"
1313
export "TRACK_WIDGET_CREATION=false"
14-
export "TREE_SHAKE_ICONS=true"
14+
export "TREE_SHAKE_ICONS=false"
1515
export "PACKAGE_CONFIG=.packages"

‎example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,122 +1,122 @@
11
{
2-
"images" : [
2+
"images": [
33
{
4-
"size" : "20x20",
5-
"idiom" : "iphone",
6-
"filename" : "Icon-App-20x20@2x.png",
7-
"scale" : "2x"
4+
"size": "20x20",
5+
"idiom": "iphone",
6+
"filename": "Icon-App-20x20@2x.png",
7+
"scale": "2x"
88
},
99
{
10-
"size" : "20x20",
11-
"idiom" : "iphone",
12-
"filename" : "Icon-App-20x20@3x.png",
13-
"scale" : "3x"
10+
"size": "20x20",
11+
"idiom": "iphone",
12+
"filename": "Icon-App-20x20@3x.png",
13+
"scale": "3x"
1414
},
1515
{
16-
"size" : "29x29",
17-
"idiom" : "iphone",
18-
"filename" : "Icon-App-29x29@1x.png",
19-
"scale" : "1x"
16+
"size": "29x29",
17+
"idiom": "iphone",
18+
"filename": "Icon-App-29x29@1x.png",
19+
"scale": "1x"
2020
},
2121
{
22-
"size" : "29x29",
23-
"idiom" : "iphone",
24-
"filename" : "Icon-App-29x29@2x.png",
25-
"scale" : "2x"
22+
"size": "29x29",
23+
"idiom": "iphone",
24+
"filename": "Icon-App-29x29@2x.png",
25+
"scale": "2x"
2626
},
2727
{
28-
"size" : "29x29",
29-
"idiom" : "iphone",
30-
"filename" : "Icon-App-29x29@3x.png",
31-
"scale" : "3x"
28+
"size": "29x29",
29+
"idiom": "iphone",
30+
"filename": "Icon-App-29x29@3x.png",
31+
"scale": "3x"
3232
},
3333
{
34-
"size" : "40x40",
35-
"idiom" : "iphone",
36-
"filename" : "Icon-App-40x40@2x.png",
37-
"scale" : "2x"
34+
"size": "40x40",
35+
"idiom": "iphone",
36+
"filename": "Icon-App-40x40@2x.png",
37+
"scale": "2x"
3838
},
3939
{
40-
"size" : "40x40",
41-
"idiom" : "iphone",
42-
"filename" : "Icon-App-40x40@3x.png",
43-
"scale" : "3x"
40+
"size": "40x40",
41+
"idiom": "iphone",
42+
"filename": "Icon-App-40x40@3x.png",
43+
"scale": "3x"
4444
},
4545
{
46-
"size" : "60x60",
47-
"idiom" : "iphone",
48-
"filename" : "Icon-App-60x60@2x.png",
49-
"scale" : "2x"
46+
"size": "60x60",
47+
"idiom": "iphone",
48+
"filename": "Icon-App-60x60@2x.png",
49+
"scale": "2x"
5050
},
5151
{
52-
"size" : "60x60",
53-
"idiom" : "iphone",
54-
"filename" : "Icon-App-60x60@3x.png",
55-
"scale" : "3x"
52+
"size": "60x60",
53+
"idiom": "iphone",
54+
"filename": "Icon-App-60x60@3x.png",
55+
"scale": "3x"
5656
},
5757
{
58-
"size" : "20x20",
59-
"idiom" : "ipad",
60-
"filename" : "Icon-App-20x20@1x.png",
61-
"scale" : "1x"
58+
"size": "20x20",
59+
"idiom": "ipad",
60+
"filename": "Icon-App-20x20@1x.png",
61+
"scale": "1x"
6262
},
6363
{
64-
"size" : "20x20",
65-
"idiom" : "ipad",
66-
"filename" : "Icon-App-20x20@2x.png",
67-
"scale" : "2x"
64+
"size": "20x20",
65+
"idiom": "ipad",
66+
"filename": "Icon-App-20x20@2x.png",
67+
"scale": "2x"
6868
},
6969
{
70-
"size" : "29x29",
71-
"idiom" : "ipad",
72-
"filename" : "Icon-App-29x29@1x.png",
73-
"scale" : "1x"
70+
"size": "29x29",
71+
"idiom": "ipad",
72+
"filename": "Icon-App-29x29@1x.png",
73+
"scale": "1x"
7474
},
7575
{
76-
"size" : "29x29",
77-
"idiom" : "ipad",
78-
"filename" : "Icon-App-29x29@2x.png",
79-
"scale" : "2x"
76+
"size": "29x29",
77+
"idiom": "ipad",
78+
"filename": "Icon-App-29x29@2x.png",
79+
"scale": "2x"
8080
},
8181
{
82-
"size" : "40x40",
83-
"idiom" : "ipad",
84-
"filename" : "Icon-App-40x40@1x.png",
85-
"scale" : "1x"
82+
"size": "40x40",
83+
"idiom": "ipad",
84+
"filename": "Icon-App-40x40@1x.png",
85+
"scale": "1x"
8686
},
8787
{
88-
"size" : "40x40",
89-
"idiom" : "ipad",
90-
"filename" : "Icon-App-40x40@2x.png",
91-
"scale" : "2x"
88+
"size": "40x40",
89+
"idiom": "ipad",
90+
"filename": "Icon-App-40x40@2x.png",
91+
"scale": "2x"
9292
},
9393
{
94-
"size" : "76x76",
95-
"idiom" : "ipad",
96-
"filename" : "Icon-App-76x76@1x.png",
97-
"scale" : "1x"
94+
"size": "76x76",
95+
"idiom": "ipad",
96+
"filename": "Icon-App-76x76@1x.png",
97+
"scale": "1x"
9898
},
9999
{
100-
"size" : "76x76",
101-
"idiom" : "ipad",
102-
"filename" : "Icon-App-76x76@2x.png",
103-
"scale" : "2x"
100+
"size": "76x76",
101+
"idiom": "ipad",
102+
"filename": "Icon-App-76x76@2x.png",
103+
"scale": "2x"
104104
},
105105
{
106-
"size" : "83.5x83.5",
107-
"idiom" : "ipad",
108-
"filename" : "Icon-App-83.5x83.5@2x.png",
109-
"scale" : "2x"
106+
"size": "83.5x83.5",
107+
"idiom": "ipad",
108+
"filename": "Icon-App-83.5x83.5@2x.png",
109+
"scale": "2x"
110110
},
111111
{
112-
"size" : "1024x1024",
113-
"idiom" : "ios-marketing",
114-
"filename" : "Icon-App-1024x1024@1x.png",
115-
"scale" : "1x"
112+
"size": "1024x1024",
113+
"idiom": "ios-marketing",
114+
"filename": "Icon-App-1024x1024@1x.png",
115+
"scale": "1x"
116116
}
117117
],
118-
"info" : {
119-
"version" : 1,
120-
"author" : "xcode"
118+
"info": {
119+
"version": 1,
120+
"author": "xcode"
121121
}
122122
}

‎example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
2-
"images" : [
2+
"images": [
33
{
4-
"idiom" : "universal",
5-
"filename" : "LaunchImage.png",
6-
"scale" : "1x"
4+
"idiom": "universal",
5+
"filename": "LaunchImage.png",
6+
"scale": "1x"
77
},
88
{
9-
"idiom" : "universal",
10-
"filename" : "LaunchImage@2x.png",
11-
"scale" : "2x"
9+
"idiom": "universal",
10+
"filename": "LaunchImage@2x.png",
11+
"scale": "2x"
1212
},
1313
{
14-
"idiom" : "universal",
15-
"filename" : "LaunchImage@3x.png",
16-
"scale" : "3x"
14+
"idiom": "universal",
15+
"filename": "LaunchImage@3x.png",
16+
"scale": "3x"
1717
}
1818
],
19-
"info" : {
20-
"version" : 1,
21-
"author" : "xcode"
19+
"info": {
20+
"version": 1,
21+
"author": "xcode"
2222
}
2323
}

‎lib/screenutil.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import 'package:flutter/material.dart';
77
import 'dart:ui' as ui;
88

99
class ScreenUtil {
10-
static ScreenUtil _instance;
1110
static const Size defaultSize = Size(1080, 1920);
11+
static ScreenUtil _instance;
1212

1313
/// UI设计中手机尺寸 , px
1414
/// Size of the phone in UI Design , px

‎lib/screenutil_init.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import 'screenutil.dart';
44

55
class ScreenUtilInit extends StatelessWidget {
66
/// A helper widget that initializes [ScreenUtil]
7-
const ScreenUtilInit({
7+
ScreenUtilInit({
88
@required this.child,
99
this.designSize = ScreenUtil.defaultSize,
1010
this.allowFontScaling = false,

0 commit comments

Comments
 (0)