Added latest changes from dev and solved conflicts

pubspec.yaml

@@ -5,7 +5,7 @@ description: This is the mobile application project, developed with Flutter for
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
 publish_to: "none" # Remove this line if you wish to publish to pub.dev
 
-version: 1.0.4+6
+version: 1.0.5+7
 
 environment:
   sdk: ">=3.0.6 <4.0.0"
@@ -22,23 +22,27 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_animated_dialog: ^2.0.1
-  flutter_bloc: ^8.1.4
-  flutter_dotenv: ^5.1.0
-  flutter_localization: ^0.2.0
-  flutter_secure_storage: ^9.0.0
   flutter_svg: ^2.0.10+1
-  get_it: ^7.6.7
-  html: ^0.15.4
+  sleek_circular_slider: ^2.0.1
+  day_picker: 2.2.0
+  # Utility Packages
+  flutter_secure_storage: ^9.0.0
+  flutter_dotenv: ^5.1.0
+  # noinspection YAMLSchemaValidation
   intl: ^0.19.0
+  get_it: ^7.6.7
+  url_launcher: ^6.2.5
+  flutter_localization: ^0.2.0
+  flutter_bloc: ^8.1.4
+  html: ^0.15.4
   onesignal_flutter: ^5.2.0
   permission_handler: ^11.3.1
   pin_code_fields: ^8.0.1
   share_plus: ^9.0.0
   shared_preferences: ^2.2.2
-  sleek_circular_slider: ^2.0.1
   smooth_page_indicator: ^1.1.0
-  url_launcher: ^6.2.5
   uuid: ^4.4.0
+  time_picker_spinner: ^1.0.0
 
 dev_dependencies:
   flutter_lints: ^3.0.1