From 521d9f4edd435b64914618d9c86abdc932d8b6c7 Mon Sep 17 00:00:00 2001 From: "mirza.shafique" Date: Wed, 22 Mar 2023 11:57:05 +0300 Subject: [PATCH] New UI Implemented Fix 3 Phase 1 --- android/app/build.gradle | 2 +- android/app/src/main/AndroidManifest.xml | 1 + assets/icons/ic_ads.svg | 6 + assets/icons/ic_appoinments.svg | 5 + assets/icons/ic_branches.svg | 9 + assets/icons/ic_home.svg | 3 + assets/icons/ic_requests.svg | 5 + lib/api/client/branch_api_client.dart | 1 - lib/classes/app_permissions.dart | 30 -- lib/classes/app_state.dart | 4 +- lib/extensions/string_extensions.dart | 44 +- lib/extensions/widget_extensions.dart | 65 ++- lib/main.dart | 10 +- lib/pages/dashboard/dashboard_page.dart | 69 ++- .../dashboard/fragments/home_fragment.dart | 36 ++ lib/pages/dashboard/widget/ad_widget.dart | 105 ++++ .../widget/appointment_slider_widget.dart | 89 ++++ .../dashboard/widget/bottom_nav_bar.dart | 47 ++ .../dashboard/widget/my_branches_widget.dart | 39 ++ .../dashboard/widget/view_all_widget.dart | 21 + .../settings/branch/branch_detail_page.dart | 4 +- .../settings/branch/branch_list_page.dart | 198 ++++---- lib/pages/user/register_page.dart | 47 +- lib/theme/app_theme.dart | 2 +- lib/utils/AppPermissionHandler.dart | 30 ++ lib/utils/location/Location.dart | 3 +- lib/widgets/app_bar.dart | 13 +- lib/widgets/tab/role_type_tab.dart | 60 +++ pubspec.lock | 451 +++++++++++------- pubspec.yaml | 4 +- 30 files changed, 1031 insertions(+), 372 deletions(-) create mode 100644 assets/icons/ic_ads.svg create mode 100644 assets/icons/ic_appoinments.svg create mode 100644 assets/icons/ic_branches.svg create mode 100644 assets/icons/ic_home.svg create mode 100644 assets/icons/ic_requests.svg delete mode 100644 lib/classes/app_permissions.dart create mode 100644 lib/pages/dashboard/fragments/home_fragment.dart create mode 100644 lib/pages/dashboard/widget/ad_widget.dart create mode 100644 lib/pages/dashboard/widget/appointment_slider_widget.dart create mode 100644 lib/pages/dashboard/widget/bottom_nav_bar.dart create mode 100644 lib/pages/dashboard/widget/my_branches_widget.dart create mode 100644 lib/pages/dashboard/widget/view_all_widget.dart create mode 100644 lib/widgets/tab/role_type_tab.dart diff --git a/android/app/build.gradle b/android/app/build.gradle index 26481de..7a739ec 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -43,7 +43,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.ejada.hmg" + applicationId "com.ejadaa.hmg" minSdkVersion 23 targetSdkVersion 33 versionCode flutterVersionCode.toInteger() diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 34c7045..bb43782 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -13,6 +13,7 @@ android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" + android:exported="true" android:windowSoftInputMode="adjustResize">