diff --git a/android/app/src/main/res/ic_launcher-web.png b/android/app/src/main/res/ic_launcher-web.png new file mode 100644 index 0000000..99f12ba Binary files /dev/null and b/android/app/src/main/res/ic_launcher-web.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index db77bb4..228954a 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 17987b7..888170b 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 09d4391..d54c007 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index d5f1c8d..d617692 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 4d6372e..4dd6118 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh index 0670a01..d74fcce 100644 --- a/ios/Flutter/flutter_export_environment.sh +++ b/ios/Flutter/flutter_export_environment.sh @@ -1,7 +1,7 @@ #!/bin/sh # This is a generated file; do not edit or check into version control. export "FLUTTER_ROOT=C:\flutter" -export "FLUTTER_APPLICATION_PATH=F:\OfficeWorks\codecanyon-22764499-ecommerce-ui-kit-using-flutter\treva_shop_flutter" +export "FLUTTER_APPLICATION_PATH=C:\Users\ASUS\Desktop\aslshop" export "FLUTTER_TARGET=lib\main.dart" export "FLUTTER_BUILD_DIR=build" export "SYMROOT=${SOURCE_ROOT}/../build\ios" diff --git a/lib/UI/AcountUIComponent/AboutApps.dart b/lib/UI/AcountUIComponent/AboutApps.dart index b74c9ca..99c2f20 100644 --- a/lib/UI/AcountUIComponent/AboutApps.dart +++ b/lib/UI/AcountUIComponent/AboutApps.dart @@ -34,13 +34,13 @@ class _aboutAppsState extends State { fontFamily: "Gotik"), ), centerTitle: true, - iconTheme: IconThemeData(color: Color.fromRGBO(101, 36, 255, 99)), - backgroundColor: Color.fromRGBO(101, 36, 255, 50), + iconTheme: IconThemeData(color: Colors.black), + backgroundColor: Color.fromRGBO(101, 36, 255, 99), elevation: 0.0, ), body: SingleChildScrollView( child: Container( - color: Color.fromRGBO(101, 36, 255, .25), + color: Colors.white30, child: Column( children: [ Padding( diff --git a/lib/UI/AcountUIComponent/CallCenter.dart b/lib/UI/AcountUIComponent/CallCenter.dart index 1a31675..234a357 100644 --- a/lib/UI/AcountUIComponent/CallCenter.dart +++ b/lib/UI/AcountUIComponent/CallCenter.dart @@ -40,7 +40,7 @@ class _callCenterState extends State { elevation: 0.0, ), body: Container( - color: Color.fromRGBO(101, 36, 255, .25), + color: Colors.white30, child: Center( child: Column( crossAxisAlignment: CrossAxisAlignment.center, diff --git a/lib/UI/AcountUIComponent/CreditCardSetting.dart b/lib/UI/AcountUIComponent/CreditCardSetting.dart index 1d1096f..e14c64a 100644 --- a/lib/UI/AcountUIComponent/CreditCardSetting.dart +++ b/lib/UI/AcountUIComponent/CreditCardSetting.dart @@ -52,14 +52,14 @@ class _creditCardSettingState extends State { ), body: SingleChildScrollView( child: Container( - color: Color.fromRGBO(101, 36, 255, .20), + color: Colors.white30, child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start, children: [ Padding( padding: - const EdgeInsets.only(top: 10.0, left: 15.0, right: 15.0), + const EdgeInsets.only(top: 10.0, left: 15.0, right: 15.0), child: Stack( children: [ Image.asset( @@ -91,7 +91,7 @@ class _creditCardSettingState extends State { Text( "Card Name", style: - _txtCustomSub.copyWith(color: Colors.white), + _txtCustomSub.copyWith(color: Colors.white), ), Text("CVV / CVC", style: _txtCustomSub.copyWith( @@ -129,7 +129,7 @@ class _creditCardSettingState extends State { creditCard(), Padding( padding: - const EdgeInsets.only(top: 30.0, left: 15.0, bottom: 10.0), + const EdgeInsets.only(top: 30.0, left: 15.0, bottom: 10.0), child: Text( "Transactions Details", style: _txtCustomHead.copyWith(fontSize: 16.0), @@ -152,7 +152,7 @@ class creditCard extends StatelessWidget { padding: const EdgeInsets.only(top: 20.0, left: 15.0, right: 15.0), child: Container( decoration: BoxDecoration( - color: Color.fromRGBO(255, 222, 92, 99), + color: Colors.black.withOpacity(.3), borderRadius: BorderRadius.all(Radius.circular(5.0)), boxShadow: [ BoxShadow( @@ -165,7 +165,7 @@ class creditCard extends StatelessWidget { children: [ Padding( padding: - const EdgeInsets.only(top: 20.0, left: 20.0, right: 60.0), + const EdgeInsets.only(top: 20.0, left: 20.0, right: 60.0), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ @@ -258,7 +258,7 @@ class creditCard extends StatelessWidget { Container( height: 50.0, width: 1000.0, - color: Colors.green, + color: Color.fromRGBO(101, 36, 255, 99), child: Center( child: Text("Edit Details", style: _txtCustomHead.copyWith( @@ -280,7 +280,7 @@ class transactionsDetail extends StatelessWidget { top: 10.0, left: 15.0, right: 15.0, bottom: 10.0), child: Container( decoration: BoxDecoration( - color: Color.fromRGBO(255, 222, 92, 99), + color: Colors.black.withOpacity(.3), borderRadius: BorderRadius.all(Radius.circular(5.0)), boxShadow: [ BoxShadow( @@ -359,7 +359,7 @@ class dataTransaction extends StatelessWidget { ), Text(price, style: _txtCustomSub.copyWith( - color: Colors.redAccent, + color: Colors.green, fontSize: 16.0, )), ], diff --git a/lib/UI/AcountUIComponent/Message.dart b/lib/UI/AcountUIComponent/Message.dart index 81c5d25..027be8a 100644 --- a/lib/UI/AcountUIComponent/Message.dart +++ b/lib/UI/AcountUIComponent/Message.dart @@ -9,7 +9,7 @@ class _chatState extends State { @override Widget build(BuildContext context) { return Scaffold( - backgroundColor: Color.fromRGBO(101, 36, 255, 99), + backgroundColor: Color.fromRGBO(101, 36, 255, 99), appBar: AppBar( title: Text( "Message", diff --git a/lib/UI/AcountUIComponent/MyOrders.dart b/lib/UI/AcountUIComponent/MyOrders.dart index ba9ca9a..2cc2313 100644 --- a/lib/UI/AcountUIComponent/MyOrders.dart +++ b/lib/UI/AcountUIComponent/MyOrders.dart @@ -8,7 +8,7 @@ class order extends StatefulWidget { class _orderState extends State { static var _txtCustom = TextStyle( - color: Colors.black54, + color: Colors.black, fontSize: 15.0, fontWeight: FontWeight.w500, fontFamily: "Gotik", @@ -65,21 +65,22 @@ class _orderState extends State { MediaQueryData mediaQueryData = MediaQuery.of(context); return Scaffold( appBar: AppBar( + backgroundColor: Color.fromRGBO(101, 36, 255, 99), title: Text( "Track My Order", style: TextStyle( fontWeight: FontWeight.w700, fontSize: 20.0, - color: Colors.black54, + color: Colors.white, fontFamily: "Gotik"), ), centerTitle: true, - iconTheme: IconThemeData(color: Color(0xFF6991C7)), + iconTheme: IconThemeData(color: Colors.black), elevation: 0.0, ), body: SingleChildScrollView( child: Container( - color: Color.fromRGBO(101, 36, 255, .25), + color: Colors.black.withOpacity(.2), width: 800.0, child: Padding( padding: const EdgeInsets.only(top: 20.0, left: 25.0), @@ -100,7 +101,7 @@ class _orderState extends State { Text( "Orders", style: _txtCustom.copyWith( - color: Colors.black54, + color: Colors.black, fontSize: 18.0, fontWeight: FontWeight.w600), ), @@ -175,11 +176,11 @@ class _orderState extends State { child: Container( height: 130.0, decoration: BoxDecoration( - color: Colors.redAccent, + color: Colors.white30, borderRadius: BorderRadius.all(Radius.circular(10.0)), boxShadow: [ BoxShadow( - color: Colors.white, + color: Colors.black.withOpacity(.4), blurRadius: 4.5, spreadRadius: 1.0, ) diff --git a/lib/UI/AcountUIComponent/Notification.dart b/lib/UI/AcountUIComponent/Notification.dart index f2600fd..bed2c27 100644 --- a/lib/UI/AcountUIComponent/Notification.dart +++ b/lib/UI/AcountUIComponent/Notification.dart @@ -38,7 +38,7 @@ class _notificationState extends State { Widget build(BuildContext context) { MediaQueryData mediaQuery = MediaQuery.of(context); return Scaffold( - backgroundColor: Colors.white, + backgroundColor: Colors.white, appBar: AppBar( title: Text( "Notification", @@ -68,7 +68,7 @@ class _notificationState extends State { }); }, background: Container( - color: Color.fromRGBO(101, 36, 255, .20), + color: Colors.white30, ), child: Container( height: 88.0, diff --git a/lib/UI/AcountUIComponent/Profile.dart b/lib/UI/AcountUIComponent/Profile.dart index fa4be71..743cd2b 100644 --- a/lib/UI/AcountUIComponent/Profile.dart +++ b/lib/UI/AcountUIComponent/Profile.dart @@ -45,48 +45,48 @@ class _profilState extends State { Container( ), - Column( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Container( - height: 100.0, - width: 100.0, - decoration: BoxDecoration( - border: Border.all(color: Colors.black, width: 2.5), - shape: BoxShape.circle, - image: DecorationImage( - image: AssetImage("assets/img/womanface.jpg"))), - ), - Padding( - padding: const EdgeInsets.only(top: 5.0), - child: Text( - "Malinda Smith", - style: _txtName, + Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Container( + height: 100.0, + width: 100.0, + decoration: BoxDecoration( + border: Border.all(color: Colors.black, width: 2.5), + shape: BoxShape.circle, + image: DecorationImage( + image: AssetImage("assets/img/womanface.jpg"))), ), - ), - InkWell( - onTap: null, - child: Padding( - padding: const EdgeInsets.only(top: 0.0), + Padding( + padding: const EdgeInsets.only(top: 5.0), child: Text( - "Edit Profile", - style: _txtEdit, + "Malinda Smith", + style: _txtName, ), ), - ), - ], - ), - Container( + InkWell( + onTap: null, + child: Padding( + padding: const EdgeInsets.only(top: 0.0), + child: Text( + "Edit Profile", + style: _txtEdit, + ), + ), + ), + ], + ), + Container( - ), - ], + ), + ], ), ); return SingleChildScrollView( child: Container( - color: Color.fromRGBO(101, 36, 255, .20), + color: Colors.white30, child: Stack( children: [ /// Setting Header Banner @@ -129,7 +129,7 @@ class _profilState extends State { tap: () { Navigator.of(context).push(PageRouteBuilder( pageBuilder: (_, __, ___) => - new creditCardSetting())); + new creditCardSetting())); }, ), Padding( diff --git a/lib/UI/AcountUIComponent/SettingAcount.dart b/lib/UI/AcountUIComponent/SettingAcount.dart index 8880b80..adaf3ba 100644 --- a/lib/UI/AcountUIComponent/SettingAcount.dart +++ b/lib/UI/AcountUIComponent/SettingAcount.dart @@ -58,7 +58,7 @@ class _settingAcountState extends State { child: Container( height: 50.0, width: 1000.0, - color: Colors.red, + color: Color.fromRGBO(101, 36, 255, 99), child: Padding( padding: const EdgeInsets.only( top: 13.0, left: 20.0, bottom: 15.0), @@ -104,7 +104,7 @@ class setting extends StatelessWidget { child: Container( height: 235.0, decoration: BoxDecoration( - color: Color.fromRGBO(101, 36, 255, .25), + color: Colors.white30, ), child: Padding( padding: const EdgeInsets.only(left: 20.0), @@ -137,7 +137,7 @@ class setting extends StatelessWidget { ), Icon( Icons.keyboard_arrow_right, - color: Colors.yellowAccent, + color: Colors.black, ) ]), ), @@ -159,7 +159,7 @@ class setting extends StatelessWidget { ), Icon( Icons.keyboard_arrow_right, - color: Colors.yellowAccent, + color: Colors.black, ) ]), ), @@ -181,7 +181,7 @@ class setting extends StatelessWidget { ), Icon( Icons.keyboard_arrow_right, - color: Colors.yellowAccent, + color: Colors.black, ) ]), ), diff --git a/lib/UI/BottomNavigationBar.dart b/lib/UI/BottomNavigationBar.dart index 8b7466b..b44045f 100644 --- a/lib/UI/BottomNavigationBar.dart +++ b/lib/UI/BottomNavigationBar.dart @@ -5,81 +5,81 @@ import 'package:treva_shop_flutter/UI/HomeUIComponent/Home.dart'; import 'package:treva_shop_flutter/UI/AcountUIComponent/Profile.dart'; class bottomNavigationBar extends StatefulWidget { - @override - _bottomNavigationBarState createState() => _bottomNavigationBarState(); + @override + _bottomNavigationBarState createState() => _bottomNavigationBarState(); } class _bottomNavigationBarState extends State { - int currentIndex = 0; - /// Set a type current number a layout class - Widget callPage(int current) { - switch (current) { - case 0: - return new Menu(); - case 1: - return new brand(); - case 2: - return new cart(); - case 3: - return new profil(); - break; - default: - return Menu(); + int currentIndex = 0; + /// Set a type current number a layout class + Widget callPage(int current) { + switch (current) { + case 0: + return new Menu(); + case 1: + return new brand(); + case 2: + return new cart(); + case 3: + return new profil(); + break; + default: + return Menu(); + } } - } - /// Build BottomNavigationBar Widget - @override - Widget build(BuildContext context) { - return Scaffold( - body: callPage(currentIndex), - bottomNavigationBar: Theme( - data: Theme.of(context).copyWith( - canvasColor: Color.fromRGBO(77,255,160, 99), - textTheme: Theme.of(context).textTheme.copyWith( - caption: TextStyle(color: Colors.black.withOpacity(.8)))), - child: BottomNavigationBar( - type: BottomNavigationBarType.fixed, - currentIndex: currentIndex, - fixedColor: Color(0xFF6991C7), - onTap: (value) { - currentIndex = value; - setState(() {}); - }, - items: [ - BottomNavigationBarItem( - icon: Icon( - Icons.home, - size: 23.0, - ), - title: Text( - "Home", - style: TextStyle(fontFamily: "Berlin", letterSpacing: 0.5), - )), - BottomNavigationBarItem( - icon: Icon(Icons.shop), - title: Text( - "Brand", - style: TextStyle(fontFamily: "Berlin", letterSpacing: 0.5), - )), - BottomNavigationBarItem( - icon: Icon(Icons.shopping_cart), - title: Text( - "Cart", - style: TextStyle(fontFamily: "Berlin", letterSpacing: 0.5), - )), - BottomNavigationBarItem( - icon: Icon( - Icons.person, - size: 24.0, - ), - title: Text( - "Acount", - style: TextStyle(fontFamily: "Berlin", letterSpacing: 0.5), - )), - ], - )), - ); - } + /// Build BottomNavigationBar Widget + @override + Widget build(BuildContext context) { + return Scaffold( + body: callPage(currentIndex), + bottomNavigationBar: Theme( + data: Theme.of(context).copyWith( + canvasColor: Color.fromRGBO(101, 36, 255, 99), + textTheme: Theme.of(context).textTheme.copyWith( + caption: TextStyle(color: Colors.white))), + child: BottomNavigationBar( + type: BottomNavigationBarType.fixed, + currentIndex: currentIndex, + fixedColor: Color.fromRGBO(213, 213, 213, 99), + onTap: (value) { + currentIndex = value; + setState(() {}); + }, + items: [ + BottomNavigationBarItem( + icon: Icon( + Icons.home, + size: 23.0, + ), + title: Text( + "Home", + style: TextStyle(fontFamily: "Berlin", letterSpacing: 0.5), + )), + BottomNavigationBarItem( + icon: Icon(Icons.shop), + title: Text( + "Brand", + style: TextStyle(fontFamily: "Berlin", letterSpacing: 0.5), + )), + BottomNavigationBarItem( + icon: Icon(Icons.shopping_cart), + title: Text( + "Cart", + style: TextStyle(fontFamily: "Berlin", letterSpacing: 0.5), + )), + BottomNavigationBarItem( + icon: Icon( + Icons.person, + size: 24.0, + ), + title: Text( + "Acount", + style: TextStyle(fontFamily: "Berlin", letterSpacing: 0.5), + )), + ], + )), + ); + } } diff --git a/lib/UI/BrandUIComponent/BrandDetail.dart b/lib/UI/BrandUIComponent/BrandDetail.dart index f0d923c..7d11428 100644 --- a/lib/UI/BrandUIComponent/BrandDetail.dart +++ b/lib/UI/BrandUIComponent/BrandDetail.dart @@ -259,7 +259,7 @@ class _brandDetailState extends State { ontap: () { Navigator.of(context).push(PageRouteBuilder( pageBuilder: (_, __, ___) => - new privatemessage(brand))); + new privatemessage(brand))); }, ), Padding(padding: EdgeInsets.only(top: 10.0)), @@ -329,7 +329,7 @@ class _brandDetailState extends State { height: 45.9, width: 1.0, decoration: - BoxDecoration(color: Colors.black12), + BoxDecoration(color: Colors.black12), ) ], ), @@ -359,7 +359,7 @@ class _brandDetailState extends State { /// Create Grid Item SliverGrid( delegate: SliverChildBuilderDelegate( - (BuildContext context, int index) { + (BuildContext context, int index) { return Container( decoration: BoxDecoration( color: Colors.white, @@ -392,7 +392,7 @@ class _brandDetailState extends State { Padding(padding: EdgeInsets.only(top: 7.0)), Padding( padding: - const EdgeInsets.only(left: 15.0, right: 15.0), + const EdgeInsets.only(left: 15.0, right: 15.0), child: Text( brand.item.itemName, style: TextStyle( @@ -407,7 +407,7 @@ class _brandDetailState extends State { Padding(padding: EdgeInsets.only(top: 1.0)), Padding( padding: - const EdgeInsets.only(left: 15.0, right: 15.0), + const EdgeInsets.only(left: 15.0, right: 15.0), child: Text( brand.item.itemPrice, style: TextStyle( @@ -493,9 +493,9 @@ class buttonCustom extends StatelessWidget { ), child: Center( child: Text( - txt, - style: TextStyle(color: Colors.white, fontFamily: "Sans"), - )), + txt, + style: TextStyle(color: Colors.white, fontFamily: "Sans"), + )), ), ); } diff --git a/lib/UI/BrandUIComponent/BrandLayout.dart b/lib/UI/BrandUIComponent/BrandLayout.dart index 3d87a78..d21c97a 100644 --- a/lib/UI/BrandUIComponent/BrandLayout.dart +++ b/lib/UI/BrandUIComponent/BrandLayout.dart @@ -50,7 +50,7 @@ class _brandState extends State { /// Calling variable appbar appBar: _appbar, body: Container( - color: Color.fromRGBO(101, 36, 255, .25), + color: Colors.white30, child: CustomScrollView( /// Create List Menu slivers: [ diff --git a/lib/UI/BrandUIComponent/Chat.dart b/lib/UI/BrandUIComponent/Chat.dart index 82dd1cd..a96f736 100644 --- a/lib/UI/BrandUIComponent/Chat.dart +++ b/lib/UI/BrandUIComponent/Chat.dart @@ -94,21 +94,21 @@ class _privatemessageState extends State margin: new EdgeInsets.symmetric(horizontal: 3.0), child: Theme.of(context).platform == TargetPlatform.iOS ? new CupertinoButton( - child: new Text("Submit"), - onPressed: _isWriting - ? () => _submitMsg(_textController.text) - : null) + child: new Text("Submit"), + onPressed: _isWriting + ? () => _submitMsg(_textController.text) + : null) : new IconButton( - icon: new Icon(Icons.message), - onPressed: _isWriting - ? () => _submitMsg(_textController.text) - : null, - )), + icon: new Icon(Icons.message), + onPressed: _isWriting + ? () => _submitMsg(_textController.text) + : null, + )), ], ), decoration: Theme.of(context).platform == TargetPlatform.iOS ? new BoxDecoration( - border: new Border(top: new BorderSide(color: Colors.brown))) + border: new Border(top: new BorderSide(color: Colors.brown))) : null), ); } diff --git a/lib/UI/CartUIComponent/CartLayout.dart b/lib/UI/CartUIComponent/CartLayout.dart index 6f0f56a..6fdaf72 100644 --- a/lib/UI/CartUIComponent/CartLayout.dart +++ b/lib/UI/CartUIComponent/CartLayout.dart @@ -24,7 +24,7 @@ class _cartState extends State { desc: "Internal 1 TB", price: "\$ 950", ), - ); + ); }); } /// Declare price and value for chart @@ -33,272 +33,272 @@ class _cartState extends State { @override Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - iconTheme: IconThemeData(color: Color.fromRGBO(101, 36, 255, 99)), - centerTitle: true, - backgroundColor: Color.fromRGBO(101, 36, 255, 99), - title: Text( - "Cart", - style: TextStyle( - fontFamily: "Gotik", - fontSize: 18.0, - color: Colors.white, - fontWeight: FontWeight.w700), - ), - elevation: 0.0, + return Scaffold( + appBar: AppBar( + iconTheme: IconThemeData(color: Colors.black), + centerTitle: true, + backgroundColor: Color.fromRGBO(101, 36, 255, 99), + title: Text( + "Cart", + style: TextStyle( + fontFamily: "Gotik", + fontSize: 18.0, + color: Colors.white, + fontWeight: FontWeight.w700), ), + elevation: 0.0, + ), - /// - /// - /// Checking item value of cart - /// - /// - body: items.length>0? - ListView.builder( - itemCount: items.length, - itemBuilder: (context,position){ - /// - /// Widget for list view slide delete - /// - return Slidable( - delegate: new SlidableDrawerDelegate(), - actionExtentRatio: 0.25, - actions: [ - new IconSlideAction( - caption: 'Archive', - color: Colors.blue, - icon: Icons.archive, - onTap: () { - /// - /// SnackBar show if cart Archive - /// - Scaffold.of(context) - .showSnackBar(SnackBar(content: Text("Items Cart Archive"),duration: Duration(seconds: 2),backgroundColor: Colors.blue,)); - }, - ), - ], - secondaryActions: [ - new IconSlideAction( - key: Key(items[position].id.toString()), - caption: 'Delete', - color: Colors.red, - icon: Icons.delete, - onTap: () { - setState(() { - items.removeAt(position); - }); - /// - /// SnackBar show if cart delet - /// - Scaffold.of(context) - .showSnackBar(SnackBar(content: Text("Items Cart Deleted"),duration: Duration(seconds: 2),backgroundColor: Colors.black,)); - }, + /// + /// + /// Checking item value of cart + /// + /// + body: items.length>0? + ListView.builder( + itemCount: items.length, + itemBuilder: (context,position){ + /// + /// Widget for list view slide delete + /// + return Slidable( + delegate: new SlidableDrawerDelegate(), + actionExtentRatio: 0.25, + actions: [ + new IconSlideAction( + caption: 'Archive', + color: Colors.blue, + icon: Icons.archive, + onTap: () { + /// + /// SnackBar show if cart Archive + /// + Scaffold.of(context) + .showSnackBar(SnackBar(content: Text("Items Cart Archive"),duration: Duration(seconds: 2),backgroundColor: Colors.blue,)); + }, + ), + ], + secondaryActions: [ + new IconSlideAction( + key: Key(items[position].id.toString()), + caption: 'Delete', + color: Colors.red, + icon: Icons.delete, + onTap: () { + setState(() { + items.removeAt(position); + }); + /// + /// SnackBar show if cart delet + /// + Scaffold.of(context) + .showSnackBar(SnackBar(content: Text("Items Cart Deleted"),duration: Duration(seconds: 2),backgroundColor: Colors.black,)); + }, + ), + ], + child: Padding( + padding: const EdgeInsets.only(top: 1.0, left: 13.0, right: 13.0), + /// Background Constructor for card + child: Container( + height: 220.0, + decoration: BoxDecoration( + color: Colors.white30, + boxShadow: [ + BoxShadow( + color: Colors.black.withOpacity(.2), + blurRadius: 3.5, + spreadRadius: 0.4, + ) + ], ), - ], - child: Padding( - padding: const EdgeInsets.only(top: 1.0, left: 13.0, right: 13.0), - /// Background Constructor for card - child: Container( - height: 220.0, - decoration: BoxDecoration( - color: Color.fromRGBO(101, 36, 255, .25), - boxShadow: [ - BoxShadow( - color: Colors.white, - blurRadius: 3.5, - spreadRadius: 0.4, - ) - ], - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ - Row( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: EdgeInsets.all(10.0), + Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: EdgeInsets.all(10.0), - /// Image item - child: Container( - decoration: BoxDecoration( - color: Color.fromRGBO(101, 36, 255, .25), - boxShadow: [ - BoxShadow( - color: Colors.white, - blurRadius: 0.5, - spreadRadius: 0.1) - ]), - child: Image.asset('${items[position].img}', - height: 130.0, - width: 120.0, - fit: BoxFit.cover, - ))), - Flexible( - child: Padding( - padding: const EdgeInsets.only( - top: 25.0, left: 10.0, right: 5.0), - child: Column( + /// Image item + child: Container( + decoration: BoxDecoration( + color: Colors.white30, + boxShadow: [ + BoxShadow( + color: Colors.white, + blurRadius: 0.5, + spreadRadius: 0.1) + ]), + child: Image.asset('${items[position].img}', + height: 130.0, + width: 120.0, + fit: BoxFit.cover, + ))), + Flexible( + child: Padding( + padding: const EdgeInsets.only( + top: 25.0, left: 10.0, right: 5.0), + child: Column( - /// Text Information Item - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Text( - '${items[position].title}', - style: TextStyle( - fontWeight: FontWeight.w700, - fontFamily: "Sans", - color: Colors.black, - ), - overflow: TextOverflow.ellipsis, + /// Text Information Item + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Text( + '${items[position].title}', + style: TextStyle( + fontWeight: FontWeight.w700, + fontFamily: "Sans", + color: Colors.black, ), - Padding(padding: EdgeInsets.only(top: 10.0)), - Text( - '${items[position].desc}', - style: TextStyle( - color: Colors.black, - fontWeight: FontWeight.w500, - fontSize: 12.0, - ), + overflow: TextOverflow.ellipsis, + ), + Padding(padding: EdgeInsets.only(top: 10.0)), + Text( + '${items[position].desc}', + style: TextStyle( + color: Colors.black, + fontWeight: FontWeight.w500, + fontSize: 12.0, ), - Padding(padding: EdgeInsets.only(top: 10.0)), - Text('${items[position].price}'), - Padding( - padding: const EdgeInsets.only( - top: 18.0, left: 0.0), - child: Container( - width: 112.0, - decoration: BoxDecoration( - color: Colors.amberAccent, - border: Border.all( - color: Colors.black)), - child: Row( - mainAxisAlignment: MainAxisAlignment - .spaceAround, - children: [ + ), + Padding(padding: EdgeInsets.only(top: 10.0)), + Text('${items[position].price}'), + Padding( + padding: const EdgeInsets.only( + top: 18.0, left: 0.0), + child: Container( + width: 112.0, + decoration: BoxDecoration( + color: Colors.white, + border: Border.all( + color: Colors.black)), + child: Row( + mainAxisAlignment: MainAxisAlignment + .spaceAround, + children: [ - /// Decrease of value item - InkWell( - onTap: () { - setState(() { - value = value - 1; - pay= 950 * value; - }); - }, - child: Container( - height: 30.0, - width: 30.0, - decoration: BoxDecoration( - border: Border( - right: BorderSide( - color: Colors.black - ))), - child: Center(child: Text("-")), - ), - ), - Padding( - padding: const EdgeInsets.symmetric( - horizontal: 18.0), - child: Text(value.toString()), + /// Decrease of value item + InkWell( + onTap: () { + setState(() { + value = value - 1; + pay= 950 * value; + }); + }, + child: Container( + height: 30.0, + width: 30.0, + decoration: BoxDecoration( + border: Border( + right: BorderSide( + color: Colors.black + ))), + child: Center(child: Text("-")), ), + ), + Padding( + padding: const EdgeInsets.symmetric( + horizontal: 18.0), + child: Text(value.toString()), + ), - /// Increasing value of item - InkWell( - onTap: () { - setState(() { - value = value + 1; - pay = 950 * value; - }); - }, - child: Container( - height: 30.0, - width: 28.0, - decoration: BoxDecoration( - border: Border( - left: BorderSide( - color: Colors.black))), - child: Center(child: Text("+")), - ), + /// Increasing value of item + InkWell( + onTap: () { + setState(() { + value = value + 1; + pay = 950 * value; + }); + }, + child: Container( + height: 30.0, + width: 28.0, + decoration: BoxDecoration( + border: Border( + left: BorderSide( + color: Colors.black))), + child: Center(child: Text("+")), ), - ], - ), + ), + ], ), ), - ], - ), + ), + ], ), ), - ], - ), - Padding(padding: EdgeInsets.only(top: 8.0)), - Divider( - height: 2.0, - color: Colors.black, - ), - Padding( - padding: const EdgeInsets.only( - top: 9.0, left: 10.0, right: 10.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Padding( - padding: const EdgeInsets.only(left: 10.0), + ), + ], + ), + Padding(padding: EdgeInsets.only(top: 8.0)), + Divider( + height: 2.0, + color: Colors.black, + ), + Padding( + padding: const EdgeInsets.only( + top: 9.0, left: 10.0, right: 10.0), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Padding( + padding: const EdgeInsets.only(left: 10.0), - /// Total price of item buy - child: Text( - "Total : \$ " + pay.toString(), - style: TextStyle( - color: Colors.black, - fontWeight: FontWeight.w500, - fontSize: 15.5, - fontFamily: "Sans"), - ), + /// Total price of item buy + child: Text( + "Total : \$ " + pay.toString(), + style: TextStyle( + color: Colors.black, + fontWeight: FontWeight.w500, + fontSize: 15.5, + fontFamily: "Sans"), ), - InkWell( - onTap: () { - Navigator.of(context).push(PageRouteBuilder( - pageBuilder: (_, __, ___) => delivery())); - }, - child: Padding( - padding: const EdgeInsets.only(right: 10.0), - child: Container( - height: 40.0, - width: 120.0, - decoration: BoxDecoration( - color: Colors.redAccent, - ), - child: Center( - child: Text( - "Pay", - style: TextStyle( - color: Colors.white, - fontFamily: "Sans", - fontWeight: FontWeight.w600), - ), + ), + InkWell( + onTap: () { + Navigator.of(context).push(PageRouteBuilder( + pageBuilder: (_, __, ___) => delivery())); + }, + child: Padding( + padding: const EdgeInsets.only(right: 10.0), + child: Container( + height: 40.0, + width: 120.0, + decoration: BoxDecoration( + color: Color.fromRGBO(101, 36, 255, 99), + ), + child: Center( + child: Text( + "Pay", + style: TextStyle( + color: Colors.white, + fontFamily: "Sans", + fontWeight: FontWeight.w600), ), ), ), ), - ], - ), + ), + ], ), - ], - ), + ), + ], ), ), - ); - }, - scrollDirection: Axis.vertical, - ): noItemCart() - ); - } + ), + ); + }, + scrollDirection: Axis.vertical, + ): noItemCart() + ); } +} - /// +/// /// /// If no item cart this class showing /// diff --git a/lib/UI/CartUIComponent/Delivery.dart b/lib/UI/CartUIComponent/Delivery.dart index 4257a82..b11d2bd 100644 --- a/lib/UI/CartUIComponent/Delivery.dart +++ b/lib/UI/CartUIComponent/Delivery.dart @@ -28,11 +28,11 @@ class _deliveryState extends State { ), centerTitle: true, backgroundColor: Color.fromRGBO(101, 36, 255, 99), - iconTheme: IconThemeData(color: Color.fromRGBO(101, 36, 255, 99)), + iconTheme: IconThemeData(color: Colors.black), ), body: SingleChildScrollView( child: Container( - color: Color.fromRGBO(101, 36, 255, .20), + color: Colors.white30, child: Padding( padding: const EdgeInsets.only(top: 30.0, left: 20.0, right: 20.0), child: Column( @@ -84,7 +84,7 @@ class _deliveryState extends State { height: 55.0, width: 300.0, decoration: BoxDecoration( - color: Colors.redAccent, + color: Color.fromRGBO(101, 36, 255, 99), borderRadius: BorderRadius.all(Radius.circular(40.0))), child: Center( child: Text( diff --git a/lib/UI/CartUIComponent/Payment.dart b/lib/UI/CartUIComponent/Payment.dart index a5416d5..d4f9817 100644 --- a/lib/UI/CartUIComponent/Payment.dart +++ b/lib/UI/CartUIComponent/Payment.dart @@ -61,7 +61,7 @@ class _paymentState extends State { ), body: SingleChildScrollView( child: Container( - color: Color.fromRGBO(101, 36, 255, .25), + color: Colors.white30, child: Padding( padding: const EdgeInsets.only(top: 30.0, left: 20.0, right: 20.0), child: Column( @@ -221,7 +221,7 @@ class _paymentState extends State { height: 55.0, width: 300.0, decoration: BoxDecoration( - color: Colors.redAccent, + color: Color.fromRGBO(101, 36, 255, 99), borderRadius: BorderRadius.all(Radius.circular(40.0))), child: Center( child: Text( @@ -279,20 +279,20 @@ _showDialog(BuildContext ctx) { ), Center( child: Padding( - padding: const EdgeInsets.only(top: 16.0), - child: Text( - "Yuppy!!", - style: _txtCustomHead, - ), - )), + padding: const EdgeInsets.only(top: 16.0), + child: Text( + "Yuppy!!", + style: _txtCustomHead, + ), + )), Center( child: Padding( - padding: const EdgeInsets.only(top: 30.0, bottom: 40.0), - child: Text( - "Your Payment Receive to Seller", - style: _txtCustomSub, - ), - )), + padding: const EdgeInsets.only(top: 30.0, bottom: 40.0), + child: Text( + "Your Payment Receive to Seller", + style: _txtCustomSub, + ), + )), ], ), ); diff --git a/lib/UI/HomeUIComponent/AppbarGradient.dart b/lib/UI/HomeUIComponent/AppbarGradient.dart index a665299..9937918 100644 --- a/lib/UI/HomeUIComponent/AppbarGradient.dart +++ b/lib/UI/HomeUIComponent/AppbarGradient.dart @@ -11,7 +11,7 @@ class AppbarGradient extends StatefulWidget { class _AppbarGradientState extends State { String CountNotice = "4"; - /// Build Appbar in layout home + /// Build Appbar in layout home @override Widget build(BuildContext context) { @@ -73,8 +73,8 @@ class _AppbarGradientState extends State { ), Padding( padding: EdgeInsets.only( - left: 17.0, - )), + left: 17.0, + )), Padding( padding: EdgeInsets.only(top: 3.0), child: Text( @@ -114,7 +114,7 @@ class _AppbarGradientState extends State { "assets/img/bell5.png", height: 24.0, ), - /* CircleAvatar( + /* CircleAvatar( radius: 8.6, backgroundColor: Colors.redAccent, child: Text( diff --git a/lib/UI/HomeUIComponent/CategoryDetail.dart b/lib/UI/HomeUIComponent/CategoryDetail.dart index 005e929..04fee3c 100644 --- a/lib/UI/HomeUIComponent/CategoryDetail.dart +++ b/lib/UI/HomeUIComponent/CategoryDetail.dart @@ -47,10 +47,10 @@ class _categoryDetailState extends State { /// @override void initState() { - Timer(Duration(seconds: 3),(){ -setState(() { - loadImage=false; -}); + Timer(Duration(seconds: 3),(){ + setState(() { + loadImage=false; + }); }); // TODO: implement initState super.initState(); @@ -745,11 +745,11 @@ class loadingMenuItemCard extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisSize: MainAxisSize.min, children: [ - Container( - height: 185.0, - width: 160.0, - color: Colors.black12, - ), + Container( + height: 185.0, + width: 160.0, + color: Colors.black12, + ), Padding( padding: const EdgeInsets.only(left: 10.0, right: 5.0,top: 12.0), child: Container( diff --git a/lib/UI/HomeUIComponent/ChatItem.dart b/lib/UI/HomeUIComponent/ChatItem.dart index a741cd3..9951579 100644 --- a/lib/UI/HomeUIComponent/ChatItem.dart +++ b/lib/UI/HomeUIComponent/ChatItem.dart @@ -37,13 +37,13 @@ class _chatItemState extends State with TickerProviderStateMixin { new Flexible( child: _messages.length>0 ? Container( - child: new ListView.builder( - itemBuilder: (_, int index) => _messages[index], - itemCount: _messages.length, - reverse: true, - padding: new EdgeInsets.all(10.0), - ), - ): NoMessage(), + child: new ListView.builder( + itemBuilder: (_, int index) => _messages[index], + itemCount: _messages.length, + reverse: true, + padding: new EdgeInsets.all(10.0), + ), + ): NoMessage(), ), /// Line new Divider(height: 1.5), @@ -114,7 +114,7 @@ class _chatItemState extends State with TickerProviderStateMixin { ), decoration: Theme.of(context).platform == TargetPlatform.iOS ? new BoxDecoration( - border: new Border(top: new BorderSide(color: Colors.brown))) + border: new Border(top: new BorderSide(color: Colors.brown))) : null), ); } @@ -199,19 +199,19 @@ class NoMessage extends StatelessWidget { Widget build(BuildContext context) { return Center( child: Container( - child: ListView( - children: [ - Padding( - padding: const EdgeInsets.only(top:100.0), - child: Center( - child: Opacity( - opacity: 0.5, - child: Image.asset("assets/imgIllustration/IlustrasiMessage.png",height: 220.0,)), - ), + child: ListView( + children: [ + Padding( + padding: const EdgeInsets.only(top:100.0), + child: Center( + child: Opacity( + opacity: 0.5, + child: Image.asset("assets/imgIllustration/IlustrasiMessage.png",height: 220.0,)), + ), + ), + Center(child: Text("Not Have Message", style: TextStyle( fontWeight: FontWeight.w300,color: Colors.black12,fontSize: 17.0,fontFamily: "Popins"),)) + ], ), - Center(child: Text("Not Have Message", style: TextStyle( fontWeight: FontWeight.w300,color: Colors.black12,fontSize: 17.0,fontFamily: "Popins"),)) - ], - ), - )); + )); } } diff --git a/lib/UI/HomeUIComponent/Home.dart b/lib/UI/HomeUIComponent/Home.dart index d9c92c0..d9fb0b5 100644 --- a/lib/UI/HomeUIComponent/Home.dart +++ b/lib/UI/HomeUIComponent/Home.dart @@ -144,7 +144,7 @@ class _MenuState extends State with TickerProviderStateMixin { /// CategoryIcon Component var categoryIcon = Container( - color: Color.fromRGBO(101, 36, 255,.25), + color: Colors.white30, padding: EdgeInsets.only(top: 20.0), alignment: AlignmentDirectional.centerStart, child: Column( @@ -214,7 +214,7 @@ class _MenuState extends State with TickerProviderStateMixin { /// ListView a WeekPromotion Component var PromoHorizontalList = Container( - color: Color.fromRGBO(101, 36, 255, .25), + color: Colors.white30, height: 230.0, padding: EdgeInsets.only(bottom: 40.0), child: Column( @@ -281,7 +281,7 @@ class _MenuState extends State with TickerProviderStateMixin { /// To set FlashSale Scrolling horizontal child: ListView( scrollDirection: Axis.horizontal, - + children: [ Row( mainAxisAlignment: MainAxisAlignment.start, @@ -421,7 +421,7 @@ class _MenuState extends State with TickerProviderStateMixin { /// Category Component in bottom of flash sale var categoryImageBottom = Container( height: 310.0, - color: Color.fromRGBO(101, 36, 255, .25), + color: Colors.white30, child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -531,7 +531,7 @@ class _MenuState extends State with TickerProviderStateMixin { /// Grid item in bottom of Category var Grid = SingleChildScrollView( child: Container( - color: Color.fromRGBO(101, 36, 255, .25), + color: Colors.white30, child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/lib/UI/OnBoarding.dart b/lib/UI/OnBoarding.dart index 7edb185..e531189 100644 --- a/lib/UI/OnBoarding.dart +++ b/lib/UI/OnBoarding.dart @@ -9,18 +9,18 @@ class onBoarding extends StatefulWidget { } var _fontHeaderStyle = TextStyle( - fontFamily: "Popins", - fontSize: 21.0, - fontWeight: FontWeight.w800, - color: Colors.black87, - letterSpacing: 1.5 + fontFamily: "Popins", + fontSize: 21.0, + fontWeight: FontWeight.w800, + color: Colors.black87, + letterSpacing: 1.5 ); var _fontDescriptionStyle = TextStyle( - fontFamily: "Sans", - fontSize: 15.0, - color: Colors.black, - fontWeight: FontWeight.w400 + fontFamily: "Sans", + fontSize: 15.0, + color: Colors.black, + fontWeight: FontWeight.w400 ); /// @@ -28,7 +28,7 @@ var _fontDescriptionStyle = TextStyle( /// final pages = [ new PageViewModel( - pageColor: Color.fromRGBO(101, 36, 255, .25), + pageColor: Colors.white30, iconColor: Colors.black, bubbleBackgroundColor: Color.fromRGBO(101, 36, 255, .25), title: Text( @@ -37,8 +37,8 @@ final pages = [ body: Container( height: 250.0, child: Text( - 'ASL Shopping App \nbuy your desired product easily.',textAlign: TextAlign.center, - style: _fontDescriptionStyle + 'ASL Shopping App \nbuy your desired product easily.',textAlign: TextAlign.center, + style: _fontDescriptionStyle ), ), mainImage: Image.asset( @@ -49,7 +49,7 @@ final pages = [ )), new PageViewModel( - pageColor: Color.fromRGBO(101, 36, 255, .25), + pageColor: Colors.white30, iconColor: Colors.black, bubbleBackgroundColor: Color.fromRGBO(101, 36, 255, .25), title: Text( @@ -70,7 +70,7 @@ final pages = [ )), new PageViewModel( - pageColor: Color.fromRGBO(101, 36, 255, .25), + pageColor: Colors.white30, iconColor: Colors.black, bubbleBackgroundColor: Color.fromRGBO(101, 36, 255, .25), title: Text( @@ -102,13 +102,13 @@ class _onBoardingState extends State { doneText: Text("DONE",style: _fontDescriptionStyle.copyWith(color: Colors.deepPurpleAccent,fontWeight: FontWeight.w800,letterSpacing: 1.0),), onTapDoneButton: (){ Navigator.of(context).pushReplacement(PageRouteBuilder(pageBuilder: (_,__,___)=> new ChoseLogin(), - transitionsBuilder: (_,Animation animation,__,Widget widget){ - return Opacity( - opacity: animation.value, - child: widget, - ); - }, - transitionDuration: Duration(milliseconds: 1500), + transitionsBuilder: (_,Animation animation,__,Widget widget){ + return Opacity( + opacity: animation.value, + child: widget, + ); + }, + transitionDuration: Duration(milliseconds: 1500), )); }, ); diff --git a/lib/main.dart b/lib/main.dart index 83d26df..e372ef0 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -106,7 +106,6 @@ class _SplashScreenState extends State { fontSize: 19.0, ), ), - /// Animation text Treva Shop to choose Login with Hero Animation (Click to open code) Hero( tag: "ASL", child: Text(