From 00d744c0bc8c6edcee07c17575f58fd4f6b429c4 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Sun, 16 Aug 2020 11:05:56 +0300 Subject: [PATCH] add driver app config --- README.md | 13 +--- android/app/build.gradle | 2 +- android/app/src/debug/AndroidManifest.xml | 2 +- android/app/src/main/AndroidManifest.xml | 4 +- .../MainActivity.kt | 2 +- android/app/src/profile/AndroidManifest.xml | 2 +- ios/Flutter/Debug.xcconfig | 1 + ios/Flutter/Release.xcconfig | 1 + ios/Runner.xcodeproj/project.pbxproj | 74 ++++++++++++++++++- .../contents.xcworkspacedata | 3 + ios/Runner/Info.plist | 2 +- lib/config/config.dart | 4 +- lib/config/localized_values.dart | 1 + lib/core/enum/viewstate.dart | 2 +- lib/core/service/client/base_app_client.dart | 6 +- lib/core/service/hospital_service.dart | 8 +- lib/core/viewModels/base_view_model.dart | 4 +- lib/core/viewModels/hospital_view_model.dart | 6 +- lib/core/viewModels/project_view_model.dart | 4 +- lib/main.dart | 5 +- lib/pages/base/base_view.dart | 2 +- lib/pages/landing/home_page.dart | 40 +++------- lib/pages/landing/landing_page.dart | 14 ++-- lib/pages/landing/replay_page.dart | 4 +- lib/uitl/cupertino_picker.dart | 4 +- lib/uitl/translations_delegate_base.dart | 4 +- lib/widgets/avatar/large_avatar.dart | 2 +- .../bottom_navigation/bottom_nav_bar.dart | 26 +++---- .../bottom_navigation_item.dart | 2 +- lib/widgets/buttons/BottomButton.dart | 2 +- lib/widgets/buttons/mini_button.dart | 2 +- lib/widgets/charts/app_line_chart.dart | 2 +- lib/widgets/charts/app_time_series_chart.dart | 6 +- lib/widgets/drawer/app_drawer_widget.dart | 6 +- lib/widgets/drawer/drawer_item_widget.dart | 4 +- lib/widgets/errors/app_embedded_error.dart | 2 +- .../input/date_picker/button_actions.dart | 2 +- lib/widgets/others/app_scaffold_widget.dart | 6 +- lib/widgets/others/network_base_view.dart | 8 +- pubspec.yaml | 2 +- test/widget_test.dart | 2 +- 41 files changed, 169 insertions(+), 119 deletions(-) rename android/app/src/main/kotlin/com/cloud/{diplomaticquarterapp => driverapp}/MainActivity.kt (71%) diff --git a/README.md b/README.md index 8a284ca..dfc45e0 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,9 @@ -# diplomaticquarterapp +# driverapp -A new Flutter application. +A Flutter application for driver all copyright @cloudSolution . ## Getting Started -This project is a starting point for a Flutter application. +This project for driver to deliver from Pharmacies to the patient -A few resources to get you started if this is your first Flutter project: -- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab) -- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook) - -For help getting started with Flutter, view our -[online documentation](https://flutter.dev/docs), which offers tutorials, -samples, guidance on mobile development, and a full API reference. diff --git a/android/app/build.gradle b/android/app/build.gradle index 807f7fa..204fc49 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -38,7 +38,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.cloud.diplomaticquarterapp" + applicationId "com.cloud.driverapp" minSdkVersion 21 targetSdkVersion 30 versionCode flutterVersionCode.toInteger() diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index d8fd4e8..989b30e 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.cloud.driverapp"> diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index b88d520..cdbc90e 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.cloud.driverapp"> + package="com.cloud.driverapp"> diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig index 592ceee..e8efba1 100644 --- a/ios/Flutter/Debug.xcconfig +++ b/ios/Flutter/Debug.xcconfig @@ -1 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig index 592ceee..399e934 100644 --- a/ios/Flutter/Release.xcconfig +++ b/ios/Flutter/Release.xcconfig @@ -1 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index b1c7ff0..90398e9 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -10,6 +10,7 @@ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 8B6BDAFEFE9F44237A6527BD /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BB7989D06E405EC2B7D413F5 /* Pods_Runner.framework */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; @@ -31,7 +32,9 @@ /* Begin PBXFileReference section */ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 185157743AF2FD6A699A9164 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 5789CE9154A06F3607D4ADE1 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; @@ -42,6 +45,8 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + BA3DF4F2FAFDED219DE82FE6 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + BB7989D06E405EC2B7D413F5 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -49,6 +54,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8B6BDAFEFE9F44237A6527BD /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -72,6 +78,8 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, + B69A888B9FA482F483596EC4 /* Pods */, + B794B586A3B7A750A2E896F7 /* Frameworks */, ); sourceTree = ""; }; @@ -106,6 +114,25 @@ name = "Supporting Files"; sourceTree = ""; }; + B69A888B9FA482F483596EC4 /* Pods */ = { + isa = PBXGroup; + children = ( + BA3DF4F2FAFDED219DE82FE6 /* Pods-Runner.debug.xcconfig */, + 5789CE9154A06F3607D4ADE1 /* Pods-Runner.release.xcconfig */, + 185157743AF2FD6A699A9164 /* Pods-Runner.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; + B794B586A3B7A750A2E896F7 /* Frameworks */ = { + isa = PBXGroup; + children = ( + BB7989D06E405EC2B7D413F5 /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -113,12 +140,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( + 8DAFEBAA7C3777B49F25082F /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + 62970E506F749C03E305F3C4 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -191,6 +220,45 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; + 62970E506F749C03E305F3C4 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 8DAFEBAA7C3777B49F25082F /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -308,7 +376,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.cloud.diplomaticquarterapp; + PRODUCT_BUNDLE_IDENTIFIER = com.cloud.driverapp; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -442,7 +510,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.cloud.diplomaticquarterapp; + PRODUCT_BUNDLE_IDENTIFIER = com.cloud.driverapp; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -469,7 +537,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.cloud.diplomaticquarterapp; + PRODUCT_BUNDLE_IDENTIFIER = com.cloud.driverapp; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; SWIFT_VERSION = 5.0; diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata index 1d526a1..21a3cc1 100644 --- a/ios/Runner.xcworkspace/contents.xcworkspacedata +++ b/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -4,4 +4,7 @@ + + diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 8f1009c..933c8db 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -11,7 +11,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - diplomaticquarterapp + driverapp CFBundlePackageType APPL CFBundleShortVersionString diff --git a/lib/config/config.dart b/lib/config/config.dart index 5769567..e6ae40e 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -1,4 +1,6 @@ +import 'package:flutter/cupertino.dart'; + const MAX_SMALL_SCREEN = 660; const BASE_URL = 'https://uat.hmgwebservices.com/Services'; @@ -7,5 +9,5 @@ const GET_PROJECT = '/Lists.svc/REST/GetProject'; class AppGlobal { - static var context; + static BuildContext context; } diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 7cb0159..5916d90 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -11,5 +11,6 @@ const Map> localizedValues = { 'services': {'en': 'SERVICES', 'ar': 'الخدمات'}, 'mySchedule': {'en': 'My Schedule', 'ar': 'جدولي'}, 'logout': {'en': 'Logout', 'ar': 'تسجيل خروج'}, + 'booking':{'en': 'Booking','ar':'حجز'} }; diff --git a/lib/core/enum/viewstate.dart b/lib/core/enum/viewstate.dart index 09b5d34..94d79be 100644 --- a/lib/core/enum/viewstate.dart +++ b/lib/core/enum/viewstate.dart @@ -1 +1 @@ -enum ViewState { Idle, Busy, Error } +enum ViewState { Idle, Busy, Error, BusyLocal, ErrorLocal } diff --git a/lib/core/service/client/base_app_client.dart b/lib/core/service/client/base_app_client.dart index 72c3856..5008fe5 100644 --- a/lib/core/service/client/base_app_client.dart +++ b/lib/core/service/client/base_app_client.dart @@ -1,8 +1,8 @@ import 'dart:convert'; -import 'package:diplomaticquarterapp/config/config.dart'; -import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; -import 'package:diplomaticquarterapp/uitl/utils.dart'; +import 'package:driverapp/config/config.dart'; +import 'package:driverapp/uitl/app_shared_preferences.dart'; +import 'package:driverapp/uitl/utils.dart'; import 'package:http/http.dart' as http; AppSharedPreferences sharedPref = new AppSharedPreferences(); diff --git a/lib/core/service/hospital_service.dart b/lib/core/service/hospital_service.dart index c131d94..ad99ea9 100644 --- a/lib/core/service/hospital_service.dart +++ b/lib/core/service/hospital_service.dart @@ -1,7 +1,7 @@ -import 'package:diplomaticquarterapp/config/config.dart'; -import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart'; -import 'package:diplomaticquarterapp/core/model/hospitals/request_get_hospitals_model.dart'; -import 'package:diplomaticquarterapp/core/service/base_service.dart'; +import 'package:driverapp/config/config.dart'; +import 'package:driverapp/core/model/hospitals/hospitals_model.dart'; +import 'package:driverapp/core/model/hospitals/request_get_hospitals_model.dart'; +import 'package:driverapp/core/service/base_service.dart'; class HospitalService extends BaseService { List _hospitals = List(); diff --git a/lib/core/viewModels/base_view_model.dart b/lib/core/viewModels/base_view_model.dart index 497a96b..f48bc1b 100644 --- a/lib/core/viewModels/base_view_model.dart +++ b/lib/core/viewModels/base_view_model.dart @@ -1,4 +1,4 @@ -import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; +import 'package:driverapp/core/enum/viewstate.dart'; import 'package:flutter/material.dart'; class BaseViewModel extends ChangeNotifier { @@ -9,6 +9,8 @@ class BaseViewModel extends ChangeNotifier { String error = ""; + //TODO load user details from SP + void setState(ViewState viewState) { _state = viewState; notifyListeners(); diff --git a/lib/core/viewModels/hospital_view_model.dart b/lib/core/viewModels/hospital_view_model.dart index 66ad4b0..6259974 100644 --- a/lib/core/viewModels/hospital_view_model.dart +++ b/lib/core/viewModels/hospital_view_model.dart @@ -1,6 +1,6 @@ -import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; -import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart'; -import 'package:diplomaticquarterapp/core/service/hospital_service.dart'; +import 'package:driverapp/core/enum/viewstate.dart'; +import 'package:driverapp/core/model/hospitals/hospitals_model.dart'; +import 'package:driverapp/core/service/hospital_service.dart'; import '../../locator.dart'; import 'base_view_model.dart'; diff --git a/lib/core/viewModels/project_view_model.dart b/lib/core/viewModels/project_view_model.dart index e91ea4f..d2713a0 100644 --- a/lib/core/viewModels/project_view_model.dart +++ b/lib/core/viewModels/project_view_model.dart @@ -1,8 +1,8 @@ import 'dart:async'; import 'package:connectivity/connectivity.dart'; -import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; -import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; +import 'package:driverapp/config/shared_pref_kay.dart'; +import 'package:driverapp/uitl/app_shared_preferences.dart'; import 'package:flutter/cupertino.dart'; class ProjectViewModel with ChangeNotifier { diff --git a/lib/main.dart b/lib/main.dart index 2eb5dd2..930ca7d 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,7 +1,8 @@ -import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:driverapp/uitl/translations_delegate_base.dart'; import 'package:flutter/material.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:provider/provider.dart'; + import 'config/size_config.dart'; import 'core/viewModels/project_view_model.dart'; import 'locator.dart'; @@ -29,7 +30,7 @@ class MyApp extends StatelessWidget { child: Consumer( builder: (context, projectProvider, child) => MaterialApp( showSemanticsDebugger: false, - title: 'Diplomatic Quarter App', + title: 'Driver App', locale: projectProvider.appLocal, localizationsDelegates: [ TranslationBaseDelegate(), diff --git a/lib/pages/base/base_view.dart b/lib/pages/base/base_view.dart index 3ed2baa..63190fb 100644 --- a/lib/pages/base/base_view.dart +++ b/lib/pages/base/base_view.dart @@ -1,4 +1,4 @@ -import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; +import 'package:driverapp/core/viewModels/base_view_model.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index 0c44941..42dd0f5 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -1,12 +1,13 @@ -import 'package:diplomaticquarterapp/core/model/hospitals/hospitals_model.dart'; -import 'package:diplomaticquarterapp/core/viewModels/hospital_view_model.dart'; -import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; -import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:driverapp/core/model/hospitals/hospitals_model.dart'; +import 'package:driverapp/core/viewModels/hospital_view_model.dart'; +import 'package:driverapp/widgets/data_display/text.dart'; +import 'package:driverapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import '../base/base_view.dart'; +//TODO This page for testing when come back it souled be change class HomePage extends StatefulWidget { @override _HomePageState createState() => _HomePageState(); @@ -29,31 +30,10 @@ class _HomePageState extends State { child: Container( child: Texts('call api '), ), - ), Expanded( child: _getHospitals(model.hospitals), ) -// BaseView( -// onModelReady: (dctorViewModel) => dctorViewModel.getHospitals(), -// builder: (BuildContext context, DoctorViewModel dctorViewModel, -// Widget child) => -// InkWell( -// onTap: () { -// dctorViewModel.getHospitals(); -// }, -// child: Container( -// width: double.infinity, -// height: 150, -// child: NetworkBaseView( -// baseViewModel: dctorViewModel, -// child: Container( -// child: Texts('The API 2'), -// ), -// ), -// ), -// ), -// ), ], ), ), @@ -61,9 +41,9 @@ class _HomePageState extends State { } Widget _getHospitals(List hospitals) => ListView.builder( - itemCount: hospitals.length, - itemBuilder: (BuildContext context, int index) => Container( - child: Texts(hospitals[index].name), - ), - ); + itemCount: hospitals.length, + itemBuilder: (BuildContext context, int index) => Container( + child: Texts(hospitals[index].name), + ), + ); } diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index ec9e152..a14e9eb 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -1,7 +1,7 @@ -import 'package:diplomaticquarterapp/pages/landing/replay_page.dart'; -import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; -import 'package:diplomaticquarterapp/widgets/bottom_navigation/bottom_nav_bar.dart'; -import 'package:diplomaticquarterapp/widgets/drawer/app_drawer_widget.dart'; +import 'package:driverapp/pages/landing/replay_page.dart'; +import 'package:driverapp/uitl/translations_delegate_base.dart'; +import 'package:driverapp/widgets/bottom_navigation/bottom_nav_bar.dart'; +import 'package:driverapp/widgets/drawer/app_drawer_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -66,10 +66,12 @@ class _LandingPageState extends State { case 0: return TranslationBase.of(context).home; case 1: - return 'asd'; + return 'new One'; case 2: - return TranslationBase.of(context).mySchedule; + return TranslationBase.of(context).booking; case 3: + return TranslationBase.of(context).mySchedule; + case 4: return TranslationBase.of(context).services; } } diff --git a/lib/pages/landing/replay_page.dart b/lib/pages/landing/replay_page.dart index 368f7a1..712d83e 100644 --- a/lib/pages/landing/replay_page.dart +++ b/lib/pages/landing/replay_page.dart @@ -1,5 +1,5 @@ -import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; -import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; +import 'package:driverapp/widgets/data_display/text.dart'; +import 'package:driverapp/widgets/others/app_scaffold_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/lib/uitl/cupertino_picker.dart b/lib/uitl/cupertino_picker.dart index d40d4b3..608ef80 100644 --- a/lib/uitl/cupertino_picker.dart +++ b/lib/uitl/cupertino_picker.dart @@ -1,5 +1,5 @@ -import 'package:diplomaticquarterapp/config/size_config.dart'; -import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:driverapp/config/size_config.dart'; +import 'package:driverapp/uitl/translations_delegate_base.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index f9630b6..1a61090 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:diplomaticquarterapp/config/localized_values.dart'; +import 'package:driverapp/config/localized_values.dart'; import 'package:flutter/foundation.dart' show SynchronousFuture; import 'package:flutter/material.dart'; @@ -38,7 +38,7 @@ class TranslationBase { String get logout => localizedValues['logout'][locale.languageCode]; - + String get booking => localizedValues['booking'][locale.languageCode]; } class TranslationBaseDelegate extends LocalizationsDelegate { diff --git a/lib/widgets/avatar/large_avatar.dart b/lib/widgets/avatar/large_avatar.dart index cd6ee53..7e66f73 100644 --- a/lib/widgets/avatar/large_avatar.dart +++ b/lib/widgets/avatar/large_avatar.dart @@ -1,4 +1,4 @@ -import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:driverapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/bottom_navigation/bottom_nav_bar.dart b/lib/widgets/bottom_navigation/bottom_nav_bar.dart index 7093118..0281749 100644 --- a/lib/widgets/bottom_navigation/bottom_nav_bar.dart +++ b/lib/widgets/bottom_navigation/bottom_nav_bar.dart @@ -1,4 +1,4 @@ -import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; +import 'package:driverapp/uitl/translations_delegate_base.dart'; import 'package:eva_icons_flutter/eva_icons_flutter.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -52,24 +52,20 @@ class _BottomNavBarState extends State { currentIndex: 1, name: TranslationBase.of(context).replay2, ), - Expanded( - child: SizedBox( - height: 50, - child: Column( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - SizedBox(height: 22) - ], - ), - ), + BottomNavigationItem( + icon: EvaIcons.plus, + activeIcon: EvaIcons.plus, + changeIndex: _changeIndex, + index: _index, + currentIndex: 2, + name: TranslationBase.of(context).booking, ), BottomNavigationItem( - icon:EvaIcons.person, + icon: EvaIcons.person, activeIcon: EvaIcons.person, changeIndex: _changeIndex, index: _index, - currentIndex: 2, + currentIndex: 3, name: TranslationBase.of(context).mySchedule, ), BottomNavigationItem( @@ -77,7 +73,7 @@ class _BottomNavBarState extends State { activeIcon: EvaIcons.calendar, changeIndex: _changeIndex, index: _index, - currentIndex: 3, + currentIndex: 4, name: TranslationBase.of(context).services, ) ], diff --git a/lib/widgets/bottom_navigation/bottom_navigation_item.dart b/lib/widgets/bottom_navigation/bottom_navigation_item.dart index b248e4a..e0bf8d8 100644 --- a/lib/widgets/bottom_navigation/bottom_navigation_item.dart +++ b/lib/widgets/bottom_navigation/bottom_navigation_item.dart @@ -1,4 +1,4 @@ -import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:driverapp/widgets/data_display/text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/buttons/BottomButton.dart b/lib/widgets/buttons/BottomButton.dart index 3e85aa1..34d5aa9 100644 --- a/lib/widgets/buttons/BottomButton.dart +++ b/lib/widgets/buttons/BottomButton.dart @@ -1,4 +1,4 @@ -import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart'; +import 'package:driverapp/widgets/buttons/secondary_button.dart'; import 'package:flutter/material.dart'; /// [label] button label diff --git a/lib/widgets/buttons/mini_button.dart b/lib/widgets/buttons/mini_button.dart index 2c08e7c..d38fe12 100644 --- a/lib/widgets/buttons/mini_button.dart +++ b/lib/widgets/buttons/mini_button.dart @@ -1,4 +1,4 @@ -import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:driverapp/widgets/data_display/text.dart'; import 'package:flutter/material.dart'; enum MINI_BUTTON { Secondary, Primary } diff --git a/lib/widgets/charts/app_line_chart.dart b/lib/widgets/charts/app_line_chart.dart index 553afec..1a29b1e 100644 --- a/lib/widgets/charts/app_line_chart.dart +++ b/lib/widgets/charts/app_line_chart.dart @@ -1,5 +1,5 @@ -import 'package:flutter/material.dart'; import 'package:charts_flutter/flutter.dart' as charts; +import 'package:flutter/material.dart'; /// chart line /// [seriesList] charts series diff --git a/lib/widgets/charts/app_time_series_chart.dart b/lib/widgets/charts/app_time_series_chart.dart index 413b03d..a9fd289 100644 --- a/lib/widgets/charts/app_time_series_chart.dart +++ b/lib/widgets/charts/app_time_series_chart.dart @@ -1,8 +1,8 @@ import 'package:charts_flutter/flutter.dart' as charts; import 'package:charts_flutter/flutter.dart'; -import 'package:diplomaticquarterapp/config/size_config.dart'; -import 'package:diplomaticquarterapp/widgets/data_display/list/flexible_container.dart'; -import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:driverapp/config/size_config.dart'; +import 'package:driverapp/widgets/data_display/list/flexible_container.dart'; +import 'package:driverapp/widgets/data_display/text.dart'; import 'package:flutter/material.dart'; /// App Time Series Chart diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index c1e9244..c57b5ba 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/lib/widgets/drawer/app_drawer_widget.dart @@ -1,6 +1,6 @@ -import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; -import 'package:diplomaticquarterapp/widgets/data_display/list/flexible_container.dart'; -import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:driverapp/uitl/translations_delegate_base.dart'; +import 'package:driverapp/widgets/data_display/list/flexible_container.dart'; +import 'package:driverapp/widgets/data_display/text.dart'; import 'package:flutter/material.dart'; import '../../config/size_config.dart'; diff --git a/lib/widgets/drawer/drawer_item_widget.dart b/lib/widgets/drawer/drawer_item_widget.dart index 06dcd17..6719a18 100644 --- a/lib/widgets/drawer/drawer_item_widget.dart +++ b/lib/widgets/drawer/drawer_item_widget.dart @@ -1,7 +1,7 @@ import 'dart:ui'; -import 'package:diplomaticquarterapp/config/size_config.dart'; -import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:driverapp/config/size_config.dart'; +import 'package:driverapp/widgets/data_display/text.dart'; import 'package:flutter/material.dart'; /// diff --git a/lib/widgets/errors/app_embedded_error.dart b/lib/widgets/errors/app_embedded_error.dart index a4c956c..e42c9fb 100644 --- a/lib/widgets/errors/app_embedded_error.dart +++ b/lib/widgets/errors/app_embedded_error.dart @@ -1,4 +1,4 @@ -import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; +import 'package:driverapp/widgets/data_display/text.dart'; import 'package:flutter/material.dart'; ///show App Embedded Error diff --git a/lib/widgets/input/date_picker/button_actions.dart b/lib/widgets/input/date_picker/button_actions.dart index 7f10b3c..249b2ce 100644 --- a/lib/widgets/input/date_picker/button_actions.dart +++ b/lib/widgets/input/date_picker/button_actions.dart @@ -1,4 +1,4 @@ -import 'package:diplomaticquarterapp/widgets/Buttons/button.dart'; +import 'package:driverapp/widgets/Buttons/button.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/others/app_scaffold_widget.dart b/lib/widgets/others/app_scaffold_widget.dart index 89bb433..d5e9c51 100644 --- a/lib/widgets/others/app_scaffold_widget.dart +++ b/lib/widgets/others/app_scaffold_widget.dart @@ -1,6 +1,6 @@ -import 'package:diplomaticquarterapp/config/config.dart'; -import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; -import 'package:diplomaticquarterapp/widgets/progress_indicator/app_loader_widget.dart'; +import 'package:driverapp/config/config.dart'; +import 'package:driverapp/core/viewModels/base_view_model.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'; diff --git a/lib/widgets/others/network_base_view.dart b/lib/widgets/others/network_base_view.dart index 8188db2..5776e84 100644 --- a/lib/widgets/others/network_base_view.dart +++ b/lib/widgets/others/network_base_view.dart @@ -1,7 +1,7 @@ -import 'package:diplomaticquarterapp/core/enum/viewstate.dart'; -import 'package:diplomaticquarterapp/core/viewModels/base_view_model.dart'; -import 'package:diplomaticquarterapp/widgets/errors/app_embedded_error.dart'; -import 'package:diplomaticquarterapp/widgets/progress_indicator/app_circular_progress_Indeicator.dart'; +import 'package:driverapp/core/enum/viewstate.dart'; +import 'package:driverapp/core/viewModels/base_view_model.dart'; +import 'package:driverapp/widgets/errors/app_embedded_error.dart'; +import 'package:driverapp/widgets/progress_indicator/app_circular_progress_Indeicator.dart'; import 'package:flutter/cupertino.dart'; class NetworkBaseView extends StatelessWidget { diff --git a/pubspec.yaml b/pubspec.yaml index 4bb76ea..fefcf54 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,4 +1,4 @@ -name: diplomaticquarterapp +name: driverapp description: A new Flutter application. diff --git a/test/widget_test.dart b/test/widget_test.dart index 01e6853..602461a 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -8,7 +8,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:diplomaticquarterapp/main.dart'; +import 'package:driverapp/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async {