diff --git a/android/app/build.gradle b/android/app/build.gradle index 9b1ccb08..07a4d1cc 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -35,7 +35,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 34 + compileSdkVersion rootProject.ext.compileSdkVersion buildToolsVersion "33.0.1" ndkVersion flutter.ndkVersion @@ -60,7 +60,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-gradle-build-configuration. minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion rootProject.ext.targetSdkVersion versionCode System.getenv('VERSION_CODE')?.hashCode()?.abs() ?: 404 versionName flutterVersionName } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 25acc46b..73bc88fd 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -41,7 +41,7 @@ - + + + + NSPrivacyAccessedAPITypes + + + + NSPrivacyAccessedAPIType + NSPrivacyAccessedAPICategoryUserDefaults + + NSPrivacyAccessedAPITypeReasons + + CA92.1 + + + + + diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 8b1f92c6..c7f09fea 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 0056F8382D0C2A050080BAFB /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 0056F8372D0C2A050080BAFB /* PrivacyInfo.xcprivacy */; }; 04AD4F67A3C80B4D8D21E1D5 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D9AA8843D70E9DCF281E30EE /* Pods_Runner.framework */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; @@ -31,6 +32,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 0056F8372D0C2A050080BAFB /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = ""; }; 00B871672B0DE8FE007D0206 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; @@ -96,6 +98,7 @@ 97C146E51CF9000F007C117D = { isa = PBXGroup; children = ( + 0056F8372D0C2A050080BAFB /* PrivacyInfo.xcprivacy */, 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, @@ -193,6 +196,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 0056F8382D0C2A050080BAFB /* PrivacyInfo.xcprivacy in Resources */, 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index 05c51b51..027124c4 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -5,10 +5,10 @@ BGTaskSchedulerPermittedIdentifiers com.transistorsoft.fetch - com.moonchain.mxc.notificationsTask - com.moonchain.mxc.wifiHooksTask - com.moonchain.mxc.minerAutoClaimTask - com.moonchain.mxc.blueberryAutoSyncTask + com.transistorsoft.notificationsTask + com.transistorsoft.wifiHooksTask + com.transistorsoft.minerAutoClaimTask + com.transistorsoft.blueberryAutoSyncTask CADisableMinimumFrameDurationOnPhone diff --git a/lib/common/components/recent_transactions/widgets/speed_up_cancel_bottom_sheet_info.dart b/lib/common/components/recent_transactions/widgets/speed_up_cancel_bottom_sheet_info.dart index 44744e81..0764edaf 100644 --- a/lib/common/components/recent_transactions/widgets/speed_up_cancel_bottom_sheet_info.dart +++ b/lib/common/components/recent_transactions/widgets/speed_up_cancel_bottom_sheet_info.dart @@ -21,28 +21,25 @@ class SpeedUpCancelBottomSheetInfo extends ConsumerWidget { Widget build(BuildContext context, WidgetRef ref) { return Column( children: [ - Padding( - padding: const EdgeInsets.symmetric(horizontal: 6), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - ...notice(context), - SingleLineInfoItem( - title: 'estimated_fee', - value: MXCFormatter.formatNumberForUI( - estimatedFee, - ), - hint: symbol, + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ...notice(context), + SingleLineInfoItem( + title: 'estimated_fee', + value: MXCFormatter.formatNumberForUI( + estimatedFee, ), - SingleLineInfoItem( - title: 'max_fee', - value: MXCFormatter.formatNumberForUI( - maxFee, - ), - hint: symbol, + hint: symbol, + ), + SingleLineInfoItem( + title: 'max_fee', + value: MXCFormatter.formatNumberForUI( + maxFee, ), - ], - ), + hint: symbol, + ), + ], ), const SizedBox(height: Sizes.spaceXSmall), submitButton(context), diff --git a/lib/features/dapps/subfeatures/open_dapp/widgets/add_asset_info.dart b/lib/features/dapps/subfeatures/open_dapp/widgets/add_asset_info.dart index 44882ddf..7b27bb82 100644 --- a/lib/features/dapps/subfeatures/open_dapp/widgets/add_asset_info.dart +++ b/lib/features/dapps/subfeatures/open_dapp/widgets/add_asset_info.dart @@ -22,13 +22,10 @@ class AddAssetInfo extends ConsumerWidget { final presenter = ref.read(openDAppPageContainer.actions); return Column( children: [ - Padding( - padding: const EdgeInsets.symmetric(horizontal: 6), - child: Column( - children: [ - ...tokenInfo(context, token), - ], - ), + Column( + children: [ + ...tokenInfo(context, token), + ], ), const SizedBox(height: 8), addTokenButton(context), diff --git a/lib/features/dapps/subfeatures/open_dapp/widgets/message_info.dart b/lib/features/dapps/subfeatures/open_dapp/widgets/message_info.dart index facead68..3651a41b 100644 --- a/lib/features/dapps/subfeatures/open_dapp/widgets/message_info.dart +++ b/lib/features/dapps/subfeatures/open_dapp/widgets/message_info.dart @@ -23,14 +23,11 @@ class MessageInfo extends ConsumerWidget { final presenter = ref.read(openDAppPageContainer.actions); return Column( children: [ - Padding( - padding: const EdgeInsets.symmetric(horizontal: 6), - child: Column( - children: [ - titleItem(context), - messageItem(context, presenter, message), - ], - ), + Column( + children: [ + titleItem(context), + messageItem(context, presenter, message), + ], ), const SizedBox(height: 8), signButton(context), diff --git a/lib/features/dapps/subfeatures/open_dapp/widgets/transaction_info.dart b/lib/features/dapps/subfeatures/open_dapp/widgets/transaction_info.dart index 6b24a148..14d69f2e 100644 --- a/lib/features/dapps/subfeatures/open_dapp/widgets/transaction_info.dart +++ b/lib/features/dapps/subfeatures/open_dapp/widgets/transaction_info.dart @@ -29,35 +29,32 @@ class TransactionInfo extends ConsumerWidget { Widget build(BuildContext context, WidgetRef ref) { return Column( children: [ - Padding( - padding: const EdgeInsets.symmetric(horizontal: 6), - child: Column( - children: [ - amountItem(context), - SingleLineInfoItem( - title: 'from', - value: from, - ), - SingleLineInfoItem( - title: 'to', - value: to, - ), - SingleLineInfoItem( - title: 'estimated_fee', - value: MXCFormatter.formatNumberForUI( - estimatedFee, - ), - hint: symbol, + Column( + children: [ + amountItem(context), + SingleLineInfoItem( + title: 'from', + value: from, + ), + SingleLineInfoItem( + title: 'to', + value: to, + ), + SingleLineInfoItem( + title: 'estimated_fee', + value: MXCFormatter.formatNumberForUI( + estimatedFee, ), - SingleLineInfoItem( - title: 'max_fee', - value: MXCFormatter.formatNumberForUI( - maxFee, - ), - hint: symbol, + hint: symbol, + ), + SingleLineInfoItem( + title: 'max_fee', + value: MXCFormatter.formatNumberForUI( + maxFee, ), - ], - ), + hint: symbol, + ), + ], ), const SizedBox(height: 8), transactionButton(context), diff --git a/lib/features/dapps/subfeatures/open_dapp/widgets/typed_message_info.dart b/lib/features/dapps/subfeatures/open_dapp/widgets/typed_message_info.dart index 4a116d6c..06018054 100644 --- a/lib/features/dapps/subfeatures/open_dapp/widgets/typed_message_info.dart +++ b/lib/features/dapps/subfeatures/open_dapp/widgets/typed_message_info.dart @@ -25,14 +25,11 @@ class TypeMessageInfo extends ConsumerWidget { final presenter = ref.read(openDAppPageContainer.actions); return Column( children: [ - Padding( - padding: const EdgeInsets.symmetric(horizontal: 6), - child: Column( - children: [ - titleItem(context), - ...infoItems(context, presenter), - ], - ), + Column( + children: [ + titleItem(context), + ...infoItems(context, presenter), + ], ), const SizedBox(height: 8), signButton(context), diff --git a/lib/features/portfolio/subfeatures/nft/send_nft/widgets/transaction_info.dart b/lib/features/portfolio/subfeatures/nft/send_nft/widgets/transaction_info.dart index 3ccda338..2f772bf4 100644 --- a/lib/features/portfolio/subfeatures/nft/send_nft/widgets/transaction_info.dart +++ b/lib/features/portfolio/subfeatures/nft/send_nft/widgets/transaction_info.dart @@ -32,17 +32,14 @@ class TransactionInfo extends StatelessWidget { Widget build(BuildContext context) { return Column( children: [ - Padding( - padding: const EdgeInsets.symmetric(horizontal: 6), - child: Column( - children: [ - imageItem(context, nft), - addressItem(context, 'from', from), - addressItem(context, 'to', to), - if (TransactionProcessType.confirm != processType) - priceItem(context, 'estimated_fee', estimatedFee, symbol), - ], - ), + Column( + children: [ + imageItem(context, nft), + addressItem(context, 'from', from), + addressItem(context, 'to', to), + if (TransactionProcessType.confirm != processType) + priceItem(context, 'estimated_fee', estimatedFee, symbol), + ], ), const SizedBox(height: 8), transactionButton(context), diff --git a/lib/features/settings/subfeatures/dapp_hooks/widgets/auto_claim_dialog.dart b/lib/features/settings/subfeatures/dapp_hooks/widgets/auto_claim_dialog.dart index bb24c561..4cbfaebc 100644 --- a/lib/features/settings/subfeatures/dapp_hooks/widgets/auto_claim_dialog.dart +++ b/lib/features/settings/subfeatures/dapp_hooks/widgets/auto_claim_dialog.dart @@ -12,46 +12,41 @@ Future showAutoClaimExecutionAlertDialog( bottomSheetTitle: 'auto_claim_execution_dialog_title', hasCloseButton: false, widgets: [ - Padding( - padding: const EdgeInsetsDirectional.symmetric( - horizontal: Sizes.spaceXLarge, - ), - child: Column( - children: [ - Text( - translate( - 'auto_claim_execution_dialog_text', - ), - style: FontTheme.of(context, listen: false) - .body1 - .primary() - .copyWith(), - softWrap: true, - textAlign: TextAlign.justify, + Column( + children: [ + Text( + translate( + 'auto_claim_execution_dialog_text', ), - const SizedBox( - height: Sizes.spaceNormal, - ), - MxcButton.secondary( - key: const ValueKey('cancelButton'), - title: translate('cancel'), - onTap: () => Navigator.of(context).pop(false), - size: MXCWalletButtonSize.xl, - ), - const SizedBox( - height: Sizes.spaceNormal, - ), - MxcButton.primary( - key: const ValueKey('executeButton'), - title: translate('execute'), - onTap: () { - executeAutoClaim(); - Navigator.of(context).pop(true); - }, - size: MXCWalletButtonSize.xl, - ), - ], - ), + style: FontTheme.of(context, listen: false) + .body1 + .primary() + .copyWith(), + softWrap: true, + textAlign: TextAlign.justify, + ), + const SizedBox( + height: Sizes.spaceNormal, + ), + MxcButton.secondary( + key: const ValueKey('cancelButton'), + title: translate('cancel'), + onTap: () => Navigator.of(context).pop(false), + size: MXCWalletButtonSize.xl, + ), + const SizedBox( + height: Sizes.spaceNormal, + ), + MxcButton.primary( + key: const ValueKey('executeButton'), + title: translate('execute'), + onTap: () { + executeAutoClaim(); + Navigator.of(context).pop(true); + }, + size: MXCWalletButtonSize.xl, + ), + ], ) ], ); diff --git a/lib/features/settings/subfeatures/dapp_hooks/widgets/location_permission_bottom_sheet.dart b/lib/features/settings/subfeatures/dapp_hooks/widgets/location_permission_bottom_sheet.dart index c011a7d1..94772eb7 100644 --- a/lib/features/settings/subfeatures/dapp_hooks/widgets/location_permission_bottom_sheet.dart +++ b/lib/features/settings/subfeatures/dapp_hooks/widgets/location_permission_bottom_sheet.dart @@ -14,48 +14,43 @@ Future showLocationPermissionBottomSheet({ bottomSheetTitle: 'location_permission_required_title', hasCloseButton: false, widgets: [ - Padding( - padding: const EdgeInsetsDirectional.symmetric( - horizontal: Sizes.spaceXLarge, - ), - child: Column( - children: [ - Text( - translate( - 'location_permission_required_text', - ), - style: FontTheme.of(context, listen: false) - .body1 - .primary() - .copyWith(), - softWrap: true, - textAlign: TextAlign.justify, + Column( + children: [ + Text( + translate( + 'location_permission_required_text', ), - const SizedBox( - height: Sizes.spaceNormal, - ), - MxcButton.primary( - key: const ValueKey('openLocationSettingsButton'), - title: translate('open_settings'), - onTap: () { - openLocationSettings(); - Navigator.of(context).pop(true); - }, - size: MXCWalletButtonSize.xl, - ), - const SizedBox( - height: Sizes.spaceNormal, - ), - MxcButton.secondary( - key: const ValueKey('cancelButton'), - title: translate('cancel'), - onTap: () { - Navigator.of(context).pop(true); - }, - size: MXCWalletButtonSize.xl, - ), - ], - ), + style: FontTheme.of(context, listen: false) + .body1 + .primary() + .copyWith(), + softWrap: true, + textAlign: TextAlign.justify, + ), + const SizedBox( + height: Sizes.spaceNormal, + ), + MxcButton.primary( + key: const ValueKey('openLocationSettingsButton'), + title: translate('open_settings'), + onTap: () { + openLocationSettings(); + Navigator.of(context).pop(true); + }, + size: MXCWalletButtonSize.xl, + ), + const SizedBox( + height: Sizes.spaceNormal, + ), + MxcButton.secondary( + key: const ValueKey('cancelButton'), + title: translate('cancel'), + onTap: () { + Navigator.of(context).pop(true); + }, + size: MXCWalletButtonSize.xl, + ), + ], ), ], ); diff --git a/lib/features/settings/subfeatures/dapp_hooks/widgets/wifi_hooks_background_fetch_alert_bottom_sheet.dart b/lib/features/settings/subfeatures/dapp_hooks/widgets/wifi_hooks_background_fetch_alert_bottom_sheet.dart index 5b1d60a5..eff71e39 100644 --- a/lib/features/settings/subfeatures/dapp_hooks/widgets/wifi_hooks_background_fetch_alert_bottom_sheet.dart +++ b/lib/features/settings/subfeatures/dapp_hooks/widgets/wifi_hooks_background_fetch_alert_bottom_sheet.dart @@ -13,36 +13,31 @@ Future showWiFiHooksBackgroundFetchAlertBottomSheet({ bottomSheetTitle: 'background_fetch_notice_title', hasCloseButton: false, widgets: [ - Padding( - padding: const EdgeInsetsDirectional.symmetric( - horizontal: Sizes.spaceXLarge, - ), - child: Column( - children: [ - Text( - translate( - 'wifi_location_background_fetch_notice_text', - ), - style: FontTheme.of(context, listen: false) - .body1 - .primary() - .copyWith(), - softWrap: true, - textAlign: TextAlign.justify, + Column( + children: [ + Text( + translate( + 'wifi_location_background_fetch_notice_text', ), - const SizedBox( - height: Sizes.spaceNormal, - ), - MxcButton.primary( - key: const ValueKey('acknowledgeButton'), - title: translate('acknowledge'), - onTap: () { - Navigator.of(context).pop(true); - }, - size: MXCWalletButtonSize.xl, - ), - ], - ), + style: FontTheme.of(context, listen: false) + .body1 + .primary() + .copyWith(), + softWrap: true, + textAlign: TextAlign.justify, + ), + const SizedBox( + height: Sizes.spaceNormal, + ), + MxcButton.primary( + key: const ValueKey('acknowledgeButton'), + title: translate('acknowledge'), + onTap: () { + Navigator.of(context).pop(true); + }, + size: MXCWalletButtonSize.xl, + ), + ], ), ], ); diff --git a/lib/features/settings/subfeatures/notifications/widgets/background_fetch_dialog.dart b/lib/features/settings/subfeatures/notifications/widgets/background_fetch_dialog.dart index d7f73880..351493ff 100644 --- a/lib/features/settings/subfeatures/notifications/widgets/background_fetch_dialog.dart +++ b/lib/features/settings/subfeatures/notifications/widgets/background_fetch_dialog.dart @@ -13,36 +13,31 @@ Future showBackgroundFetchAlertDialog({ bottomSheetTitle: 'background_fetch_notice_title', hasCloseButton: false, widgets: [ - Padding( - padding: const EdgeInsetsDirectional.symmetric( - horizontal: Sizes.spaceXLarge, - ), - child: Column( - children: [ - Text( - translate( - 'background_fetch_notice_text', - ), - style: FontTheme.of(context, listen: false) - .body1 - .primary() - .copyWith(), - softWrap: true, - textAlign: TextAlign.justify, + Column( + children: [ + Text( + translate( + 'background_fetch_notice_text', ), - const SizedBox( - height: Sizes.spaceNormal, - ), - MxcButton.primary( - key: const ValueKey('acknowledgeButton'), - title: translate('acknowledge'), - onTap: () { - Navigator.of(context).pop(true); - }, - size: MXCWalletButtonSize.xl, - ), - ], - ), + style: FontTheme.of(context, listen: false) + .body1 + .primary() + .copyWith(), + softWrap: true, + textAlign: TextAlign.justify, + ), + const SizedBox( + height: Sizes.spaceNormal, + ), + MxcButton.primary( + key: const ValueKey('acknowledgeButton'), + title: translate('acknowledge'), + onTap: () { + Navigator.of(context).pop(true); + }, + size: MXCWalletButtonSize.xl, + ), + ], ), ], ); diff --git a/packages/shared b/packages/shared index fb120b58..9e6a991f 160000 --- a/packages/shared +++ b/packages/shared @@ -1 +1 @@ -Subproject commit fb120b585963d4d6fc28e7e9b15f244a482d5313 +Subproject commit 9e6a991fa67b9000da48ad45a351cd9d80edf3c1 diff --git a/pubspec.yaml b/pubspec.yaml index d93f8ff0..5a40e484 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,7 +19,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # In Windows, build-name is used as the major, minor, and patch parts # of the product and file versions while build-number is used as the build suffix. -version: 1.4.1 +version: 1.4.2 environment: @@ -37,7 +37,7 @@ dependencies: app_settings: ^5.1.1 appinio_social_share: path: packages/flutter_packages/packages/appinio_social_share - background_fetch: ^1.2.1 + background_fetch: ^1.3.7 cached_network_image: ^3.4.1 clipboard: ^0.1.3 collection: ^1.17.0