TW-2022: Change explain text in permission dialog

linagora · Sep 13, 2024 · 4799eb0 · 4799eb0
1 parent 5558fd5
commit 4799eb0
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 31 deletions.
diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb
@@ -1180,7 +1180,7 @@
     "type": "text",
     "placeholders": {}
   },
-  "loading": "Loading status...",
+  "loadingStatus": "Loading status...",
   "loadMore": "Load more…",
   "@loadMore": {
     "type": "text",
@@ -3041,10 +3041,10 @@
       }
     }
   },
-  "explainPermissionToAccessContacts": "Twake chat collects your contacts only when you are on a contact search screen to find out whether your friends are on the Matrix server, enabling connection with them. Your contacts are not synchronized with our server.",
-  "explainPermissionToAccessMedias": "Twake chat collects your photos, videos, music, and other documents to enable sending and saving selected files. Please go to Settings > Permissions and activate Storage permission: Photos and Videos.",
-  "explainPermissionToAccessPhotos": "Twake chat collects your photos to enable sending and saving selected photos only when the app is in use. Press Settings > Permissions, then enable Storage permission: Photos.",
-  "explainPermissionToAccessVideos": "Twake chat collects your videos to enable sending and saving selected videos only when the app is in use. Press Settings > Permissions, then enable Storage permission: Videos.",
+  "explainPermissionToAccessContacts": "Twake Chat DOES NOT collect your contacts. Twake Chat sends only contact hashes to the Twake Chat servers to understand who from your friends already joined Twake Chat, enabling connection with them. Your contacts ARE NOT synchronized with our server.",
+  "explainPermissionToAccessMedias": "Twake Chat does not synchronize data between your device and our servers. We only store media that you have sent to the chat room. All media files sent to chat are encrypted and stored securely. Go to Settings > Permissions and activate the Storage: Photos and Videos permission. You can also deny access to your media library at any time.",
+  "explainPermissionToAccessPhotos": "Twake Chat does not synchronize data between your device and our servers. We only store media that you have sent to the chat room. All media files sent to chat are encrypted and stored securely. Go to Settings > Permissions and activate the Storage: Photos permission. You can also deny access to your media library at any time.",
+  "explainPermissionToAccessVideos": "Twake Chat does not synchronize data between your device and our servers. We only store media that you have sent to the chat room. All media files sent to chat are encrypted and stored securely. Go to Settings > Permissions and activate the Storage: Videos permission. You can also deny access to your media library at any time.",
   "downloading": "Downloading",
   "settingUpYourTwake": "Setting up your Twake\nIt could take a while",
   "performingAutomaticalLogin": "Performing automatical login  via SSO",

diff --git a/lib/pages/chat/chat_app_bar_title.dart b/lib/pages/chat/chat_app_bar_title.dart
@@ -196,7 +196,7 @@ class _DirectChatAppBarStatusContent extends StatelessWidget {
                 }
                 if (directChatPresence == null) {
                   return ChatAppBarTitleText(
-                    text: L10n.of(context)!.loading,
+                    text: L10n.of(context)!.loadingStatus,
                   );
                 }
                 final typingText = room.getLocalizedTypingText(context);

diff --git a/lib/presentation/mixins/common_media_picker_mixin.dart b/lib/presentation/mixins/common_media_picker_mixin.dart
@@ -40,11 +40,11 @@ mixin CommonMediaPickerMixin {
             text: isMicrophone
                 ? L10n.of(context)!.tapToAllowAccessToYourMicrophone
                 : L10n.of(context)!.tapToAllowAccessToYourCamera,
-            style: Theme.of(context).textTheme.titleSmall,
+            style: Theme.of(context).textTheme.bodyMedium,
             children: <TextSpan>[
               TextSpan(
                 text: ' ${L10n.of(context)!.twake}.',
-                style: Theme.of(context).textTheme.titleSmall!.copyWith(
+                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
                       fontWeight: FontWeight.bold,
                     ),
               ),

diff --git a/lib/presentation/mixins/contacts_view_controller_mixin.dart b/lib/presentation/mixins/contacts_view_controller_mixin.dart
@@ -87,6 +87,7 @@ mixin class ContactsViewControllerMixin {
             permission: Permission.contacts,
             explainTextRequestPermission: Text(
               L10n.of(context)!.explainPermissionToAccessContacts,
+              style: Theme.of(context).textTheme.bodyMedium,
             ),
             onRefuseTap: _handleDenyPermissionDialog,
             onAcceptButton: () async {

diff --git a/lib/presentation/mixins/save_file_to_twake_downloads_folder_mixin.dart b/lib/presentation/mixins/save_file_to_twake_downloads_folder_mixin.dart
@@ -244,6 +244,7 @@ mixin SaveFileToTwakeAndroidDownloadsFolderMixin {
                 L10n.of(context)!.explainPermissionToDownloadFiles(
                   AppConfig.applicationName,
                 ),
+                style: Theme.of(context).textTheme.bodyMedium,
               ),
               onAcceptButton: () =>
                   PermissionHandlerService().goToSettingsForPermissionActions(),

diff --git a/lib/presentation/mixins/save_media_to_gallery_android_mixin.dart b/lib/presentation/mixins/save_media_to_gallery_android_mixin.dart
@@ -137,6 +137,7 @@ mixin SaveMediaToGalleryAndroidMixin
               L10n.of(context)!.explainPermissionToGallery(
                 AppConfig.applicationName,
               ),
+              style: Theme.of(context).textTheme.bodyMedium,
             ),
             onAcceptButton: () =>
                 permissionHandlerService.goToSettingsForPermissionActions(),

diff --git a/lib/utils/permission_dialog.dart b/lib/utils/permission_dialog.dart
@@ -53,25 +53,24 @@ class _PermissionDialogState extends State<PermissionDialog>
             borderRadius: BorderRadius.circular(28.0),
             color: Theme.of(context).colorScheme.surface,
           ),
-          width: 312,
-          height: 280,
+          width: MediaQuery.sizeOf(context).width * 0.85,
           padding: const EdgeInsets.symmetric(horizontal: 24.0),
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              if (widget.icon != null) ...[
+          child: IntrinsicHeight(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                if (widget.icon != null) ...[
+                  const SizedBox(
+                    height: 24.0,
+                  ),
+                  widget.icon!,
+                ],
                 const SizedBox(
-                  height: 24.0,
+                  height: 16.0,
                 ),
-                widget.icon!,
-              ],
-              const SizedBox(
-                height: 16.0,
-              ),
-              widget.explainTextRequestPermission,
-              const SizedBox(height: 24.0),
-              Expanded(
-                child: Row(
+                widget.explainTextRequestPermission,
+                const SizedBox(height: 24.0),
+                Row(
                   mainAxisAlignment: MainAxisAlignment.end,
                   children: [
                     _PermissionTextButton(
@@ -97,8 +96,9 @@ class _PermissionDialogState extends State<PermissionDialog>
                     ),
                   ],
                 ),
-              ),
-            ],
+                const SizedBox(height: 24.0),
+              ],
+            ),
           ),
         ),
       ),

diff --git a/lib/utils/permission_service.dart b/lib/utils/permission_service.dart
@@ -94,6 +94,7 @@ class PermissionHandlerService {
             permission: Permission.photos,
             explainTextRequestPermission: Text(
               L10n.of(context)!.explainPermissionToAccessPhotos,
+              style: Theme.of(context).textTheme.bodyMedium,
             ),
             onAcceptButton: () async {
               Navigator.of(dialogContext).pop(true);
@@ -119,6 +120,7 @@ class PermissionHandlerService {
             permission: Permission.videos,
             explainTextRequestPermission: Text(
               L10n.of(context)!.explainPermissionToAccessVideos,
+              style: Theme.of(context).textTheme.bodyMedium,
             ),
             onAcceptButton: () async {
               Navigator.of(dialogContext).pop(true);
@@ -161,6 +163,7 @@ class PermissionHandlerService {
                   Platform.isIOS ? Permission.photos : Permission.storage,
               explainTextRequestPermission: Text(
                 L10n.of(context)!.explainPermissionToAccessMedias,
+                style: Theme.of(context).textTheme.bodyMedium,
               ),
               onAcceptButton: () async {
                 Navigator.of(dialogContext).pop(true);

diff --git a/lib/widgets/contacts_warning_banner/contacts_warning_banner_view.dart b/lib/widgets/contacts_warning_banner/contacts_warning_banner_view.dart
@@ -42,7 +42,7 @@ class ContactsWarningBannerView extends StatelessWidget {
                 Padding(
                   padding: ContactsWarningBannerStyle.paddingForContentBanner,
                   child: Text(
-                    L10n.of(context)!.contactsWarningBannerTitle,
+                    L10n.of(context)!.explainPermissionToAccessContacts,
                     style: Theme.of(context).textTheme.bodyMedium?.copyWith(
                           color: Theme.of(context).colorScheme.onSurface,
                         ),

diff --git a/lib/widgets/mixins/handle_download_and_preview_file_mixin.dart b/lib/widgets/mixins/handle_download_and_preview_file_mixin.dart
@@ -62,8 +62,10 @@ mixin HandleDownloadAndPreviewFileMixin {
           builder: (context) {
             return PermissionDialog(
               permission: Permission.storage,
-              explainTextRequestPermission:
-                  Text(L10n.of(context)!.explainStoragePermission),
+              explainTextRequestPermission: Text(
+                L10n.of(context)!.explainStoragePermission,
+                style: Theme.of(context).textTheme.bodyMedium,
+              ),
               icon: const Icon(Icons.preview_outlined),
             );
           },
@@ -89,8 +91,10 @@ mixin HandleDownloadAndPreviewFileMixin {
           builder: (context) {
             return PermissionDialog(
               permission: Permission.storage,
-              explainTextRequestPermission:
-                  Text(L10n.of(context)!.explainGoToStorageSetting),
+              explainTextRequestPermission: Text(
+                L10n.of(context)!.explainGoToStorageSetting,
+                style: Theme.of(context).textTheme.bodyMedium,
+              ),
               icon: const Icon(Icons.preview_outlined),
             );
           },