diff --git a/.gitignore b/.gitignore index ebdaebb7..5178923f 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,7 @@ lib/generated_plugin_registrant.dart .vscode/settings.json .vscode/settings.json .vscode/settings.json +ios/Podfile.lock + +ios/Flutter/.last_build_id +ios/Runner.xcodeproj/project.pbxproj diff --git a/fonts/DoctorApp.ttf b/assets/fonts/DoctorApp.ttf similarity index 100% rename from fonts/DoctorApp.ttf rename to assets/fonts/DoctorApp.ttf diff --git a/assets/images/undraw_connected_world_wuay.png b/assets/images/undraw_connected_world_wuay.png new file mode 100644 index 00000000..f1bd3f00 Binary files /dev/null and b/assets/images/undraw_connected_world_wuay.png differ diff --git a/icons_app/config.json b/lib/icons_app/config.json similarity index 100% rename from icons_app/config.json rename to lib/icons_app/config.json diff --git a/lib/presentation/doctor_app_icons.dart b/lib/icons_app/doctor_app_icons.dart similarity index 100% rename from lib/presentation/doctor_app_icons.dart rename to lib/icons_app/doctor_app_icons.dart diff --git a/lib/providers/project_provider.dart b/lib/providers/project_provider.dart index 3fe2d0f9..ae5bd759 100644 --- a/lib/providers/project_provider.dart +++ b/lib/providers/project_provider.dart @@ -11,7 +11,7 @@ class ProjectProvider with ChangeNotifier { Locale _appLocale; String currentLanguage = 'ar'; bool _isArabic = false; - bool isInternetConnection; + bool isInternetConnection=true; Locale get appLocal => _appLocale; diff --git a/lib/screens/dashboard_screen.dart b/lib/screens/dashboard_screen.dart index 367189cd..ac07b71f 100644 --- a/lib/screens/dashboard_screen.dart +++ b/lib/screens/dashboard_screen.dart @@ -1,9 +1,9 @@ import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; +import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/clinic_model.dart'; import 'package:doctor_app_flutter/models/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/profile_req_Model.dart'; -import 'package:doctor_app_flutter/presentation/doctor_app_icons.dart'; import 'package:doctor_app_flutter/providers/auth_provider.dart'; import 'package:doctor_app_flutter/providers/doctor_reply_provider.dart'; import 'package:doctor_app_flutter/providers/hospital_provider.dart'; diff --git a/lib/screens/patients/patients_screen.dart b/lib/screens/patients/patients_screen.dart index f0a543f2..1d082721 100644 --- a/lib/screens/patients/patients_screen.dart +++ b/lib/screens/patients/patients_screen.dart @@ -7,6 +7,7 @@ *@desc: */ +import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patient_model.dart'; import 'package:doctor_app_flutter/models/patient/topten_users_res_model.dart'; @@ -21,8 +22,6 @@ import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.d import 'package:doctor_app_flutter/widgets/shared/profile_image_widget.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:flutter_svg/flutter_svg.dart'; -import 'package:doctor_app_flutter/presentation/doctor_app_icons.dart'; import '../../config/size_config.dart'; import 'package:hexcolor/hexcolor.dart'; diff --git a/lib/screens/patients/profile/insurance_approvals_screen.dart b/lib/screens/patients/profile/insurance_approvals_screen.dart index c4dba964..d4e095e2 100644 --- a/lib/screens/patients/profile/insurance_approvals_screen.dart +++ b/lib/screens/patients/profile/insurance_approvals_screen.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/patient/insurance_aprovals_request.dart'; -import 'package:doctor_app_flutter/presentation/doctor_app_icons.dart'; import 'package:doctor_app_flutter/widgets/shared/errors/dr_app_embedded_error.dart'; import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/dashboard/dashboard_item_icons_texts.dart b/lib/widgets/dashboard/dashboard_item_icons_texts.dart index 6c231199..03107f46 100644 --- a/lib/widgets/dashboard/dashboard_item_icons_texts.dart +++ b/lib/widgets/dashboard/dashboard_item_icons_texts.dart @@ -1,7 +1,6 @@ import 'dart:ffi'; import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:flutter_svg/svg.dart'; import '../shared/rounded_container_widget.dart'; import 'package:flutter/material.dart'; diff --git a/lib/widgets/doctor/doctor_reply_widget.dart b/lib/widgets/doctor/doctor_reply_widget.dart index 6fc9ec66..0b6620de 100644 --- a/lib/widgets/doctor/doctor_reply_widget.dart +++ b/lib/widgets/doctor/doctor_reply_widget.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/models/list_gt_my_pationents_question_model.dart'; -import 'package:doctor_app_flutter/presentation/doctor_app_icons.dart'; +import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/patients/profile/large_avatar.dart'; diff --git a/lib/widgets/shared/app_drawer_widget.dart b/lib/widgets/shared/app_drawer_widget.dart index d269398c..16f41a48 100644 --- a/lib/widgets/shared/app_drawer_widget.dart +++ b/lib/widgets/shared/app_drawer_widget.dart @@ -1,4 +1,4 @@ -import 'package:doctor_app_flutter/presentation/doctor_app_icons.dart'; +import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; diff --git a/lib/widgets/shared/app_scaffold_widget.dart b/lib/widgets/shared/app_scaffold_widget.dart index e273f381..60828f71 100644 --- a/lib/widgets/shared/app_scaffold_widget.dart +++ b/lib/widgets/shared/app_scaffold_widget.dart @@ -2,10 +2,9 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/providers/project_provider.dart'; import 'package:doctor_app_flutter/routes.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_svg/svg.dart'; import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; -import '../../presentation/doctor_app_icons.dart'; +import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import '../../widgets/shared/app_loader_widget.dart'; import 'app_texts_widget.dart'; @@ -60,8 +59,8 @@ class AppScaffold extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - SvgPicture.asset( - "assets/images/undraw_connected_world_wuay.svg", + Image.asset( + "assets/images/undraw_connected_world_wuay.png", height: 250, ), AppText('No Internet Connection') diff --git a/lib/widgets/shared/bottom_nav_bar.dart b/lib/widgets/shared/bottom_nav_bar.dart index f2fd66cc..1b75493d 100644 --- a/lib/widgets/shared/bottom_nav_bar.dart +++ b/lib/widgets/shared/bottom_nav_bar.dart @@ -1,4 +1,4 @@ -import 'package:doctor_app_flutter/presentation/doctor_app_icons.dart'; +import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index 53409f9e..c6e998f2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -49,7 +49,7 @@ dependencies: # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^0.1.2 # SVG - flutter_svg: ^0.17.4 + #flutter_svg: ^0.17.4 percent_indicator: "^2.1.1" dev_dependencies: @@ -88,6 +88,7 @@ flutter: - family: WorkSans fonts: - asset: assets/fonts/Work_Sans/WorkSans-Regular.ttf + - asset: assets/fonts/Work_Sans/WorkSans-Bold.ttf - asset: assets/fonts/Work_Sans/WorkSans-Bold.ttf weight: 700 # - family: Trajan Pro @@ -97,7 +98,7 @@ flutter: # weight: 700 - family: DoctorApp fonts: - - asset: fonts/DoctorApp.ttf + - asset: assets/fonts/DoctorApp.ttf # # For details regarding fonts from package dependencies, # see https://flutter.dev/custom-fonts/#from-packages