Minor updates to address deprecation warnings.

larryaasen · Sep 4, 2024 · 4603c94 · 4603c94
1 parent fa02d08
commit 4603c94
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 20 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        flutter-version: ['3.16.0', '3.19.4']
+        flutter-version: ['3.16.0', '3.19.4', '3.24.1']
 
     steps:
       - uses: actions/checkout@v3
@@ -33,7 +33,7 @@ jobs:
 
       - name: Analyze
         run: flutter analyze
-      
+
       - name: Run unit and widget tests
         run: flutter test --coverage --coverage-path=lcov.info
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
-## Next
+## 10.4.0
 
 - [413] Fixed Haitian Creole messages to use correct grammar. (thanks to @wjeanvilma)
 - [415] Added Kurdish Sorani ('ku') language translation. (thanks to @drpshtiwan)
+- Minor updates to address deprecation warnings.
 
 ## 10.3.0
 
@@ -662,12 +663,12 @@ the US. The country code can be overriden with the optional `countryCode` parame
 
 ## 0.10.4
 
-* Updated dependency xml to ">=3.5.0 <5.0.0" to improve score on pub.dev in the 
+* Updated dependency xml to ">=3.5.0 <5.0.0" to improve score on pub.dev in the
 Maintenance issues and suggestions section.
 
 ## 0.10.3
 
-* Updated depenency flutter_device_locale to 0.4.0, and xml to 3.5.0, to improve score on pub.dev in the 
+* Updated depenency flutter_device_locale to 0.4.0, and xml to 3.5.0, to improve score on pub.dev in the
 Maintenance issues and suggestions section.
 
 ## 0.10.2
@@ -683,7 +684,7 @@ Maintenance issues and suggestions section.
 
 * Added options to hide ignore and later buttons. (Thanks to Karthik Ponnam)
 * Added option to close alert dialog on tap outside of alert dialog. (Thanks to Karthik Ponnam)
-* 
+*
 
 ## 0.9.0
 
@@ -743,7 +744,7 @@ defaults to debug logging on, and added command line app to evaluate the iTunes
 * added many customizations to the widget including callbacks for onIgnore, onLater, and onUpdate
 * updated the README screenshot
 * updated tests, improved README
-* broke out widget into new file 
+* broke out widget into new file
 
 ## 0.1.0
 

diff --git a/example/ios/Runner/AppDelegate.swift b/example/ios/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

diff --git a/example/lib/main_alert_theme.dart b/example/lib/main_alert_theme.dart
@@ -57,7 +57,7 @@ class MyUpgradeAlertState extends UpgradeAlertState {
         textButtonTheme: const TextButtonThemeData(
           style: ButtonStyle(
             // Change the color of the text buttons.
-            foregroundColor: MaterialStatePropertyAll(Colors.orange),
+            foregroundColor: WidgetStatePropertyAll(Colors.orange),
           ),
         ),
       ),

diff --git a/example/lib/main_card_theme.dart b/example/lib/main_card_theme.dart
@@ -23,7 +23,7 @@ class MyApp extends StatelessWidget {
     textButtonTheme: const TextButtonThemeData(
       style: ButtonStyle(
         // Change the color of the text buttons.
-        foregroundColor: MaterialStatePropertyAll(Colors.orange),
+        foregroundColor: WidgetStatePropertyAll(Colors.orange),
       ),
     ),
   );

diff --git a/lib/src/alert_style_widget.dart b/lib/src/alert_style_widget.dart
@@ -18,11 +18,11 @@ class AlertStyleWidget extends StatelessWidget {
   ///
   /// Typically this is a list of [TextButton] widgets.
   ///
-  /// These widgets will be wrapped in a [ButtonBar], which introduces 8 pixels
+  /// These widgets will be wrapped in a [OverflowBar], which introduces 8 pixels
   /// of padding on each side.
   ///
   /// If the [title] is not null but the [content] _is_ null, then an extra 20
-  /// pixels of padding is added above the [ButtonBar] to separate the [title]
+  /// pixels of padding is added above the [OverflowBar] to separate the [title]
   /// from the [actions].
   final List<Widget> actions;
 
@@ -73,11 +73,7 @@ class AlertStyleWidget extends StatelessWidget {
       ),
     ));
 
-    children.add(
-      ButtonBar(
-        children: actions,
-      ),
-    );
+    children.add(OverflowBar(children: actions));
 
     Widget dialogChild = IntrinsicWidth(
       child: Column(

diff --git a/lib/src/upgrade_alert.dart b/lib/src/upgrade_alert.dart
@@ -140,9 +140,10 @@ class UpgradeAlertState extends State<UpgradeAlert> {
       displayed = true;
       final appMessages = widget.upgrader.determineMessages(context);
 
-      Future.delayed(const Duration(milliseconds: 0), () {
+      Future.delayed(Duration.zero, () {
         showTheDialog(
           key: widget.dialogKey ?? const Key('upgrader_alert_dialog'),
+          // ignore: use_build_context_synchronously
           context: context,
           title: appMessages.message(UpgraderMessage.title),
           message: widget.upgrader.body(appMessages),
@@ -236,7 +237,7 @@ class UpgradeAlertState extends State<UpgradeAlert> {
       builder: (BuildContext context) {
         return PopScope(
           canPop: onCanPop(),
-          onPopInvoked: (didPop) {
+          onPopInvokedWithResult: (didPop, result) {
             if (widget.upgrader.state.debugLogging) {
               print('upgrader: showTheDialog onPopInvoked: $didPop');
             }

diff --git a/lib/src/upgrader.dart b/lib/src/upgrader.dart
@@ -34,7 +34,7 @@ typedef WillDisplayUpgradeCallback = void Function({
 /// Creates a shared instance of [Upgrader].
 Upgrader _sharedInstance = Upgrader();
 
-/// An upgrade controllerthat maintains a [state] that is used to
+/// An upgrade controller that maintains a [state] that is used to
 /// trigger an alert or other UI to evaluate upgrading criteria.
 ///
 /// See also: