diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh index c743a0a..7a8007f 100755 --- a/ios/Flutter/flutter_export_environment.sh +++ b/ios/Flutter/flutter_export_environment.sh @@ -1,10 +1,15 @@ #!/bin/sh # This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=/home/shivanchal/flutter" -export "FLUTTER_APPLICATION_PATH=/home/shivanchal/projects_flutter/flutter_Flipkart_UI_clone_original" -export "FLUTTER_TARGET=lib/main.dart" +export "FLUTTER_ROOT=C:\src\flutter" +export "FLUTTER_APPLICATION_PATH=E:\summer_course_android\git_demo\flutter_Ecommerce_UI_clone" +export "FLUTTER_TARGET=lib\main.dart" export "FLUTTER_BUILD_DIR=build" -export "SYMROOT=${SOURCE_ROOT}/../build/ios" -export "FLUTTER_FRAMEWORK_DIR=/home/shivanchal/flutter/bin/cache/artifacts/engine/ios" +export "SYMROOT=${SOURCE_ROOT}/../build\ios" +export "OTHER_LDFLAGS=$(inherited) -framework Flutter" +export "FLUTTER_FRAMEWORK_DIR=C:\src\flutter\bin\cache\artifacts\engine\ios" export "FLUTTER_BUILD_NAME=1.0.0" export "FLUTTER_BUILD_NUMBER=1" +export "DART_OBFUSCATION=false" +export "TRACK_WIDGET_CREATION=false" +export "TREE_SHAKE_ICONS=false" +export "PACKAGE_CONFIG=.packages" diff --git a/lib/src/splash/splash_screens.dart b/lib/src/splash/splash_screens.dart index e6441d8..87e2f1d 100644 --- a/lib/src/splash/splash_screens.dart +++ b/lib/src/splash/splash_screens.dart @@ -31,7 +31,7 @@ class SplashScreenState extends State animationController = new AnimationController( vsync: this, duration: new Duration(seconds: 2)); animation = - new CurvedAnimation(parent: animationController, curve: Curves.easeOut); + new CurvedAnimation(parent: animationController, curve: Curves.easeOut); animation.addListener(() => this.setState(() {})); animationController.forward(); @@ -52,18 +52,22 @@ class SplashScreenState extends State mainAxisAlignment: MainAxisAlignment.end, mainAxisSize: MainAxisSize.min, children: [ - - Padding(padding: EdgeInsets.only(bottom: 30.0),child:new Image.asset('assets/powered_by.png',height: 25.0,fit: BoxFit.scaleDown,)) - - - ],), + Padding( + padding: EdgeInsets.only(bottom: 30.0), + child: new Image.asset( + 'assets/powered_by.png', + height: 35.0, + fit: BoxFit.scaleDown, + )) + ], + ), new Column( mainAxisAlignment: MainAxisAlignment.center, children: [ new Image.asset( 'assets/logo.png', - width: animation.value * 250, - height: animation.value * 250, + width: animation.value * 300, + height: animation.value * 300, ), ], ), @@ -71,4 +75,4 @@ class SplashScreenState extends State ), ); } -} \ No newline at end of file +} diff --git a/lib/src/ui/body.dart b/lib/src/ui/body.dart index 1d2a49e..f31b686 100644 --- a/lib/src/ui/body.dart +++ b/lib/src/ui/body.dart @@ -16,52 +16,55 @@ class _BodyState extends State { @override Widget build(BuildContext context) { return SafeArea( - child: ListView( - children: [ - Container( - height: MediaQuery.of(context).size.height / 11, - color: Color(0xff2874F0), - child: Padding( - padding: const EdgeInsets.all(8), - child: Container( - alignment: Alignment.center, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(5), - color: Colors.white), - child: InkWell( - child: Row( - children: [ - Padding( - padding: const EdgeInsets.only(left: 10), - child: Icon(Icons.search), - ), - Padding( - padding: const EdgeInsets.only(left: 10), - child: Text( - 'Search for Products, Brands and More', - style: TextStyle(color: Colors.grey), + child: Container( + color: Colors.white, + child: ListView( + children: [ + Container( + height: MediaQuery.of(context).size.height / 11, + color: Color(0xff2874F0), + child: Padding( + padding: const EdgeInsets.all(8), + child: Container( + alignment: Alignment.center, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(5), + color: Colors.white), + child: InkWell( + child: Row( + children: [ + Padding( + padding: const EdgeInsets.only(left: 10), + child: Icon(Icons.search), ), - ), - ], + Padding( + padding: const EdgeInsets.only(left: 10), + child: Text( + 'Search for Products, Brands and More', + style: TextStyle(color: Colors.grey), + ), + ), + ], + ), ), ), ), ), - ), - Firstlist(), - Secondlist(), - Thirdlist(), - Fourthlist(), - SizedBox( - height: 5, - ), - Fifthlist(), - Sixthlist(), - Seventhlist(), - SizedBox( - height: 5, - ) - ], + Firstlist(), + Secondlist(), + Thirdlist(), + Fourthlist(), + SizedBox( + height: 5, + ), + Fifthlist(), + Sixthlist(), + Seventhlist(), + SizedBox( + height: 5, + ) + ], + ), ), ); } diff --git a/lib/src/ui/widgets/DealsOfTheDay.dart b/lib/src/ui/widgets/DealsOfTheDay.dart index 696b68c..48b0ff1 100644 --- a/lib/src/ui/widgets/DealsOfTheDay.dart +++ b/lib/src/ui/widgets/DealsOfTheDay.dart @@ -41,7 +41,7 @@ class _FourthlistState extends State { child: Column( children: [ Container( - height: MediaQuery.of(context).size.height / 6.5, + height: MediaQuery.of(context).size.height / 6, width: MediaQuery.of(context).size.width / 4, child: Image.asset(deal[index].imageUrl), ), diff --git a/lib/src/ui/widgets/Drawerfile.dart b/lib/src/ui/widgets/Drawerfile.dart index a173edf..915bf7a 100644 --- a/lib/src/ui/widgets/Drawerfile.dart +++ b/lib/src/ui/widgets/Drawerfile.dart @@ -54,7 +54,7 @@ class _DrawerfileState extends State { drawerItemModel.add(DrawerItemModel("Gift Card", null)); drawerItemModel.add(DrawerItemModel("My Chats", null)); drawerItemModel.add(DrawerItemModel("Help Centre", null)); - drawerItemModel.add(DrawerItemModel("Legal", null)); + drawerItemModel.add(DrawerItemModel("Logout", null)); } buildItem(BuildContext context, int index) { diff --git a/lib/src/ui/widgets/FeaturedBrand.dart b/lib/src/ui/widgets/FeaturedBrand.dart index 2366e5d..2e477cb 100644 --- a/lib/src/ui/widgets/FeaturedBrand.dart +++ b/lib/src/ui/widgets/FeaturedBrand.dart @@ -9,6 +9,7 @@ class _FifthlistState extends State { @override Widget build(BuildContext context) { return Container( + color: Colors.white, height: MediaQuery.of(context).size.height / 2.45, width: MediaQuery.of(context).size.width, child: Card( diff --git a/pubspec.lock b/pubspec.lock index a48c6ef..3c64e9e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,62 +1,48 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - archive: - dependency: transitive - description: - name: archive - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.11" - args: - dependency: transitive - description: - name: args - url: "https://pub.dartlang.org" - source: hosted - version: "1.5.2" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.4.0" + version: "2.4.2" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" - charcode: + version: "2.0.0" + characters: dependency: transitive description: - name: charcode + name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" - collection: + version: "1.0.0" + charcode: dependency: transitive description: - name: collection + name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.14.11" - convert: + version: "1.1.3" + clock: dependency: transitive description: - name: convert + name: clock url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" - crypto: + version: "1.0.1" + collection: dependency: transitive description: - name: crypto + name: collection url: "https://pub.dartlang.org" source: hosted - version: "2.1.3" + version: "1.14.13" cupertino_icons: dependency: "direct main" description: @@ -64,6 +50,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.2" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" flutter: dependency: "direct main" description: flutter @@ -74,20 +67,13 @@ packages: description: flutter source: sdk version: "0.0.0" - image: - dependency: transitive - description: - name: image - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.4" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.6" + version: "0.12.8" meta: dependency: transitive description: @@ -101,28 +87,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.6.4" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0+1" - petitparser: - dependency: transitive - description: - name: petitparser - url: "https://pub.dartlang.org" - source: hosted - version: "2.4.0" - quiver: - dependency: transitive - description: - name: quiver - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.5" + version: "1.7.0" sky_engine: dependency: transitive description: flutter @@ -134,14 +99,14 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.5.5" + version: "1.7.0" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.3" + version: "1.9.5" stream_channel: dependency: transitive description: @@ -169,14 +134,14 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.11" + version: "0.2.17" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.2.0" vector_math: dependency: transitive description: @@ -184,12 +149,5 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.8" - xml: - dependency: transitive - description: - name: xml - url: "https://pub.dartlang.org" - source: hosted - version: "3.5.0" sdks: - dart: ">=2.4.0 <3.0.0" + dart: ">=2.9.0-14.0.dev <3.0.0"