Flutter fixes and package updates

- FlatButton no longer exists in flutter; replace it with TextButton (plus associated changes needed for TextButton styling working differently). - Update dependencies to latest versions - Fix a bug with the theme changer not changing theme immediately when changing it in the settings page.
2022-09-07 15:55:40 -03:00 · 2022-09-07 15:55:40 -03:00 · 404b1105b1
parent 206b42401c
commit 404b1105b1
25 changed files with 169 additions and 171 deletions
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -32,7 +32,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

 android {
-    compileSdkVersion 31
+    compileSdkVersion 33

    sourceSets {
        main.java.srcDirs += 'src/main/kotlin'
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@ -617,4 +617,4 @@
 /* End XCConfigurationList section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
-}
+}
--- a/lib/src/screens/accounts/account_list_page.dart
+++ b/lib/src/screens/accounts/account_list_page.dart
@ -29,8 +29,8 @@ class AccountListPage extends BasePage {
            ButtonTheme(
              minWidth: 28.0,
              height: 28.0,
-              child: FlatButton(
-                  shape: CircleBorder(),
+              child: TextButton(
+                  style: TextButton.styleFrom(shape: CircleBorder()),
                  onPressed: () async {
                    await Navigator.of(context)
                        .pushNamed(Routes.accountCreation);
--- a/lib/src/screens/address_book/address_book_page.dart
+++ b/lib/src/screens/address_book/address_book_page.dart
@ -37,8 +37,8 @@ class AddressBookPage extends BasePage {
            ButtonTheme(
              minWidth: 28.0,
              height: 28.0,
-              child: FlatButton(
-                  shape: CircleBorder(),
+              child: TextButton(
+                  style: TextButton.styleFrom(shape: CircleBorder()),
                  onPressed: () async {
                    await Navigator.of(context)
                        .pushNamed(Routes.addressBookAddContact);
--- a/lib/src/screens/address_book/contact_page.dart
+++ b/lib/src/screens/address_book/contact_page.dart
@ -128,7 +128,7 @@ class ContactFormState extends State<ContactForm> {
                                  textAlign: TextAlign.center,
                                ),
                                actions: <Widget>[
-                                  FlatButton(
+                                  TextButton(
                                      onPressed: () =>
                                          Navigator.of(context).pop(),
                                      child: Text(tr(context).ok))
--- a/lib/src/screens/base_page.dart
+++ b/lib/src/screens/base_page.dart
@ -34,10 +34,10 @@ abstract class BasePage extends StatelessWidget {
      width: isModalBackButton ? 37 : 20,
      child: ButtonTheme(
        minWidth: double.minPositive,
-        child: FlatButton(
-            highlightColor: Colors.transparent,
-            splashColor: Colors.transparent,
-            padding: EdgeInsets.all(0),
+        child: TextButton(
+            style: ButtonStyle(
+                overlayColor: MaterialStateProperty.all(Colors.transparent),
+                padding: MaterialStateProperty.all(EdgeInsets.all(0))),
            onPressed: () => onClose(context),
            child: isModalBackButton ? _closeButton : _backButton),
      ),
--- a/lib/src/screens/dashboard/dashboard_page.dart
+++ b/lib/src/screens/dashboard/dashboard_page.dart
@ -27,8 +27,8 @@ class DashboardPage extends BasePage {
  Widget leading(BuildContext context) {
    return SizedBox(
        width: 30,
-        child: FlatButton(
-            padding: EdgeInsets.all(0),
+        child: TextButton(
+            style: TextButton.styleFrom(padding: EdgeInsets.all(0)),
            onPressed: () => _presentWalletMenu(context),
            child: Icon(Icons.sync_rounded,
                color: Theme.of(context).primaryTextTheme.caption?.color,
@ -66,8 +66,8 @@ class DashboardPage extends BasePage {
  Widget trailing(BuildContext context) {
    return SizedBox(
      width: 30,
-      child: FlatButton(
-          padding: EdgeInsets.all(0),
+      child: TextButton(
+          style: TextButton.styleFrom(padding: EdgeInsets.all(0)),
          onPressed: () => Navigator.of(context).pushNamed(Routes.profile),
          child: Icon(Icons.account_circle_rounded,
              color: Theme.of(context).primaryTextTheme.caption?.color,
--- a/lib/src/screens/disclaimer/disclaimer_page.dart
+++ b/lib/src/screens/disclaimer/disclaimer_page.dart
@ -61,7 +61,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
              textAlign: TextAlign.center,
            ),
            actions: <Widget>[
-              FlatButton(
+              TextButton(
                  onPressed: () {
                    Navigator.of(context).pop();
                  },
--- a/lib/src/screens/new_wallet/new_wallet_page.dart
+++ b/lib/src/screens/new_wallet/new_wallet_page.dart
@ -70,7 +70,7 @@ class _WalletNameFormState extends State<WalletNameForm> {
                return AlertDialog(
                  content: Text(state.error),
                  actions: <Widget>[
-                    FlatButton(
+                    TextButton(
                      child: Text(tr(context).ok),
                      onPressed: () => Navigator.of(context).pop(),
                    ),
--- a/lib/src/screens/nodes/nodes_list_page.dart
+++ b/lib/src/screens/nodes/nodes_list_page.dart
@ -27,7 +27,7 @@ class NodeListPage extends BasePage {
      children: <Widget>[
        ButtonTheme(
          minWidth: double.minPositive,
-          child: FlatButton(
+          child: TextButton(
              onPressed: () async {
                await showConfirmOxenDialog(
                    context,
@ -60,8 +60,8 @@ class NodeListPage extends BasePage {
                ButtonTheme(
                  minWidth: 28.0,
                  height: 28.0,
-                  child: FlatButton(
-                      shape: CircleBorder(),
+                  child: TextButton(
+                      style: TextButton.styleFrom(shape: CircleBorder()),
                      onPressed: () async =>
                          await Navigator.of(context).pushNamed(Routes.newNode),
                      child: Offstage()),
--- a/lib/src/screens/pin_code/pin_code.dart
+++ b/lib/src/screens/pin_code/pin_code.dart
@ -116,7 +116,7 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
        ),
        Spacer(flex: 2),
        if (widget.hasLengthSwitcher) ...[
-          FlatButton(
+          TextButton(
              onPressed: () {
                changePinLength(pinLength == 4 ? 6 : 4);
              },
@ -155,10 +155,11 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
                            return Container(
                              margin: EdgeInsets.only(
                                  left: marginLeft, right: marginRight),
-                              child: FlatButton(
+                              child: TextButton(
                                onPressed: () => _pop(),
-                                color: Colors.transparent,
-                                shape: CircleBorder(),
+                                style: TextButton.styleFrom(
+                                    primary: Colors.transparent,
+                                    shape: CircleBorder()),
                                child: deleteIcon,
                              ),
                            );
@ -169,10 +170,11 @@ class PinCodeState<T extends PinCodeWidget> extends State<T> {
                          return Container(
                            margin: EdgeInsets.only(
                                left: marginLeft, right: marginRight),
-                            child: FlatButton(
+                            child: TextButton(
                              onPressed: () => _push(index),
-                              color: Colors.transparent,
-                              shape: CircleBorder(),
+                              style: TextButton.styleFrom(
+                                  primary: Colors.transparent,
+                                  shape: CircleBorder()),
                              child: Text('$index',
                                  style: TextStyle(
                                      fontSize: 23.0, color: Palette.blueGrey)),
--- a/lib/src/screens/profile/profile_page.dart
+++ b/lib/src/screens/profile/profile_page.dart
@ -13,8 +13,8 @@ class ProfilePage extends BasePage {
  Widget trailing(BuildContext context) {
    return SizedBox(
      width: 25,
-      child: FlatButton(
-          padding: EdgeInsets.all(0),
+      child: TextButton(
+          style: TextButton.styleFrom(padding: EdgeInsets.all(0)),
          onPressed: () => Navigator.of(context).pushNamed(Routes.settings),
          child: Icon(Icons.settings_rounded,
              color: Theme.of(context).primaryTextTheme.caption?.color,
--- a/lib/src/screens/receive/receive_page.dart
+++ b/lib/src/screens/receive/receive_page.dart
@ -28,10 +28,10 @@ class ReceivePage extends BasePage {
      width: 37.0,
      child: ButtonTheme(
        minWidth: double.minPositive,
-        child: FlatButton(
-            highlightColor: Colors.transparent,
-            splashColor: Colors.transparent,
-            padding: EdgeInsets.all(0),
+        child: TextButton(
+            style: ButtonStyle(
+                overlayColor: MaterialStateProperty.all(Colors.transparent),
+                padding: MaterialStateProperty.all(EdgeInsets.all(0))),
            onPressed: () => Share.share(walletStore.subaddress.address),
            child: Icon(
              Icons.share,
--- a/lib/src/screens/restore/restore_wallet_from_keys_page.dart
+++ b/lib/src/screens/restore/restore_wallet_from_keys_page.dart
@ -63,7 +63,7 @@ class _RestoreFromKeysFromState extends State<RestoreFromKeysFrom> {
                return AlertDialog(
                  content: Text(state.error),
                  actions: <Widget>[
-                    FlatButton(
+                    TextButton(
                      child: Text(tr(context).ok),
                      onPressed: () => Navigator.of(context).pop(),
                    ),
--- a/lib/src/screens/restore/restore_wallet_from_seed_details.dart
+++ b/lib/src/screens/restore/restore_wallet_from_seed_details.dart
@ -48,7 +48,7 @@ class _RestoreFromSeedDetailsFormState
                return AlertDialog(
                  content: Text(state.error),
                  actions: <Widget>[
-                    FlatButton(
+                    TextButton(
                      child: Text(tr(context).ok),
                      onPressed: () => Navigator.of(context).pop(),
                    ),
--- a/lib/src/screens/restore/restore_wallet_from_seed_page.dart
+++ b/lib/src/screens/restore/restore_wallet_from_seed_page.dart
@ -29,8 +29,8 @@ class RestoreWalletFromSeedPage extends BasePage {
  Widget trailing(BuildContext context) => SizedBox(
      width: 80,
      height: 20,
-      child: FlatButton(
-          padding: EdgeInsets.all(0),
+      child: TextButton(
+          style: TextButton.styleFrom(padding: EdgeInsets.all(0)),
          onPressed: () => formKey.currentState?.clear(),
          child: Text(tr(context).clear)));

--- a/lib/src/screens/seed/seed_page.dart
+++ b/lib/src/screens/seed/seed_page.dart
@ -122,7 +122,7 @@ class SeedPage extends BasePage {
                                      onPressed: () {
                                        Clipboard.setData(
                                            ClipboardData(text: _seed));
-                                        Scaffold.of(context).showSnackBar(
+                                        ScaffoldMessenger.of(context).showSnackBar(
                                          SnackBar(
                                            content: Text(tr(context).copied_to_clipboard),
                                            backgroundColor: Colors.green,
--- a/lib/src/screens/settings/widgets/settings_switch_list_row.dart
+++ b/lib/src/screens/settings/widgets/settings_switch_list_row.dart
@ -42,7 +42,7 @@ class SettingsSwitchListRow extends StatelessWidget {
              onTaped: () {
                final dark = !settingsStore.isDarkTheme;
                settingsStore.saveDarkTheme(dark);
-                Provider.of<ThemeChanger>(context).setTheme(dark ? Themes.darkTheme : Themes.lightTheme);
+                Provider.of<ThemeChanger>(context, listen: false).setTheme(dark ? Themes.darkTheme : Themes.lightTheme);
              }
          )
      );
--- a/lib/src/screens/setup_pin_code/setup_pin_code.dart
+++ b/lib/src/screens/setup_pin_code/setup_pin_code.dart
@ -58,7 +58,7 @@ class _SetupPinCodeFormState<WidgetType extends SetupPinCodeForm>
              return AlertDialog(
                content: Text(tr(context).setup_successful),
                actions: <Widget>[
-                  FlatButton(
+                  TextButton(
                    child: Text(tr(context).ok),
                    onPressed: () {
                      Navigator.of(context).pop();
@ -76,7 +76,7 @@ class _SetupPinCodeFormState<WidgetType extends SetupPinCodeForm>
              return AlertDialog(
                content: Text(tr(context).pin_is_incorrect),
                actions: <Widget>[
-                  FlatButton(
+                  TextButton(
                    child: Text(tr(context).ok),
                    onPressed: () {
                      Navigator.of(context).pop();
--- a/lib/src/screens/stake/new_stake_page.dart
+++ b/lib/src/screens/stake/new_stake_page.dart
@ -268,7 +268,7 @@ class NewStakeFormState extends State<NewStakeForm> {
                  title: Text(t.error),
                  content: Text(state.error),
                  actions: <Widget>[
-                    FlatButton(
+                    TextButton(
                        child: Text(t.ok),
                        onPressed: () => Navigator.of(context).pop())
                  ],
@ -302,7 +302,7 @@ class NewStakeFormState extends State<NewStakeForm> {
                  title: Text(t.sending),
                  content: Text(t.transaction_sent),
                  actions: <Widget>[
-                    FlatButton(
+                    TextButton(
                        child: Text(t.ok),
                        onPressed: () {
                          _snpkController.text = '';
--- a/lib/src/widgets/primary_button.dart
+++ b/lib/src/widgets/primary_button.dart
@ -23,14 +23,15 @@ class PrimaryButton extends StatelessWidget {
    return ButtonTheme(
        minWidth: double.infinity,
        height: 56.0,
-        child: FlatButton(
+        child: TextButton(
          onPressed: isDisabled
              ? onDisabledPressed
              : onPressed,
-          color: isDisabled ? Colors.transparent : color ?? OxenPalette.tealWithOpacity,
-          shape: RoundedRectangleBorder(
-              side: BorderSide(color: borderColor ?? OxenPalette.teal),
-              borderRadius: BorderRadius.circular(10.0)),
+          style: TextButton.styleFrom(
+              primary: isDisabled ? Colors.transparent : color ?? OxenPalette.tealWithOpacity,
+              shape: RoundedRectangleBorder(
+                  side: BorderSide(color: borderColor ?? OxenPalette.teal),
+                  borderRadius: BorderRadius.circular(10.0))),
          child: Text(text,
              style: TextStyle(
                  fontSize: 16.0,
@ -62,12 +63,13 @@ class LoadingPrimaryButton extends StatelessWidget {
    return ButtonTheme(
        minWidth: double.infinity,
        height: 56.0,
-        child: FlatButton(
+        child: TextButton(
          onPressed: (isLoading || isDisabled) ? null : onPressed,
-          color: color ?? OxenPalette.tealWithOpacity,
-          shape: RoundedRectangleBorder(
-              side: BorderSide(color: borderColor ?? OxenPalette.teal),
-              borderRadius: BorderRadius.circular(10.0)),
+          style: TextButton.styleFrom(
+              primary: color ?? OxenPalette.tealWithOpacity,
+              shape: RoundedRectangleBorder(
+                  side: BorderSide(color: borderColor ?? OxenPalette.teal),
+                  borderRadius: BorderRadius.circular(10.0))),
          child: isLoading
              ? CupertinoActivityIndicator(animating: true)
              : Text(text,
@ -102,12 +104,13 @@ class PrimaryIconButton extends StatelessWidget {
    return ButtonTheme(
        minWidth: double.infinity,
        height: 56.0,
-        child: FlatButton(
+        child: TextButton(
          onPressed: onPressed,
-          color: color ?? OxenPalette.tealWithOpacity,
-          shape: RoundedRectangleBorder(
-              side: BorderSide(color: borderColor ?? OxenPalette.teal),
-              borderRadius: BorderRadius.circular(10.0)),
+          style: TextButton.styleFrom(
+              primary: color ?? OxenPalette.tealWithOpacity,
+              shape: RoundedRectangleBorder(
+                  side: BorderSide(color: borderColor ?? OxenPalette.teal),
+                  borderRadius: BorderRadius.circular(10.0))),
          child: Stack(
            children: <Widget>[
              Row(
@ -159,12 +162,13 @@ class PrimaryImageButton extends StatelessWidget {
    return ButtonTheme(
        minWidth: double.infinity,
        height: 58.0,
-        child: FlatButton(
+        child: TextButton(
          onPressed: onPressed,
-          color: color,
-          shape: RoundedRectangleBorder(
-              side: BorderSide(color: borderColor),
-              borderRadius: BorderRadius.circular(12.0)),
+          style: TextButton.styleFrom(
+              primary: color,
+              shape: RoundedRectangleBorder(
+                  side: BorderSide(color: borderColor),
+                  borderRadius: BorderRadius.circular(12.0))),
          child: Row(
            children: <Widget>[
              Container(
--- a/oxen_coin/pubspec.lock
+++ b/oxen_coin/pubspec.lock
@ -7,56 +7,49 @@ packages:
      name: async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.5.0-nullsafety.1"
+    version: "2.9.0"
  boolean_selector:
    dependency: transitive
    description:
      name: boolean_selector
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.0-nullsafety.1"
+    version: "2.1.0"
  characters:
    dependency: transitive
    description:
      name: characters
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.0-nullsafety.3"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.1"
  clock:
    dependency: transitive
    description:
      name: clock
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.0-nullsafety.1"
+    version: "1.1.1"
  collection:
    dependency: transitive
    description:
      name: collection
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.15.0-nullsafety.3"
+    version: "1.16.0"
  fake_async:
    dependency: transitive
    description:
      name: fake_async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.3.1"
  ffi:
    dependency: "direct main"
    description:
      name: ffi
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.1.3"
+    version: "2.0.1"
  flutter:
    dependency: "direct main"
    description: flutter
@ -73,21 +66,28 @@ packages:
      name: matcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.12.10-nullsafety.1"
+    version: "0.12.12"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.5"
  meta:
    dependency: transitive
    description:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "1.8.0"
  path:
    dependency: transitive
    description:
      name: path
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.8.0-nullsafety.1"
+    version: "1.8.2"
  sky_engine:
    dependency: transitive
    description: flutter
@ -99,56 +99,48 @@ packages:
      name: source_span
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.8.0-nullsafety.2"
+    version: "1.9.0"
  stack_trace:
    dependency: transitive
    description:
      name: stack_trace
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.10.0-nullsafety.1"
+    version: "1.10.0"
  stream_channel:
    dependency: transitive
    description:
      name: stream_channel
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.0-nullsafety.1"
+    version: "2.1.0"
  string_scanner:
    dependency: transitive
    description:
      name: string_scanner
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.0-nullsafety.1"
+    version: "1.1.1"
  term_glyph:
    dependency: transitive
    description:
      name: term_glyph
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.2.0-nullsafety.1"
+    version: "1.2.1"
  test_api:
    dependency: transitive
    description:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.19-nullsafety.2"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.0-nullsafety.3"
+    version: "0.4.12"
  vector_math:
    dependency: transitive
    description:
      name: vector_math
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.0-nullsafety.3"
+    version: "2.1.2"
 sdks:
-  dart: ">=2.10.0-110 <2.11.0"
-  flutter: ">=1.12.13+hotfix.6 <2.0.0"
+  dart: ">=2.17.0 <3.0.0"
--- a/oxen_coin/pubspec.yaml
+++ b/oxen_coin/pubspec.yaml
@ -8,7 +8,7 @@ environment:
 dependencies:
  flutter:
    sdk: flutter
-  ffi: ^1.1.2
+  ffi: ^2.0.1

 dev_dependencies:
  flutter_test:
--- a/pubspec.lock
+++ b/pubspec.lock
@ -7,21 +7,21 @@ packages:
      name: _fe_analyzer_shared
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "40.0.0"
+    version: "47.0.0"
  analyzer:
    dependency: transitive
    description:
      name: analyzer
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "4.1.0"
+    version: "4.7.0"
  archive:
    dependency: transitive
    description:
      name: archive
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.3.0"
+    version: "3.3.1"
  args:
    dependency: transitive
    description:
@ -42,7 +42,7 @@ packages:
      name: async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.8.2"
+    version: "2.9.0"
  auto_size_text:
    dependency: "direct main"
    description:
@ -63,7 +63,7 @@ packages:
      name: basic_utils
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "4.2.2"
+    version: "5.2.2"
  boolean_selector:
    dependency: transitive
    description:
@ -84,7 +84,7 @@ packages:
      name: build_config
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
  build_daemon:
    dependency: transitive
    description:
@ -105,7 +105,7 @@ packages:
      name: build_runner
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.11"
+    version: "2.2.0"
  build_runner_core:
    dependency: transitive
    description:
@ -126,21 +126,14 @@ packages:
      name: built_value
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "8.3.2"
+    version: "8.4.1"
  characters:
    dependency: transitive
    description:
      name: characters
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.2.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.1"
+    version: "1.2.1"
  checked_yaml:
    dependency: transitive
    description:
@ -148,20 +141,27 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.0.1"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.5"
  clock:
    dependency: transitive
    description:
      name: clock
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
  code_builder:
    dependency: transitive
    description:
      name: code_builder
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "4.1.0"
+    version: "4.2.0"
  collection:
    dependency: transitive
    description:
@ -203,7 +203,7 @@ packages:
      name: devicelocale
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.5.2"
+    version: "0.5.5"
  dio:
    dependency: "direct main"
    description:
@ -224,21 +224,21 @@ packages:
      name: fake_async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
  ffi:
    dependency: transitive
    description:
      name: ffi
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.2.1"
+    version: "2.0.1"
  file:
    dependency: transitive
    description:
      name: file
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "6.1.2"
+    version: "6.1.4"
  fixnum:
    dependency: transitive
    description:
@ -264,7 +264,7 @@ packages:
      name: flutter_launcher_icons
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.9.3"
+    version: "0.10.0"
  flutter_localizations:
    dependency: "direct main"
    description: flutter
@ -283,28 +283,28 @@ packages:
      name: flutter_plugin_android_lifecycle
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.6"
+    version: "2.0.7"
  flutter_secure_storage:
    dependency: "direct main"
    description:
      name: flutter_secure_storage
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "5.0.2"
+    version: "6.0.0"
  flutter_secure_storage_linux:
    dependency: transitive
    description:
      name: flutter_secure_storage_linux
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
  flutter_secure_storage_macos:
    dependency: transitive
    description:
      name: flutter_secure_storage_macos
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
  flutter_secure_storage_platform_interface:
    dependency: transitive
    description:
@ -332,7 +332,7 @@ packages:
      name: flutter_slidable
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.3.0"
+    version: "2.0.0"
  flutter_test:
    dependency: "direct dev"
    description: flutter
@ -356,7 +356,7 @@ packages:
      name: glob
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.2"
+    version: "2.1.0"
  graphs:
    dependency: transitive
    description:
@ -370,7 +370,7 @@ packages:
      name: hive
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.2.2"
+    version: "2.2.3"
  hive_flutter:
    dependency: "direct main"
    description:
@ -391,14 +391,14 @@ packages:
      name: http
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.13.4"
+    version: "0.13.5"
  http_multi_server:
    dependency: transitive
    description:
      name: http_multi_server
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
  http_parser:
    dependency: transitive
    description:
@ -440,7 +440,7 @@ packages:
      name: json_annotation
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "4.5.0"
+    version: "4.6.0"
  lints:
    dependency: "direct dev"
    description:
@ -454,21 +454,21 @@ packages:
      name: local_auth
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
  local_auth_android:
    dependency: transitive
    description:
      name: local_auth_android
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.5"
+    version: "1.0.11"
  local_auth_ios:
    dependency: transitive
    description:
      name: local_auth_ios
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.7"
+    version: "1.0.9"
  local_auth_platform_interface:
    dependency: transitive
    description:
@ -482,7 +482,7 @@ packages:
      name: local_auth_windows
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.1"
+    version: "1.0.3"
  logging:
    dependency: transitive
    description:
@ -496,21 +496,21 @@ packages:
      name: matcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.12.11"
+    version: "0.12.12"
  material_color_utilities:
    dependency: transitive
    description:
      name: material_color_utilities
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.1.4"
+    version: "0.1.5"
  meta:
    dependency: transitive
    description:
      name: meta
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
  mime:
    dependency: transitive
    description:
@ -524,7 +524,7 @@ packages:
      name: mobx
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.7+2"
+    version: "2.0.7+5"
  mobx_codegen:
    dependency: "direct dev"
    description:
@ -552,14 +552,14 @@ packages:
      name: package_config
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.2"
+    version: "2.1.0"
  package_info_plus:
    dependency: "direct main"
    description:
      name: package_info_plus
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.4.2"
+    version: "1.4.3+1"
  package_info_plus_linux:
    dependency: transitive
    description:
@ -594,14 +594,14 @@ packages:
      name: package_info_plus_windows
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.5"
+    version: "2.1.0"
  path:
    dependency: transitive
    description:
      name: path
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
  path_provider:
    dependency: "direct main"
    description:
@ -615,14 +615,14 @@ packages:
      name: path_provider_android
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.14"
+    version: "2.0.20"
  path_provider_ios:
    dependency: transitive
    description:
      name: path_provider_ios
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.9"
+    version: "2.0.11"
  path_provider_linux:
    dependency: transitive
    description:
@ -650,7 +650,7 @@ packages:
      name: path_provider_windows
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.7"
+    version: "2.1.3"
  petitparser:
    dependency: transitive
    description:
@ -678,14 +678,14 @@ packages:
      name: pointycastle
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.6.0"
+    version: "3.6.1"
  pool:
    dependency: transitive
    description:
      name: pool
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.5.0"
+    version: "1.5.1"
  process:
    dependency: transitive
    description:
@ -699,7 +699,7 @@ packages:
      name: protobuf
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.1"
+    version: "2.1.0"
  provider:
    dependency: "direct main"
    description:
@ -720,7 +720,7 @@ packages:
      name: pubspec_parse
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
  qr:
    dependency: transitive
    description:
@ -741,14 +741,14 @@ packages:
      name: rxdart
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.27.4"
+    version: "0.27.5"
  share_plus:
    dependency: "direct main"
    description:
      name: share_plus
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "4.0.7"
+    version: "4.1.0"
  share_plus_linux:
    dependency: transitive
    description:
@ -797,7 +797,7 @@ packages:
      name: shared_preferences_android
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.12"
+    version: "2.0.13"
  shared_preferences_ios:
    dependency: transitive
    description:
@ -825,7 +825,7 @@ packages:
      name: shared_preferences_platform_interface
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
  shared_preferences_web:
    dependency: transitive
    description:
@ -846,14 +846,14 @@ packages:
      name: shelf
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.3.0"
+    version: "1.3.2"
  shelf_web_socket:
    dependency: transitive
    description:
      name: shelf_web_socket
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
  sky_engine:
    dependency: transitive
    description: flutter
@ -879,7 +879,7 @@ packages:
      name: source_span
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.8.2"
+    version: "1.9.0"
  stack_trace:
    dependency: transitive
    description:
@ -907,28 +907,28 @@ packages:
      name: string_scanner
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
  synchronized:
    dependency: "direct main"
    description:
      name: synchronized
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "3.0.0+2"
+    version: "3.0.0+3"
  term_glyph:
    dependency: transitive
    description:
      name: term_glyph
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
  test_api:
    dependency: transitive
    description:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.4.9"
+    version: "0.4.12"
  timing:
    dependency: transitive
    description:
@ -949,14 +949,14 @@ packages:
      name: url_launcher
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "6.1.3"
+    version: "6.1.5"
  url_launcher_android:
    dependency: transitive
    description:
      name: url_launcher_android
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "6.0.17"
+    version: "6.0.18"
  url_launcher_ios:
    dependency: transitive
    description:
@ -984,14 +984,14 @@ packages:
      name: url_launcher_platform_interface
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.5"
+    version: "2.1.0"
  url_launcher_web:
    dependency: transitive
    description:
      name: url_launcher_web
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.0.11"
+    version: "2.0.13"
  url_launcher_windows:
    dependency: transitive
    description:
@ -1033,14 +1033,14 @@ packages:
      name: win32
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.6.1"
+    version: "3.0.0"
  xdg_directories:
    dependency: transitive
    description:
      name: xdg_directories
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.2.0+1"
+    version: "0.2.0+2"
  xml:
    dependency: transitive
    description:
@ -1057,4 +1057,4 @@ packages:
    version: "3.1.1"
 sdks:
  dart: ">=2.17.0 <3.0.0"
-  flutter: ">=2.10.0"
+  flutter: ">=3.0.0"
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -42,7 +42,7 @@ dependencies:
  qr_flutter: ^4.0.0
  uuid: ^3.0.3
  shared_preferences: ^2.0.13
-  flutter_secure_storage: ^5.0.2
+  flutter_secure_storage: ^6.0.0
  provider: ^6.0.2
  rxdart: ^0.27.3
  yaml: ^3.1.0
@ -51,7 +51,7 @@ dependencies:
  path_provider: ^2.0.9
  mobx: ^2.0.6
  flutter_mobx: ^2.0.4
-  flutter_slidable: ^1.2.0
+  flutter_slidable: ^2.0.0
  share_plus: ^4.0.3
  dio: ^4.0.0
  oxen_coin:
@ -68,7 +68,7 @@ dependencies:
  # Use with the CupertinoIcons class for iOS style icons.
  cupertino_icons: ^1.0.2
  encrypt: ^5.0.0
-  basic_utils: ^4.2.0
+  basic_utils: ^5.2.2

 dev_dependencies:
  flutter_test:
@ -77,7 +77,7 @@ dev_dependencies:
  build_resolvers: ^2.0.6
  mobx_codegen: ^2.0.5+2
  hive_generator: ^1.1.2
-  flutter_launcher_icons: ^0.9.0
+  flutter_launcher_icons: ^0.10.0
  lints: ^2.0.0