Merge branch 'main' into TALAO

Author: hawkbee1

.gitignore

@@ -141,3 +141,5 @@ app.*.map.json
 
 #case sensitive files issue on macOS
 doc/api/
+macos/Flutter/ephemeral/flutter_export_environment.sh
+macos/Flutter/ephemeral/Flutter-Generated.xcconfig

analysis_options.yaml

@@ -17,3 +17,4 @@ linter:
     use_string_buffers: false
     always_put_required_named_parameters_first: false
     depend_on_referenced_packages: false
+    use_super_parameters: true

android/app/build.gradle.kts

@@ -83,7 +83,10 @@ android {
     buildTypes {
         release {
             signingConfig = signingConfigs.getByName("release")
-        }
+            // Clear the automatically set filters.
+            ndk.abiFilters.clear()
+            // Set your custom filters.
+            ndk.abiFilters.addAll(listOf("arm64-v8a", "armeabi-v7a"))        }
         debug {
             signingConfig = signingConfigs.getByName("debug")
         }

ios/Podfile

@@ -3,7 +3,7 @@ source 'https://github.com/passbase/cocoapods-specs.git'
 source 'https://github.com/passbase/microblink-cocoapods-specs.git'
 
 # Uncomment this line to define a global platform for your project
-platform :ios, '14.0'
+platform :ios, '15.5'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

ios/Runner.xcodeproj/project.pbxproj

@@ -402,7 +402,7 @@
 				ENABLE_BITCODE = NO;
 				FLAVOR_APP_NAME = "TALAO Wallet";
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "TALAO Wallet";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -544,7 +544,7 @@
 				ENABLE_BITCODE = NO;
 				FLAVOR_APP_NAME = "TALAO Wallet";
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "TALAO Wallet";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -573,7 +573,7 @@
 				ENABLE_BITCODE = NO;
 				FLAVOR_APP_NAME = "TALAO Wallet";
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "TALAO Wallet";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -660,7 +660,7 @@
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "i386 i386 arm64";
 				FLAVOR_APP_NAME = "[DEV] Altme";
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "Talao Wallet";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -744,7 +744,7 @@
 				ENABLE_BITCODE = NO;
 				FLAVOR_APP_NAME = "[DEV] Altme";
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "Talao Wallet";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -825,7 +825,7 @@
 				ENABLE_BITCODE = NO;
 				FLAVOR_APP_NAME = "[DEV] Altme";
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "Talao Wallet";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -910,7 +910,7 @@
 				ENABLE_BITCODE = NO;
 				FLAVOR_APP_NAME = "[STG] Altme";
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "Talao Wallet";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -992,7 +992,7 @@
 				ENABLE_BITCODE = NO;
 				FLAVOR_APP_NAME = "[STG] Altme";
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "Talao Wallet";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1071,7 +1071,7 @@
 				ENABLE_BITCODE = NO;
 				FLAVOR_APP_NAME = "[STG] Altme";
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "Talao Wallet";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

ios/Runner/Info.plist

@@ -120,7 +120,7 @@
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>CFBundleURLName</key>
-			<string>openid</string>
+			<string>eudi-openid4vp</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>eudi-openid4vp</string>

lib/activity_log/activity_log_manager.dart

@@ -5,7 +5,7 @@ import 'package:secure_storage/secure_storage.dart';
 
 class ActivityLogManager {
   ActivityLogManager(SecureStorageProvider secureStorageProvider)
-      : _secureStorageProvider = secureStorageProvider;
+    : _secureStorageProvider = secureStorageProvider;
 
   final SecureStorageProvider _secureStorageProvider;
 
@@ -19,9 +19,8 @@ class ActivityLogManager {
       final logStrings = logDataJson.split('\n');
       return logStrings
           .map(
-            (logString) => LogData.fromJson(
-              jsonDecode(logString) as Map<String, dynamic>,
-            ),
+            (logString) =>
+                LogData.fromJson(jsonDecode(logString) as Map<String, dynamic>),
           )
           .toList();
     }

lib/activity_log/log_class.dart

@@ -6,11 +6,8 @@ part 'log_class.g.dart';
 
 @JsonSerializable()
 class LogData extends Equatable {
-  LogData({
-    required this.type,
-    DateTime? timestamp,
-    this.vcInfo,
-  }) : timestamp = timestamp ?? DateTime.now();
+  LogData({required this.type, DateTime? timestamp, this.vcInfo})
+    : timestamp = timestamp ?? DateTime.now();
 
   factory LogData.fromJson(Map<String, dynamic> json) =>
       _$LogDataFromJson(json);
@@ -22,20 +19,12 @@ class LogData extends Equatable {
   Map<String, dynamic> toJson() => _$LogDataToJson(this);
 
   @override
-  List<Object?> get props => [
-        type,
-        timestamp,
-        vcInfo,
-      ];
+  List<Object?> get props => [type, timestamp, vcInfo];
 }
 
 @JsonSerializable()
 class VCInfo extends Equatable {
-  const VCInfo({
-    required this.id,
-    required this.name,
-    this.domain,
-  });
+  const VCInfo({required this.id, required this.name, this.domain});
 
   factory VCInfo.fromJson(Map<String, dynamic> json) => _$VCInfoFromJson(json);
 
@@ -46,9 +35,5 @@ class VCInfo extends Equatable {
   Map<String, dynamic> toJson() => _$VCInfoToJson(this);
 
   @override
-  List<Object?> get props => [
-        id,
-        name,
-        domain,
-      ];
+  List<Object?> get props => [id, name, domain];
 }

lib/ai/widget/ai_analysis_page.dart

@@ -6,20 +6,13 @@ import 'package:altme/l10n/l10n.dart';
 import 'package:flutter/material.dart';
 
 class AiAnalysisPage extends StatelessWidget {
-  const AiAnalysisPage({
-    super.key,
-    required this.content,
-  });
+  const AiAnalysisPage({super.key, required this.content});
 
   final String content;
 
-  static Route<dynamic> route({
-    required String content,
-  }) =>
+  static Route<dynamic> route({required String content}) =>
       MaterialPageRoute<void>(
-        builder: (_) => AiAnalysisPage(
-          content: content,
-        ),
+        builder: (_) => AiAnalysisPage(content: content),
         settings: const RouteSettings(name: '/AiAnalysisPage'),
       );
 
@@ -45,9 +38,7 @@ class AiAnalysisPage extends StatelessWidget {
         ),
       ),
       navigation: Padding(
-        padding: const EdgeInsets.all(
-          Sizes.spaceSmall,
-        ),
+        padding: const EdgeInsets.all(Sizes.spaceSmall),
         child: Column(
           mainAxisSize: MainAxisSize.min,
           children: [

lib/ai/widget/ai_credential_analysis_button.dart

@@ -16,10 +16,7 @@ import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:secure_storage/secure_storage.dart';
 
 class AiCredentialAnalysisButton extends StatelessWidget {
-  const AiCredentialAnalysisButton({
-    super.key,
-    required this.credential,
-  });
+  const AiCredentialAnalysisButton({super.key, required this.credential});
 
   /// received credential is already in base64 format if it is a jwt and
   /// is converted to base64 if it is a json-ld
@@ -34,9 +31,7 @@ class AiCredentialAnalysisButton extends StatelessWidget {
         if (credential.aiCredentialAnalysis != null &&
             credential.aiCredentialAnalysis!.isNotEmpty) {
           await Navigator.of(context).push<void>(
-            AiAnalysisPage.route(
-              content: credential.aiCredentialAnalysis!,
-            ),
+            AiAnalysisPage.route(content: credential.aiCredentialAnalysis!),
           );
           return;
         }
@@ -45,7 +40,8 @@ class AiCredentialAnalysisButton extends StatelessWidget {
         /// current link with talao.io. In the popup User can
         /// press on the accept button to continue or cancel
         /// to close the popup
-        final acceptAnalysis = await showDialog<bool>(
+        final acceptAnalysis =
+            await showDialog<bool>(
               context: context,
               builder: (BuildContext context) {
                 return ConfirmDialog(
@@ -62,9 +58,7 @@ class AiCredentialAnalysisButton extends StatelessWidget {
         if (acceptAnalysis) {
           LoadingView().show(context: context, text: l10n.aiPleaseWait);
           final encodedCredential = base64Encode(
-            utf8.encode(
-              credential.jwt ?? jsonEncode(credential.data),
-            ),
+            utf8.encode(credential.jwt ?? jsonEncode(credential.data)),
           );
           final client = DioClient(
             secureStorageProvider: getSecureStorage,
@@ -81,27 +75,24 @@ class AiCredentialAnalysisButton extends StatelessWidget {
             'api-key': dotenv.get('WALLET_API_KEY_ID360'),
           };
           try {
-            final response = await client.post(
-              'https://talao.co/ai/wallet/vc',
-              data: {
-                'vc': encodedCredential,
-              },
-              headers: headers,
-              timeout: 90,
-            ) as String;
+            final response =
+                await client.post(
+                      'https://talao.co/ai/wallet/vc',
+                      data: {'vc': encodedCredential},
+                      headers: headers,
+                      timeout: 90,
+                    )
+                    as String;
             if (response == '') {
               throw Exception('Ai analysis is null or empty');
             }
             LoadingView().hide();
             await context.read<CredentialsCubit>().updateCredential(
-                  credential:
-                      credential.copyWith(aiCredentialAnalysis: response),
-                );
-            await Navigator.of(context).push<void>(
-              AiAnalysisPage.route(
-                content: response,
-              ),
+              credential: credential.copyWith(aiCredentialAnalysis: response),
             );
+            await Navigator.of(
+              context,
+            ).push<void>(AiAnalysisPage.route(content: response));
           } catch (e) {
             LoadingView().hide();
             Exception('Error during AI analysis: $e');