Skip to content

Commit 02d8ac2

Browse files
afgprogrammerafgprogrammer
committed
Fix issue
1 parent c169534 commit 02d8ac2

File tree

12 files changed

+176
-141
lines changed

12 files changed

+176
-141
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: 9 additions & 21 deletions
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 = 1510;
152140
ORGANIZATIONNAME = "The Chromium Authors";
153141
TargetAttributes = {
154142
97C146ED1CF9000F007C117D = {
@@ -193,20 +181,23 @@
193181
/* Begin PBXShellScriptBuildPhase section */
194182
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
195183
isa = PBXShellScriptBuildPhase;
184+
alwaysOutOfDate = 1;
196185
buildActionMask = 2147483647;
197186
files = (
198187
);
199188
inputPaths = (
189+
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
200190
);
201191
name = "Thin Binary";
202192
outputPaths = (
203193
);
204194
runOnlyForDeploymentPostprocessing = 0;
205195
shellPath = /bin/sh;
206-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
196+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
207197
};
208198
9740EEB61CF901F6004384FC /* Run Script */ = {
209199
isa = PBXShellScriptBuildPhase;
200+
alwaysOutOfDate = 1;
210201
buildActionMask = 2147483647;
211202
files = (
212203
);
@@ -255,7 +246,6 @@
255246
/* Begin XCBuildConfiguration section */
256247
249021D3217E4FDB00AE95B9 /* Profile */ = {
257248
isa = XCBuildConfiguration;
258-
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
259249
buildSettings = {
260250
ALWAYS_SEARCH_USER_PATHS = NO;
261251
CLANG_ANALYZER_NONNULL = YES;
@@ -295,7 +285,7 @@
295285
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
296286
GCC_WARN_UNUSED_FUNCTION = YES;
297287
GCC_WARN_UNUSED_VARIABLE = YES;
298-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
288+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
299289
MTL_ENABLE_DEBUG_INFO = NO;
300290
SDKROOT = iphoneos;
301291
TARGETED_DEVICE_FAMILY = "1,2";
@@ -331,7 +321,6 @@
331321
};
332322
97C147031CF9000F007C117D /* Debug */ = {
333323
isa = XCBuildConfiguration;
334-
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
335324
buildSettings = {
336325
ALWAYS_SEARCH_USER_PATHS = NO;
337326
CLANG_ANALYZER_NONNULL = YES;
@@ -377,7 +366,7 @@
377366
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
378367
GCC_WARN_UNUSED_FUNCTION = YES;
379368
GCC_WARN_UNUSED_VARIABLE = YES;
380-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
369+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
381370
MTL_ENABLE_DEBUG_INFO = YES;
382371
ONLY_ACTIVE_ARCH = YES;
383372
SDKROOT = iphoneos;
@@ -387,7 +376,6 @@
387376
};
388377
97C147041CF9000F007C117D /* Release */ = {
389378
isa = XCBuildConfiguration;
390-
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
391379
buildSettings = {
392380
ALWAYS_SEARCH_USER_PATHS = NO;
393381
CLANG_ANALYZER_NONNULL = YES;
@@ -427,7 +415,7 @@
427415
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
428416
GCC_WARN_UNUSED_FUNCTION = YES;
429417
GCC_WARN_UNUSED_VARIABLE = YES;
430-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
418+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
431419
MTL_ENABLE_DEBUG_INFO = NO;
432420
SDKROOT = iphoneos;
433421
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

‎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 = "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/animations/FadeAnimation.dart‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
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),
14-
Tween(begin: 0.0, end: 1.0)
15-
),
16-
Track('translateX').add(Duration(milliseconds: 500),
17-
Tween(begin: 120.0, end: 0.0),
18-
curve: Curves.easeOut
19-
)
20-
]);
21-
return ControlledAnimation(
22-
delay: Duration(milliseconds: (500 * delay).round()),
23-
duration: tween.duration,
24-
tween: tween,
25-
child: child,
26-
builderWithChild: (context, child, animation) => Opacity(
27-
opacity: animation['opacity'],
28-
child: Transform.translate(
29-
offset: Offset(animation['translateX'], 0),
30-
child: child,
31-
),
32-
),
33-
);
34-
}
35-
}
10+
// @override
11+
// Widget build(BuildContext context) {
12+
// final tween = MultiTrackTween([
13+
// Track('opacity').add(Duration(milliseconds: 500),
14+
// Tween(begin: 0.0, end: 1.0)
15+
// ),
16+
// Track('translateX').add(Duration(milliseconds: 500),
17+
// Tween(begin: 120.0, end: 0.0),
18+
// curve: Curves.easeOut
19+
// )
20+
// ]);
21+
// return ControlledAnimation(
22+
// delay: Duration(milliseconds: (500 * delay).round()),
23+
// duration: tween.duration,
24+
// tween: tween,
25+
// child: child,
26+
// builderWithChild: (context, child, animation) => Opacity(
27+
// opacity: animation['opacity'],
28+
// child: Transform.translate(
29+
// offset: Offset(animation['translateX'], 0),
30+
// child: child,
31+
// ),
32+
// ),
33+
// );
34+
// }
35+
// }

‎lib/main.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:flutter/material.dart';
2-
import 'package:food_app/pages/HomePage.dart';
32
import 'package:food_app/pages/StarterPage.dart';
43

54
void main() => runApp(

‎lib/pages/HomePage.dart‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ class _HomePageState extends State<HomePage> {
3131
appBar: AppBar(
3232
backgroundColor: Colors.grey[100],
3333
elevation: 0,
34-
brightness: Brightness.light,
34+
// brightness: Brightness.light,
3535
leading: Icon(null),
3636
actions: <Widget>[
37-
FadeAnimation(1, IconButton(
37+
IconButton(
3838
onPressed: () {},
3939
icon: Icon(Icons.shopping_basket, color: Colors.grey[800],),
40-
))
40+
)
4141
],
4242
),
4343
body: SafeArea(
@@ -49,15 +49,15 @@ class _HomePageState extends State<HomePage> {
4949
child: Column(
5050
crossAxisAlignment: CrossAxisAlignment.start,
5151
children: <Widget>[
52-
FadeAnimation(1, Text('Food Delivery', style: TextStyle(color: Colors.grey[80], fontWeight: FontWeight.bold, fontSize: 30),)),
52+
Text('Food Delivery', style: TextStyle(color: Colors.grey[80], fontWeight: FontWeight.bold, fontSize: 30),),
5353
SizedBox(height: 20,),
5454
Container(
5555
height: 50,
5656
child: ListView.builder(
5757
scrollDirection: Axis.horizontal,
5858
itemCount: categories.length,
5959
itemBuilder: (context, index) =>
60-
FadeAnimation(1, makeCategory(title: categories[index], index: index))
60+
makeCategory(title: categories[index], index: index)
6161
),
6262
// child: ListView(
6363
// scrollDirection: Axis.horizontal,
@@ -74,18 +74,18 @@ class _HomePageState extends State<HomePage> {
7474
],
7575
),
7676
),
77-
FadeAnimation(1, Padding(
77+
Padding(
7878
padding: EdgeInsets.all(20),
7979
child: Text('Free Delivery', style: TextStyle(color: Colors.grey[700], fontSize: 20, fontWeight: FontWeight.bold),),
80-
)),
80+
),
8181
Expanded(
8282
child: Padding(
8383
padding: EdgeInsets.symmetric(horizontal: 20.0),
8484
child: ListView.builder(
8585
scrollDirection: Axis.horizontal,
8686
itemCount: foods.length,
8787
itemBuilder: (context, index) =>
88-
FadeAnimation(1, makeItem(image: foods[index]["image"], isFavorite: foods[index]["isFavorite"], index:index))
88+
makeItem(image: foods[index]["image"], isFavorite: foods[index]["isFavorite"], index:index)
8989
),
9090
// child: ListView(
9191
// scrollDirection: Axis.horizontal,

‎lib/pages/StarterPage.dart‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ class StarterPage extends StatefulWidget {
99
}
1010

1111
class _StarterPageState extends State<StarterPage> with TickerProviderStateMixin{
12-
AnimationController _animationController;
13-
Animation<double> _animation;
12+
late AnimationController _animationController;
13+
late Animation<double> _animation;
1414

1515
bool _textVisible = true;
1616

@@ -48,6 +48,8 @@ class _StarterPageState extends State<StarterPage> with TickerProviderStateMixin
4848

4949
@override
5050
Widget build(BuildContext context) {
51+
final theme = Theme.of(context);
52+
5153
return Scaffold(
5254
body: Container(
5355
decoration: BoxDecoration(
@@ -74,11 +76,10 @@ class _StarterPageState extends State<StarterPage> with TickerProviderStateMixin
7476
crossAxisAlignment: CrossAxisAlignment.start,
7577
mainAxisAlignment: MainAxisAlignment.end,
7678
children: <Widget>[
77-
FadeAnimation(.5, Text('Taking Order For Faster Delivery', style: TextStyle(color: Colors.white, fontSize: 50, fontWeight: FontWeight.bold),)),
78-
SizedBox(height: 20,),
79-
FadeAnimation(1, Text("See resturants nearby by \nadding location", style: TextStyle(color: Colors.white, height: 1.4, fontSize: 18),)),
80-
SizedBox(height: 100,),
81-
FadeAnimation(1.2,
79+
Text('Taking Order For Faster Delivery', style: theme.textTheme.headlineLarge!.copyWith(color: Colors.white, fontWeight: FontWeight.bold),),
80+
SizedBox(height: 16,),
81+
Text("See restaurants nearby by \nadding location", style: theme.textTheme.titleLarge!.copyWith(color: Colors.grey.shade300),),
82+
SizedBox(height: 80,),
8283
ScaleTransition(
8384
scale: _animation,
8485
child: Container(
@@ -101,17 +102,15 @@ class _StarterPageState extends State<StarterPage> with TickerProviderStateMixin
101102
),
102103
)
103104
)),
104-
),
105105
SizedBox(height: 30,),
106-
FadeAnimation(1.4,
107106
AnimatedOpacity(
108107
opacity: _textVisible ? 1.0 : 0.0,
109108
duration: Duration(milliseconds: 50),
110109
child: Align(
111110
child: Text("Now Deliver To Your Door 24/7", style: TextStyle(color: Colors.white70, fontSize: 15),),
112111
),
113-
)),
114-
SizedBox(height: 30,),
112+
),
113+
SizedBox(height: 50,),
115114
],
116115
),
117116
),

0 commit comments

Comments
 (0)