Merge pull request #61 from MXCzkEVM/cloud_backup

Cloud backup
MXCzkEVM · Oct 9, 2024 · 10f692e · 10f692e
2 parents 1a4521f + 4433438
commit 10f692e
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 16 deletions.
diff --git a/assets/flutter_i18n/en.json b/assets/flutter_i18n/en.json
@@ -456,13 +456,15 @@
 	"in": "Loading..",
 	"google_drive_secured_storage": "Google Drive secured storage",
 	"icloud_secured_storage": "iCloud Secured storage",
-	"make_sure_you_have_stored_your_keys_correctly_in_your_x": "Make sure you have stored your keys correctly in your {0}",
+	"ensure_that_your_keys_are_stored_correctly_in_your_x": "Ensure that your keys are stored correctly in your {0}!",
 	"icloud": "iCloud",
 	"google_drive": "Google Drive",
 	"store_in_x": "Store in {0}",
 	"your_email_address": "Your Email Address",
 	"invalid_email": "Please enter a valid email address (e.g., [email protected])",
 	"email": "Email",
 	"unable_to_authenticate_with_x": "Unable to authenticate with {0}.",
-	"unable_to_upload_backup_to_x": "Unable to upload backup to {0}."
+	"unable_to_upload_backup_to_x": "Unable to upload backup to {0}.",
+	"google_drive_backup_note": "Important: We save the mnemonic seed phrase in the file named moonchain-key.txt located in the MoonBase folder.",
+	"tips_for_storing_keys_safely": "Tip for Storing Keys Safely"
 }
diff --git a/assets/icons/mxc-icons.ttf b/assets/icons/mxc-icons.ttf
diff --git a/ios/Runner/Runner.entitlements b/ios/Runner/Runner.entitlements
@@ -8,7 +8,19 @@
 	<array>
 		<string>applinks:mxc1usd.com</string>
 	</array>
+	<key>com.apple.developer.icloud-container-identifiers</key>
+	<array>
+		<string>iCloud.moonchain.mxc</string>
+	</array>
+	<key>com.apple.developer.icloud-services</key>
+	<array>
+		<string>CloudDocuments</string>
+	</array>
 	<key>com.apple.developer.networking.wifi-info</key>
 	<true/>
+	<key>com.apple.developer.ubiquity-container-identifiers</key>
+	<array>
+		<string>iCloud.moonchain.mxc</string>
+	</array>
 </dict>
 </plist>
diff --git a/ios/Runner/RunnerDebug.entitlements b/ios/Runner/RunnerDebug.entitlements
@@ -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">
+<plist version="1.0">
+<dict>
+	<key>aps-environment</key>
+	<string>development</string>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:mxc1usd.com</string>
+	</array>
+	<key>com.apple.developer.icloud-container-identifiers</key>
+	<array>
+		<string>iCloud.moonchain.mxc</string>
+	</array>
+	<key>com.apple.developer.icloud-services</key>
+	<array>
+		<string>CloudDocuments</string>
+	</array>
+	<key>com.apple.developer.networking.wifi-info</key>
+	<true/>
+	<key>com.apple.developer.ubiquity-container-identifiers</key>
+	<array>
+		<string>iCloud.moonchain.mxc</string>
+	</array>
+</dict>
+</plist>
diff --git a/lib/features/splash/create_storage/presentation/create_storage_page.dart b/lib/features/splash/create_storage/presentation/create_storage_page.dart
@@ -114,7 +114,7 @@ class SplashStoragePage extends SplashBasePage {
       MxcButton.secondaryWhite(
         key: const ValueKey('GoogleDriveButton'),
         icon: MxcIcons.google_drive,
-        iconSize: 24,
+        iconSize: 32,
         titleSize: 18,
         title: FlutterI18n.translate(context, 'google_drive_secured_storage'),
         onTap: () => Navigator.of(context).push(
@@ -130,7 +130,7 @@ class SplashStoragePage extends SplashBasePage {
           ? MxcButton.secondaryWhite(
               key: const ValueKey('icloudButton'),
               icon: MxcIcons.icloud,
-              iconSize: 18,
+              iconSize: 32,
               titleSize: 18,
               title: FlutterI18n.translate(context, 'icloud_secured_storage'),
               onTap: () => Navigator.of(context).push(

diff --git a/...se/presentation/google_drive_recovery_phrase_alert/google_drive_recovery_phrase_page.dart b/...se/presentation/google_drive_recovery_phrase_alert/google_drive_recovery_phrase_page.dart
@@ -56,16 +56,41 @@ class GoogleDriveRecoveryPhrasePage extends RecoveryPhraseBasePage {
               ),
               child: getIcon(context)),
           const SizedBox(height: 12),
-          Text(
-            FlutterI18n.translate(context,
-                    'make_sure_you_have_stored_your_keys_correctly_in_your_x')
-                .replaceFirst(
-                    '{0}', FlutterI18n.translate(context, 'google_drive')),
-            style: FontTheme.of(context).body1().copyWith(
-                  fontWeight: FontWeight.w500,
-                  color: ColorsTheme.of(context).textPrimary,
-                ),
-            textAlign: TextAlign.center,
+          Text.rich(
+            TextSpan(children: [
+              TextSpan(
+                text: FlutterI18n.translate(
+                    context, 'tips_for_storing_keys_safely'),
+                style: FontTheme.of(context).body1().copyWith(
+                      fontWeight: FontWeight.w700,
+                      color: ColorsTheme.of(context).textPrimary,
+                    ),
+              ),
+              const TextSpan(
+                text: '\n',
+              ),
+              TextSpan(
+                text: FlutterI18n.translate(context,
+                        'ensure_that_your_keys_are_stored_correctly_in_your_x')
+                    .replaceFirst(
+                        '{0}', FlutterI18n.translate(context, 'google_drive')),
+                style: FontTheme.of(context).body1().copyWith(
+                      fontWeight: FontWeight.w500,
+                      color: ColorsTheme.of(context).textPrimary,
+                    ),
+              ),
+              const TextSpan(
+                text: '\n\n',
+              ),
+              TextSpan(
+                text:
+                    FlutterI18n.translate(context, 'google_drive_backup_note'),
+                style: FontTheme.of(context).body1().copyWith(
+                      fontWeight: FontWeight.w500,
+                      color: ColorsTheme.of(context).textPrimary,
+                    ),
+              ),
+            ]),
           ),
         ],
       ),

diff --git a/...ecovery_phrase/presentation/icloud_recovery_phrase_alert/icloud_recovery_phrase_page.dart b/...ecovery_phrase/presentation/icloud_recovery_phrase_alert/icloud_recovery_phrase_page.dart
@@ -58,7 +58,7 @@ class ICloudRecoveryPhrasePage extends RecoveryPhraseBasePage {
           const SizedBox(height: 12),
           Text(
             FlutterI18n.translate(context,
-                    'make_sure_you_have_stored_your_keys_correctly_in_your_x')
+                    'ensure_that_your_keys_are_stored_correctly_in_your_x')
                 .replaceFirst('{0}', FlutterI18n.translate(context, 'icloud')),
             style: FontTheme.of(context).body1().copyWith(
                   fontWeight: FontWeight.w500,

diff --git a/packages/shared b/packages/shared
+1 −1		logic/lib/src/domain/const/config.dart
+5 −5		ui/assets/icons/config.json
+1 −1		ui/lib/src/mxc_icons.dart