Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

minor UI changes #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions ios/Flutter/flutter_export_environment.sh
Original file line number Diff line number Diff line change
@@ -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"
22 changes: 13 additions & 9 deletions lib/src/splash/splash_screens.dart
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class SplashScreenState extends State<AnimatedSplashScreen>
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();
Expand All @@ -52,23 +52,27 @@ class SplashScreenState extends State<AnimatedSplashScreen>
mainAxisAlignment: MainAxisAlignment.end,
mainAxisSize: MainAxisSize.min,
children: <Widget>[

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: <Widget>[
new Image.asset(
'assets/logo.png',
width: animation.value * 250,
height: animation.value * 250,
width: animation.value * 300,
height: animation.value * 300,
),
],
),
],
),
);
}
}
}
85 changes: 44 additions & 41 deletions lib/src/ui/body.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,52 +16,55 @@ class _BodyState extends State<Body> {
@override
Widget build(BuildContext context) {
return SafeArea(
child: ListView(
children: <Widget>[
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: <Widget>[
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: <Widget>[
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: <Widget>[
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,
)
],
),
),
);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/ui/widgets/DealsOfTheDay.dart
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class _FourthlistState extends State<Fourthlist> {
child: Column(
children: <Widget>[
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),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/src/ui/widgets/Drawerfile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class _DrawerfileState extends State<Drawerfile> {
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) {
Expand Down
1 change: 1 addition & 0 deletions lib/src/ui/widgets/FeaturedBrand.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class _FifthlistState extends State<Fifthlist> {
@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(
Expand Down
98 changes: 28 additions & 70 deletions pubspec.lock
Original file line number Diff line number Diff line change
@@ -1,69 +1,62 @@
# 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:
name: cupertino_icons
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
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -169,27 +134,20 @@ 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:
name: vector_math
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"