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 ae67253..b459166 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 625aeb2..b2f0c77 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 eda3079..2dad811 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 ff6f0da..f9b4b7f 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 be668f6..8b6c080 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/assets/images/booking_request.svg b/assets/images/booking_request.svg index 97c533f..a4fba38 100644 --- a/assets/images/booking_request.svg +++ b/assets/images/booking_request.svg @@ -1,5 +1,5 @@ - - - - + + + + diff --git a/assets/images/customers.svg b/assets/images/customers.svg index b2bbe34..6e7fbdd 100644 --- a/assets/images/customers.svg +++ b/assets/images/customers.svg @@ -1,5 +1,5 @@ - - - - + + + + diff --git a/assets/images/deliveryboyview.svg b/assets/images/deliveryboyview.svg index 0dc8d96..c1c141d 100644 --- a/assets/images/deliveryboyview.svg +++ b/assets/images/deliveryboyview.svg @@ -1,8 +1,8 @@ - - - - - - - + + + + + + + diff --git a/assets/images/tankersview.svg b/assets/images/tankersview.svg index 96567d7..97b875d 100644 --- a/assets/images/tankersview.svg +++ b/assets/images/tankersview.svg @@ -1,12 +1,12 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/images/addtankerblue.png b/images/addtankerblue.png index cec0d00..982cd9a 100644 Binary files a/images/addtankerblue.png and b/images/addtankerblue.png differ diff --git a/images/appbgsupplier.png b/images/appbgsupplier.png index 7f8444d..44953b3 100644 Binary files a/images/appbgsupplier.png and b/images/appbgsupplier.png differ diff --git a/images/appiconn.png b/images/appiconn.png index 55fa562..79579fc 100644 Binary files a/images/appiconn.png and b/images/appiconn.png differ diff --git a/images/backgroundimage.png b/images/backgroundimage.png new file mode 100644 index 0000000..493f8dc Binary files /dev/null and b/images/backgroundimage.png differ diff --git a/images/bggimgg.png b/images/bggimgg.png new file mode 100644 index 0000000..c69cd72 Binary files /dev/null and b/images/bggimgg.png differ diff --git a/images/connectionsblue.png b/images/connectionsblue.png index b01c88e..2ed60e8 100644 Binary files a/images/connectionsblue.png and b/images/connectionsblue.png differ diff --git a/images/customercareblue.png b/images/customercareblue.png index 7fdc2d4..87a50d0 100644 Binary files a/images/customercareblue.png and b/images/customercareblue.png differ diff --git a/images/editprofileblue.png b/images/editprofileblue.png index 76956ec..56cdc57 100644 Binary files a/images/editprofileblue.png and b/images/editprofileblue.png differ diff --git a/images/img.png b/images/img.png index 803da46..e12ecfb 100644 Binary files a/images/img.png and b/images/img.png differ diff --git a/images/logoutblue.png b/images/logoutblue.png index 27bdaa7..d70a475 100644 Binary files a/images/logoutblue.png and b/images/logoutblue.png differ diff --git a/images/profile_pic.png b/images/profile_pic.png index 3fd3f73..e760687 100644 Binary files a/images/profile_pic.png and b/images/profile_pic.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index 1a6bf7b..5b9027a 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index f7c6aea..4ad45b7 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index d2b58c1..2fdc96f 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index 2f790a4..6a3d15a 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index 3c34c2c..220c5aa 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index 1462d8f..88c438b 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index 9842996..c4e5c57 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index d2b58c1..2fdc96f 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index b86365d..e0ebb40 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index 346de13..f8e08f0 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png index 217e835..17e1914 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png index 98e4bb4..aad33aa 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png index 972b7f4..d83b3fa 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png index e7c7941..213d84b 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index 346de13..f8e08f0 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index 6d1449a..2abf09c 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png index e803194..53dc943 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png index fc29f2a..44c74e6 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index e765612..ae0d94c 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index bdaca89..ce18c0b 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index 55f283d..2a44029 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/lib/adddeliveryboy.dart b/lib/adddeliveryboy.dart index df12c0a..d8ef8d3 100644 --- a/lib/adddeliveryboy.dart +++ b/lib/adddeliveryboy.dart @@ -80,6 +80,7 @@ class _deliverboyState extends State { @override Widget build(BuildContext context) { return Scaffold( + appBar:AppSettings.appBar('Add Deliveryboy'), body: SafeArea( child: SingleChildScrollView( child: Column( diff --git a/lib/dashboard.dart b/lib/dashboard.dart index bd94d40..2b38c66 100644 --- a/lib/dashboard.dart +++ b/lib/dashboard.dart @@ -154,15 +154,15 @@ class _DashboardState extends State { Expanded( child: GestureDetector( onTap: () { - Navigator.push( + Navigator.push( context, MaterialPageRoute(builder: (context) => TankersView()), ); }, child: Container( - height: 100, padding: EdgeInsets.all(05), - margin: EdgeInsets.only(left:15, top:10, right: 0, bottom:0), + margin: + EdgeInsets.only(left: 10, top: 10, right: 10, bottom: 0), //height: MediaQuery.of(context).size.height * .05, //width: MediaQuery.of(context).size.width * .45, decoration: BoxDecoration( @@ -170,26 +170,24 @@ class _DashboardState extends State { borderRadius: BorderRadius.circular(12), ), // Change button text when light changes state. - child: Center( - child: Column( - children: [ - Container( - //height: 50, - padding: EdgeInsets.fromLTRB(0, 15,0,0), - child: new SvgPicture.asset("assets/images/tankersview.svg") - ), - SizedBox(height: 5,), - Text('Takers View',style: dashboardTextStyle(),), - ], - ), - ) + child: Column( + children: [ + Container( + padding: EdgeInsets.fromLTRB(35, 10, 0, 0), + child: new SvgPicture.asset( + "assets/images/tankersview.svg")), + Text( + 'Takers View', + style: dashboardTextStyle(), + ), + ], + ), ), )), - SizedBox( - width: MediaQuery.of(context).size.width * .03, + width: MediaQuery.of(context).size.width * .02, ), Expanded( @@ -201,9 +199,8 @@ class _DashboardState extends State { ); }, child: Container( - height: 100, padding: EdgeInsets.all(05), - margin: EdgeInsets.only(left:15, top:10, right: 0, bottom:0), + margin: EdgeInsets.only(left:10, top:10, right: 10, bottom:0), //height: MediaQuery.of(context).size.height * .05, //width: MediaQuery.of(context).size.width * .45, decoration: BoxDecoration( @@ -216,10 +213,9 @@ class _DashboardState extends State { children: [ Container( //height: 50, - padding: EdgeInsets.fromLTRB(0, 15,0,0), + padding: EdgeInsets.fromLTRB(35, 10,0,0), child: new SvgPicture.asset("assets/images/deliveryboyview.svg") ), - SizedBox(height: 5,), Text('Deliveryboys View',style: dashboardTextStyle(),), ], @@ -242,9 +238,8 @@ class _DashboardState extends State { ); }, child: Container( - height: 100, padding: EdgeInsets.all(05), - margin: EdgeInsets.only(left:15, top:10, right: 0, bottom:0), + margin: EdgeInsets.only(left:10, top:10, right: 10, bottom:0), //height: MediaQuery.of(context).size.height * .05, //width: MediaQuery.of(context).size.width * .45, decoration: BoxDecoration( @@ -257,10 +252,9 @@ class _DashboardState extends State { children: [ Container( //height: 50, - padding: EdgeInsets.fromLTRB(0, 15,0,0), + padding: EdgeInsets.fromLTRB(35, 10,0,0), child: new SvgPicture.asset("assets/images/customers.svg") ), - SizedBox(height: 5,), Text('Customers',style: dashboardTextStyle(),), ], @@ -271,7 +265,7 @@ class _DashboardState extends State { SizedBox( - width: MediaQuery.of(context).size.width * .03, + width: MediaQuery.of(context).size.width * .02, ), Expanded( @@ -283,9 +277,8 @@ class _DashboardState extends State { ); }, child: Container( - height: 100, padding: EdgeInsets.all(05), - margin: EdgeInsets.only(left:15, top:10, right: 0, bottom:0), + margin: EdgeInsets.only(left:10, top:10, right: 10, bottom:0), //height: MediaQuery.of(context).size.height * .05, //width: MediaQuery.of(context).size.width * .45, decoration: BoxDecoration( @@ -298,10 +291,9 @@ class _DashboardState extends State { children: [ Container( //height: 50, - padding: EdgeInsets.fromLTRB(0, 15,0,0), + padding: EdgeInsets.fromLTRB(35, 10,0,0), child: new SvgPicture.asset("assets/images/booking_request.svg") ), - SizedBox(height: 5,), Text('Booking Requests',style: dashboardTextStyle(),), ], @@ -415,11 +407,13 @@ class _DashboardState extends State { resizeToAvoidBottomInset: false, appBar:AppSettings.appBar('Arminta Water Management'), drawer: Drawer( + backgroundColor: secondaryColor, // Add a ListView to the drawer. This ensures the user can scroll // through the options in the drawer if there isn't enough vertical // space to fit everything. //backgroundColor: screenBackgroundColor, child: ListView( + // Important: Remove any padding from the ListView. padding: EdgeInsets.zero, children: [ diff --git a/lib/login.dart b/lib/login.dart index b6aa99a..f9d5b56 100644 --- a/lib/login.dart +++ b/lib/login.dart @@ -74,11 +74,11 @@ class _LoginState extends State { body: Stack( children: [ - /* Container( + Container( decoration: const BoxDecoration( - image: DecorationImage(image:AssetImage("images/backgroundimage.png"), fit: BoxFit.cover,), + image: DecorationImage(image:AssetImage("images/bggimgg.png"), fit: BoxFit.cover,), ), - ),*/ + ), GestureDetector( onTap: () { FocusManager.instance.primaryFocus?.unfocus(); @@ -104,52 +104,38 @@ class _LoginState extends State { Container( padding: const EdgeInsets.all(10), child: TextFormField( - cursorColor: greyColor, + cursorColor: Colors.white, controller: mobileNumberController, keyboardType: TextInputType.number, - decoration: const InputDecoration( - prefixIcon: Icon( - Icons.phone, - color: greyColor, - ), - border: OutlineInputBorder( - borderSide: BorderSide(color: greyColor)), - focusedBorder: OutlineInputBorder( - borderSide: BorderSide(color:greyColor), - ), - enabledBorder: OutlineInputBorder( - borderSide: BorderSide(color: greyColor), - ), - labelText: 'Enter MobileNumber', - labelStyle: TextStyle( - color: greyColor, //<-- SEE HERE - ), - ), + decoration: textFormFieldDecoration(Icons.phone,'Enter MobileNumber'), + ), ), const SizedBox( height: 15, ), - Container( + Container( padding: const EdgeInsets.fromLTRB(10, 10, 10, 0), child: TextFormField( cursorColor: greyColor, obscureText: isObscureText, controller: passwordController, decoration: InputDecoration( + filled: true, + fillColor: Colors.white, labelText: 'Password', prefixIcon: const Icon(Icons.password, color: greyColor,), labelStyle: const TextStyle( - color: greyColor, //<-- SEE HERE + color: primaryColor, fontWeight: FontWeight.bold//<-- SEE HERE ), border: const OutlineInputBorder( - borderSide: BorderSide(color: greyColor)), + borderSide: BorderSide(color: primaryColor)), focusedBorder: const OutlineInputBorder( - borderSide: BorderSide(color: greyColor), + borderSide: BorderSide(color: primaryColor), ), enabledBorder: const OutlineInputBorder( - borderSide: BorderSide(color: textFieldStartColor), + borderSide: BorderSide(color: primaryColor), ), suffixIcon: IconButton( icon: Icon( @@ -180,7 +166,7 @@ class _LoginState extends State { child: const Text( 'Forgot Password?', style: TextStyle( - color: greyColor, + color: Colors.white, fontSize: 15, decoration: TextDecoration.underline, @@ -249,21 +235,21 @@ class _LoginState extends State { }, child: const Text('Login'), )), - Padding(padding: const EdgeInsets.fromLTRB(180, 10,0,10), + Padding(padding: const EdgeInsets.fromLTRB(150, 10,0,10), child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ const Text( 'Not a Member Yet?', style: TextStyle( - color: greyColor, + color: Colors.white, ), ), TextButton( child: const Text( 'Sign Up', style: TextStyle(fontSize: 15, - decoration: TextDecoration.underline,color: greyColor), + decoration: TextDecoration.underline,color: Colors.white), ), onPressed: () { Navigator.push( diff --git a/lib/settings.dart b/lib/settings.dart index 382a1c9..9d000a8 100644 --- a/lib/settings.dart +++ b/lib/settings.dart @@ -12,16 +12,16 @@ import 'package:geolocator/geolocator.dart'; import 'package:watermanagement/preloader.dart'; import 'package:dio/dio.dart'; -const Color primaryColor = Color(0XFF0D4E84); +//const Color primaryColor = Color(0XFF0D4E84); +const Color primaryColor = Color(0XFF4D317D); +const Color secondaryColor = Color(0XFFDCCBFA); const Color greyColor = Color(0XFF8F8E8E); const Color textFieldStartColor = Colors.grey; -const Color screenBackgroundColor = Color(0XFFEAF6FF); +const Color screenBackgroundColor = Color(0XFFDCCBFA); const Color screenBackgroundColord = Colors.black12; const Color dashboardbackground = Color(0XFFF5F5F5); - - -Color AppBarGradient_1 = Color(0XFF1258F6); +Color AppBarGradient_1 = Color(0XFF4D317D); TextStyle PreloaderText() { return TextStyle(color: Colors.blueAccent); @@ -52,7 +52,27 @@ TextStyle serverIssueTextStyle() { return TextStyle(color: Colors.red, fontSize: 15); } - +InputDecoration textFormFieldDecoration(IconData icon,var text){ + return InputDecoration( + filled: true, + fillColor: Colors.white, + prefixIcon: Icon( + icon, + color: greyColor, + ), + border: OutlineInputBorder(borderSide: BorderSide(color: primaryColor)), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide(color: primaryColor), + ), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide(color: primaryColor), + ), + labelText: text, + labelStyle: + TextStyle(color: primaryColor, fontWeight: FontWeight.bold //<-- SEE HERE + ), + ); +} @@ -390,6 +410,7 @@ class AppSettings { } } static Future getTankers() async { + //query parameter var uri = Uri.parse(getTankersDataUrl); uri = uri.replace(query: 'supplierId=$supplierId'); diff --git a/lib/signup.dart b/lib/signup.dart index d285067..fc26077 100644 --- a/lib/signup.dart +++ b/lib/signup.dart @@ -131,12 +131,9 @@ class _SignInState extends State { child: Scaffold( body: Stack(children: [ Container( - /*decoration: const BoxDecoration( - image: DecorationImage( - image: AssetImage(""), - fit: BoxFit.cover, - ), - ),*/ + decoration: const BoxDecoration( + image: DecorationImage(image:AssetImage("images/bggimgg.png"), fit: BoxFit.cover,), + ), ), GestureDetector( onTap: () { @@ -166,55 +163,24 @@ class _SignInState extends State { cursorColor: greyColor, controller: nameController, textCapitalization: TextCapitalization.sentences, - decoration: const InputDecoration( - prefixIcon: Icon( - Icons.person, - color: greyColor, - ), - border: OutlineInputBorder( - borderSide: BorderSide(color: greyColor)), - focusedBorder: OutlineInputBorder( - borderSide: BorderSide(color: greyColor), - ), - enabledBorder: OutlineInputBorder( - borderSide: BorderSide(color: greyColor), - ), - labelText: 'Supplier Name', - labelStyle: TextStyle( - color: greyColor, //<-- SEE HERE - ), - ), + decoration: textFormFieldDecoration(Icons.person,'Supplier Name'), ), - ), //name + ), //n const SizedBox( height: 5, ), + + + Container( padding: const EdgeInsets.all(10), child: TextFormField( cursorColor: greyColor, controller: emailController, - keyboardType: TextInputType.emailAddress, - decoration: const InputDecoration( - prefixIcon: Icon( - Icons.email, - color: greyColor, - ), - border: OutlineInputBorder( - borderSide: BorderSide(color: greyColor)), - focusedBorder: OutlineInputBorder( - borderSide: BorderSide(color: greyColor), - ), - enabledBorder: OutlineInputBorder( - borderSide: BorderSide(color: greyColor), - ), - labelText: 'Enter your email', - labelStyle: TextStyle( - color: greyColor, //<-- SEE HERE - ), - ), + textCapitalization: TextCapitalization.sentences, + decoration: textFormFieldDecoration(Icons.email,'Enter your email'), ), - ), //email + ), const SizedBox( height: 5, @@ -224,28 +190,11 @@ class _SignInState extends State { child: TextFormField( cursorColor: greyColor, controller: mobileNumberController, - keyboardType: TextInputType.phone, maxLength: 10, - decoration: const InputDecoration( - prefixIcon: Icon( - Icons.phone_android, - color: greyColor, - ), - border: OutlineInputBorder( - borderSide: BorderSide(color: greyColor)), - focusedBorder: OutlineInputBorder( - borderSide: BorderSide(color: greyColor), - ), - enabledBorder: OutlineInputBorder( - borderSide: BorderSide(color: greyColor), - ), - labelText: 'Enter Mobile Number', - labelStyle: TextStyle( - color: greyColor, //<-- SEE HERE - ), - ), + textCapitalization: TextCapitalization.sentences, + decoration: textFormFieldDecoration(Icons.phone,'Enter Mobile Number'), ), - ), //mobile + ), const SizedBox( height: 5, @@ -356,24 +305,7 @@ class _SignInState extends State { }, keyboardType: TextInputType.streetAddress, readOnly: false, - decoration: const InputDecoration( - prefixIcon: Icon( - Icons.location_on_rounded, - color: greyColor, - ), - border: OutlineInputBorder( - borderSide: BorderSide(color: greyColor)), - focusedBorder: OutlineInputBorder( - borderSide: BorderSide(color: greyColor), - ), - enabledBorder: OutlineInputBorder( - borderSide: BorderSide(color: greyColor), - ), - labelText: 'select adress from MAP', - labelStyle: TextStyle( - color: greyColor, //<-- SEE HERE - ), - ), + decoration: textFormFieldDecoration(Icons.location_on_rounded,'select address from MAP'), ), ), @@ -391,24 +323,8 @@ class _SignInState extends State { cursorColor: greyColor, controller: userAddressDescriptionController, keyboardType: TextInputType.emailAddress, - decoration: const InputDecoration( - prefixIcon: Icon( - Icons.plagiarism_outlined, - color: greyColor, - ), - border: OutlineInputBorder( - borderSide: BorderSide(color: greyColor)), - focusedBorder: OutlineInputBorder( - borderSide: BorderSide(color: greyColor), - ), - enabledBorder: OutlineInputBorder( - borderSide: BorderSide(color: greyColor), - ), - labelText: 'Address Description (Ex: Flat No)', - labelStyle: TextStyle( - color: greyColor, //<-- SEE HERE - ), - ), + decoration: textFormFieldDecoration(Icons.plagiarism_outlined,'Address Description (Ex: Flat No)'), + ), ),//address description @@ -421,35 +337,8 @@ class _SignInState extends State { cursorColor: greyColor, obscureText: isPwdObscureText, controller: passwordController, - decoration: InputDecoration( - labelText: 'Create Password', - prefixIcon: const Icon( - Icons.lock, - color: greyColor, - ), - labelStyle: const TextStyle( - color: greyColor, //<-- SEE HERE - ), - border: const OutlineInputBorder( - borderSide: BorderSide(color: greyColor)), - focusedBorder: const OutlineInputBorder( - borderSide: BorderSide(color: greyColor), - ), - enabledBorder: const OutlineInputBorder( - borderSide: BorderSide(color: textFieldStartColor), - ), - suffixIcon: IconButton( - icon: Icon( - Icons.visibility_off_outlined, - color: isPwdObscureText?greyColor:primaryColor, - ), - onPressed: () { - setState(() { - isPwdObscureText = !isPwdObscureText; - }); - }, - ), - ), + decoration: textFormFieldDecoration(Icons.lock,'Create Password'), + ), ), //pwd const SizedBox( @@ -543,7 +432,7 @@ class _SignInState extends State { const Text( 'Are you a Member?', style: TextStyle( - color: primaryColor, + color: Colors.white, ), ), TextButton( @@ -551,7 +440,7 @@ class _SignInState extends State { 'Login?', style: TextStyle( fontSize: 20, - color: greyColor, + color: Colors.white, decoration: TextDecoration.underline, ), ), diff --git a/lib/tankersview.dart b/lib/tankersview.dart index cba1b99..b567f0f 100644 --- a/lib/tankersview.dart +++ b/lib/tankersview.dart @@ -601,7 +601,6 @@ class _TankersViewState extends State { icon: const Icon(Icons.edit,color: primaryColor,), onPressed: () { showUpdateTankerDialog(modelTanksViewList[index]); - }, ),), Expanded(child:IconButton( diff --git a/lib/updateprofile.dart b/lib/updateprofile.dart index d47ac6d..1bb3c10 100644 --- a/lib/updateprofile.dart +++ b/lib/updateprofile.dart @@ -293,7 +293,7 @@ class _UpdateprofileState extends State { decoration: const InputDecoration( prefixIcon: Icon( Icons.description, - color: greyColor, + color:greyColor, ), contentPadding: const EdgeInsets.symmetric(vertical: 60.0, horizontal: 30.0), border: OutlineInputBorder(