From 6f50f6f3e3fe6f5c2b6a2f3ac26596e836a61689 Mon Sep 17 00:00:00 2001 From: Amanda Southworth Date: Tue, 6 Jun 2023 16:53:45 -0700 Subject: [PATCH 1/4] Adding testing boilerplate --- Package/lib/src/Core/Foundation/sensory.dart | 4 +- Package/pubspec.lock | 205 +++++++++++++++++- Package/pubspec.yaml | 1 + .../aureus_core_accessibility_test.dart | 1 + Package/test/aureus_tests.dart | 3 + 5 files changed, 210 insertions(+), 4 deletions(-) diff --git a/Package/lib/src/Core/Foundation/sensory.dart b/Package/lib/src/Core/Foundation/sensory.dart index 969e611d..98b531a1 100644 --- a/Package/lib/src/Core/Foundation/sensory.dart +++ b/Package/lib/src/Core/Foundation/sensory.dart @@ -1,6 +1,4 @@ import 'package:aureus/aureus.dart'; - -import 'package:flutter/services.dart'; import 'package:just_audio/just_audio.dart'; /// {@category Foundation} @@ -41,7 +39,7 @@ class Sensory { /// A reusable function to play the sound. Future runAudioPlayer(String path) async { - await player.setAsset(path, package: "aureus"); + await player.setAsset(path); await player.play(); } diff --git a/Package/pubspec.lock b/Package/pubspec.lock index ee8ae84d..2a17bfb2 100644 --- a/Package/pubspec.lock +++ b/Package/pubspec.lock @@ -1,6 +1,27 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + url: "https://pub.dartlang.org" + source: hosted + version: "31.0.0" + analyzer: + dependency: transitive + description: + name: analyzer + url: "https://pub.dartlang.org" + source: hosted + version: "2.8.0" + args: + dependency: transitive + description: + name: args + url: "https://pub.dartlang.org" + source: hosted + version: "2.3.1" async: dependency: transitive description: @@ -71,6 +92,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.3.1" + cli_util: + dependency: transitive + description: + name: cli_util + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.5" clock: dependency: transitive description: @@ -85,6 +113,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.15.0" + convert: + dependency: transitive + description: + name: convert + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.0" + coverage: + dependency: transitive + description: + name: coverage + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" cross_file: dependency: transitive description: @@ -170,6 +212,20 @@ packages: description: flutter source: sdk version: "0.0.0" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.3" + glob: + dependency: transitive + description: + name: glob + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.1" google_fonts: dependency: "direct main" description: @@ -191,6 +247,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.13.5" + http_multi_server: + dependency: transitive + description: + name: http_multi_server + url: "https://pub.dartlang.org" + source: hosted + version: "3.2.1" http_parser: dependency: transitive description: @@ -205,6 +268,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.17.0" + io: + dependency: transitive + description: + name: io + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.4" js: dependency: transitive description: @@ -239,7 +309,7 @@ packages: name: latlong2 url: "https://pub.dartlang.org" source: hosted - version: "0.8.1" + version: "0.8.2" lints: dependency: transitive description: @@ -254,6 +324,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.1" + logging: + dependency: transitive + description: + name: logging + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" matcher: dependency: transitive description: @@ -282,6 +359,27 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.0" + mime: + dependency: transitive + description: + name: mime + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" + node_preamble: + dependency: transitive + description: + name: node_preamble + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.2" + package_config: + dependency: transitive + description: + name: package_config + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" path: dependency: transitive description: @@ -394,6 +492,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.3" + pool: + dependency: transitive + description: + name: pool + url: "https://pub.dartlang.org" + source: hosted + version: "1.5.1" positioned_tap_detector_2: dependency: transitive description: @@ -415,6 +520,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.0" + pub_semver: + dependency: transitive + description: + name: pub_semver + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.2" quiver: dependency: transitive description: @@ -520,11 +632,53 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.3" + shelf: + dependency: transitive + description: + name: shelf + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.2" + shelf_packages_handler: + dependency: transitive + description: + name: shelf_packages_handler + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.1" + shelf_static: + dependency: transitive + description: + name: shelf_static + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.1" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2" sky_engine: dependency: transitive description: flutter source: sdk version: "0.0.99" + source_map_stack_trace: + dependency: transitive + description: + name: source_map_stack_trace + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.1" + source_maps: + dependency: transitive + description: + name: source_maps + url: "https://pub.dartlang.org" + source: hosted + version: "0.10.10" source_span: dependency: transitive description: @@ -567,6 +721,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.2.0" + test: + dependency: "direct dev" + description: + name: test + url: "https://pub.dartlang.org" + source: hosted + version: "1.19.5" test_api: dependency: transitive description: @@ -574,6 +735,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.4.8" + test_core: + dependency: transitive + description: + name: test_core + url: "https://pub.dartlang.org" + source: hosted + version: "0.4.9" transparent_image: dependency: transitive description: @@ -651,6 +819,34 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.13" + vm_service: + dependency: transitive + description: + name: vm_service + url: "https://pub.dartlang.org" + source: hosted + version: "7.5.0" + watcher: + dependency: transitive + description: + name: watcher + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2" + web_socket_channel: + dependency: transitive + description: + name: web_socket_channel + url: "https://pub.dartlang.org" + source: hosted + version: "2.4.0" + webkit_inspection_protocol: + dependency: transitive + description: + name: webkit_inspection_protocol + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" win32: dependency: transitive description: @@ -672,6 +868,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.2.0+3" + yaml: + dependency: transitive + description: + name: yaml + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.1" sdks: dart: ">=2.16.2 <3.0.0" flutter: ">=2.10.0" diff --git a/Package/pubspec.yaml b/Package/pubspec.yaml index 47c389c7..7b04e6a5 100644 --- a/Package/pubspec.yaml +++ b/Package/pubspec.yaml @@ -56,3 +56,4 @@ dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^1.0.0 + test: ^1.19.5 diff --git a/Package/test/Core Tests/Accessibility Tests/aureus_core_accessibility_test.dart b/Package/test/Core Tests/Accessibility Tests/aureus_core_accessibility_test.dart index e69de29b..8b137891 100644 --- a/Package/test/Core Tests/Accessibility Tests/aureus_core_accessibility_test.dart +++ b/Package/test/Core Tests/Accessibility Tests/aureus_core_accessibility_test.dart @@ -0,0 +1 @@ + diff --git a/Package/test/aureus_tests.dart b/Package/test/aureus_tests.dart index 648a11bb..7f0f5666 100644 --- a/Package/test/aureus_tests.dart +++ b/Package/test/aureus_tests.dart @@ -1,3 +1,6 @@ library aureus_tests; +import 'package:test/test.dart'; +export 'package:test/test.dart'; + // \ No newline at end of file From 48633c119a1df4cf47109be52ba091e3d2b8d7ed Mon Sep 17 00:00:00 2001 From: Amanda Southworth Date: Wed, 14 Jun 2023 14:24:28 -0700 Subject: [PATCH 2/4] Removing bug causing RouteObserver bug --- .../Widgets/Views/Supporting/NotificationOverlayView.dart | 7 ------- .../aureus_core_accessibility_test.dart | 2 +- .../Foundation Tests/aureus_core_foundation_test.dart | 1 + .../Core Tests/Safety Tests/aureus_core_safety_test.dart | 1 + .../Component Obj Tests/aureus_object_components_test.dart | 1 + .../Element Obj Tests/aureus_object_elements_test.dart | 1 + .../aureus_object_functionality_test.dart | 1 + .../Observers Obj Tests/aureus_object_observers_test.dart | 1 + .../Views Obj Tests/aureus_object_views_test.dart | 1 + .../aureus_widget_alert_controllers_test.dart | 1 + .../Buttons/aureus_widget_buttons_test.dart | 1 + .../aureus_widget_collection_view_test.dart | 1 + .../Communication/aureus_widget_communication_test.dart | 1 + .../Input Forms/aureus_widget_input_forms_test.dart | 1 + .../Tabbing Bars/aureus_widget_tabbing_bars_test.dart | 1 + .../Badges/aureus_widget_badges_test.dart | 1 + .../Element Widg Tests/Cards/aureus_widget_cards_test.dart | 1 + .../Info Hierachy/aureus_widget_info_hierarchy_test.dart | 1 + .../Element Widg Tests/Misc/aureus_widget_misc_test.dart | 1 + .../User Input/aureus_widget_user_input_test.dart | 1 + .../Mini Tools/aureus_widget_tools_minitools_test.dart | 1 + .../Trackers/aureus_widget_tools_trackers_test.dart | 1 + .../User Input/aureus_widget_tools_user_input_test.dart | 1 + .../aureus_widget_views_info_hierarchy_test.dart | 1 + .../Landing/aureus_widget_views_landing_test.dart | 1 + .../Onboarding/aureus_widget_views_onboarding_test.dart | 1 + .../Safety Plan/aureus_widget_views_safety_plan_test.dart | 1 + .../Supporting/aureus_widget_views_supporting_test.dart | 1 + .../aureus_widget_views_tool_library_test.dart | 1 + .../Utilities/aureus_widget_views_utilities_test.dart | 1 + Package/test/aureus_tests.dart | 2 ++ 31 files changed, 31 insertions(+), 8 deletions(-) diff --git a/Package/lib/src/Widgets/Views/Supporting/NotificationOverlayView.dart b/Package/lib/src/Widgets/Views/Supporting/NotificationOverlayView.dart index 298d14be..3ae28a47 100644 --- a/Package/lib/src/Widgets/Views/Supporting/NotificationOverlayView.dart +++ b/Package/lib/src/Widgets/Views/Supporting/NotificationOverlayView.dart @@ -64,7 +64,6 @@ class _NotificationOverlayViewState extends State .animate(CurvedAnimation(parent: _controller, curve: Curves.ease)); WidgetsBinding.instance!.addPostFrameCallback((timeStamp) { - print('ADDED POST FRAME CALLBACK FOR VIEW'); resourceValues.routeObserver!.subscribe(this, ModalRoute.of(context)!); }); @@ -75,9 +74,6 @@ class _NotificationOverlayViewState extends State void didPush() { print("DID PUSH!"); - notificationMaster.unregisterObserver(this); - notificationMaster.resetRequests(); - super.didPush(); } @@ -85,9 +81,6 @@ class _NotificationOverlayViewState extends State void didPop() { print("DID POP!"); - notificationMaster.unregisterObserver(this); - notificationMaster.resetRequests(); - super.didPop(); } diff --git a/Package/test/Core Tests/Accessibility Tests/aureus_core_accessibility_test.dart b/Package/test/Core Tests/Accessibility Tests/aureus_core_accessibility_test.dart index 8b137891..76d5771c 100644 --- a/Package/test/Core Tests/Accessibility Tests/aureus_core_accessibility_test.dart +++ b/Package/test/Core Tests/Accessibility Tests/aureus_core_accessibility_test.dart @@ -1 +1 @@ - +part of aureus_tests; diff --git a/Package/test/Core Tests/Foundation Tests/aureus_core_foundation_test.dart b/Package/test/Core Tests/Foundation Tests/aureus_core_foundation_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Core Tests/Foundation Tests/aureus_core_foundation_test.dart +++ b/Package/test/Core Tests/Foundation Tests/aureus_core_foundation_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Core Tests/Safety Tests/aureus_core_safety_test.dart b/Package/test/Core Tests/Safety Tests/aureus_core_safety_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Core Tests/Safety Tests/aureus_core_safety_test.dart +++ b/Package/test/Core Tests/Safety Tests/aureus_core_safety_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Object Tests/Component Obj Tests/aureus_object_components_test.dart b/Package/test/Object Tests/Component Obj Tests/aureus_object_components_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Object Tests/Component Obj Tests/aureus_object_components_test.dart +++ b/Package/test/Object Tests/Component Obj Tests/aureus_object_components_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Object Tests/Element Obj Tests/aureus_object_elements_test.dart b/Package/test/Object Tests/Element Obj Tests/aureus_object_elements_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Object Tests/Element Obj Tests/aureus_object_elements_test.dart +++ b/Package/test/Object Tests/Element Obj Tests/aureus_object_elements_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Object Tests/Functionality Obj Tests/aureus_object_functionality_test.dart b/Package/test/Object Tests/Functionality Obj Tests/aureus_object_functionality_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Object Tests/Functionality Obj Tests/aureus_object_functionality_test.dart +++ b/Package/test/Object Tests/Functionality Obj Tests/aureus_object_functionality_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Object Tests/Observers Obj Tests/aureus_object_observers_test.dart b/Package/test/Object Tests/Observers Obj Tests/aureus_object_observers_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Object Tests/Observers Obj Tests/aureus_object_observers_test.dart +++ b/Package/test/Object Tests/Observers Obj Tests/aureus_object_observers_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Object Tests/Views Obj Tests/aureus_object_views_test.dart b/Package/test/Object Tests/Views Obj Tests/aureus_object_views_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Object Tests/Views Obj Tests/aureus_object_views_test.dart +++ b/Package/test/Object Tests/Views Obj Tests/aureus_object_views_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/Component Widg Tests/Alert Controllers/aureus_widget_alert_controllers_test.dart b/Package/test/Widget Tests/Component Widg Tests/Alert Controllers/aureus_widget_alert_controllers_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/Component Widg Tests/Alert Controllers/aureus_widget_alert_controllers_test.dart +++ b/Package/test/Widget Tests/Component Widg Tests/Alert Controllers/aureus_widget_alert_controllers_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/Component Widg Tests/Buttons/aureus_widget_buttons_test.dart b/Package/test/Widget Tests/Component Widg Tests/Buttons/aureus_widget_buttons_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/Component Widg Tests/Buttons/aureus_widget_buttons_test.dart +++ b/Package/test/Widget Tests/Component Widg Tests/Buttons/aureus_widget_buttons_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/Component Widg Tests/Collection Views/aureus_widget_collection_view_test.dart b/Package/test/Widget Tests/Component Widg Tests/Collection Views/aureus_widget_collection_view_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/Component Widg Tests/Collection Views/aureus_widget_collection_view_test.dart +++ b/Package/test/Widget Tests/Component Widg Tests/Collection Views/aureus_widget_collection_view_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/Component Widg Tests/Communication/aureus_widget_communication_test.dart b/Package/test/Widget Tests/Component Widg Tests/Communication/aureus_widget_communication_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/Component Widg Tests/Communication/aureus_widget_communication_test.dart +++ b/Package/test/Widget Tests/Component Widg Tests/Communication/aureus_widget_communication_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/Component Widg Tests/Input Forms/aureus_widget_input_forms_test.dart b/Package/test/Widget Tests/Component Widg Tests/Input Forms/aureus_widget_input_forms_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/Component Widg Tests/Input Forms/aureus_widget_input_forms_test.dart +++ b/Package/test/Widget Tests/Component Widg Tests/Input Forms/aureus_widget_input_forms_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/Component Widg Tests/Tabbing Bars/aureus_widget_tabbing_bars_test.dart b/Package/test/Widget Tests/Component Widg Tests/Tabbing Bars/aureus_widget_tabbing_bars_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/Component Widg Tests/Tabbing Bars/aureus_widget_tabbing_bars_test.dart +++ b/Package/test/Widget Tests/Component Widg Tests/Tabbing Bars/aureus_widget_tabbing_bars_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/Element Widg Tests/Badges/aureus_widget_badges_test.dart b/Package/test/Widget Tests/Element Widg Tests/Badges/aureus_widget_badges_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/Element Widg Tests/Badges/aureus_widget_badges_test.dart +++ b/Package/test/Widget Tests/Element Widg Tests/Badges/aureus_widget_badges_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/Element Widg Tests/Cards/aureus_widget_cards_test.dart b/Package/test/Widget Tests/Element Widg Tests/Cards/aureus_widget_cards_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/Element Widg Tests/Cards/aureus_widget_cards_test.dart +++ b/Package/test/Widget Tests/Element Widg Tests/Cards/aureus_widget_cards_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/Element Widg Tests/Info Hierachy/aureus_widget_info_hierarchy_test.dart b/Package/test/Widget Tests/Element Widg Tests/Info Hierachy/aureus_widget_info_hierarchy_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/Element Widg Tests/Info Hierachy/aureus_widget_info_hierarchy_test.dart +++ b/Package/test/Widget Tests/Element Widg Tests/Info Hierachy/aureus_widget_info_hierarchy_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/Element Widg Tests/Misc/aureus_widget_misc_test.dart b/Package/test/Widget Tests/Element Widg Tests/Misc/aureus_widget_misc_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/Element Widg Tests/Misc/aureus_widget_misc_test.dart +++ b/Package/test/Widget Tests/Element Widg Tests/Misc/aureus_widget_misc_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/Element Widg Tests/User Input/aureus_widget_user_input_test.dart b/Package/test/Widget Tests/Element Widg Tests/User Input/aureus_widget_user_input_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/Element Widg Tests/User Input/aureus_widget_user_input_test.dart +++ b/Package/test/Widget Tests/Element Widg Tests/User Input/aureus_widget_user_input_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/Tool Widg Tests/Mini Tools/aureus_widget_tools_minitools_test.dart b/Package/test/Widget Tests/Tool Widg Tests/Mini Tools/aureus_widget_tools_minitools_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/Tool Widg Tests/Mini Tools/aureus_widget_tools_minitools_test.dart +++ b/Package/test/Widget Tests/Tool Widg Tests/Mini Tools/aureus_widget_tools_minitools_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/Tool Widg Tests/Trackers/aureus_widget_tools_trackers_test.dart b/Package/test/Widget Tests/Tool Widg Tests/Trackers/aureus_widget_tools_trackers_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/Tool Widg Tests/Trackers/aureus_widget_tools_trackers_test.dart +++ b/Package/test/Widget Tests/Tool Widg Tests/Trackers/aureus_widget_tools_trackers_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/Tool Widg Tests/User Input/aureus_widget_tools_user_input_test.dart b/Package/test/Widget Tests/Tool Widg Tests/User Input/aureus_widget_tools_user_input_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/Tool Widg Tests/User Input/aureus_widget_tools_user_input_test.dart +++ b/Package/test/Widget Tests/Tool Widg Tests/User Input/aureus_widget_tools_user_input_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/View Widg Tests/Info Hierarchy/aureus_widget_views_info_hierarchy_test.dart b/Package/test/Widget Tests/View Widg Tests/Info Hierarchy/aureus_widget_views_info_hierarchy_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/View Widg Tests/Info Hierarchy/aureus_widget_views_info_hierarchy_test.dart +++ b/Package/test/Widget Tests/View Widg Tests/Info Hierarchy/aureus_widget_views_info_hierarchy_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/View Widg Tests/Landing/aureus_widget_views_landing_test.dart b/Package/test/Widget Tests/View Widg Tests/Landing/aureus_widget_views_landing_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/View Widg Tests/Landing/aureus_widget_views_landing_test.dart +++ b/Package/test/Widget Tests/View Widg Tests/Landing/aureus_widget_views_landing_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/View Widg Tests/Onboarding/aureus_widget_views_onboarding_test.dart b/Package/test/Widget Tests/View Widg Tests/Onboarding/aureus_widget_views_onboarding_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/View Widg Tests/Onboarding/aureus_widget_views_onboarding_test.dart +++ b/Package/test/Widget Tests/View Widg Tests/Onboarding/aureus_widget_views_onboarding_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/View Widg Tests/Safety Plan/aureus_widget_views_safety_plan_test.dart b/Package/test/Widget Tests/View Widg Tests/Safety Plan/aureus_widget_views_safety_plan_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/View Widg Tests/Safety Plan/aureus_widget_views_safety_plan_test.dart +++ b/Package/test/Widget Tests/View Widg Tests/Safety Plan/aureus_widget_views_safety_plan_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/View Widg Tests/Supporting/aureus_widget_views_supporting_test.dart b/Package/test/Widget Tests/View Widg Tests/Supporting/aureus_widget_views_supporting_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/View Widg Tests/Supporting/aureus_widget_views_supporting_test.dart +++ b/Package/test/Widget Tests/View Widg Tests/Supporting/aureus_widget_views_supporting_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/View Widg Tests/Tool Library/aureus_widget_views_tool_library_test.dart b/Package/test/Widget Tests/View Widg Tests/Tool Library/aureus_widget_views_tool_library_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/View Widg Tests/Tool Library/aureus_widget_views_tool_library_test.dart +++ b/Package/test/Widget Tests/View Widg Tests/Tool Library/aureus_widget_views_tool_library_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/Widget Tests/View Widg Tests/Utilities/aureus_widget_views_utilities_test.dart b/Package/test/Widget Tests/View Widg Tests/Utilities/aureus_widget_views_utilities_test.dart index e69de29b..76d5771c 100644 --- a/Package/test/Widget Tests/View Widg Tests/Utilities/aureus_widget_views_utilities_test.dart +++ b/Package/test/Widget Tests/View Widg Tests/Utilities/aureus_widget_views_utilities_test.dart @@ -0,0 +1 @@ +part of aureus_tests; diff --git a/Package/test/aureus_tests.dart b/Package/test/aureus_tests.dart index 7f0f5666..8bcf3c9b 100644 --- a/Package/test/aureus_tests.dart +++ b/Package/test/aureus_tests.dart @@ -3,4 +3,6 @@ library aureus_tests; import 'package:test/test.dart'; export 'package:test/test.dart'; +import '../lib/aureus.dart'; + // \ No newline at end of file From bf4af6fb25e0928dcc01528b833f841133f20953 Mon Sep 17 00:00:00 2001 From: Amanda Southworth Date: Wed, 14 Jun 2023 14:29:08 -0700 Subject: [PATCH 3/4] Reworking Widgets Binding postframecallback --- Package/CHANGELOG.md | 5 +++++ .../Views/Supporting/NotificationOverlayView.dart | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Package/CHANGELOG.md b/Package/CHANGELOG.md index 95f601f0..da2a4070 100644 --- a/Package/CHANGELOG.md +++ b/Package/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.0.9 +- Fixing RouteObserver navigation bug that stops +users from navigating forward after going back. +- Adding basic test structure for testing to be implemented. + ## 0.0.8 Fixing Perichron import bug. diff --git a/Package/lib/src/Widgets/Views/Supporting/NotificationOverlayView.dart b/Package/lib/src/Widgets/Views/Supporting/NotificationOverlayView.dart index 3ae28a47..870febd3 100644 --- a/Package/lib/src/Widgets/Views/Supporting/NotificationOverlayView.dart +++ b/Package/lib/src/Widgets/Views/Supporting/NotificationOverlayView.dart @@ -38,7 +38,6 @@ class _NotificationOverlayViewState extends State @override void initState() { sensation.prepare(); - notificationMaster.registerObserver(this); _controller = AnimationController( vsync: this, duration: const Duration(milliseconds: 300)) @@ -63,10 +62,6 @@ class _NotificationOverlayViewState extends State begin: const Offset(0.0, 0.0), end: const Offset(0.0, 0.0)) .animate(CurvedAnimation(parent: _controller, curve: Curves.ease)); - WidgetsBinding.instance!.addPostFrameCallback((timeStamp) { - resourceValues.routeObserver!.subscribe(this, ModalRoute.of(context)!); - }); - super.initState(); } @@ -243,7 +238,10 @@ class _NotificationOverlayViewState extends State @override Widget build(BuildContext context) { - notificationMaster.registerObserver(this); + WidgetsBinding.instance!.addPostFrameCallback((_) { + //resourceValues.routeObserver!.subscribe(this, ModalRoute.of(context)!); + notificationMaster.registerObserver(this); + }); // Builds an overlay item to hold any items coming into the view return Material( From c2a049a6f32fad4f245357a0ecf16fe13f6b910a Mon Sep 17 00:00:00 2001 From: Amanda Southworth Date: Wed, 14 Jun 2023 14:46:09 -0700 Subject: [PATCH 4/4] Adding 0.0.9 package to Aureus --- Package/CHANGELOG.md | 1 + Package/lib/src/Core/foundation.dart | 7 ------- .../Supporting/NotificationOverlayView.dart | 17 +---------------- Package/pubspec.yaml | 2 +- 4 files changed, 3 insertions(+), 24 deletions(-) diff --git a/Package/CHANGELOG.md b/Package/CHANGELOG.md index da2a4070..2de6799d 100644 --- a/Package/CHANGELOG.md +++ b/Package/CHANGELOG.md @@ -2,6 +2,7 @@ - Fixing RouteObserver navigation bug that stops users from navigating forward after going back. - Adding basic test structure for testing to be implemented. +- Removed RouteObserver from foundation file, we were able to fix a bug without RouteAware! :-) ## 0.0.8 Fixing Perichron import bug. diff --git a/Package/lib/src/Core/foundation.dart b/Package/lib/src/Core/foundation.dart index ab916134..4222b752 100644 --- a/Package/lib/src/Core/foundation.dart +++ b/Package/lib/src/Core/foundation.dart @@ -127,11 +127,6 @@ class AureusInformation { /// A privacy policy that determines how you handle the users' data and information. final String privacyPolicy; - /// A route observer that's been passed to your main MaterialApp. This needs to be - /// given for the [NotificationOverlayView], so that Aureus can properly manage - /// what screens are currently being shown to the user. - final RouteObserver routeObserver; - const AureusInformation({ required this.name, required this.mission, @@ -142,7 +137,6 @@ class AureusInformation { required this.requestedDataPermissions, required this.termsOfService, required this.privacyPolicy, - required this.routeObserver, }) : assert(name != "" && mission != "" && developerName != "" && @@ -226,7 +220,6 @@ class AureusValues { packageVariables?.resourceInformation.requestedDataPermissions; var tos = packageVariables?.resourceInformation.termsOfService; var privacy = packageVariables?.resourceInformation.privacyPolicy; - var routeObserver = packageVariables?.resourceInformation.routeObserver; // Flattened navigation values var splash = packageVariables?.resourceNavigation.splashScreen; diff --git a/Package/lib/src/Widgets/Views/Supporting/NotificationOverlayView.dart b/Package/lib/src/Widgets/Views/Supporting/NotificationOverlayView.dart index 870febd3..f0f5d4e3 100644 --- a/Package/lib/src/Widgets/Views/Supporting/NotificationOverlayView.dart +++ b/Package/lib/src/Widgets/Views/Supporting/NotificationOverlayView.dart @@ -28,7 +28,7 @@ class NotificationOverlayView extends StatefulWidget { } class _NotificationOverlayViewState extends State - with AureusNotificationObserver, TickerProviderStateMixin, RouteAware { + with AureusNotificationObserver, TickerProviderStateMixin { // A 'stand in' overlay view that will hold the UI components Widget overlayView = Container(); var hasOverlayEnabled = false; @@ -65,20 +65,6 @@ class _NotificationOverlayViewState extends State super.initState(); } - @override - void didPush() { - print("DID PUSH!"); - - super.didPush(); - } - - @override - void didPop() { - print("DID POP!"); - - super.didPop(); - } - @override void dispose() { notificationMaster.unregisterObserver(this); @@ -239,7 +225,6 @@ class _NotificationOverlayViewState extends State @override Widget build(BuildContext context) { WidgetsBinding.instance!.addPostFrameCallback((_) { - //resourceValues.routeObserver!.subscribe(this, ModalRoute.of(context)!); notificationMaster.registerObserver(this); }); diff --git a/Package/pubspec.yaml b/Package/pubspec.yaml index 7b04e6a5..32904713 100644 --- a/Package/pubspec.yaml +++ b/Package/pubspec.yaml @@ -1,6 +1,6 @@ name: aureus description: An open-source design system for non-profits to quickly develop user safety critical applications. -version: 0.0.8 +version: 0.0.9 homepage: https://withaureus.org/ documentation: https://github.com/Astra-Labs/Aureus/