Merge pull request #104 from cypherstack/staging

Staging
cypherstack · Sep 30, 2022 · 4d946bf · 4d946bf
2 parents 6b45fa5 + fbfe944
commit 4d946bf
Show file tree

Hide file tree

Showing 66 changed files with 8,546 additions and 4,372 deletions.
diff --git a/assets/svg/coin_icons/Wownero.svg b/assets/svg/coin_icons/Wownero.svg
diff --git a/assets/svg/drd-icon.svg b/assets/svg/drd-icon.svg
diff --git a/crypto_plugins/flutter_libmonero b/crypto_plugins/flutter_libmonero
diff --git a/lib/main.dart b/lib/main.dart
@@ -8,6 +8,7 @@ import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_libmonero/monero/monero.dart';
+import 'package:flutter_libmonero/wownero/wownero.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:hive_flutter/hive_flutter.dart';
@@ -84,7 +85,6 @@ void main() async {
     appDirectory = (await getLibraryDirectory());
   }
   // FlutterNativeSplash.preserve(widgetsBinding: widgetsBinding);
-  await Hive.initFlutter(appDirectory.path);
   if (!(Logging.isArmLinux || Logging.isTestEnv)) {
     final isar = await Isar.open(
       [LogSchema],
@@ -128,11 +128,14 @@ void main() async {
 
   Hive.registerAdapter(NodeAdapter());
 
-  Hive.registerAdapter(WalletInfoAdapter());
+  if (!Hive.isAdapterRegistered(WalletInfoAdapter().typeId)) {
+    Hive.registerAdapter(WalletInfoAdapter());
+  }
 
   Hive.registerAdapter(WalletTypeAdapter());
 
   Hive.registerAdapter(UnspentCoinsInfoAdapter());
+  await Hive.initFlutter(appDirectory.path);
 
   await Hive.openBox<dynamic>(DB.boxNameDBInfo);
   int dbVersion = DB.instance.get<dynamic>(
@@ -143,6 +146,7 @@ void main() async {
   }
 
   monero.onStartup();
+  wownero.onStartup();
 
   await Hive.openBox<dynamic>(DB.boxNameTheme);
 

diff --git a/lib/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart b/lib/pages/add_wallet_views/create_or_restore_wallet_view/create_or_restore_wallet_view.dart
@@ -37,9 +37,11 @@ class CreateOrRestoreWalletView extends StatelessWidget {
         body: SizedBox(
           width: 480,
           child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
             crossAxisAlignment: CrossAxisAlignment.center,
             children: [
+              const Spacer(
+                flex: 10,
+              ),
               CreateRestoreWalletTitle(
                 coin: coin,
                 isDesktop: isDesktop,
@@ -67,6 +69,9 @@ class CreateOrRestoreWalletView extends StatelessWidget {
                 coin: coin,
                 isDesktop: isDesktop,
               ),
+              const Spacer(
+                flex: 15,
+              ),
             ],
           ),
         ),

diff --git a/lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart b/lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart
@@ -151,6 +151,10 @@ class _NameYourWalletViewState extends ConsumerState<NameYourWalletView> {
         crossAxisAlignment:
             isDesktop ? CrossAxisAlignment.center : CrossAxisAlignment.stretch,
         children: [
+          if (isDesktop)
+            const Spacer(
+              flex: 10,
+            ),
           if (!isDesktop)
             const Spacer(
               flex: 1,
@@ -163,7 +167,7 @@ class _NameYourWalletViewState extends ConsumerState<NameYourWalletView> {
               height: 100,
             ),
           SizedBox(
-            height: isDesktop ? 24 : 16,
+            height: isDesktop ? 0 : 16,
           ),
           Text(
             "Name your ${coin.prettyName} wallet",
@@ -358,6 +362,10 @@ class _NameYourWalletViewState extends ConsumerState<NameYourWalletView> {
               ),
             ),
           ),
+          if (isDesktop)
+            const Spacer(
+              flex: 15,
+            ),
         ],
       );
 }