Feature/flutter 1.22 compatibility (#15)

* Trying to make compatibility between flutter windows 1.22 and 1.27 ios beta

* Running iOS on stable 1.22 version.

README.md

@@ -63,7 +63,7 @@ Feel free to check out the smart contract used in this project [https://github.c
 
 ### Release notes
 
-2021 feb 27: App running and tested on iOS and android with flutter version 1.27.0-9.0.pre.85 (dart 2.10.5). Flutter and libraries has been upgraded. Small code changes just to get rid of deprecated flutter components.
+2021 feb 27: App running and tested on iOS and android with flutter version 1.22 (dart 2.10.5). Flutter and libraries has been upgraded. Small code changes just to get rid of deprecated flutter components.
 
 ### License
 

ios/Flutter/Debug.xcconfig

@@ -1,2 +1,2 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

ios/Flutter/Release.xcconfig

@@ -1,2 +1,2 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+platform :ios, '9.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

ios/Podfile.lock

@@ -182,7 +182,7 @@ SPEC CHECKSUMS:
   FirebaseMLCommon: f42d067ca7fed962e09f02ba94a24e06ee50d933
   FirebaseMLVision: fd7cdd33d067c976c16fd521e7e92c26c980c947
   FirebaseMLVisionBarcodeModel: 394cd61c52dc03558088caf82b0dade8028f57d5
-  Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
+  Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
   GoogleAPIClientForREST: 4bb409633efcc2e1b3f945afe7e35039b5a61db2
   GoogleAppMeasurement: 966e88df9d19c15715137bb2ddaf52373f111436
   GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
@@ -195,6 +195,6 @@ SPEC CHECKSUMS:
   shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
   url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
 
-PODFILE CHECKSUM: f43216b3d38dd9dd263637544dc9bdce3e278e7a
+PODFILE CHECKSUM: 76cfc2fa0003e9287778eb8d305c4079de8a0386
 
 COCOAPODS: 1.10.1

ios/Runner.xcodeproj/project.pbxproj

@@ -362,6 +362,7 @@
 				DEVELOPMENT_TEAM = CUFZ3BA873;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -491,6 +492,7 @@
 				DEVELOPMENT_TEAM = CUFZ3BA873;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -514,6 +516,7 @@
 				DEVELOPMENT_TEAM = CUFZ3BA873;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

lib/components/copyButton/copy_button.dart

@@ -13,7 +13,7 @@ class CopyButton extends StatelessWidget {
       onPressed: () {
         Clipboard.setData(ClipboardData(text: this.value));
 
-        ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+        Scaffold.of(context).showSnackBar(SnackBar(
           content: Text("Copied"),
         ));
       },

lib/context/hook_provider.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/widgets.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:provider/provider.dart';
+import 'package:provider/provider.dart' as p;
 
 typedef HookWidgetBuilder<Handler> = Widget Function(
     BuildContext context, Handler store);
@@ -12,9 +12,9 @@ abstract class ContextProviderWidget<T> extends HookWidget {
   ContextProviderWidget({this.child, this.builder});
 
   Widget provide(BuildContext context, T handler) {
-    return MultiProvider(
+    return p.MultiProvider(
       providers: [
-        Provider.value(value: handler),
+        p.Provider.value(value: handler),
       ],
       child: builder != null ? builder(context, handler) : child,
     );

lib/context/setup/wallet_setup_provider.dart

@@ -5,7 +5,7 @@ import 'package:etherwallet/service/address_service.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 
-import 'package:provider/provider.dart';
+import 'package:provider/provider.dart' as p;
 
 import '../hook_provider.dart';
 
@@ -19,7 +19,7 @@ class WalletSetupProvider extends ContextProviderWidget<WalletSetupHandler> {
     final store = useReducer<WalletSetup, WalletSetupAction>(reducer,
         initialState: WalletSetup());
 
-    final addressService = Provider.of<AddressService>(context);
+    final addressService = p.Provider.of<AddressService>(context);
     final handler = useMemoized(
       () => WalletSetupHandler(store, addressService),
       [addressService, store],
@@ -30,7 +30,7 @@ class WalletSetupProvider extends ContextProviderWidget<WalletSetupHandler> {
 }
 
 WalletSetupHandler useWalletSetup(BuildContext context) {
-  var handler = Provider.of<WalletSetupHandler>(context);
+  var handler = p.Provider.of<WalletSetupHandler>(context);
 
   return handler;
 }

lib/context/transfer/wallet_transfer_provider.dart

@@ -6,7 +6,7 @@ import 'package:etherwallet/service/contract_service.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 
-import 'package:provider/provider.dart';
+import 'package:provider/provider.dart' as p;
 
 import '../hook_provider.dart';
 
@@ -21,8 +21,8 @@ class WalletTransferProvider
     final store = useReducer<WalletTransfer, WalletTransferAction>(reducer,
         initialState: WalletTransfer());
 
-    final contractService = Provider.of<ContractService>(context);
-    final configurationService = Provider.of<ConfigurationService>(context);
+    final contractService = p.Provider.of<ContractService>(context);
+    final configurationService = p.Provider.of<ConfigurationService>(context);
     final handler = useMemoized(
       () => WalletTransferHandler(store, contractService, configurationService),
       [contractService, store],
@@ -33,7 +33,7 @@ class WalletTransferProvider
 }
 
 WalletTransferHandler useWalletTransfer(BuildContext context) {
-  var handler = Provider.of<WalletTransferHandler>(context);
+  var handler = p.Provider.of<WalletTransferHandler>(context);
 
   return handler;
 }

lib/context/wallet/wallet_handler.dart

@@ -82,7 +82,7 @@ class WalletHandler {
   }
 
   Future<void> resetWallet() async {
-    await _configurationService.setMnemonic("");
+    await _configurationService.setMnemonic(null);
     await _configurationService.setupDone(false);
   }
 }

lib/context/wallet/wallet_provider.dart

@@ -5,7 +5,7 @@ import 'package:etherwallet/service/contract_service.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 
-import 'package:provider/provider.dart';
+import 'package:provider/provider.dart' as p;
 
 import '../hook_provider.dart';
 import 'wallet_state.dart';
@@ -20,9 +20,9 @@ class WalletProvider extends ContextProviderWidget<WalletHandler> {
     final store =
         useReducer<Wallet, WalletAction>(reducer, initialState: Wallet());
 
-    final addressService = Provider.of<AddressService>(context);
-    final contractService = Provider.of<ContractService>(context);
-    final configurationService = Provider.of<ConfigurationService>(context);
+    final addressService = p.Provider.of<AddressService>(context);
+    final contractService = p.Provider.of<ContractService>(context);
+    final configurationService = p.Provider.of<ConfigurationService>(context);
     final handler = useMemoized(
       () => WalletHandler(
         store,
@@ -38,7 +38,7 @@ class WalletProvider extends ContextProviderWidget<WalletHandler> {
 }
 
 WalletHandler useWallet(BuildContext context) {
-  var handler = Provider.of<WalletHandler>(context);
+  var handler = p.Provider.of<WalletHandler>(context);
 
   return handler;
 }

lib/main.dart

@@ -3,7 +3,7 @@ import 'package:etherwallet/router.dart';
 import 'package:etherwallet/services_provider.dart';
 import 'package:firebase_analytics/observer.dart';
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
+import 'package:provider/provider.dart' as p;
 import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:provider/single_child_widget.dart';
 
@@ -23,7 +23,7 @@ class MainApp extends StatelessWidget {
   // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
-    return MultiProvider(
+    return p.MultiProvider(
         providers: stores,
         child: new MaterialApp(
           title: 'Flutter App',

lib/router.dart

@@ -6,7 +6,7 @@ import 'package:etherwallet/wallet_main_page.dart';
 import 'package:etherwallet/wallet_transfer_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:provider/provider.dart';
+import 'package:provider/provider.dart' as p;
 
 import 'context/wallet/wallet_provider.dart';
 import 'context/setup/wallet_setup_provider.dart';
@@ -16,7 +16,7 @@ import 'intro_page.dart';
 Map<String, WidgetBuilder> getRoutes(context) {
   return {
     '/': (BuildContext context) {
-      var configurationService = Provider.of<ConfigurationService>(context);
+      var configurationService = p.Provider.of<ConfigurationService>(context);
       if (configurationService.didSetupWallet())
         return WalletProvider(builder: (context, store) {
           return WalletMainPage("Your wallet");

lib/service/configuration_service.dart

@@ -15,12 +15,12 @@ class ConfigurationService implements IConfigurationService {
 
   @override
   Future<void> setMnemonic(String value) async {
-    await _preferences.setString("mnemonic", value);
+    await _preferences.setString("mnemonic", value ?? "");
   }
 
   @override
   Future<void> setPrivateKey(String value) async {
-    await _preferences.setString("privateKey", value);
+    await _preferences.setString("privateKey", value ?? "");
   }
 
   @override

lib/wallet_main_page.dart

@@ -51,7 +51,7 @@ class WalletMainPage extends HookWidget {
               onPressed: !store.state.loading
                   ? () async {
                       await store.fetchOwnBalance();
-                      ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+                      Scaffold.of(context).showSnackBar(SnackBar(
                         content: Text("Balance updated"),
                         duration: Duration(milliseconds: 800),
                       ));