Skip to content

Commit 119f334

Browse files
committed
Update ios build
1 parent 5b99d2c commit 119f334

File tree

9 files changed

+123
-135
lines changed

9 files changed

+123
-135
lines changed

ios/Flutter/AppFrameworkInfo.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>8.0</string>
24+
<string>11.0</string>
2525
</dict>
2626
</plist>

ios/Runner.xcodeproj/project.pbxproj

+9-21
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,13 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
12-
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
13-
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1412
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
15-
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
16-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1713
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
1814
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1915
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -27,8 +23,6 @@
2723
dstPath = "";
2824
dstSubfolderSpec = 10;
2925
files = (
30-
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
31-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
3226
);
3327
name = "Embed Frameworks";
3428
runOnlyForDeploymentPostprocessing = 0;
@@ -39,13 +33,11 @@
3933
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4034
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
4135
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
42-
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
4336
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
4437
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
4538
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
4639
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
4740
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
48-
9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
4941
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
5042
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
5143
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -58,8 +50,6 @@
5850
isa = PBXFrameworksBuildPhase;
5951
buildActionMask = 2147483647;
6052
files = (
61-
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
62-
3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
6353
);
6454
runOnlyForDeploymentPostprocessing = 0;
6555
};
@@ -69,9 +59,7 @@
6959
9740EEB11CF90186004384FC /* Flutter */ = {
7060
isa = PBXGroup;
7161
children = (
72-
3B80C3931E831B6300D905FE /* App.framework */,
7362
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
74-
9740EEBA1CF902C7004384FC /* Flutter.framework */,
7563
9740EEB21CF90195004384FC /* Debug.xcconfig */,
7664
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
7765
9740EEB31CF90195004384FC /* Generated.xcconfig */,
@@ -148,7 +136,7 @@
148136
97C146E61CF9000F007C117D /* Project object */ = {
149137
isa = PBXProject;
150138
attributes = {
151-
LastUpgradeCheck = 1020;
139+
LastUpgradeCheck = 1430;
152140
ORGANIZATIONNAME = "The Chromium Authors";
153141
TargetAttributes = {
154142
97C146ED1CF9000F007C117D = {
@@ -194,20 +182,23 @@
194182
/* Begin PBXShellScriptBuildPhase section */
195183
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
196184
isa = PBXShellScriptBuildPhase;
185+
alwaysOutOfDate = 1;
197186
buildActionMask = 2147483647;
198187
files = (
199188
);
200189
inputPaths = (
190+
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
201191
);
202192
name = "Thin Binary";
203193
outputPaths = (
204194
);
205195
runOnlyForDeploymentPostprocessing = 0;
206196
shellPath = /bin/sh;
207-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
197+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
208198
};
209199
9740EEB61CF901F6004384FC /* Run Script */ = {
210200
isa = PBXShellScriptBuildPhase;
201+
alwaysOutOfDate = 1;
211202
buildActionMask = 2147483647;
212203
files = (
213204
);
@@ -256,7 +247,6 @@
256247
/* Begin XCBuildConfiguration section */
257248
249021D3217E4FDB00AE95B9 /* Profile */ = {
258249
isa = XCBuildConfiguration;
259-
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
260250
buildSettings = {
261251
ALWAYS_SEARCH_USER_PATHS = NO;
262252
CLANG_ANALYZER_NONNULL = YES;
@@ -296,7 +286,7 @@
296286
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
297287
GCC_WARN_UNUSED_FUNCTION = YES;
298288
GCC_WARN_UNUSED_VARIABLE = YES;
299-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
289+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
300290
MTL_ENABLE_DEBUG_INFO = NO;
301291
SDKROOT = iphoneos;
302292
TARGETED_DEVICE_FAMILY = "1,2";
@@ -333,7 +323,6 @@
333323
};
334324
97C147031CF9000F007C117D /* Debug */ = {
335325
isa = XCBuildConfiguration;
336-
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
337326
buildSettings = {
338327
ALWAYS_SEARCH_USER_PATHS = NO;
339328
CLANG_ANALYZER_NONNULL = YES;
@@ -379,7 +368,7 @@
379368
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
380369
GCC_WARN_UNUSED_FUNCTION = YES;
381370
GCC_WARN_UNUSED_VARIABLE = YES;
382-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
371+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
383372
MTL_ENABLE_DEBUG_INFO = YES;
384373
ONLY_ACTIVE_ARCH = YES;
385374
SDKROOT = iphoneos;
@@ -389,7 +378,6 @@
389378
};
390379
97C147041CF9000F007C117D /* Release */ = {
391380
isa = XCBuildConfiguration;
392-
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
393381
buildSettings = {
394382
ALWAYS_SEARCH_USER_PATHS = NO;
395383
CLANG_ANALYZER_NONNULL = YES;
@@ -429,7 +417,7 @@
429417
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
430418
GCC_WARN_UNUSED_FUNCTION = YES;
431419
GCC_WARN_UNUSED_VARIABLE = YES;
432-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
420+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
433421
MTL_ENABLE_DEBUG_INFO = NO;
434422
SDKROOT = iphoneos;
435423
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

ios/Runner/Info.plist

+4
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,9 @@
4141
</array>
4242
<key>UIViewControllerBasedStatusBarAppearance</key>
4343
<false/>
44+
<key>CADisableMinimumFrameDurationOnPhone</key>
45+
<true/>
46+
<key>UIApplicationSupportsIndirectInputEvents</key>
47+
<true/>
4448
</dict>
4549
</plist>

lib/Animation/FadeAnimation.dart

-33
This file was deleted.

lib/main.dart

+17-15
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:day13/Animation/FadeAnimation.dart';
1+
import 'package:animate_do/animate_do.dart';
22
import 'package:flutter/material.dart';
33

44
void main() => runApp(
@@ -31,7 +31,7 @@ class _HomePageState extends State<HomePage> {
3131
top: -40,
3232
height: 400,
3333
width: width,
34-
child: FadeAnimation(1, Container(
34+
child: FadeInUp(duration: Duration(seconds: 1), child: Container(
3535
decoration: BoxDecoration(
3636
image: DecorationImage(
3737
image: AssetImage('assets/images/background.png'),
@@ -43,7 +43,7 @@ class _HomePageState extends State<HomePage> {
4343
Positioned(
4444
height: 400,
4545
width: width+20,
46-
child: FadeAnimation(1.3, Container(
46+
child: FadeInUp(duration: Duration(milliseconds: 1000), child: Container(
4747
decoration: BoxDecoration(
4848
image: DecorationImage(
4949
image: AssetImage('assets/images/background-2.png'),
@@ -60,12 +60,13 @@ class _HomePageState extends State<HomePage> {
6060
child: Column(
6161
crossAxisAlignment: CrossAxisAlignment.start,
6262
children: <Widget>[
63-
FadeAnimation(1.5, Text("Login", style: TextStyle(color: Color.fromRGBO(49, 39, 79, 1), fontWeight: FontWeight.bold, fontSize: 30),)),
63+
FadeInUp(duration: Duration(milliseconds: 1500), child: Text("Login", style: TextStyle(color: Color.fromRGBO(49, 39, 79, 1), fontWeight: FontWeight.bold, fontSize: 30),)),
6464
SizedBox(height: 30,),
65-
FadeAnimation(1.7, Container(
65+
FadeInUp(duration: Duration(milliseconds: 1700), child: Container(
6666
decoration: BoxDecoration(
6767
borderRadius: BorderRadius.circular(10),
6868
color: Colors.white,
69+
border: Border.all(color: Color.fromRGBO(196, 135, 198, .3)),
6970
boxShadow: [
7071
BoxShadow(
7172
color: Color.fromRGBO(196, 135, 198, .3),
@@ -80,46 +81,47 @@ class _HomePageState extends State<HomePage> {
8081
padding: EdgeInsets.all(10),
8182
decoration: BoxDecoration(
8283
border: Border(bottom: BorderSide(
83-
color: Colors.grey[200]
84+
color: Color.fromRGBO(196, 135, 198, .3)
8485
))
8586
),
8687
child: TextField(
8788
decoration: InputDecoration(
8889
border: InputBorder.none,
8990
hintText: "Username",
90-
hintStyle: TextStyle(color: Colors.grey)
91+
hintStyle: TextStyle(color: Colors.grey.shade700)
9192
),
9293
),
9394
),
9495
Container(
9596
padding: EdgeInsets.all(10),
9697
child: TextField(
98+
obscureText: true,
9799
decoration: InputDecoration(
98100
border: InputBorder.none,
99101
hintText: "Password",
100-
hintStyle: TextStyle(color: Colors.grey)
102+
hintStyle: TextStyle(color: Colors.grey.shade700)
101103
),
102104
),
103105
)
104106
],
105107
),
106108
)),
107109
SizedBox(height: 20,),
108-
FadeAnimation(1.7, Center(child: Text("Forgot Password?", style: TextStyle(color: Color.fromRGBO(196, 135, 198, 1)),))),
110+
FadeInUp(duration: Duration(milliseconds: 1700), child: Center(child: TextButton(onPressed: () {}, child: Text("Forgot Password?", style: TextStyle(color: Color.fromRGBO(196, 135, 198, 1)),)))),
109111
SizedBox(height: 30,),
110-
FadeAnimation(1.9, Container(
111-
height: 50,
112-
margin: EdgeInsets.symmetric(horizontal: 60),
113-
decoration: BoxDecoration(
112+
FadeInUp(duration: Duration(milliseconds: 1900), child: MaterialButton(
113+
onPressed: () {},
114+
color: Color.fromRGBO(49, 39, 79, 1),
115+
shape: RoundedRectangleBorder(
114116
borderRadius: BorderRadius.circular(50),
115-
color: Color.fromRGBO(49, 39, 79, 1),
116117
),
118+
height: 50,
117119
child: Center(
118120
child: Text("Login", style: TextStyle(color: Colors.white),),
119121
),
120122
)),
121123
SizedBox(height: 30,),
122-
FadeAnimation(2, Center(child: Text("Create Account", style: TextStyle(color: Color.fromRGBO(49, 39, 79, .6)),))),
124+
FadeInUp(duration: Duration(milliseconds: 2000), child: Center(child: TextButton(onPressed: () {}, child: Text("Create Account", style: TextStyle(color: Color.fromRGBO(49, 39, 79, .6)),)))),
123125
],
124126
),
125127
)

0 commit comments

Comments
 (0)