Merge pull request #132 from MXCzkEVM/big_upgrade

Big upgrade
MXCzkEVM · Dec 16, 2024 · 58128f2 · 58128f2
2 parents d4aa05f + 606830d
commit 58128f2
Show file tree

Hide file tree

Showing 18 changed files with 226 additions and 229 deletions.
diff --git 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
@@ -41,7 +41,7 @@
     <!-- Should be removed If analytics is added and in 
     Google play console we need to tell them we this add id for analytics 
     https://stackoverflow.com/questions/73129574/you-cant-submit-updates-as-some-information-about-your-app-is-incomplete-googl -->
-    <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove" />
+    <!-- <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove" /> -->
 
     <!-- legacy for Android 11 or lower -->
     <!-- <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />

diff --git a/android/build.gradle b/android/build.gradle
@@ -24,6 +24,11 @@ allprojects {
     }
 }
 
+ext {
+    compileSdkVersion = 34
+    targetSdkVersion = 34 
+}
+
 rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"

diff --git a/ios/PrivacyInfo.xcprivacy b/ios/PrivacyInfo.xcprivacy
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!--
+   PrivacyInfo.xcprivacy
+   Runner
+
+   Created by Reza on 12/13/24.
+   Copyright (c) 2024 . All rights reserved.
+-->
+<plist version="1.0">
+<dict>
+    <key>NSPrivacyAccessedAPITypes</key>
+    <array>
+        <!-- [1] background_fetch: UserDefaults -->
+        <dict>
+            <key>NSPrivacyAccessedAPIType</key>
+            <string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+
+            <key>NSPrivacyAccessedAPITypeReasons</key>
+            <array>
+                <string>CA92.1</string>
+            </array>
+        </dict>        
+    </array>
+</dict>
+</plist>
diff --git 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 = "<group>"; };
 		00B871672B0DE8FE007D0206 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
@@ -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
@@ -5,10 +5,10 @@
 	<key>BGTaskSchedulerPermittedIdentifiers</key>
 	<array>
 		<string>com.transistorsoft.fetch</string>
-		<string>com.moonchain.mxc.notificationsTask</string>
-		<string>com.moonchain.mxc.wifiHooksTask</string>
-		<string>com.moonchain.mxc.minerAutoClaimTask</string>
-		<string>com.moonchain.mxc.blueberryAutoSyncTask</string>
+		<string>com.transistorsoft.notificationsTask</string>
+		<string>com.transistorsoft.wifiHooksTask</string>
+		<string>com.transistorsoft.minerAutoClaimTask</string>
+		<string>com.transistorsoft.blueberryAutoSyncTask</string>
 	</array>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>

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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -12,46 +12,41 @@ Future<bool?> 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,
+          ),
+        ],
       )
     ],
   );