Skip to content

Commit 1e92006

Browse files
afgprogrammerafgprogrammer
committed
Update repo
1 parent d93dac3 commit 1e92006

File tree

12 files changed

+142
-155
lines changed

12 files changed

+142
-155
lines changed

‎assets/images/watch-1.jpg‎

-785 KB
Loading

‎assets/images/watch-2.jpg‎

-2.13 MB
Loading

‎assets/images/watch-3.jpg‎

-1.4 MB
Loading

‎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: 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 = 1430;
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 = 11.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 = 11.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 = 11.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 = "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/main.dart‎

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:day18_carousel/Animation/FadeAnimation.dart';
1+
import 'package:animate_do/animate_do.dart';
22
import 'package:flutter/material.dart';
33

44
void main() => runApp(
@@ -69,9 +69,9 @@ class _HomePageState extends State<HomePage> {
6969
_next();
7070
}
7171
},
72-
child: FadeAnimation(.8, Container(
72+
child: FadeInUp(duration: Duration(milliseconds: 800), child: Container(
7373
width: double.infinity,
74-
height: 550,
74+
height: 600,
7575
decoration: BoxDecoration(
7676
image: DecorationImage(
7777
image: AssetImage(products[currentIndex][0]),
@@ -83,15 +83,15 @@ class _HomePageState extends State<HomePage> {
8383
gradient: LinearGradient(
8484
begin: Alignment.bottomRight,
8585
colors: [
86-
Colors.grey[700].withOpacity(.9),
86+
Colors.grey.shade700.withOpacity(.9),
8787
Colors.grey.withOpacity(.0),
8888
]
8989
)
9090
),
9191
child: Column(
9292
mainAxisAlignment: MainAxisAlignment.end,
9393
children: <Widget>[
94-
FadeAnimation(1, Container(
94+
FadeInUp(duration: Duration(milliseconds: 1000), child: Container(
9595
width: 90,
9696
margin: EdgeInsets.only(bottom: 60),
9797
child: Row(
@@ -106,7 +106,7 @@ class _HomePageState extends State<HomePage> {
106106
Expanded(
107107
child: Transform.translate(
108108
offset: Offset(0, -40),
109-
child: FadeAnimation(1, Container(
109+
child: FadeInUp(duration: Duration(milliseconds: 1000), child: Container(
110110
width: double.infinity,
111111
padding: EdgeInsets.all(30),
112112
decoration: BoxDecoration(
@@ -115,41 +115,42 @@ class _HomePageState extends State<HomePage> {
115115
),
116116
child: Column(
117117
crossAxisAlignment: CrossAxisAlignment.start,
118+
mainAxisAlignment: MainAxisAlignment.spaceBetween,
118119
children: <Widget>[
119-
FadeAnimation(1.3, Text(products[currentIndex][1], style: TextStyle(color: Colors.grey[800], fontSize: 50, fontWeight: FontWeight.bold),)),
120-
SizedBox(height: 15,),
121-
Row(
122-
children: <Widget>[
123-
FadeAnimation(1.4, Text(products[currentIndex][2], style: TextStyle(color: Colors.yellow[700], fontWeight: FontWeight.bold, fontSize: 20),)),
124-
SizedBox(width: 10,),
125-
FadeAnimation(1.5, Row(
120+
Column(
121+
children: [
122+
FadeInUp(duration: Duration(milliseconds: 1300), child: Text(products[currentIndex][1], style: TextStyle(color: Colors.grey[800], fontSize: 40, fontWeight: FontWeight.bold),)),
123+
SizedBox(height: 15,),
124+
Row(
126125
children: <Widget>[
127-
Icon(Icons.star, size: 18, color: Colors.yellow[700],),
128-
Icon(Icons.star, size: 18, color: Colors.yellow[700],),
129-
Icon(Icons.star, size: 18, color: Colors.yellow[700],),
130-
Icon(Icons.star, size: 18, color: Colors.yellow[700],),
131-
Icon(Icons.star_half, size: 18, color: Colors.yellow[700],),
132-
SizedBox(width: 5,),
133-
Text("(4.2/70 reviews)", style: TextStyle(color: Colors.grey, fontSize: 12),)
126+
FadeInUp(duration: Duration(milliseconds: 1400), child: Text(products[currentIndex][2], style: TextStyle(color: Colors.yellow[700], fontWeight: FontWeight.bold, fontSize: 20),)),
127+
SizedBox(width: 10,),
128+
FadeInUp(duration: Duration(milliseconds: 1500), child: Row(
129+
children: <Widget>[
130+
Icon(Icons.star, size: 18, color: Colors.yellow[700],),
131+
Icon(Icons.star, size: 18, color: Colors.yellow[700],),
132+
Icon(Icons.star, size: 18, color: Colors.yellow[700],),
133+
Icon(Icons.star, size: 18, color: Colors.yellow[700],),
134+
Icon(Icons.star_half, size: 18, color: Colors.yellow[700],),
135+
SizedBox(width: 5,),
136+
Text("(4.2/70 reviews)", style: TextStyle(color: Colors.grey, fontSize: 12),)
137+
],
138+
))
134139
],
135-
))
140+
),
136141
],
137142
),
138-
Expanded(
139-
child: Align(
140-
alignment: Alignment.bottomCenter,
141-
child: FadeAnimation(1.7, Container(
142-
height: 45,
143-
decoration: BoxDecoration(
144-
color: Colors.yellow[700],
145-
borderRadius: BorderRadius.circular(8)
146-
),
147-
child: Center(
148-
child: Text("ADD TO CART", style: TextStyle(fontWeight: FontWeight.bold),),
149-
),
150-
)),
143+
FadeInUp(duration: Duration(milliseconds: 1700), child: MaterialButton(
144+
onPressed: () {},
145+
height: 45,
146+
color: Colors.yellow[700],
147+
shape: RoundedRectangleBorder(
148+
borderRadius: BorderRadius.circular(8)
151149
),
152-
)
150+
child: Center(
151+
child: Text("ADD TO CART", style: TextStyle(fontWeight: FontWeight.bold),),
152+
),
153+
)),
153154
],
154155
),
155156
)),

0 commit comments

Comments
 (0)