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 98e43dc

Browse files
Fixed issue running in new flutter versions
1 parent d3f254e commit 98e43dc

File tree

13 files changed

+198
-121
lines changed

13 files changed

+198
-121
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>12.0</string>
2525
</dict>
2626
</plist>

‎ios/Runner.xcodeproj/project.pbxproj

Lines changed: 8 additions & 5 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 */
@@ -127,7 +127,7 @@
127127
97C146E61CF9000F007C117D /* Project object */ = {
128128
isa = PBXProject;
129129
attributes = {
130-
LastUpgradeCheck = 1020;
130+
LastUpgradeCheck = 1510;
131131
ORGANIZATIONNAME = "";
132132
TargetAttributes = {
133133
97C146ED1CF9000F007C117D = {
@@ -171,10 +171,12 @@
171171
/* Begin PBXShellScriptBuildPhase section */
172172
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
173173
isa = PBXShellScriptBuildPhase;
174+
alwaysOutOfDate = 1;
174175
buildActionMask = 2147483647;
175176
files = (
176177
);
177178
inputPaths = (
179+
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
178180
);
179181
name = "Thin Binary";
180182
outputPaths = (
@@ -185,6 +187,7 @@
185187
};
186188
9740EEB61CF901F6004384FC /* Run Script */ = {
187189
isa = PBXShellScriptBuildPhase;
190+
alwaysOutOfDate = 1;
188191
buildActionMask = 2147483647;
189192
files = (
190193
);
@@ -272,7 +275,7 @@
272275
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
273276
GCC_WARN_UNUSED_FUNCTION = YES;
274277
GCC_WARN_UNUSED_VARIABLE = YES;
275-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
278+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
276279
MTL_ENABLE_DEBUG_INFO = NO;
277280
SDKROOT = iphoneos;
278281
SUPPORTED_PLATFORMS = iphoneos;
@@ -346,7 +349,7 @@
346349
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
347350
GCC_WARN_UNUSED_FUNCTION = YES;
348351
GCC_WARN_UNUSED_VARIABLE = YES;
349-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
352+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
350353
MTL_ENABLE_DEBUG_INFO = YES;
351354
ONLY_ACTIVE_ARCH = YES;
352355
SDKROOT = iphoneos;
@@ -395,7 +398,7 @@
395398
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
396399
GCC_WARN_UNUSED_FUNCTION = YES;
397400
GCC_WARN_UNUSED_VARIABLE = YES;
398-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
401+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
399402
MTL_ENABLE_DEBUG_INFO = NO;
400403
SDKROOT = iphoneos;
401404
SUPPORTED_PLATFORMS = iphoneos;

‎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 = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎ios/Runner/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import UIKit
22
import Flutter
33

4-
@UIApplicationMain
4+
@main
55
@objc class AppDelegate: FlutterAppDelegate {
66
override func application(
77
_ application: UIApplication,

‎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: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
import 'package:flutter/material.dart';
2-
import 'package:simple_animations/simple_animations.dart';
1+
// import 'package:flutter/material.dart';
2+
// import 'package:simple_animations/simple_animations.dart';
33

4-
class FadeAnimation extends StatelessWidget {
5-
final double delay;
6-
final Widget child;
4+
// class FadeAnimation extends StatelessWidget {
5+
// final double delay;
6+
// final Widget child;
77

8-
FadeAnimation(this.delay, this.child);
8+
// FadeAnimation(this.delay, this.child);
99

10-
@override
11-
Widget build(BuildContext context) {
12-
final tween = MultiTrackTween([
13-
Track("opacity").add(Duration(milliseconds: 500), Tween(begin: 0.0, end: 1.0)),
14-
Track("translateY").add(
15-
Duration(milliseconds: 500), Tween(begin: -30.0, end: 0.0),
16-
curve: Curves.easeOut)
17-
]);
10+
// @override
11+
// Widget build(BuildContext context) {
12+
// final tween = MultiTrackTween([
13+
// Track("opacity").add(Duration(milliseconds: 500), Tween(begin: 0.0, end: 1.0)),
14+
// Track("translateY").add(
15+
// Duration(milliseconds: 500), Tween(begin: -30.0, end: 0.0),
16+
// curve: Curves.easeOut)
17+
// ]);
1818

19-
return ControlledAnimation(
20-
delay: Duration(milliseconds: (500 * delay).round()),
21-
duration: tween.duration,
22-
tween: tween,
23-
child: child,
24-
builderWithChild: (context, child, animation) => Opacity(
25-
opacity: (animation as Map)["opacity"],
26-
child: Transform.translate(
27-
offset: Offset(0, animation["translateY"]),
28-
child: child
29-
),
30-
),
31-
);
32-
}
33-
}
19+
// return ControlledAnimation(
20+
// delay: Duration(milliseconds: (500 * delay).round()),
21+
// duration: tween.duration,
22+
// tween: tween,
23+
// child: child,
24+
// builderWithChild: (context, child, animation) => Opacity(
25+
// opacity: (animation as Map)["opacity"],
26+
// child: Transform.translate(
27+
// offset: Offset(0, animation["translateY"]),
28+
// child: child
29+
// ),
30+
// ),
31+
// );
32+
// }
33+
// }

‎lib/pages/cleaning.dart

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:day35/animation/FadeAnimation.dart';
1+
import 'package:animate_do/animate_do.dart';
22
import 'package:day35/pages/date_time.dart';
33
import 'package:flutter/material.dart';
44

@@ -48,7 +48,7 @@ class _CleaningPageState extends State<CleaningPage> {
4848
headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
4949
return <Widget>[
5050
SliverToBoxAdapter(
51-
child: FadeAnimation(1, Padding(
51+
child: FadeInUp(child: Padding(
5252
padding: EdgeInsets.only(top: 120.0, right: 20.0, left: 20.0),
5353
child: Text(
5454
'Where do you want \ncleaned?',
@@ -68,7 +68,10 @@ class _CleaningPageState extends State<CleaningPage> {
6868
physics: NeverScrollableScrollPhysics(),
6969
itemCount: _rooms.length,
7070
itemBuilder: (BuildContext context, int index) {
71-
return FadeAnimation((1.2 + index) / 4, room(_rooms[index], index));
71+
return FadeInUp(
72+
delay: Duration(milliseconds: 500 * index),
73+
duration: Duration(milliseconds: 500),
74+
child: room(_rooms[index], index));
7275
}
7376
),
7477
),

‎lib/pages/date_time.dart

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:day35/animation/FadeAnimation.dart';
1+
import 'package:animate_do/animate_do.dart';
22
import 'package:day35/pages/home.dart';
33
import 'package:flutter/material.dart';
44
import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
@@ -148,7 +148,7 @@ class _DateAndTimeState extends State<DateAndTime> {
148148
headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
149149
return <Widget>[
150150
SliverToBoxAdapter(
151-
child: FadeAnimation(1, Padding(
151+
child: FadeInUp(child: Padding(
152152
padding: EdgeInsets.only(top: 120.0, right: 20.0, left: 20.0),
153153
child: Text(
154154
'Select Date \nand Time',
@@ -168,7 +168,7 @@ class _DateAndTimeState extends State<DateAndTime> {
168168
crossAxisAlignment: CrossAxisAlignment.start,
169169
children: [
170170
SizedBox(height: 30,),
171-
FadeAnimation(1, Row(
171+
FadeInUp(child: Row(
172172
children: [
173173
Text("October 2021"),
174174
Spacer(),
@@ -190,7 +190,9 @@ class _DateAndTimeState extends State<DateAndTime> {
190190
scrollDirection: Axis.horizontal,
191191
itemCount: _days.length,
192192
itemBuilder: (BuildContext context, int index) {
193-
return FadeAnimation((1 + index) / 6, GestureDetector(
193+
return FadeInUp(
194+
delay: Duration(milliseconds: 500 * index),
195+
child: GestureDetector(
194196
onTap: () {
195197
setState(() {
196198
_selectedDay = _days[index][0];
@@ -221,7 +223,7 @@ class _DateAndTimeState extends State<DateAndTime> {
221223
),
222224
),
223225
SizedBox(height: 10,),
224-
FadeAnimation(1.2, Container(
226+
FadeInUp(child: Container(
225227
height: 60,
226228
decoration: BoxDecoration(
227229
borderRadius: BorderRadius.circular(10),
@@ -262,7 +264,7 @@ class _DateAndTimeState extends State<DateAndTime> {
262264
),
263265
)),
264266
SizedBox(height: 40,),
265-
FadeAnimation(1.2, Text("Repeat", style: TextStyle(fontSize: 18, fontWeight: FontWeight.w600),)),
267+
FadeInUp(child: Text("Repeat", style: TextStyle(fontSize: 18, fontWeight: FontWeight.w600),)),
266268
SizedBox(height: 10,),
267269
Container(
268270
height: 50,
@@ -280,7 +282,9 @@ class _DateAndTimeState extends State<DateAndTime> {
280282
_selectedRepeat = index;
281283
});
282284
},
283-
child: FadeAnimation((1.2 + index) / 4, Container(
285+
child: FadeInUp(
286+
delay: Duration(milliseconds: 500 * index),
287+
child: Container(
284288
padding: EdgeInsets.symmetric(horizontal: 20),
285289
decoration: BoxDecoration(
286290
borderRadius: BorderRadius.circular(15),
@@ -296,7 +300,7 @@ class _DateAndTimeState extends State<DateAndTime> {
296300
)
297301
),
298302
SizedBox(height: 40,),
299-
FadeAnimation(1.4, Text("Additional Service", style: TextStyle(fontSize: 18, fontWeight: FontWeight.w600),)),
303+
FadeInUp(child: Text("Additional Service", style: TextStyle(fontSize: 18, fontWeight: FontWeight.w600),)),
300304
SizedBox(height: 10,),
301305
Container(
302306
height: 120,
@@ -318,7 +322,9 @@ class _DateAndTimeState extends State<DateAndTime> {
318322
}
319323
});
320324
},
321-
child: FadeAnimation((1.4 + index) / 4, Container(
325+
child: FadeInUp(
326+
delay: Duration(milliseconds: 500 * index),
327+
child: Container(
322328
width: 110,
323329
decoration: BoxDecoration(
324330
borderRadius: BorderRadius.circular(15),

‎lib/pages/home.dart

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:day35/animation/FadeAnimation.dart';
1+
import 'package:animate_do/animate_do.dart';
22
import 'package:day35/models/service.dart';
33
import 'package:flutter/material.dart';
44

@@ -53,7 +53,7 @@ class _HomePageState extends State<HomePage> {
5353
body: SingleChildScrollView(
5454
child: Column(
5555
children: [
56-
FadeAnimation(1, Padding(
56+
FadeInUp(child: Padding(
5757
padding: EdgeInsets.only(left: 20.0, top: 10.0, right: 10.0),
5858
child: Row(
5959
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -66,7 +66,7 @@ class _HomePageState extends State<HomePage> {
6666
],
6767
),
6868
)),
69-
FadeAnimation(1.2, Padding(
69+
FadeInUp(child: Padding(
7070
padding: EdgeInsets.symmetric(horizontal: 20.0),
7171
child: Container(
7272
padding: EdgeInsets.all(20.0),
@@ -117,7 +117,7 @@ class _HomePageState extends State<HomePage> {
117117
),
118118
)),
119119
SizedBox(height: 20,),
120-
FadeAnimation(1.3, Padding(
120+
FadeInUp(child: Padding(
121121
padding: EdgeInsets.only(left: 20.0, right: 10.0),
122122
child: Row(
123123
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -143,12 +143,14 @@ class _HomePageState extends State<HomePage> {
143143
physics: NeverScrollableScrollPhysics(),
144144
itemCount: services.length,
145145
itemBuilder: (BuildContext context, int index) {
146-
return FadeAnimation((1.0 + index) / 4, serviceContainer(services[index].imageURL, services[index].name, index));
146+
return FadeInUp(
147+
delay: Duration(milliseconds: 500 * index),
148+
child: serviceContainer(services[index].imageURL, services[index].name, index));
147149
}
148150
),
149151
),
150152
SizedBox(height: 20,),
151-
FadeAnimation(1.3, Padding(
153+
FadeInUp(child: Padding(
152154
padding: EdgeInsets.only(left: 20.0, right: 10.0),
153155
child: Row(
154156
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -168,7 +170,9 @@ class _HomePageState extends State<HomePage> {
168170
scrollDirection: Axis.horizontal,
169171
itemCount: workers.length,
170172
itemBuilder: (BuildContext context, int index) {
171-
return FadeAnimation((1.0 + index) / 4, workerContainer(workers[index][0], workers[index][1], workers[index][2], workers[index][3]));
173+
return FadeInUp(
174+
delay: Duration(milliseconds: 500 * index),
175+
child: workerContainer(workers[index][0], workers[index][1], workers[index][2], workers[index][3]));
172176
}
173177
),
174178
),

‎lib/pages/select_service.dart

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
import 'package:day35/animation/FadeAnimation.dart';
1+
import 'package:animate_do/animate_do.dart';
32
import 'package:day35/models/service.dart';
43
import 'package:day35/pages/cleaning.dart';
54
import 'package:flutter/material.dart';
@@ -47,7 +46,7 @@ class _SelectServiceState extends State<SelectService> {
4746
headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
4847
return <Widget>[
4948
SliverToBoxAdapter(
50-
child: FadeAnimation(1.2, Padding(
49+
child: FadeInUp(child: Padding(
5150
padding: EdgeInsets.only(top: 120.0, right: 20.0, left: 20.0),
5251
child: Text(
5352
'Which service \ndo you need?',
@@ -77,7 +76,9 @@ class _SelectServiceState extends State<SelectService> {
7776
physics: NeverScrollableScrollPhysics(),
7877
itemCount: services.length,
7978
itemBuilder: (BuildContext context, int index) {
80-
return FadeAnimation((1.0 + index) / 4, serviceContainer(services[index].imageURL, services[index].name, index));
79+
return FadeInUp(
80+
delay: Duration(milliseconds: 500 * index),
81+
child: serviceContainer(services[index].imageURL, services[index].name, index));
8182
}
8283
),
8384
),

0 commit comments

Comments
(0)

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