Merge branch 'dev'

.gitlab-ci.yml

@@ -29,6 +29,9 @@ build_and_test:
     - when: manual
   stage: build_and_test
   script:
+    - flutter clean
+    - rm -rf /root/.pub-cache
+    - flutter pub get
     - flutter analyze
 
 releases:test:

config/gdev_endpoints.json

@@ -1,4 +1,4 @@
 [
       "wss://gdev.p2p.legal/ws",
-      "wss://gdev.librelois.fr/ws"
+      "wss://gdev.trentesaux.fr/ws"
 ]

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,122 +1,122 @@
 {
   "images": [
     {
-      "size" : "20x20",
-      "idiom" : "iphone",
       "filename": "Icon-App-20x20@2x.png",
-      "scale" : "2x"
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "20x20"
     },
     {
-      "size" : "20x20",
-      "idiom" : "iphone",
       "filename": "Icon-App-20x20@3x.png",
-      "scale" : "3x"
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "20x20"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
       "filename": "Icon-App-29x29@1x.png",
-      "scale" : "1x"
+      "idiom": "iphone",
+      "scale": "1x",
+      "size": "29x29"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
       "filename": "Icon-App-29x29@2x.png",
-      "scale" : "2x"
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "29x29"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
       "filename": "Icon-App-29x29@3x.png",
-      "scale" : "3x"
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "29x29"
     },
     {
-      "size" : "40x40",
-      "idiom" : "iphone",
       "filename": "Icon-App-40x40@2x.png",
-      "scale" : "2x"
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "40x40"
     },
     {
-      "size" : "40x40",
-      "idiom" : "iphone",
       "filename": "Icon-App-40x40@3x.png",
-      "scale" : "3x"
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "40x40"
     },
     {
-      "size" : "60x60",
-      "idiom" : "iphone",
       "filename": "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
       "idiom": "iphone",
+      "scale": "2x",
+      "size": "60x60"
+    },
+    {
       "filename": "Icon-App-60x60@3x.png",
-      "scale" : "3x"
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "60x60"
     },
     {
-      "size" : "20x20",
-      "idiom" : "ipad",
       "filename": "Icon-App-20x20@1x.png",
-      "scale" : "1x"
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "20x20"
     },
     {
-      "size" : "20x20",
-      "idiom" : "ipad",
       "filename": "Icon-App-20x20@2x.png",
-      "scale" : "2x"
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "20x20"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
       "filename": "Icon-App-29x29@1x.png",
-      "scale" : "1x"
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "29x29"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
       "filename": "Icon-App-29x29@2x.png",
-      "scale" : "2x"
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "29x29"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
       "filename": "Icon-App-40x40@1x.png",
-      "scale" : "1x"
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "40x40"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
       "filename": "Icon-App-40x40@2x.png",
-      "scale" : "2x"
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "40x40"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
       "filename": "Icon-App-76x76@1x.png",
-      "scale" : "1x"
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "76x76"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
       "filename": "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
       "idiom": "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
+      "scale": "2x",
-      "scale" : "2x"
+      "size": "76x76"
+    },
+    {
+      "filename": "Icon-App-83.5x83.5@2x.png",
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "83.5x83.5"
     },
     {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
       "filename": "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
+      "idiom": "ios-marketing",
+      "scale": "1x",
+      "size": "1024x1024"
     }
   ],
   "info": {
-    "version" : 1,
+    "author": "icons_launcher",
-    "author" : "xcode"
+    "version": 1
   }
 }

lib/main.dart

@@ -58,8 +58,11 @@ Future<void> main() async {
 
   HomeProvider homeProvider = HomeProvider();
   // DuniterIndexer _duniterIndexer = DuniterIndexer();
+
   await initHiveForFlutter();
   await homeProvider.initHive();
+  configBox = await Hive.openBox("configBox");
+
   appVersion = await homeProvider.getAppVersion();
 
   // Configure Hive and open boxes

lib/screens/home.dart

@@ -47,24 +47,28 @@ class _HomeScreenState extends State<HomeScreen> {
       final myWalletProvider =
           Provider.of<MyWalletsProvider>(context, listen: false);
 
-      configBox = await Hive.openBox("configBox");
       final bool isWalletsExists = myWalletProvider.checkIfWalletExist();
 
-      if (!sub.sdkReady && !sub.sdkLoading) await sub.initApi();
-      if (sub.sdkReady && !sub.nodeConnected) {
       // Check if versionData non compatible, drop everything
-        if (isWalletsExists &&
+      if (configBox.get('dataVersion') == null) {
-            (configBox.get('dataVersion') ?? 0) < dataVersion) {
+        configBox.put('dataVersion', dataVersion);
+      }
+      if (isWalletsExists && (configBox.get('dataVersion')) < dataVersion) {
+        if (!sub.sdkReady && !sub.sdkLoading) sub.initApi();
         await infoPopup(context, "chestNotCompatibleMustReinstallGecko".tr());
         await Hive.deleteBoxFromDisk('walletBox');
         await Hive.deleteBoxFromDisk('chestBox');
         chestBox = await Hive.openBox<ChestData>("chestBox");
         await configBox.delete('defaultWallet');
+        if (!sub.sdkReady && !sub.sdkLoading) await sub.initApi();
         await sub.deleteAllAccounts();
         configBox.put('dataVersion', dataVersion);
         myWalletProvider.reload();
+      } else {
+        if (!sub.sdkReady && !sub.sdkLoading) await sub.initApi();
       }
 
+      if (sub.sdkReady && !sub.nodeConnected) {
         walletBox = await Hive.openBox<WalletData>("walletBox");
         await Hive.deleteBoxFromDisk('g1WalletsBox');
         g1WalletsBox = await Hive.openBox<G1WalletsList>("g1WalletsBox");
@@ -164,6 +168,7 @@ class _HomeScreenState extends State<HomeScreen> {
                     );
                   },
                 ),
+                if (isWalletsExists)
                   ListTile(
                     key: keyContacts,
                     title: Text('contactsManagement'.tr()),

pubspec.lock

@@ -182,7 +182,7 @@ packages:
       name: carousel_slider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.1.1"
+    version: "4.2.1"
   characters:
     dependency: transitive
     description:
@@ -266,7 +266,7 @@ packages:
       name: dart_code_metrics
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.1.0"
+    version: "5.2.1"
   dart_style:
     dependency: transitive
     description:
@@ -1031,7 +1031,7 @@ packages:
       name: provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.0.4"
+    version: "6.0.5"
   pub_semver:
     dependency: transitive
     description:
@@ -1110,14 +1110,14 @@ packages:
       name: sentry
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.18.0"
+    version: "6.18.1"
   sentry_flutter:
     dependency: "direct main"
     description:
       name: sentry_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.18.0"
+    version: "6.18.1"
   shared_preferences:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -5,7 +5,7 @@ description: Pay with G1.
 # pub.dev using `pub publish`. This is preferred for private packages.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 0.0.15+51
+version: 0.1.0+52
 
 environment:
   sdk: '>=2.12.0 <3.0.0'
@@ -68,7 +68,7 @@ dependencies:
 dev_dependencies:
   # flutter_launcher_icons: ^0.9.2
   # flutter_launcher_icons_maker: ^^0.10.2
-  icons_launcher: ^2.0.2
+  icons_launcher: ^2.0.6
   build_runner: ^2.1.2
   flutter_test:
     sdk: flutter
@@ -76,11 +76,13 @@ dev_dependencies:
     sdk: flutter
   dart_code_metrics: ^5.0.1
 
-flutter_icons:
+icons_launcher:
-  android: true
+  image_path: 'assets/icon/gecko_flat.png'
-  ios: true
+  platforms:
-  image_path: "assets/icon/gecko_flat.png"
+    android:
-  remove_alpha_ios: true
+      enable: true
+    ios:
+      enable: true
 
 uses-material-design: true
 

scripts/generateIcon.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-flutter pub run icons_launcher:main
+flutter pub run icons_launcher:create
 
 exit 0