Bump flutter v3.13.8 xcode15 (#1519)

* build on IOS 17 is successfully

* Tested on Android

* bymp flutter v3.13.8

* bum dependencies

* tested on Android

* tested on IOS

* for test

* for test

* for test

* for test

* for test

* success...

* fix: Readme Xcode version

* fixed by comment

* Pulled origin master && Fixed all conflicts

* [android] update gradle

---------

Co-authored-by: clangenb <37865735+clangenb@users.noreply.github.com>

.github/workflows/ios_integration_test.yml

@@ -2,11 +2,11 @@ name: IOS CI
 
 on:
   push:
-    branches: [ master, f-droid ]
+    branches: [master, f-droid]
     tags:
       - "*"
   pull_request:
-    branches: [ master, f-droid ]
+    branches: [master, f-droid]
 
 env:
   NODE_VERSION: 18.14.2
@@ -48,6 +48,11 @@ jobs:
       # Setup Environment
       - uses: actions/checkout@v3
 
+      - name: prepare xcode
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: "14.3"
+
       - name: "Prepare environment for ios"
         working-directory: ./scripts
         run: ./ios_init_env.sh

README.md

@@ -29,9 +29,9 @@ Encointer wallet and client for mobile phones
 
 ### Requirements
 - Dart sdk: ">=3.0.1 <3.0.0"
-- Flutter: "3.13.0"
+- Flutter: "3.13.8"
 - Android: minSdkVersion 17
-- iOS: --ios-language swift, Xcode version >= 14.0.0
+- iOS: --ios-language swift, Xcode version >= 14.3
 
 # Build Instructions
 

app/android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -54,7 +54,7 @@ android {
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }

app/android/build.gradle

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

app/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Jun 23 08:50:38 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

app/ios/Podfile.lock

@@ -199,10 +199,10 @@ SPEC CHECKSUMS:
   add_2_calendar: e9d68636aed37fb18e12f5a3d74c2e0589487af0
   aes_ecb_pkcs5_flutter: a82e6ecc47654000805ad9d094a8cd29e4bf9667
   app_links: 5ef33d0d295a89d9d16bb81b0e3b0d5f70d6c875
-  connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
+  connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
   device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  flutter_inappwebview: 4fe74e5e65809c3d363febfd9e2b21aa79bb0f1c
+  flutter_inappwebview: 166ed136c90e43c69b451f6d825da379be66c847
   flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
   flutter_timezone: ffb07bdad3c6276af8dada0f11978d8a1f8a20bb
@@ -221,18 +221,18 @@ SPEC CHECKSUMS:
   mobile_scanner: 47056db0c04027ea5f41a716385542da28574662
   nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
   OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
-  package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
+  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
   path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
   permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
   printing: 233e1b73bd1f4a05615548e9b5a324c98588640b
   PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
-  share_plus: 599aa54e4ea31d4b4c0e9c911bcc26c55e791028
+  share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
   shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
   url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
   wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
 
 PODFILE CHECKSUM: 90aee035b683484f7e14ac9a57b7dc9185377dcb
 
-COCOAPODS: 1.12.0
+COCOAPODS: 1.13.0

app/lib/common/components/map/encointer_map.dart

@@ -34,17 +34,16 @@ class EncointerMap extends StatelessWidget {
     return FlutterMap(
       mapController: mapController,
       options: MapOptions(
-        center: center ?? const LatLng(47.389712, 8.517076),
-        zoom: initialZoom,
+        initialCenter: center ?? const LatLng(47.389712, 8.517076),
+        initialZoom: initialZoom,
         maxZoom: maxZoom,
+        backgroundColor: Colors.white,
         onPointerDown: onPointerDown,
         onTap: (_, __) => _popupLayerController.hideAllPopups(disableAnimation: true),
       ),
       children: [
         TileLayer(
-          backgroundColor: Colors.white,
           urlTemplate: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
-          subdomains: const ['a', 'b', 'c'],
         ),
         PopupMarkerLayer(
           options: PopupMarkerLayerOptions(
@@ -55,14 +54,12 @@ class EncointerMap extends StatelessWidget {
               (index) => Marker(
                 key: Key('cid-$index-marker'),
                 point: locations[index],
-                rotateAlignment: Alignment.bottomCenter,
-                builder: (_) => Icon(
+                child: Icon(
                   Icons.location_on,
                   size: 40,
                   color: Colors.blueAccent,
                   key: Key(EWTestKeys.cidMarkerIcon(index)),
                 ),
-                anchorPos: AnchorPos.align(AnchorAlign.top),
               ),
             ),
           ),
@@ -80,13 +77,15 @@ class PopupBuilder extends StatelessWidget {
     this.bottom,
     this.maxWidth = 300,
     this.maxHeight = 800,
+    this.onTap,
   });
 
   final String title;
   final String description;
   final double maxWidth;
   final double maxHeight;
   final Widget? bottom;
+  final void Function()? onTap;
 
   @override
   Widget build(BuildContext context) {
@@ -97,22 +96,25 @@ class PopupBuilder extends StatelessWidget {
         color: context.colorScheme.background,
         borderRadius: BorderRadius.circular(8),
       ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text(
-            title,
-            maxLines: 1,
-            overflow: TextOverflow.ellipsis,
-            style: const TextStyle(fontWeight: FontWeight.bold),
-          ),
-          Text(
-            description,
-            style: const TextStyle(fontSize: 12, color: Colors.black54),
-          ),
-          bottom ?? const SizedBox.shrink(),
-        ],
+      child: InkWell(
+        onTap: onTap,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              title,
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+              style: const TextStyle(fontWeight: FontWeight.bold),
+            ),
+            Text(
+              description,
+              style: const TextStyle(fontSize: 12, color: Colors.black54),
+            ),
+            bottom ?? const SizedBox.shrink(),
+          ],
+        ),
       ),
     );
   }

app/lib/common/components/qr_code_view/qr_code_image_view.dart

@@ -25,7 +25,7 @@ class QrCodeImage extends StatelessWidget {
         maxScale: 1.0,
         minScale: 0.2,
         backgroundDecoration: BoxDecoration(color: context.colorScheme.background),
-        child: PrettyQr(
+        child: PrettyQrView.data(
           data: qrCode,
           errorCorrectLevel: errorCorrectionLevel,
         ),

app/lib/page-encointer/common/community_chooser_on_map.dart

@@ -66,24 +66,22 @@ class _CommunityChooserOnMapState extends State<CommunityChooserOnMap> {
               initialZoom: 2,
               popupBuilder: (BuildContext context, Marker marker) {
                 return PopupBuilder(
+                  key: Key(
+                    '${marker.key.toString().substring(3, marker.key.toString().length - 3)}-description',
+                  ),
                   title: communityDataAt[marker.point]!.name,
                   description: communityDataAt[marker.point]!.cid.toFmtString(),
-                  bottom: InkWell(
-                    key: Key(
-                      '${marker.key.toString().substring(3, marker.key.toString().length - 3)}-description',
-                    ),
-                    child: Text(
-                      l10n.communityDoChoose,
-                      style: const TextStyle(fontSize: 12, fontWeight: FontWeight.bold, color: Colors.black54),
-                    ),
-                    onTap: () async {
-                      final store = context.read<AppStore>();
-                      await store.encointer.setChosenCid(communityDataAt[marker.point]!.cid);
-                      if (RepositoryProvider.of<AppSettings>(context).developerMode) {
-                        context.read<AppSettings>().changeTheme(store.encointer.community?.cid.toFmtString());
-                      }
-                      Navigator.pop(context);
-                    },
+                  onTap: () async {
+                    final store = context.read<AppStore>();
+                    await store.encointer.setChosenCid(communityDataAt[marker.point]!.cid);
+                    if (RepositoryProvider.of<AppSettings>(context).developerMode) {
+                      context.read<AppSettings>().changeTheme(store.encointer.community?.cid.toFmtString());
+                    }
+                    Navigator.pop(context);
+                  },
+                  bottom: Text(
+                    l10n.communityDoChoose,
+                    style: const TextStyle(fontSize: 12, fontWeight: FontWeight.bold, color: Colors.black54),
                   ),
                 );
               },

app/lib/page/assets/qr_code_printing/pages/qr_code_share_or_print_view.dart

@@ -45,7 +45,10 @@ class _QrCodeShareOrPrintViewState extends State<QrCodeShareOrPrintView> {
             child: Center(
               child: RepaintBoundary(
                 key: _renderObjectKey,
-                child: PrettyQr(data: widget.qrCode, size: widget.size),
+                child: SizedBox(
+                  width: widget.size,
+                  child: PrettyQrView.data(data: widget.qrCode),
+                ),
               ),
             ),
           ),

app/lib/page/profile/account/account_manage_page.dart

@@ -8,6 +8,8 @@ import 'package:encointer_wallet/models/faucet/faucet.dart';
 import 'package:encointer_wallet/common/components/address_icon.dart';
 import 'package:encointer_wallet/common/components/logo/community_icon.dart';
 import 'package:encointer_wallet/theme/theme.dart';
+import 'package:encointer_wallet/config.dart';
+import 'package:encointer_wallet/utils/repository_provider.dart';
 import 'package:encointer_wallet/page/profile/account/export_result_page.dart';
 import 'package:encointer_wallet/store/account/account.dart';
 import 'package:encointer_wallet/utils/alerts/app_alert.dart';
@@ -144,6 +146,7 @@ class _AccountManagePageState extends State<AccountManagePage> {
     final isKeyboard = MediaQuery.of(context).viewInsets.bottom != 0;
     final store = context.watch<AppStore>();
     final appSettingsStore = context.watch<AppSettings>();
+    final appConfig = RepositoryProvider.of<AppConfig>(context);
 
     final accountToBeEditedPubKey = ModalRoute.of(context)!.settings.arguments as String?;
     final accountToBeEdited = store.account.getAccountData(accountToBeEditedPubKey);
@@ -173,7 +176,7 @@ class _AccountManagePageState extends State<AccountManagePage> {
                 )
               : Text(l10n.canUseFaucetOnlyWithCurrentAccount, style: h3Grey, textAlign: TextAlign.left)
         else
-          const CupertinoActivityIndicator(),
+          appConfig.isIntegrationTest ? const SizedBox.shrink() : const CupertinoActivityIndicator(),
       ];
     }
 

app/lib/page/profile/contacts/account_share_page.dart

@@ -4,7 +4,6 @@ import 'package:pretty_qr_code/pretty_qr_code.dart';
 import 'package:provider/provider.dart';
 import 'package:share_plus/share_plus.dart';
 
-import 'package:encointer_wallet/gen/assets.gen.dart';
 import 'package:encointer_wallet/theme/theme.dart';
 import 'package:encointer_wallet/utils/format.dart';
 import 'package:encointer_wallet/config/consts.dart';
@@ -63,11 +62,9 @@ class _AccountSharePageState extends State<AccountSharePage> {
               const SizedBox(height: 16),
               // Enhance brightness for the QR-code
               const WakeLockAndBrightnessEnhancer(brightness: 1),
-              PrettyQr(
-                image: Assets.images.public.app.image(height: 40, width: 40).image,
-                data: contactQrCode.toQrPayload(),
-                size: MediaQuery.of(context).size.width * 0.85,
-                typeNumber: 7,
+              SizedBox(
+                width: MediaQuery.of(context).size.width * 0.85,
+                child: PrettyQrView.data(data: contactQrCode.toQrPayload()),
               ),
               const SizedBox(height: 16),
               Text(

app/lib/service/substrate_api/core/js_api.dart

@@ -108,7 +108,7 @@ class JSApi {
     }
 
     if (!wrapPromise) {
-      final res = await _web!.webViewController.evaluateJavascript(source: code);
+      final res = await _web!.webViewController?.evaluateJavascript(source: code);
       return res as T;
     }
 
@@ -127,7 +127,7 @@ class JSApi {
             .callHandler("$encointerJsService", { path: "$method:error", data: err.message  });
         })''';
 
-    await _web!.webViewController.evaluateJavascript(source: script);
+    await _web!.webViewController?.evaluateJavascript(source: script);
 
     return c.future;
   }
@@ -143,7 +143,7 @@ class JSApi {
 
   Future<void> unsubscribeMessage(String channel) async {
     if (_msgHandlers[channel] != null) {
-      await _web!.webViewController.evaluateJavascript(source: 'unsub$channel()');
+      await _web!.webViewController?.evaluateJavascript(source: 'unsub$channel()');
     }
   }