diff --git a/CHANGELOG.md b/CHANGELOG.md index b377124..985c0ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ +## 4.12.0 +March 17, 2024 +- Deprecated getter, startState. Use getter firstState instead +- Deprecated getter, endState. Use getter lastState instead + ## 4.11.0 February 18, 2023 - Deprecated diff --git a/example/lib/src/another_app/home/view/home_page.dart b/example/lib/src/another_app/home/view/home_page.dart index d9f1719..856a0b6 100644 --- a/example/lib/src/another_app/home/view/home_page.dart +++ b/example/lib/src/another_app/home/view/home_page.dart @@ -52,8 +52,8 @@ class _HomePageState extends StateX { ), persistentFooterButtons: [ OverflowBar( - spacing: 5, - overflowAlignment: OverflowBarAlignment.center, + // spacing: 5, + // overflowAlignment: OverflowBarAlignment.center, children: [ TextButton( onPressed: () => con.newDogs(), diff --git a/example/lib/src/view/home/page_01.dart b/example/lib/src/view/home/page_01.dart index 40d9f12..68b798f 100644 --- a/example/lib/src/view/home/page_01.dart +++ b/example/lib/src/view/home/page_01.dart @@ -185,7 +185,7 @@ class Page1State extends StateX { // Save the count con.page1Count = count; // Both access the 'first' StateX object - startState?.setState(() {}); + firstState?.setState(() {}); rootState?.setState(() {}); }, ); diff --git a/example/lib/src/view/home/page_02.dart b/example/lib/src/view/home/page_02.dart index 4b33ca9..12d2c3f 100644 --- a/example/lib/src/view/home/page_02.dart +++ b/example/lib/src/view/home/page_02.dart @@ -42,12 +42,12 @@ class Page2State extends StateX { assert(firstStateX is AppStateX, 'Should be a AppStateX object.'); /// Retrieve the first State object - final firstState = controller?.state?.startState; + final firstState = controller?.state?.firstState; assert(firstState is State, 'Should be a State object.'); /// Retrieve the latest, most recent State object. - final lastState = controller?.state?.endState; + final lastState = controller?.state?.lastState; assert(lastState is Page2State, 'Should be this State object'); @@ -55,8 +55,8 @@ class Page2State extends StateX { /// Note, this State object's own context is not yet defined in initState() /// This is so important, there's a number of ways to get it. // ignore: unused_local_variable - BuildContext? lastContext = controller?.state?.endState?.context; - lastContext = controller?.rootState?.endState?.context; + BuildContext? lastContext = controller?.state?.lastState?.context; + lastContext = controller?.rootState?.lastState?.context; lastContext = controller?.lastContext; /// The app's data object diff --git a/example/lib/src/view/home/page_03.dart b/example/lib/src/view/home/page_03.dart index 6c17247..dd9c69e 100644 --- a/example/lib/src/view/home/page_03.dart +++ b/example/lib/src/view/home/page_03.dart @@ -47,7 +47,7 @@ class _Page3State extends StateIn { count: count, newKey: () { // Both access the 'first' StateX object - startState?.setState(() {}); + firstState?.setState(() {}); rootState?.setState(() {}); }, counter: () { @@ -105,7 +105,7 @@ class _Page3State extends StateIn { key: const Key('InheritedWidget example'), onPressed: () async { await Navigator.push( - endState!.context, + lastState!.context, MaterialPageRoute( builder: (BuildContext context) => const i.HomePage())); diff --git a/lib/state_extended.dart b/lib/state_extended.dart index 1b67f1d..5fe2d14 100644 --- a/lib/state_extended.dart +++ b/lib/state_extended.dart @@ -1423,7 +1423,7 @@ mixin _MapOfStates on State { /// Returns null if empty. StateXController? get rootCon { StateXController? controller; - final state = startState; + final state = firstState; if (state != null) { controller = state.controller; } @@ -1432,11 +1432,15 @@ mixin _MapOfStates on State { /// Return the first State object // Bit of overkill, but some programmers don't appreciate Polymorphism. + @Deprecated('Use firstState instead') StateX? get startState => _nextStateX(); + StateX? get firstState => _nextStateX(); /// Return the 'latest' State object // Bit of overkill, but some programmers don't appreciate Polymorphism. + @Deprecated('Use lastState instead') StateX? get endState => _nextStateX(reversed: true); + StateX? get lastState => _nextStateX(reversed: true); /// Loop through the list and return the next available State object StateX? _nextStateX({bool? reversed}) { @@ -2564,7 +2568,7 @@ abstract class AppStateX extends StateX // call the latest SateX object's error routine // Possibly the error occurred there. - final state = endState; + final state = lastState; if (state != null) { try { diff --git a/pubspec.lock b/pubspec.lock index 9654cd8..c0209a2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -60,10 +60,10 @@ packages: dependency: transitive description: name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c" url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "7.0.0" flutter: dependency: "direct main" description: flutter @@ -126,6 +126,30 @@ packages: url: "https://pub.dev" source: hosted version: "0.18.1" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.dev" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + url: "https://pub.dev" + source: hosted + version: "2.0.1" lints: dependency: transitive description: @@ -138,50 +162,50 @@ packages: dependency: transitive description: name: matcher - sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.16" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.5.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" path: dependency: transitive description: name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.3" + version: "1.9.0" platform: dependency: transitive description: name: platform - sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102 + sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec" url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.4" process: dependency: transitive description: name: process - sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32" url: "https://pub.dev" source: hosted - version: "4.2.4" + version: "5.0.2" sky_engine: dependency: transitive description: flutter @@ -271,26 +295,18 @@ packages: dependency: transitive description: name: vm_service - sha256: c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583 - url: "https://pub.dev" - source: hosted - version: "11.10.0" - web: - dependency: transitive - description: - name: web - sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "13.0.0" webdriver: dependency: transitive description: name: webdriver - sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49" + sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e" url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" sdks: - dart: ">=3.2.0-194.0.dev <4.0.0" + dart: ">=3.2.0-0 <4.0.0" flutter: ">=1.17.0" diff --git a/pubspec.yaml b/pubspec.yaml index a60a2b1..b64e338 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: state_extended description: This class extends the capabilities of Flutter's State class and includes a controller. -version: 4.11.0 +version: 4.12.0 homepage: https://www.andrioussolutions.com repository: https://github.com/AndriousSolutions/state_extended