Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit eb27479

Browse files
Fix issue and update animation package
1 parent 095f59e commit eb27479

File tree

11 files changed

+125
-165
lines changed

11 files changed

+125
-165
lines changed

‎ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -135,7 +135,7 @@
135135
97C146E61CF9000F007C117D /* Project object */ = {
136136
isa = PBXProject;
137137
attributes = {
138-
LastUpgradeCheck = 1020;
138+
LastUpgradeCheck = 1430;
139139
ORGANIZATIONNAME = "";
140140
TargetAttributes = {
141141
97C146ED1CF9000F007C117D = {
@@ -179,10 +179,12 @@
179179
/* Begin PBXShellScriptBuildPhase section */
180180
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
181181
isa = PBXShellScriptBuildPhase;
182+
alwaysOutOfDate = 1;
182183
buildActionMask = 2147483647;
183184
files = (
184185
);
185186
inputPaths = (
187+
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
186188
);
187189
name = "Thin Binary";
188190
outputPaths = (
@@ -193,6 +195,7 @@
193195
};
194196
9740EEB61CF901F6004384FC /* Run Script */ = {
195197
isa = PBXShellScriptBuildPhase;
198+
alwaysOutOfDate = 1;
196199
buildActionMask = 2147483647;
197200
files = (
198201
);
@@ -241,7 +244,6 @@
241244
/* Begin XCBuildConfiguration section */
242245
249021D3217E4FDB00AE95B9 /* Profile */ = {
243246
isa = XCBuildConfiguration;
244-
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
245247
buildSettings = {
246248
ALWAYS_SEARCH_USER_PATHS = NO;
247249
CLANG_ANALYZER_NONNULL = YES;
@@ -281,7 +283,7 @@
281283
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
282284
GCC_WARN_UNUSED_FUNCTION = YES;
283285
GCC_WARN_UNUSED_VARIABLE = YES;
284-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
286+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
285287
MTL_ENABLE_DEBUG_INFO = NO;
286288
SDKROOT = iphoneos;
287289
SUPPORTED_PLATFORMS = iphoneos;
@@ -318,7 +320,6 @@
318320
};
319321
97C147031CF9000F007C117D /* Debug */ = {
320322
isa = XCBuildConfiguration;
321-
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
322323
buildSettings = {
323324
ALWAYS_SEARCH_USER_PATHS = NO;
324325
CLANG_ANALYZER_NONNULL = YES;
@@ -364,7 +365,7 @@
364365
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
365366
GCC_WARN_UNUSED_FUNCTION = YES;
366367
GCC_WARN_UNUSED_VARIABLE = YES;
367-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
368+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
368369
MTL_ENABLE_DEBUG_INFO = YES;
369370
ONLY_ACTIVE_ARCH = YES;
370371
SDKROOT = iphoneos;
@@ -374,7 +375,6 @@
374375
};
375376
97C147041CF9000F007C117D /* Release */ = {
376377
isa = XCBuildConfiguration;
377-
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
378378
buildSettings = {
379379
ALWAYS_SEARCH_USER_PATHS = NO;
380380
CLANG_ANALYZER_NONNULL = YES;
@@ -414,7 +414,7 @@
414414
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
415415
GCC_WARN_UNUSED_FUNCTION = YES;
416416
GCC_WARN_UNUSED_VARIABLE = YES;
417-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
417+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
418418
MTL_ENABLE_DEBUG_INFO = NO;
419419
SDKROOT = iphoneos;
420420
SUPPORTED_PLATFORMS = iphoneos;

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

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 4 additions & 0 deletions
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‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎lib/login.dart‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import 'package:animate_do/animate_do.dart';
12
import 'package:flutter/material.dart';
2-
import 'package:login_page_day_23/animation/FadeAnimation.dart';
33

44
class LoginPage extends StatelessWidget {
55
@override
@@ -9,7 +9,6 @@ class LoginPage extends StatelessWidget {
99
backgroundColor: Colors.white,
1010
appBar: AppBar(
1111
elevation: 0,
12-
brightness: Brightness.light,
1312
backgroundColor: Colors.white,
1413
leading: IconButton(
1514
onPressed: () {
@@ -30,12 +29,12 @@ class LoginPage extends StatelessWidget {
3029
children: <Widget>[
3130
Column(
3231
children: <Widget>[
33-
FadeAnimation(1, Text("Login", style: TextStyle(
32+
FadeInUp(duration:Duration(milliseconds:1000), child: Text("Login", style: TextStyle(
3433
fontSize: 30,
3534
fontWeight: FontWeight.bold
3635
),)),
3736
SizedBox(height: 20,),
38-
FadeAnimation(1.2, Text("Login to your account", style: TextStyle(
37+
FadeInUp(duration:Duration(milliseconds:1200), child: Text("Login to your account", style: TextStyle(
3938
fontSize: 15,
4039
color: Colors.grey[700]
4140
),)),
@@ -45,12 +44,12 @@ class LoginPage extends StatelessWidget {
4544
padding: EdgeInsets.symmetric(horizontal: 40),
4645
child: Column(
4746
children: <Widget>[
48-
FadeAnimation(1.2, makeInput(label: "Email")),
49-
FadeAnimation(1.3, makeInput(label: "Password", obscureText: true)),
47+
FadeInUp(duration:Duration(milliseconds:1200), child: makeInput(label: "Email")),
48+
FadeInUp(duration:Duration(milliseconds:1300), child: makeInput(label: "Password", obscureText: true)),
5049
],
5150
),
5251
),
53-
FadeAnimation(1.4, Padding(
52+
FadeInUp(duration:Duration(milliseconds:1400), child: Padding(
5453
padding: EdgeInsets.symmetric(horizontal: 40),
5554
child: Container(
5655
padding: EdgeInsets.only(top: 3, left: 3),
@@ -79,7 +78,7 @@ class LoginPage extends StatelessWidget {
7978
),
8079
),
8180
)),
82-
FadeAnimation(1.5, Row(
81+
FadeInUp(duration:Duration(milliseconds:1500), child: Row(
8382
mainAxisAlignment: MainAxisAlignment.center,
8483
children: <Widget>[
8584
Text("Don't have an account?"),
@@ -91,7 +90,7 @@ class LoginPage extends StatelessWidget {
9190
],
9291
),
9392
),
94-
FadeAnimation(1.2, Container(
93+
FadeInUp(duration:Duration(milliseconds:1200), child: Container(
9594
height: MediaQuery.of(context).size.height / 3,
9695
decoration: BoxDecoration(
9796
image: DecorationImage(
@@ -121,10 +120,10 @@ class LoginPage extends StatelessWidget {
121120
decoration: InputDecoration(
122121
contentPadding: EdgeInsets.symmetric(vertical: 0, horizontal: 10),
123122
enabledBorder: OutlineInputBorder(
124-
borderSide: BorderSide(color: Colors.grey[400])
123+
borderSide: BorderSide(color: Colors.grey.shade400)
125124
),
126125
border: OutlineInputBorder(
127-
borderSide: BorderSide(color: Colors.grey[400])
126+
borderSide: BorderSide(color: Colors.grey.shade400)
128127
),
129128
),
130129
),

‎lib/main.dart‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
import 'package:animate_do/animate_do.dart';
12
import 'package:flutter/material.dart';
2-
import 'package:flutter/widgets.dart';
3-
import 'package:login_page_day_23/animation/FadeAnimation.dart';
43
import 'package:login_page_day_23/login.dart';
54
import 'package:login_page_day_23/signup.dart';
65

@@ -28,20 +27,20 @@ class HomePage extends StatelessWidget {
2827
children: <Widget>[
2928
Column(
3029
children: <Widget>[
31-
FadeAnimation(1, Text("Welcome", style: TextStyle(
30+
FadeInUp(duration:Duration(milliseconds:1000), child:Text("Welcome", style: TextStyle(
3231
fontWeight: FontWeight.bold,
3332
fontSize: 30
3433
),)),
3534
SizedBox(height: 20,),
36-
FadeAnimation(1.2, Text("Automatic identity verification which enables you to verify your identity",
35+
FadeInUp(duration:Duration(milliseconds:1200), child: Text("Automatic identity verification which enables you to verify your identity",
3736
textAlign: TextAlign.center,
3837
style: TextStyle(
3938
color: Colors.grey[700],
4039
fontSize: 15
4140
),)),
4241
],
4342
),
44-
FadeAnimation(1.4, Container(
43+
FadeInUp(duration:Duration(milliseconds:1400), child: Container(
4544
height: MediaQuery.of(context).size.height / 3,
4645
decoration: BoxDecoration(
4746
image: DecorationImage(
@@ -51,7 +50,7 @@ class HomePage extends StatelessWidget {
5150
)),
5251
Column(
5352
children: <Widget>[
54-
FadeAnimation(1.5, MaterialButton(
53+
FadeInUp(duration:Duration(milliseconds:1500), child: MaterialButton(
5554
minWidth: double.infinity,
5655
height: 60,
5756
onPressed: () {
@@ -69,7 +68,7 @@ class HomePage extends StatelessWidget {
6968
),),
7069
)),
7170
SizedBox(height: 20,),
72-
FadeAnimation(1.6, Container(
71+
FadeInUp(duration:Duration(milliseconds:1600), child: Container(
7372
padding: EdgeInsets.only(top: 3, left: 3),
7473
decoration: BoxDecoration(
7574
borderRadius: BorderRadius.circular(50),

‎lib/signup.dart‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import 'package:animate_do/animate_do.dart';
12
import 'package:flutter/material.dart';
2-
import 'package:login_page_day_23/animation/FadeAnimation.dart';
33

44
class SignupPage extends StatelessWidget {
55
@override
@@ -9,7 +9,6 @@ class SignupPage extends StatelessWidget {
99
backgroundColor: Colors.white,
1010
appBar: AppBar(
1111
elevation: 0,
12-
brightness: Brightness.light,
1312
backgroundColor: Colors.white,
1413
leading: IconButton(
1514
onPressed: () {
@@ -28,25 +27,25 @@ class SignupPage extends StatelessWidget {
2827
children: <Widget>[
2928
Column(
3029
children: <Widget>[
31-
FadeAnimation(1, Text("Sign up", style: TextStyle(
30+
FadeInUp(duration:Duration(milliseconds:1000), child: Text("Sign up", style: TextStyle(
3231
fontSize: 30,
3332
fontWeight: FontWeight.bold
3433
),)),
3534
SizedBox(height: 20,),
36-
FadeAnimation(1.2, Text("Create an account, It's free", style: TextStyle(
35+
FadeInUp(duration:Duration(milliseconds:1200), child: Text("Create an account, It's free", style: TextStyle(
3736
fontSize: 15,
3837
color: Colors.grey[700]
3938
),)),
4039
],
4140
),
4241
Column(
4342
children: <Widget>[
44-
FadeAnimation(1.2, makeInput(label: "Email")),
45-
FadeAnimation(1.3, makeInput(label: "Password", obscureText: true)),
46-
FadeAnimation(1.4, makeInput(label: "Confirm Password", obscureText: true)),
43+
FadeInUp(duration:Duration(milliseconds:1200), child: makeInput(label: "Email")),
44+
FadeInUp(duration:Duration(milliseconds:1300), child: makeInput(label: "Password", obscureText: true)),
45+
FadeInUp(duration:Duration(milliseconds:1400), child: makeInput(label: "Confirm Password", obscureText: true)),
4746
],
4847
),
49-
FadeAnimation(1.5, Container(
48+
FadeInUp(duration:Duration(milliseconds:1500), child: Container(
5049
padding: EdgeInsets.only(top: 3, left: 3),
5150
decoration: BoxDecoration(
5251
borderRadius: BorderRadius.circular(50),
@@ -72,7 +71,7 @@ class SignupPage extends StatelessWidget {
7271
),),
7372
),
7473
)),
75-
FadeAnimation(1.6, Row(
74+
FadeInUp(duration:Duration(milliseconds:1600), child: Row(
7675
mainAxisAlignment: MainAxisAlignment.center,
7776
children: <Widget>[
7877
Text("Already have an account?"),
@@ -103,10 +102,10 @@ class SignupPage extends StatelessWidget {
103102
decoration: InputDecoration(
104103
contentPadding: EdgeInsets.symmetric(vertical: 0, horizontal: 10),
105104
enabledBorder: OutlineInputBorder(
106-
borderSide: BorderSide(color: Colors.grey[400])
105+
borderSide: BorderSide(color: Colors.grey.shade400)
107106
),
108107
border: OutlineInputBorder(
109-
borderSide: BorderSide(color: Colors.grey[400])
108+
borderSide: BorderSide(color: Colors.grey.shade400)
110109
),
111110
),
112111
),

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /