5.7.4

Author: Drawner

CHANGELOG.md

@@ -1,4 +1,14 @@
 
+## 5.7.4
+December 30, 2024
+- Correctly cast the Fluttery Framework version of StateX; not state_extended version.
+  getter appState gets Fluttery version; getter rootState gets state_extended version.
+  StateX get state in app_statex_controller.dart
+  StateX? get firstState, StateX? get lastState in app_statex_controller.dart
+  StateX? stateOf<T extends StatefulWidget>() in app_statex_controller.dart
+  stateOf<T extends StatefulWidget>() in app_statex_controller.dart
+- Corrected changeApp() in example_controller.dart
+
 ## 5.7.3
 December 29, 2024
 - Recognize only 'Testing Errors' in  app_statex.dart

example/integration_test/_test_imports.dart

@@ -0,0 +1,7 @@
+//
+export '../test/src/_test_imports.dart';
+
+// Individual Tests
+export 'src/animals_test.dart';
+export 'src/counter_test.dart';
+export 'src/words_test.dart';

example/integration_test/src/animals_test.dart

@@ -0,0 +1,25 @@
+// Copyright 2022 Andrious Solutions Ltd. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import '../_test_imports.dart';
+
+const _location = '========================== animals_test.dart';
+
+Future<void> animalsTest(WidgetTester tester) async {
+  /// New Dogs
+  await tester.tap(find.byKey(const Key('New Dogs')));
+  await tester.pumpAndSettle(const Duration(seconds: 2));
+
+  /// New Cats
+  await tester.tap(find.byKey(const Key('New Cats')));
+  await tester.pumpAndSettle(const Duration(seconds: 2));
+
+  /// New Foxes
+  await tester.tap(find.byKey(const Key('New Foxes')));
+  await tester.pumpAndSettle(const Duration(seconds: 2));
+
+  /// New Birds
+  await tester.tap(find.byKey(const Key('New Birds')));
+  await tester.pumpAndSettle(const Duration(seconds: 2));
+}

…gration_test/src/tests/counter_test.dart …e/integration_test/src/counter_test.dartexample/integration_test/src/tests/counter_test.dart renamed to example/integration_test/src/counter_test.dart example/integration_test/src/tests/counter_test.dart renamed to example/integration_test/src/counter_test.dart

@@ -1,20 +1,21 @@
-import 'src/_test_imports.dart';
+//
+// Test files
+import '_test_imports.dart';
 
 import 'package:integration_test/integration_test.dart'
     show IntegrationTestWidgetsFlutterBinding;
 
 void main() => integrationTestFlutteryFramework();
 
 void integrationTestFlutteryFramework() {
+  // Call this function instead of using the 'default' TestWidgetsFlutterBinding
   // Allow for Integration testing
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
 
   // Define a test. The TestWidgets function also provides a WidgetTester
   // to work with. The WidgetTester allows you to build and interact
   // with widgets in the test environment.
   testWidgets('testing example app', (WidgetTester tester) async {
-    //
-
     // Flutter won’t automatically rebuild your widget in the test environment.
     // Use pump() or pumpAndSettle() to ask Flutter to rebuild the widget.
     await tester.pumpWidget(FlutteryExampleApp());
@@ -48,6 +49,11 @@ void integrationTestFlutteryFramework() {
           // Test dialog windows
           await dialogTests(tester);
 
+          break;
+        case 'Inherited':
+
+          await animalsTest(tester);
+
           break;
       }
 
@@ -95,9 +101,6 @@ void integrationTestFlutteryFramework() {
 
     reportTestErrors();
 
-    // // WordPairs App Model Unit Testing
-    // await wordPairsModelTest(tester);
-    //
-    // return;
+    return;
   });
 }

example/integration_test/src/tests/unit/wordpairs_model.dart

@@ -118,12 +118,6 @@ class ExampleAppController extends AppStateXController {
       _appCount = _appNames.indexOf(appName.trim());
     }
 
-    // Possibly running in a test and can't run the Contacts app
-    // There's no sqlite in the test environment
-    if (App.inFlutterTest && _appCount == 2) {
-      _appCount = 0;
-    }
-
     await Prefs.setBool('words', _appNames[_appCount] == 'Word');
 
     // Rerun the whole app with App.setState(() {})
@@ -135,11 +129,11 @@ class ExampleAppController extends AppStateXController {
   ///
   Future<void> changeLocale() async {
     ///
-    final appState = rootState!;
+    final app = appState!;
 
-    final locale = appState.locale!;
+    final locale = app.locale!;
 
-    final locales = appState.supportedLocales;
+    final locales = app.supportedLocales;
 
     // record selected locale
     Locale? appLocale;
@@ -159,7 +153,7 @@ class ExampleAppController extends AppStateXController {
     );
 
     await DialogBox(
-      context: appState.lastContext!,
+      context: app.lastContext!,
       title: 'Current Language'.tr,
       body: [spinner],
       press01: () {},
@@ -259,10 +253,7 @@ class ExampleAppController extends AppStateXController {
     //
     final init = await super.initAsync();
 
-    // Demonstrating ways to retrieve the StatefulWidget
-    // ignore: unused_local_variable
-    var widget = firstState!.widget as FlutteryExampleApp;
-    widget = rootState!.widget as FlutteryExampleApp;
+    final widget = appState!.widget as FlutteryExampleApp;
 
     // Don't delay if in testing for example
     if (App.inWidgetsFlutterBinding) {
@@ -278,9 +269,6 @@ class ExampleAppController extends AppStateXController {
       throw Exception('Error in initAsync()!');
     }
 
-    //
-    state?.add(MaterialController());
-
     if (inDebugMode) {
       debugPrint('############ Event: initAsync() in $this');
     }

…tegration_test/src/tests/words_test.dart …ple/integration_test/src/words_test.dartexample/integration_test/src/tests/words_test.dart renamed to example/integration_test/src/words_test.dart example/integration_test/src/tests/words_test.dart renamed to example/integration_test/src/words_test.dart

@@ -8,7 +8,7 @@ import '/src/view.dart';
 import 'package:fluttery_framework/controller.dart';
 
 import 'package:english_words/english_words.dart';
-
+///
 class WordPairsTimer extends StateXController {
   /// Only one instance of the class is necessary and desired.
   factory WordPairsTimer({
@@ -26,15 +26,21 @@ class WordPairsTimer extends StateXController {
         super(state);
 
   static WordPairsTimer? _this;
+  ///
   final int? seconds;
+  ///
   final Duration? duration;
+  ///
   final void Function()? callback;
+  ///
   final int? count;
+  ///
   final WordPairsModel model;
-
+  ///
   Timer? timer;
-
+  ///
   final suggestions = <WordPair>[];
+  ///
   int index = 0;
 
   @override
@@ -152,7 +158,7 @@ class WordPairsTimer extends StateXController {
       /// Change dataObject will rebuild the InheritedWidget
       /// Changing the 'dataObject' will call the SetState class implemented above
       /// and only that widget.
-      rootState?.dataObject = _wordPair;
+      appState?.dataObject = _wordPair;
     } catch (ex) {
       /// Stop the timer.
       /// Something is not working. Don't have the timer repeat it over and over.

example/integration_test/widget_test.dart

@@ -7,14 +7,13 @@ import '/src/view.dart';
 class AppMenu extends AppPopupMenu {
   /// Only one instance of the class
   factory AppMenu() => _this ??= AppMenu._();
-  static AppMenu? _this;
-
   AppMenu._()
       : _con = ExampleAppController(),
         super(
           key: const Key('appMenuButton'),
           controller: AppMenuController(),
         );
+  static AppMenu? _this;
 
   /// The App's controller
   final ExampleAppController _con;
@@ -66,7 +65,7 @@ class AppMenu extends AppPopupMenu {
 
   /// When an menu item is selected
   @override
-  void onSelected(String value) async {
+  Future<void> onSelected(String value) async {
     switch (value) {
       case 'interface':
         _con.changeUI();
@@ -75,10 +74,10 @@ class AppMenu extends AppPopupMenu {
         await _con.changeApp();
         break;
       case 'locale':
-        _con.changeLocale();
+        await _con.changeLocale();
         break;
       case 'color':
-        _con.changeColor();
+        await _con.changeColor();
         break;
       case 'about':
         _con.aboutApp();
@@ -90,7 +89,8 @@ class AppMenu extends AppPopupMenu {
 
 /// Uses the String type as menu options
 class AppMenuController extends AppPopupMenuController {
+  ///
   factory AppMenuController() => _this ??= AppMenuController._();
-  static AppMenuController? _this;
   AppMenuController._();
+  static AppMenuController? _this;
 }