diff --git a/ios/Flutter/.last_build_id b/ios/Flutter/.last_build_id new file mode 100644 index 0000000..ef997fe --- /dev/null +++ b/ios/Flutter/.last_build_id @@ -0,0 +1 @@ +5fbd1cb9b58728098d7578fb656a1766 \ No newline at end of file diff --git a/ios/Podfile.lock b/ios/Podfile.lock new file mode 100644 index 0000000..f34583e --- /dev/null +++ b/ios/Podfile.lock @@ -0,0 +1,203 @@ +PODS: + - "app_settings (3.0.0+1)": + - Flutter + - barcode_scan (0.0.1): + - Flutter + - MTBBarcodeScanner + - SwiftProtobuf + - connectivity (0.0.1): + - Flutter + - Reachability + - connectivity_for_web (0.1.0): + - Flutter + - connectivity_macos (0.0.1): + - Flutter + - device_info (0.0.1): + - Flutter + - Flutter (1.0.0) + - flutter_flexible_toast (0.0.1): + - Flutter + - flutter_local_notifications (0.0.1): + - Flutter + - flutter_plugin_android_lifecycle (0.0.1): + - Flutter + - hexcolor (0.0.1): + - Flutter + - image_cropper (0.0.3): + - Flutter + - TOCropViewController (~> 2.5.4) + - image_picker (0.0.1): + - Flutter + - local_auth (0.0.1): + - Flutter + - location (0.0.1): + - Flutter + - location_web (0.0.1): + - Flutter + - map_launcher (0.0.1): + - Flutter + - maps_launcher (0.0.1): + - Flutter + - MTBBarcodeScanner (5.0.11) + - path_provider_linux (0.0.1): + - Flutter + - "permission_handler (5.0.1+1)": + - Flutter + - Reachability (3.2) + - shared_preferences (0.0.1): + - Flutter + - shared_preferences_linux (0.0.1): + - Flutter + - shared_preferences_macos (0.0.1): + - Flutter + - shared_preferences_web (0.0.1): + - Flutter + - SwiftProtobuf (1.11.0) + - TOCropViewController (2.5.4) + - url_launcher (0.0.1): + - Flutter + - url_launcher_linux (0.0.1): + - Flutter + - url_launcher_macos (0.0.1): + - Flutter + - url_launcher_web (0.0.1): + - Flutter + - url_launcher_windows (0.0.1): + - Flutter + +DEPENDENCIES: + - app_settings (from `.symlinks/plugins/app_settings/ios`) + - barcode_scan (from `.symlinks/plugins/barcode_scan/ios`) + - connectivity (from `.symlinks/plugins/connectivity/ios`) + - connectivity_for_web (from `.symlinks/plugins/connectivity_for_web/ios`) + - connectivity_macos (from `.symlinks/plugins/connectivity_macos/ios`) + - device_info (from `.symlinks/plugins/device_info/ios`) + - Flutter (from `Flutter`) + - flutter_flexible_toast (from `.symlinks/plugins/flutter_flexible_toast/ios`) + - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) + - flutter_plugin_android_lifecycle (from `.symlinks/plugins/flutter_plugin_android_lifecycle/ios`) + - hexcolor (from `.symlinks/plugins/hexcolor/ios`) + - image_cropper (from `.symlinks/plugins/image_cropper/ios`) + - image_picker (from `.symlinks/plugins/image_picker/ios`) + - local_auth (from `.symlinks/plugins/local_auth/ios`) + - location (from `.symlinks/plugins/location/ios`) + - location_web (from `.symlinks/plugins/location_web/ios`) + - map_launcher (from `.symlinks/plugins/map_launcher/ios`) + - maps_launcher (from `.symlinks/plugins/maps_launcher/ios`) + - path_provider_linux (from `.symlinks/plugins/path_provider_linux/ios`) + - permission_handler (from `.symlinks/plugins/permission_handler/ios`) + - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) + - shared_preferences_linux (from `.symlinks/plugins/shared_preferences_linux/ios`) + - shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`) + - shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`) + - url_launcher (from `.symlinks/plugins/url_launcher/ios`) + - url_launcher_linux (from `.symlinks/plugins/url_launcher_linux/ios`) + - url_launcher_macos (from `.symlinks/plugins/url_launcher_macos/ios`) + - url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`) + - url_launcher_windows (from `.symlinks/plugins/url_launcher_windows/ios`) + +SPEC REPOS: + trunk: + - MTBBarcodeScanner + - Reachability + - SwiftProtobuf + - TOCropViewController + +EXTERNAL SOURCES: + app_settings: + :path: ".symlinks/plugins/app_settings/ios" + barcode_scan: + :path: ".symlinks/plugins/barcode_scan/ios" + connectivity: + :path: ".symlinks/plugins/connectivity/ios" + connectivity_for_web: + :path: ".symlinks/plugins/connectivity_for_web/ios" + connectivity_macos: + :path: ".symlinks/plugins/connectivity_macos/ios" + device_info: + :path: ".symlinks/plugins/device_info/ios" + Flutter: + :path: Flutter + flutter_flexible_toast: + :path: ".symlinks/plugins/flutter_flexible_toast/ios" + flutter_local_notifications: + :path: ".symlinks/plugins/flutter_local_notifications/ios" + flutter_plugin_android_lifecycle: + :path: ".symlinks/plugins/flutter_plugin_android_lifecycle/ios" + hexcolor: + :path: ".symlinks/plugins/hexcolor/ios" + image_cropper: + :path: ".symlinks/plugins/image_cropper/ios" + image_picker: + :path: ".symlinks/plugins/image_picker/ios" + local_auth: + :path: ".symlinks/plugins/local_auth/ios" + location: + :path: ".symlinks/plugins/location/ios" + location_web: + :path: ".symlinks/plugins/location_web/ios" + map_launcher: + :path: ".symlinks/plugins/map_launcher/ios" + maps_launcher: + :path: ".symlinks/plugins/maps_launcher/ios" + path_provider_linux: + :path: ".symlinks/plugins/path_provider_linux/ios" + permission_handler: + :path: ".symlinks/plugins/permission_handler/ios" + shared_preferences: + :path: ".symlinks/plugins/shared_preferences/ios" + shared_preferences_linux: + :path: ".symlinks/plugins/shared_preferences_linux/ios" + shared_preferences_macos: + :path: ".symlinks/plugins/shared_preferences_macos/ios" + shared_preferences_web: + :path: ".symlinks/plugins/shared_preferences_web/ios" + url_launcher: + :path: ".symlinks/plugins/url_launcher/ios" + url_launcher_linux: + :path: ".symlinks/plugins/url_launcher_linux/ios" + url_launcher_macos: + :path: ".symlinks/plugins/url_launcher_macos/ios" + url_launcher_web: + :path: ".symlinks/plugins/url_launcher_web/ios" + url_launcher_windows: + :path: ".symlinks/plugins/url_launcher_windows/ios" + +SPEC CHECKSUMS: + app_settings: d103828c9f5d515c4df9ee754dabd443f7cedcf3 + barcode_scan: a5c27959edfafaa0c771905bad0b29d6d39e4479 + connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467 + connectivity_for_web: 2b8584556930d4bd490d82b836bcf45067ce345b + connectivity_macos: e2e9731b6b22dda39eb1b128f6969d574460e191 + device_info: d7d233b645a32c40dfdc212de5cf646ca482f175 + Flutter: 0e3d915762c693b495b44d77113d4970485de6ec + flutter_flexible_toast: 0547e740cae0c33bb7c51bcd931233f4584e1143 + flutter_local_notifications: 9e4738ce2471c5af910d961a6b7eadcf57c50186 + flutter_plugin_android_lifecycle: dc0b544e129eebb77a6bfb1239d4d1c673a60a35 + hexcolor: fdfb9c4258ad96e949c2dbcdf790a62194b8aa89 + image_cropper: c8f9b4157933c7bb965a66d1c5e6c8fd408c6eb4 + image_picker: 9c3312491f862b28d21ecd8fdf0ee14e601b3f09 + local_auth: 25938960984c3a7f6e3253e3f8d962fdd16852bd + location: 3a2eed4dd2fab25e7b7baf2a9efefe82b512d740 + location_web: b94e7433cfe28c0f7c8923c2ee482824b32e55a7 + map_launcher: e325db1261d029ff33e08e03baccffe09593ffea + maps_launcher: eae38ee13a9c3f210fa04e04bb4c073fa4c6ed92 + MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb + path_provider_linux: 4d630dc393e1f20364f3e3b4a2ff41d9674a84e4 + permission_handler: eac8e15b4a1a3fba55b761d19f3f4e6b005d15b6 + Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 + shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d + shared_preferences_linux: afefbfe8d921e207f01ede8b60373d9e3b566b78 + shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087 + shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9 + SwiftProtobuf: f889fe5772f90ef7d7b8aac352d1fddf39650713 + TOCropViewController: 2a1ae1242600b1f2d996fd91a5268b2309a33b5c + url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef + url_launcher_linux: ac237cb7a8058736e4aae38bdbcc748a4b394cc0 + url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313 + url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c + url_launcher_windows: 683d7c283894db8d1914d3ab2223b20cc1ad95d5 + +PODFILE CHECKSUM: c34e2287a9ccaa606aeceab922830efb9a6ff69a + +COCOAPODS: 1.10.0.rc.1 diff --git a/lib/main.dart b/lib/main.dart index 8449b2e..1a9a040 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -81,9 +81,9 @@ class MyApp extends StatelessWidget { ), ), ), - home: SplashScreenPage(), -// initialRoute: '/', -// routes: {'/': (context) => RootPage()}, + // home: SplashScreenPage(), + initialRoute: '/', + routes: {'/': (context) => SplashScreenPage()}, debugShowCheckedModeBanner: false, ), ), diff --git a/lib/pages/delivery/delivery_confirmed_page.dart b/lib/pages/delivery/delivery_confirmed_page.dart index 5b19fa3..894eb68 100644 --- a/lib/pages/delivery/delivery_confirmed_page.dart +++ b/lib/pages/delivery/delivery_confirmed_page.dart @@ -31,67 +31,64 @@ class DeliveryConfirmedPage extends StatelessWidget { titleColor: Colors.white, body: SafeArea( child: Container( - decoration: BoxDecoration(gradient: LINEAR_GRADIENT), + // child: ListView( children: [ Stack( children: [ - Column( - children: [ - Container( - child: Column( - children: [ - Container( - width: MediaQuery.of(context).size.width, - height: MediaQuery.of(context).orientation == - Orientation.portrait - ? MediaQuery.of(context).size.width * 0.7 - : MediaQuery.of(context).size.width * 0.5, - padding: EdgeInsets.only( - top: MediaQuery.of(context).size.width * 0.14, + Container( + decoration: BoxDecoration(gradient: LINEAR_GRADIENT), + height: MediaQuery.of(context).orientation == + Orientation.portrait + ? MediaQuery.of(context).size.width * 1 + : MediaQuery.of(context).size.width * 1, + child: Stack( + children: [ + Container( + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).orientation == + Orientation.portrait + ? MediaQuery.of(context).size.width * 0.7 + : MediaQuery.of(context).size.width * 0.5, + padding: EdgeInsets.only( + top: MediaQuery.of(context).size.width * 0.14, + ), + decoration: BoxDecoration( + color: Colors.white10, shape: BoxShape.circle), + child: Column( + children: [ + Icon( + Icons.check_circle, + color: Colors.white, + size: 75, + ), + SizedBox( + height: + MediaQuery.of(context).size.width * 0.03, ), - decoration: BoxDecoration( - color: Colors.white10, - shape: BoxShape.circle), - child: Column( - children: [ - Icon( - Icons.check_circle, + Text( + 'Delivery Confirmed', + style: TextStyle( color: Colors.white, - size: 75, - ), - SizedBox( - height: - MediaQuery.of(context).size.width * - 0.03, - ), - Text( - 'Delivery Confirmed', - style: TextStyle( - color: Colors.white, - fontSize: 20, - fontWeight: FontWeight.bold), - ), - SizedBox( - height: - MediaQuery.of(context).size.width * - 0.01, - ), - Text( - TranslationBase.of(context) - .confirmationSent, - style: TextStyle( - color: Colors.white, - fontSize: 13, - ), - ), - ], + fontSize: 20, + fontWeight: FontWeight.bold), ), - ), - ], + SizedBox( + height: + MediaQuery.of(context).size.width * 0.01, + ), + Text( + TranslationBase.of(context).confirmationSent, + style: TextStyle( + color: Colors.white, + fontSize: 13, + ), + ), + ], + ), ), - ), - ], + ], + ), ), // Container( // width: MediaQuery.of(context).size.width, @@ -110,7 +107,9 @@ class DeliveryConfirmedPage extends StatelessWidget { : MediaQuery.of(context).size.width * 0.60, ), decoration: BoxDecoration( - color: Colors.white, + color: Theme + .of(context) + .scaffoldBackgroundColor, borderRadius: BorderRadius.only( topLeft: Radius.circular(80), topRight: Radius.circular(80)), diff --git a/lib/pages/delivery/information_page.dart b/lib/pages/delivery/information_page.dart index 0674706..98d60f6 100644 --- a/lib/pages/delivery/information_page.dart +++ b/lib/pages/delivery/information_page.dart @@ -149,6 +149,7 @@ class InformationPage extends StatelessWidget { return BaseView( builder: (_, model, w) => AppScaffold( isShowAppBar: true, + isShowHomeIcon: true, appBarColor: Color(0xff49C1BC), arrowColor: Colors.white, titleColor: Colors.white, @@ -398,12 +399,19 @@ class InformationPage extends StatelessWidget { Navigator.of(context).pop(); model.hideBottomSheet(); } else { + /// to hide the dialog Navigator.of(context).pop(); model.hideBottomSheet(); + + /// to remove this page from the stack please no one remove this line. + Navigator.of(context).pop(); + + Navigator.pushReplacement( context, MaterialPageRoute( - builder: (context) => DeliveryConfirmedPage(item), + builder: (context) => + DeliveryConfirmedPage(item), ), ); } diff --git a/lib/pages/setting/setting_page.dart b/lib/pages/setting/setting_page.dart index a7f5389..192b5a2 100644 --- a/lib/pages/setting/setting_page.dart +++ b/lib/pages/setting/setting_page.dart @@ -24,6 +24,7 @@ class SettingPage extends StatelessWidget { arrowColor: Colors.white, titleColor: Colors.white, isAppBarGradient: true, + isShowHomeIcon: true, body: SingleChildScrollView( child: Container( height: MediaQuery.of(context).size.height, diff --git a/lib/widgets/delivery/customer_brief_card.dart b/lib/widgets/delivery/customer_brief_card.dart index f314854..b3d4406 100644 --- a/lib/widgets/delivery/customer_brief_card.dart +++ b/lib/widgets/delivery/customer_brief_card.dart @@ -2,7 +2,6 @@ import 'package:driverapp/config/size_config.dart'; import 'package:driverapp/uitl/utils.dart'; import 'package:driverapp/widgets/delivery/distance_in_kilometers.dart'; import 'package:flutter/material.dart'; -import 'package:hexcolor/hexcolor.dart'; import '../../uitl/date_uitl.dart'; import '../../uitl/translations_delegate_base.dart'; @@ -43,8 +42,8 @@ class CustomerBriefCard extends StatelessWidget { padding: EdgeInsets.only(bottom: 0.0), child: Container( width: MediaQuery.of(context).orientation == Orientation.landscape - ? SizeConfig.widthMultiplier * 125.0 - : SizeConfig.widthMultiplier * 90.0, + ? MediaQuery.of(context).size.width * 0.9 + : MediaQuery.of(context).size.width * 0.9, height: SizeConfig.heightMultiplier * 33.0, // TODO make it responsive decoration: BoxDecoration( color: Colors.white, diff --git a/lib/widgets/others/app_scaffold_widget.dart b/lib/widgets/others/app_scaffold_widget.dart index 52040c1..7f5d389 100644 --- a/lib/widgets/others/app_scaffold_widget.dart +++ b/lib/widgets/others/app_scaffold_widget.dart @@ -1,11 +1,12 @@ import 'package:driverapp/config/config.dart'; import 'package:driverapp/core/viewModels/base_view_model.dart'; +import 'package:driverapp/pages/dashboard/dashboard_screen.dart'; import 'package:driverapp/uitl/utils.dart'; import 'package:driverapp/widgets/progress_indicator/app_loader_widget.dart'; import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:gradient_app_bar/gradient_app_bar.dart'; -import 'arrow_back.dart'; import 'network_base_view.dart'; class AppScaffold extends StatelessWidget { @@ -19,6 +20,7 @@ class AppScaffold extends StatelessWidget { final Color arrowColor; final Color appBarColor; final bool isAppBarGradient; + final bool isShowHomeIcon; AppScaffold( {@required this.body, @@ -30,7 +32,8 @@ class AppScaffold extends StatelessWidget { this.titleColor, this.arrowColor, this.appBarColor, - this.isAppBarGradient = false}); + this.isAppBarGradient = false, + this.isShowHomeIcon = false}); @override Widget build(BuildContext context) { @@ -40,50 +43,70 @@ class AppScaffold extends StatelessWidget { bottom: false, child: Scaffold( backgroundColor: - appBarColor ?? Theme.of(context).scaffoldBackgroundColor, + Theme + .of(context) + .scaffoldBackgroundColor, appBar: isShowAppBar && !isAppBarGradient ? AppBar( - elevation: 0, - backgroundColor: Theme.of(context).appBarTheme.color, - textTheme: TextTheme( - headline6: TextStyle( - color: titleColor ?? Colors.white, - fontWeight: FontWeight.bold), - ), - title: Text(Utils.formatStringToPascalCase(appBarTitle)), - leading: Builder( - builder: (BuildContext context) { - return ArrowBack( - arrowColor: arrowColor, - ); - }, - ), - centerTitle: true, -// actions: [ -// IconButton( -// icon: Icon(FontAwesomeIcons.home), -// color: Colors.white, -// onPressed: () { -// // TODO add navigator to home page -// }, -// ), -// ], - ) + elevation: 0, + backgroundColor: Theme + .of(context) + .appBarTheme + .color, + textTheme: TextTheme( + headline6: TextStyle( + color: titleColor ?? Colors.white, + fontWeight: FontWeight.bold), + ), + title: Text(Utils.formatStringToPascalCase(appBarTitle)), + automaticallyImplyLeading: false, + + // leading: Builder( + // builder: (BuildContext context) { + // return ArrowBack( + // arrowColor: arrowColor, + // ); + // }, + // ), + centerTitle: true, + actions: [ + if (isShowHomeIcon) + IconButton( + icon: Icon(FontAwesomeIcons.home), + color: Colors.white, + onPressed: () { + + + }, + ), + ], + ) : isShowAppBar && isAppBarGradient ? GradientAppBar( - gradient: LINEAR_GRADIENT, - title: Text( - Utils.formatStringToPascalCase(appBarTitle), - style: TextStyle(color: Colors.white), + gradient: LINEAR_GRADIENT, + title: Text( + Utils.formatStringToPascalCase(appBarTitle), + style: TextStyle(color: Colors.white), + ), + automaticallyImplyLeading: false, + centerTitle: true, + actions: [ + if (isShowHomeIcon) + IconButton( + icon: Icon(FontAwesomeIcons.home), + color: Colors.white, + onPressed: () { + Navigator.pushReplacement( + context, + MaterialPageRoute( + builder: (context) => + DashboardScreen() ), - centerTitle: true, - leading: Builder( - builder: (BuildContext context) { - return ArrowBack( - arrowColor: arrowColor, - ); - }, - )) + ); + }, + ), + ], + ) : null, body: baseViewModel != null ? NetworkBaseView(