Feature: Migration to Flutter 3.16.9

.fvm/fvm_config.json

@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.13.6",
+  "flutterSdkVersion": "3.16.9",
   "flavors": {}
 }

.gitignore

@@ -3,6 +3,7 @@
 
 # Miscellaneous
 *.class
+*.lock
 *.log
 *.pyc
 *.swp

README.md

@@ -1,19 +1,25 @@
 # miro
+
 Miro is user interface for KIRA Network to manage accounts, balance and transfer tokens between different wallets.
 
 ## Installation
+
 Use git clone to download [miro](https://github.com/KiraCore/miro) project.
+
 ```bash
 git clone [email protected]:KiraCore/miro.git
 ```
 
 ## Usage
-The project runs on flutter version **3.13.6**. You can use [fvm](https://fvm.app/docs/getting_started/installation) 
+
+The project runs on flutter version **3.16.9**. You can
+use [fvm](https://fvm.app/documentation/getting-started/installation)
 for easy switching between versions
+
 ```bash
 # Install and use required flutter version
-fvm install 3.13.6
-fvm use 3.13.6
+fvm install 3.16.9
+fvm use 3.16.9
 
 # Install required packages in pubspec.yaml
 fvm flutter pub get
@@ -25,9 +31,11 @@ fvm flutter run -d web-server
 ```
 
 To generate config files use
+
 ```bash
 fvm flutter pub run build_runner
 ```
+
 ```bash
 # Built-in Commands 
 # - build: Runs a single build and exits.
@@ -43,7 +51,9 @@ fvm flutter pub run build_runner watch --delete-conflicting-outputs
 ```
 
 ## Tests
+
 To run Unit Tests / Integration tests
+
 ```bash
 # Run all Unit Tests
 fvm flutter test test/unit --platform chrome --null-assertions
@@ -59,13 +69,15 @@ fvm flutter test test/unit/infra/services/api_kira/query_execution_fee_service_t
 ```
 
 ## Building, Deploying and Installing
+
 To build project please run script in [deploy.sh](https://github.com/KiraCore/miro/deploy.sh). \
 Deploy script is only intended to be run on Ubuntu 20.04.4 LTS.\
 After successful build, open index.html in "/miro/build/web".\
-Enjoy! 
+Enjoy!
 
 ## Contributing
-Pull requests are welcome. For major changes, please open an issue first to discuss what would like to improve. Please 
+
+Pull requests are welcome. For major changes, please open an issue first to discuss what would like to improve. Please
 make sure to update tests as well.
 
 ## [Licence](./LICENSE.md)

lib/config/locator.dart

@@ -33,7 +33,7 @@ import 'package:miro/shared/controllers/global_nav/global_nav_controller.dart';
 
 final GetIt globalLocator = GetIt.I;
 
-Future<void> initLocator() async {
+void initLocator() {
   globalLocator
     ..registerLazySingleton<AppConfig>(AppConfig.buildDefaultConfig)
     ..registerLazySingleton<ICacheManager>(AutoCacheManager.new);

lib/config/theme/theme_config.dart

@@ -3,7 +3,7 @@ import 'package:miro/config/theme/design_colors.dart';
 
 class ThemeConfig {
   static ThemeData buildTheme({required bool isSmallScreen}) {
-    final ThemeData themeData = ThemeData.dark();
+    final ThemeData themeData = ThemeData.dark(useMaterial3: false);
 
     return themeData.copyWith(
       colorScheme: const ColorScheme.dark(background: DesignColors.background),

lib/main.dart

@@ -19,7 +19,7 @@ Future<void> main() async {
   // disable default context menu
   window.document.onContextMenu.listen((MouseEvent mouseEvent) => mouseEvent.preventDefault());
 
-  await initLocator();
+  initLocator();
   await globalLocator<ICacheManager>().init();
 
   Map<String, dynamic> configJson = await AssetsManager().getAsMap('assets/network_list_config.json');

lib/test/utils/test_utils.dart

@@ -178,7 +178,7 @@ class TestUtils {
   }
 
   static Future<void> initIntegrationTest() async {
-    await initLocator();
+    initLocator();
     await globalLocator<ICacheManager>().init();
     globalLocator<AppConfig>().init(MockNetworkListConfigJson.defaultNetworkListConfig);
   }

lib/views/layout/drawer/kira_drawer.dart

@@ -27,8 +27,8 @@ class _KiraDrawer extends State<KiraDrawer> {
   Widget build(BuildContext context) {
     return GestureDetector(
       onTap: () => _handleDrawerShadowTap(context),
-      child: WillPopScope(
-        onWillPop: _onWillPop,
+      child: PopScope(
+        onPopInvoked: (_) => _handlePopInvoked(),
         child: SizedBox(
           width: widget.width,
           height: MediaQuery.of(context).size.height,
@@ -72,14 +72,13 @@ class _KiraDrawer extends State<KiraDrawer> {
     }
   }
 
-  Future<bool> _onWillPop() async {
+  Future<void> _handlePopInvoked() async {
     bool canPop = drawerCubit.canPop;
     if (canPop) {
       _handleDrawerPop();
     } else {
       _handleDrawerClose();
     }
-    return Future<bool>.value(canPop);
   }
 
   void _handleDrawerPop() {

lib/views/layout/scaffold/backdrop/backdrop.dart

@@ -54,8 +54,9 @@ class _Backdrop extends State<Backdrop> with SingleTickerProviderStateMixin {
 
   @override
   Widget build(BuildContext context) {
-    return WillPopScope(
-      onWillPop: () => _handleTryPop(context),
+    return PopScope(
+      canPop: _isExpanded,
+      onPopInvoked: (_) => _handlePopInvoked(context),
       child: Column(
         children: <Widget>[
           AnimatedBuilder(
@@ -89,12 +90,10 @@ class _Backdrop extends State<Backdrop> with SingleTickerProviderStateMixin {
     }
   }
 
-  Future<bool> _handleTryPop(BuildContext context) async {
+  Future<void> _handlePopInvoked(BuildContext context) async {
     if (_isExpanded) {
       collapse();
-      return false;
     }
-    return true;
   }
 
   bool get _isCollapsed => _collapsedAnimationStatusList.contains(animationController.status);

lib/views/widgets/generic/date_range_dropdown/date_range_dropdown_pop_menu.dart

@@ -66,7 +66,7 @@ class _DateRangeDropdownPopMenu extends State<DateRangeDropdownPopMenu> {
 
     return Container(
       padding: const EdgeInsets.symmetric(vertical: 16),
-      width: 250,
+      width: 310,
       height: 440,
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,

lib/views/widgets/generic/pop_wrapper/pop_wrapper_mobile.dart

@@ -72,7 +72,7 @@ class _PopWrapperMobile extends State<PopWrapperMobile> {
           ),
           backgroundColor: themeData.scaffoldBackgroundColor,
           child: Container(
-            constraints: const BoxConstraints(maxWidth: 200),
+            constraints: const BoxConstraints(maxWidth: 310),
             decoration: BoxDecoration(
               color: widget.backgroundColor,
               borderRadius: BorderRadius.circular(8),

lib/views/widgets/kira/kira_tab_bar/kira_tab_bar.dart

@@ -16,7 +16,7 @@ class KiraTabBar extends StatelessWidget {
     TextTheme textTheme = Theme.of(context).textTheme;
 
     return Theme(
-      data: ThemeData().copyWith(
+      data: ThemeData(useMaterial3: false).copyWith(
         splashColor: Colors.transparent,
         highlightColor: Colors.transparent,
         splashFactory: NoSplash.splashFactory,