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 cac190f..2f24912 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 310d893..042ce5d 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 40b8026..0db0335 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 6869a40..71cd41f 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 43c16c0..a431223 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/images/appbgsuplier.png b/images/appbgsuplier.png index ecde904..dc9c4bf 100644 Binary files a/images/appbgsuplier.png and b/images/appbgsuplier.png differ diff --git a/images/appiconn.png b/images/appiconn.png index 09fddd3..e7d658b 100644 Binary files a/images/appiconn.png and b/images/appiconn.png differ diff --git a/images/backgroundimage.png b/images/backgroundimage.png index 493f8dc..c69cd72 100644 Binary files a/images/backgroundimage.png and b/images/backgroundimage.png differ diff --git a/images/connectionsblue.png b/images/connectionsblue.png index b01c88e..99dc347 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..c777f52 100644 Binary files a/images/customercareblue.png and b/images/customercareblue.png differ diff --git a/images/final_splash_screen.png b/images/final_splash_screen.png index adaa248..d75b7a0 100644 Binary files a/images/final_splash_screen.png and b/images/final_splash_screen.png differ diff --git a/images/logo.png b/images/logo.png index a986cad..0084f50 100644 Binary files a/images/logo.png and b/images/logo.png differ diff --git a/images/logoutblue.png b/images/logoutblue.png index 27bdaa7..13291ea 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 4cb969e..17ff33e 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 1f36a62..a255e70 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 bb1b93b..26f10c4 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 0e17ed9..f2f5dc0 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 05c43be..15c96ce 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 d0e8e24..911f012 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 bcb5e4e..b310f0b 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 bb1b93b..26f10c4 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 9a29a52..42d3045 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 ae190f1..d4a8af1 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 c55315b..3608bbb 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 ab1eba8..5385aed 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 55875ba..cdc2f08 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 8fdb1b2..6f5f553 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 ae190f1..d4a8af1 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 92b89d9..e0cc831 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 a1f6c6f..6f72d87 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 7de0ad9..2a23e94 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 1c13a1a..7c02824 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 4df3636..af1e4cb 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 bc92b7f..bd3e077 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/dashboard.dart b/lib/dashboard.dart index e2257c6..ac2e2d2 100644 --- a/lib/dashboard.dart +++ b/lib/dashboard.dart @@ -73,7 +73,7 @@ class _DashboardState extends State { child: Column( children: [ Container( - height: MediaQuery.of(context).size.height * .330, + height: MediaQuery.of(context).size.height * .250, width: double.infinity, decoration: BoxDecoration( borderRadius: BorderRadius.circular(0), @@ -115,7 +115,7 @@ class _DashboardState extends State { child: Column( children: [ Container( - padding: EdgeInsets.fromLTRB(20, 10,10,10), + padding: EdgeInsets.fromLTRB(30, 10,10,10), child: new SvgPicture.asset("assets/images/booking_request.svg") ), Text('Booking Data',style: dashboardTextStyle(),), @@ -228,7 +228,7 @@ class _DashboardState extends State { // 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, + backgroundColor: screenBackgroundColor, child: ListView( // Important: Remove any padding from the ListView. padding: EdgeInsets.zero, diff --git a/lib/login.dart b/lib/login.dart index 3111706..c014270 100644 --- a/lib/login.dart +++ b/lib/login.dart @@ -105,24 +105,7 @@ class _LoginState extends State { cursorColor: greyColor, 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( diff --git a/lib/otpscreen.dart b/lib/otpscreen.dart index 0fb6e2d..4e9e898 100644 --- a/lib/otpscreen.dart +++ b/lib/otpscreen.dart @@ -29,6 +29,7 @@ class _OtpScreenState extends State { @override Widget build(BuildContext context) { return Scaffold( + backgroundColor: screenBackgroundColor, body: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ @@ -141,9 +142,17 @@ class OtpInput extends StatelessWidget { keyboardType: TextInputType.number, controller: controller, maxLength: 1, - cursorColor: Theme.of(context).primaryColor, + cursorColor: primaryColor, decoration: const InputDecoration( - border: OutlineInputBorder(), + filled: true, + fillColor: Colors.white, + border: OutlineInputBorder(borderSide: BorderSide(color: primaryColor)), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide(color: primaryColor), + ), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide(color: primaryColor), + ), counterText: '', hintStyle: TextStyle(color: Colors.black, fontSize: 20.0)), onChanged: (value) { diff --git a/lib/settings.dart b/lib/settings.dart index ff9187f..0ace8d2 100644 --- a/lib/settings.dart +++ b/lib/settings.dart @@ -14,17 +14,19 @@ import 'package:geolocator/geolocator.dart'; import 'package:watermanagement/preloader.dart'; -const Color primaryColor = Color(0XFF0D4E84); +//const Color primaryColor = Color(0XFF0D4E84); +const Color primaryColor = Color(0XFF4D317D); const Color greyColor = Color(0XFF8F8E8E); const Color textFieldStartColor = Colors.grey; -const Color screenBackgroundColor = Color(0XFFEAF6FF); +//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); + return TextStyle(color:Color(0XFF4D317D)); } TextStyle labelTextStyle() { @@ -69,6 +71,28 @@ 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 + ), + ); +} + final GlobalKey preloaderWindowKey = new GlobalKey(); Future preloaderWindow(BuildContext context) async { try { diff --git a/pictures/appbgsuplier.png b/pictures/appbgsuplier.png new file mode 100644 index 0000000..ecde904 Binary files /dev/null and b/pictures/appbgsuplier.png differ diff --git a/pictures/appbgsuplier1.png b/pictures/appbgsuplier1.png new file mode 100644 index 0000000..5d793c5 Binary files /dev/null and b/pictures/appbgsuplier1.png differ diff --git a/pictures/appiconn.png b/pictures/appiconn.png new file mode 100644 index 0000000..09fddd3 Binary files /dev/null and b/pictures/appiconn.png differ diff --git a/pictures/backgroundimage.png b/pictures/backgroundimage.png new file mode 100644 index 0000000..493f8dc Binary files /dev/null and b/pictures/backgroundimage.png differ diff --git a/pictures/connectionsblue.png b/pictures/connectionsblue.png new file mode 100644 index 0000000..b01c88e Binary files /dev/null and b/pictures/connectionsblue.png differ diff --git a/pictures/customercareblue.png b/pictures/customercareblue.png new file mode 100644 index 0000000..7fdc2d4 Binary files /dev/null and b/pictures/customercareblue.png differ diff --git a/pictures/editprofileblue.png b/pictures/editprofileblue.png new file mode 100644 index 0000000..76956ec Binary files /dev/null and b/pictures/editprofileblue.png differ diff --git a/pictures/final_splash_screen.png b/pictures/final_splash_screen.png new file mode 100644 index 0000000..adaa248 Binary files /dev/null and b/pictures/final_splash_screen.png differ diff --git a/pictures/ic_launcher.png b/pictures/ic_launcher.png new file mode 100644 index 0000000..dcf4065 Binary files /dev/null and b/pictures/ic_launcher.png differ diff --git a/pictures/logo.png b/pictures/logo.png new file mode 100644 index 0000000..a986cad Binary files /dev/null and b/pictures/logo.png differ diff --git a/pictures/logoutblue.png b/pictures/logoutblue.png new file mode 100644 index 0000000..27bdaa7 Binary files /dev/null and b/pictures/logoutblue.png differ diff --git a/pictures/no_data.png b/pictures/no_data.png new file mode 100644 index 0000000..27c28a4 Binary files /dev/null and b/pictures/no_data.png differ diff --git a/pictures/profile_pic.png b/pictures/profile_pic.png new file mode 100644 index 0000000..3fd3f73 Binary files /dev/null and b/pictures/profile_pic.png differ