diff --git a/Frontend/android/app/src/main/AndroidManifest.xml b/Frontend/android/app/src/main/AndroidManifest.xml index 41e80cd2..6683a646 100644 --- a/Frontend/android/app/src/main/AndroidManifest.xml +++ b/Frontend/android/app/src/main/AndroidManifest.xml @@ -19,7 +19,8 @@ + android:icon="@mipmap/launcher_icon" + android:enableOnBackInvokedCallback="true"> { double width = MediaQuery.sizeOf(context).width; theme.setScreenType(width); precacheImage(theme.loadingImage(), context); - return MaterialApp.router( - title: getTitle(), - themeMode: ThemeMode.dark, - theme: theme.getThemeData(), - darkTheme: theme.getThemeData(), - debugShowCheckedModeBanner: false, - routerConfig: widget.router, - builder: (context, child) { - if (child == null) { - return const Scaffold( - body: Center( - child: CircularProgressIndicator(), - ), + return MultiProvider( + providers: [ + ChangeNotifierProvider( + create: (context) => MzansiWalletProvider(), + ), + ], + child: MaterialApp.router( + title: getTitle(), + themeMode: ThemeMode.dark, + theme: theme.getThemeData(), + darkTheme: theme.getThemeData(), + debugShowCheckedModeBanner: false, + routerConfig: widget.router, + builder: (context, child) { + if (child == null) { + return const Scaffold( + body: Center( + child: CircularProgressIndicator(), + ), + ); + } + return UpgradeAlert( + navigatorKey: widget.router.routerDelegate.navigatorKey, + child: child, ); - } - return UpgradeAlert( - navigatorKey: widget.router.routerDelegate.navigatorKey, - child: child, - ); - }, + }, + ), ); } } diff --git a/Frontend/pubspec.lock b/Frontend/pubspec.lock index 59bae95d..83c03080 100644 --- a/Frontend/pubspec.lock +++ b/Frontend/pubspec.lock @@ -1129,7 +1129,7 @@ packages: source: hosted version: "4.1.0" provider: - dependency: transitive + dependency: "direct main" description: name: provider sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272" diff --git a/Frontend/pubspec.yaml b/Frontend/pubspec.yaml index 75f5cd3b..0c1b30b9 100644 --- a/Frontend/pubspec.yaml +++ b/Frontend/pubspec.yaml @@ -57,6 +57,7 @@ dependencies: upgrader: ^12.0.0 screenshot: ^3.0.0 file_saver: ^0.3.1 + provider: ^6.1.5+1 dev_dependencies: flutter_test: