diff --git a/CHANGELOG.md b/CHANGELOG.md index cbd49584..498fe2de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,8 @@ ## 0.2.25 - New: Import images from the gallery -- Improves: Media files are now stored in the "twonly" album +- Improved: Media files are now stored in the dedicated "twonly" album +- Improved: UI components adapt to native styling (iOS/Android) - Fix: Migration issue that resulted in a corrupted backup mechanism - Fix: Database issues causing messages to be lost or the database to be corrupted - Fix: Permission view did not disappear after they were granted diff --git a/lib/src/visual/helpers/video_player_file.helper.dart b/lib/src/visual/helpers/video_player_file.helper.dart index 06931235..93ffdbf0 100644 --- a/lib/src/visual/helpers/video_player_file.helper.dart +++ b/lib/src/visual/helpers/video_player_file.helper.dart @@ -54,7 +54,7 @@ class _VideoPlayerFileHelperState extends State { aspectRatio: _controller.value.aspectRatio, child: VideoPlayerHelper(controller: _controller), ) - : const CircularProgressIndicator(), + : const CircularProgressIndicator.adaptive(), ); } } diff --git a/lib/src/visual/views/camera/add_new_shortcut.view.dart b/lib/src/visual/views/camera/add_new_shortcut.view.dart index 41291ace..4335a5c1 100644 --- a/lib/src/visual/views/camera/add_new_shortcut.view.dart +++ b/lib/src/visual/views/camera/add_new_shortcut.view.dart @@ -260,7 +260,7 @@ class _StartNewChatView extends State { group: group, fontSize: 15, ), - trailing: Checkbox( + trailing: Checkbox.adaptive( value: _selectedGroups.contains(group.groupId), side: WidgetStateBorderSide.resolveWith( (states) { diff --git a/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_scanned_overlay.dart b/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_scanned_overlay.dart index 8e003fcc..6718ef41 100644 --- a/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_scanned_overlay.dart +++ b/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/camera_scanned_overlay.dart @@ -75,7 +75,7 @@ class CameraScannedOverlay extends StatelessWidget { const SizedBox( width: 12, height: 12, - child: CircularProgressIndicator(strokeWidth: 2), + child: CircularProgressIndicator.adaptive(strokeWidth: 2), ) else ColoredBox( diff --git a/lib/src/visual/views/camera/camera_preview_components/save_to_gallery.dart b/lib/src/visual/views/camera/camera_preview_components/save_to_gallery.dart index de92b0e6..9be4b6aa 100644 --- a/lib/src/visual/views/camera/camera_preview_components/save_to_gallery.dart +++ b/lib/src/visual/views/camera/camera_preview_components/save_to_gallery.dart @@ -90,7 +90,7 @@ class SaveToGalleryButtonState extends State { const SizedBox( width: 12, height: 12, - child: CircularProgressIndicator(strokeWidth: 1), + child: CircularProgressIndicator.adaptive(strokeWidth: 1), ) else _imageSaved diff --git a/lib/src/visual/views/camera/share_image_contact_selection.view.dart b/lib/src/visual/views/camera/share_image_contact_selection.view.dart index 4a6f7a40..752157a1 100644 --- a/lib/src/visual/views/camera/share_image_contact_selection.view.dart +++ b/lib/src/visual/views/camera/share_image_contact_selection.view.dart @@ -218,7 +218,7 @@ class _ShareImageView extends State { ), Transform.scale( scale: 0.75, - child: Checkbox( + child: Checkbox.adaptive( value: !hideArchivedUsers, side: WidgetStateBorderSide.resolveWith( (states) { @@ -293,9 +293,9 @@ class _ShareImageView extends State { ? SizedBox( height: 12, width: 12, - child: CircularProgressIndicator( + child: CircularProgressIndicator.adaptive( strokeWidth: 2, - color: Theme.of(context).colorScheme.inversePrimary, + valueColor: AlwaysStoppedAnimation(Theme.of(context).colorScheme.inversePrimary), ), ) : const FaIcon(FontAwesomeIcons.solidPaperPlane), @@ -382,7 +382,7 @@ class UserList extends StatelessWidget { group: group, fontSize: 15, ), - trailing: Checkbox( + trailing: Checkbox.adaptive( value: selectedGroupIds.contains(group.groupId), side: WidgetStateBorderSide.resolveWith( (states) { diff --git a/lib/src/visual/views/camera/share_image_contact_selection_components/best_friends_selector.dart b/lib/src/visual/views/camera/share_image_contact_selection_components/best_friends_selector.dart index 91f8a70b..efc3ccc5 100644 --- a/lib/src/visual/views/camera/share_image_contact_selection_components/best_friends_selector.dart +++ b/lib/src/visual/views/camera/share_image_contact_selection_components/best_friends_selector.dart @@ -165,7 +165,7 @@ class UserCheckbox extends StatelessWidget { ], ), Expanded(child: Container()), - Checkbox( + Checkbox.adaptive( value: isChecked, side: WidgetStateBorderSide.resolveWith( (states) { diff --git a/lib/src/visual/views/camera/share_image_contact_selection_components/select_show_time.dart b/lib/src/visual/views/camera/share_image_contact_selection_components/select_show_time.dart index a60618f2..2bf8b551 100644 --- a/lib/src/visual/views/camera/share_image_contact_selection_components/select_show_time.dart +++ b/lib/src/visual/views/camera/share_image_contact_selection_components/select_show_time.dart @@ -68,7 +68,7 @@ class _SelectShowTimeState extends State { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - Checkbox( + Checkbox.adaptive( value: _storeAsDefault, onChanged: (value) => setState(() { _storeAsDefault = !_storeAsDefault; diff --git a/lib/src/visual/views/camera/share_image_editor.view.dart b/lib/src/visual/views/camera/share_image_editor.view.dart index d09ad5e5..923f157a 100644 --- a/lib/src/visual/views/camera/share_image_editor.view.dart +++ b/lib/src/visual/views/camera/share_image_editor.view.dart @@ -717,11 +717,9 @@ class _ShareImageEditorView extends State { ? SizedBox( height: 12, width: 12, - child: CircularProgressIndicator( + child: CircularProgressIndicator.adaptive( strokeWidth: 2, - color: Theme.of( - context, - ).colorScheme.inversePrimary, + valueColor: AlwaysStoppedAnimation(Theme.of(context).colorScheme.inversePrimary), ), ) : const FaIcon(FontAwesomeIcons.solidPaperPlane), diff --git a/lib/src/visual/views/camera/share_image_editor_components/layers/draw.layer.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/draw.layer.dart index fe71acac..5f266195 100644 --- a/lib/src/visual/views/camera/share_image_editor_components/layers/draw.layer.dart +++ b/lib/src/visual/views/camera/share_image_editor_components/layers/draw.layer.dart @@ -172,7 +172,7 @@ class _DrawLayerState extends State { Positioned.fill( child: RotatedBox( quarterTurns: 1, - child: Slider( + child: Slider.adaptive( value: _sliderValue, thumbColor: currentColor, activeColor: Colors.transparent, diff --git a/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/twitter.card.dart b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/twitter.card.dart index 0a076d64..8bdc763c 100644 --- a/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/twitter.card.dart +++ b/lib/src/visual/views/camera/share_image_editor_components/layers/link_preview/cards/twitter.card.dart @@ -82,7 +82,7 @@ class TwitterPostCard extends StatelessWidget { height: 150, color: const Color(0xFFF5F8FA), child: const Center( - child: CircularProgressIndicator( + child: CircularProgressIndicator.adaptive( strokeWidth: 2, valueColor: AlwaysStoppedAnimation(twitterBlue), ), diff --git a/lib/src/visual/views/chats/chat_messages_components/entries/chat_ask_a_friend.entry.dart b/lib/src/visual/views/chats/chat_messages_components/entries/chat_ask_a_friend.entry.dart index d50655e9..83c31467 100644 --- a/lib/src/visual/views/chats/chat_messages_components/entries/chat_ask_a_friend.entry.dart +++ b/lib/src/visual/views/chats/chat_messages_components/entries/chat_ask_a_friend.entry.dart @@ -190,7 +190,7 @@ class _ChatAskAFriendEntryState extends State { child: SizedBox( width: 14, height: 14, - child: CircularProgressIndicator( + child: CircularProgressIndicator.adaptive( strokeWidth: 2, ), ), @@ -302,7 +302,7 @@ class _ChatAskAFriendEntryState extends State { ? const SizedBox( width: 12, height: 12, - child: CircularProgressIndicator( + child: CircularProgressIndicator.adaptive( strokeWidth: 2, ), ) diff --git a/lib/src/visual/views/chats/chat_messages_components/entries/chat_contacts.entry.dart b/lib/src/visual/views/chats/chat_messages_components/entries/chat_contacts.entry.dart index 6d02afb0..6ec0371e 100644 --- a/lib/src/visual/views/chats/chat_messages_components/entries/chat_contacts.entry.dart +++ b/lib/src/visual/views/chats/chat_messages_components/entries/chat_contacts.entry.dart @@ -191,7 +191,7 @@ class _ContactRowState extends State<_ContactRow> { const SizedBox( width: 16, height: 16, - child: CircularProgressIndicator( + child: CircularProgressIndicator.adaptive( strokeWidth: 2, valueColor: AlwaysStoppedAnimation( Colors.white, diff --git a/lib/src/visual/views/chats/chat_messages_components/message_send_state_icon.dart b/lib/src/visual/views/chats/chat_messages_components/message_send_state_icon.dart index 9df84bbb..5beb4bec 100644 --- a/lib/src/visual/views/chats/chat_messages_components/message_send_state_icon.dart +++ b/lib/src/visual/views/chats/chat_messages_components/message_send_state_icon.dart @@ -76,7 +76,7 @@ class _MessageSendStateIconState extends State { SizedBox( width: 10, height: 10, - child: CircularProgressIndicator(strokeWidth: 1, color: color), + child: CircularProgressIndicator.adaptive(strokeWidth: 1, valueColor: AlwaysStoppedAnimation(color)), ), const SizedBox(width: 2), ], diff --git a/lib/src/visual/views/chats/media_viewer.view.dart b/lib/src/visual/views/chats/media_viewer.view.dart index d8cc4503..eaea72cd 100644 --- a/lib/src/visual/views/chats/media_viewer.view.dart +++ b/lib/src/visual/views/chats/media_viewer.view.dart @@ -540,7 +540,7 @@ class _MediaViewerViewState extends State { const SizedBox( width: 10, height: 10, - child: CircularProgressIndicator(strokeWidth: 1), + child: CircularProgressIndicator.adaptive(strokeWidth: 1), ) else imageSaved diff --git a/lib/src/visual/views/contact/add_contact_via_qr_link.view.dart b/lib/src/visual/views/contact/add_contact_via_qr_link.view.dart index 50ce2c6a..00d86abb 100644 --- a/lib/src/visual/views/contact/add_contact_via_qr_link.view.dart +++ b/lib/src/visual/views/contact/add_contact_via_qr_link.view.dart @@ -129,7 +129,7 @@ class _AddContactViaQrLinkViewState extends State { ? const SizedBox( height: 20, width: 20, - child: CircularProgressIndicator( + child: CircularProgressIndicator.adaptive( strokeWidth: 2, ), ) diff --git a/lib/src/visual/views/contact/add_new_contact.view.dart b/lib/src/visual/views/contact/add_new_contact.view.dart index 5c631673..94ea78e8 100644 --- a/lib/src/visual/views/contact/add_new_contact.view.dart +++ b/lib/src/visual/views/contact/add_new_contact.view.dart @@ -250,7 +250,7 @@ class _SearchUsernameView extends State { child: SizedBox( width: 18, height: 18, - child: CircularProgressIndicator(strokeWidth: 2), + child: CircularProgressIndicator.adaptive(strokeWidth: 2), ), ) else diff --git a/lib/src/visual/views/contact/add_new_contact_components/friend_suggestions.comp.dart b/lib/src/visual/views/contact/add_new_contact_components/friend_suggestions.comp.dart index 992d6cf5..2f00587c 100644 --- a/lib/src/visual/views/contact/add_new_contact_components/friend_suggestions.comp.dart +++ b/lib/src/visual/views/contact/add_new_contact_components/friend_suggestions.comp.dart @@ -112,7 +112,7 @@ class FriendSuggestionsComp extends StatelessWidget { final contact = f.$1; final isSelected = selectedFriends.contains(contact.userId); - return CheckboxListTile( + return CheckboxListTile.adaptive( contentPadding: EdgeInsets.zero, title: Text(contact.displayName ?? contact.username), value: isSelected, diff --git a/lib/src/visual/views/groups/group_create_select_group_name.view.dart b/lib/src/visual/views/groups/group_create_select_group_name.view.dart index 1bfc7132..774bcf44 100644 --- a/lib/src/visual/views/groups/group_create_select_group_name.view.dart +++ b/lib/src/visual/views/groups/group_create_select_group_name.view.dart @@ -68,7 +68,7 @@ class _GroupCreateSelectGroupNameViewState ? const SizedBox( width: 15, height: 15, - child: CircularProgressIndicator( + child: CircularProgressIndicator.adaptive( strokeWidth: 1, ), ) diff --git a/lib/src/visual/views/groups/group_create_select_members.view.dart b/lib/src/visual/views/groups/group_create_select_members.view.dart index 42930b06..b46a3c90 100644 --- a/lib/src/visual/views/groups/group_create_select_members.view.dart +++ b/lib/src/visual/views/groups/group_create_select_members.view.dart @@ -223,7 +223,7 @@ class _StartNewChatView extends State { contactId: user.userId, fontSize: 13, ), - trailing: Checkbox( + trailing: Checkbox.adaptive( value: selectedUsers.contains(user.userId) | alreadyInGroup.contains(user.userId), diff --git a/lib/src/visual/views/memories/components/synchronized_viewer_actions_toolbar.comp.dart b/lib/src/visual/views/memories/components/synchronized_viewer_actions_toolbar.comp.dart index 717067c3..1f786fbd 100644 --- a/lib/src/visual/views/memories/components/synchronized_viewer_actions_toolbar.comp.dart +++ b/lib/src/visual/views/memories/components/synchronized_viewer_actions_toolbar.comp.dart @@ -40,9 +40,9 @@ class SynchronizedViewerActionsToolbarComp extends StatelessWidget { ? const SizedBox( width: 16, height: 16, - child: CircularProgressIndicator( + child: CircularProgressIndicator.adaptive( strokeWidth: 2, - color: Colors.white, + valueColor: AlwaysStoppedAnimation(Colors.white), ), ) : const FaIcon( diff --git a/lib/src/visual/views/memories/memories.view.dart b/lib/src/visual/views/memories/memories.view.dart index a13352c6..93ff1577 100644 --- a/lib/src/visual/views/memories/memories.view.dart +++ b/lib/src/visual/views/memories/memories.view.dart @@ -409,7 +409,9 @@ class MemoriesViewState extends State { child: CircularProgressIndicator( value: state.migrationProgress, strokeWidth: 2.5, - color: context.color.primary, + valueColor: AlwaysStoppedAnimation( + context.color.primary, + ), backgroundColor: context.color.primary .withValues(alpha: 0.2), ), diff --git a/lib/src/visual/views/onboarding/recover.view.dart b/lib/src/visual/views/onboarding/recover.view.dart index 71ec9f58..39f239cd 100644 --- a/lib/src/visual/views/onboarding/recover.view.dart +++ b/lib/src/visual/views/onboarding/recover.view.dart @@ -219,8 +219,8 @@ class _BackupRecoveryViewState extends State { ? const SizedBox( height: 24, width: 24, - child: CircularProgressIndicator( - color: Colors.white, + child: CircularProgressIndicator.adaptive( + valueColor: AlwaysStoppedAnimation(Colors.white), strokeWidth: 3, ), ) diff --git a/lib/src/visual/views/onboarding/register.view.dart b/lib/src/visual/views/onboarding/register.view.dart index 570456c7..5f1ca260 100644 --- a/lib/src/visual/views/onboarding/register.view.dart +++ b/lib/src/visual/views/onboarding/register.view.dart @@ -299,8 +299,8 @@ class _RegisterViewState extends State { ? const SizedBox( width: 24, height: 24, - child: CircularProgressIndicator( - color: Colors.white, + child: CircularProgressIndicator.adaptive( + valueColor: AlwaysStoppedAnimation(Colors.white), strokeWidth: 3, ), ) diff --git a/lib/src/visual/views/onboarding/setup/components/next_button.comp.dart b/lib/src/visual/views/onboarding/setup/components/next_button.comp.dart index 36962bc9..7a23e134 100644 --- a/lib/src/visual/views/onboarding/setup/components/next_button.comp.dart +++ b/lib/src/visual/views/onboarding/setup/components/next_button.comp.dart @@ -49,7 +49,7 @@ class NextButtonComp extends StatelessWidget { ? const SizedBox( height: 24, width: 24, - child: CircularProgressIndicator( + child: CircularProgressIndicator.adaptive( strokeWidth: 2, valueColor: AlwaysStoppedAnimation(Colors.white), ), diff --git a/lib/src/visual/views/onboarding/setup/components/setup_switch_card.comp.dart b/lib/src/visual/views/onboarding/setup/components/setup_switch_card.comp.dart index 168a9a98..8dfa6664 100644 --- a/lib/src/visual/views/onboarding/setup/components/setup_switch_card.comp.dart +++ b/lib/src/visual/views/onboarding/setup/components/setup_switch_card.comp.dart @@ -28,7 +28,7 @@ class SetupSwitchCard extends StatelessWidget { mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - SwitchListTile( + SwitchListTile.adaptive( value: value, onChanged: onChanged, title: Text( diff --git a/lib/src/visual/views/recovery.view.dart b/lib/src/visual/views/recovery.view.dart index 0708262d..c9d683c2 100644 --- a/lib/src/visual/views/recovery.view.dart +++ b/lib/src/visual/views/recovery.view.dart @@ -127,7 +127,7 @@ class _RecoveryViewState extends State { ? const SizedBox( height: 16, width: 16, - child: CircularProgressIndicator(strokeWidth: 2), + child: CircularProgressIndicator.adaptive(strokeWidth: 2), ) : const Icon(Icons.restore_rounded), style: FilledButton.styleFrom( diff --git a/lib/src/visual/views/settings/backup/backup_setup.view.dart b/lib/src/visual/views/settings/backup/backup_setup.view.dart index 4b00e45e..2eb9638c 100644 --- a/lib/src/visual/views/settings/backup/backup_setup.view.dart +++ b/lib/src/visual/views/settings/backup/backup_setup.view.dart @@ -144,7 +144,7 @@ class _SetupBackupViewState extends State { ? const SizedBox( height: 12, width: 12, - child: CircularProgressIndicator(strokeWidth: 1), + child: CircularProgressIndicator.adaptive(strokeWidth: 1), ) : const Icon(Icons.lock_clock_rounded), label: Text( diff --git a/lib/src/visual/views/settings/chat/chat_settings.view.dart b/lib/src/visual/views/settings/chat/chat_settings.view.dart index 56c1a66b..f9ebc006 100644 --- a/lib/src/visual/views/settings/chat/chat_settings.view.dart +++ b/lib/src/visual/views/settings/chat/chat_settings.view.dart @@ -39,7 +39,7 @@ class _ChatSettingsViewState extends State { title: Text(context.lang.settingsPreSelectedReactions), onTap: () => context.push(Routes.settingsChatsReactions), ), - SwitchListTile( + SwitchListTile.adaptive( title: Text( context .lang diff --git a/lib/src/visual/views/settings/data_and_storage.view.dart b/lib/src/visual/views/settings/data_and_storage.view.dart index 61680e01..161adfe2 100644 --- a/lib/src/visual/views/settings/data_and_storage.view.dart +++ b/lib/src/visual/views/settings/data_and_storage.view.dart @@ -213,7 +213,7 @@ class _AutoDownloadOptionsDialogState extends State { content: Column( mainAxisSize: MainAxisSize.min, children: [ - CheckboxListTile( + CheckboxListTile.adaptive( title: const Text('Image'), value: autoDownloadOptions[widget.connectionMode.name]!.contains( DownloadMediaTypes.image.name, @@ -222,7 +222,7 @@ class _AutoDownloadOptionsDialogState extends State { await _updateAutoDownloadSetting(DownloadMediaTypes.image, value); }, ), - CheckboxListTile( + CheckboxListTile.adaptive( title: const Text('Video'), value: autoDownloadOptions[widget.connectionMode.name]!.contains( DownloadMediaTypes.video.name, diff --git a/lib/src/visual/views/settings/data_and_storage/import_from_gallery.view.dart b/lib/src/visual/views/settings/data_and_storage/import_from_gallery.view.dart index 40a8bdb2..1a7a71d8 100644 --- a/lib/src/visual/views/settings/data_and_storage/import_from_gallery.view.dart +++ b/lib/src/visual/views/settings/data_and_storage/import_from_gallery.view.dart @@ -379,7 +379,7 @@ class _ImportFromGalleryViewState extends State { Widget _buildBody() { if (_isLoading) { - return const Center(child: CircularProgressIndicator()); + return const Center(child: CircularProgressIndicator.adaptive()); } if (!_hasPermission) { @@ -530,7 +530,7 @@ class _ImportFromGalleryViewState extends State { child: Column( mainAxisSize: MainAxisSize.min, children: [ - const CircularProgressIndicator(), + const CircularProgressIndicator.adaptive(), const SizedBox(height: 24), Text( _importStatus, @@ -600,7 +600,7 @@ class _GalleryThumbnailWidgetState extends State { child: SizedBox( width: 24, height: 24, - child: CircularProgressIndicator(strokeWidth: 2), + child: CircularProgressIndicator.adaptive(strokeWidth: 2), ), ), ); diff --git a/lib/src/visual/views/settings/developer/developer.view.dart b/lib/src/visual/views/settings/developer/developer.view.dart index d6bda4ca..7926d295 100644 --- a/lib/src/visual/views/settings/developer/developer.view.dart +++ b/lib/src/visual/views/settings/developer/developer.view.dart @@ -400,7 +400,7 @@ class _DeveloperSettingsViewState extends State { ? const SizedBox( width: 24, height: 24, - child: CircularProgressIndicator(strokeWidth: 2), + child: CircularProgressIndicator.adaptive(strokeWidth: 2), ) : null, onTap: _isGeneratingMockImages diff --git a/lib/src/visual/views/settings/help/changelog.view.dart b/lib/src/visual/views/settings/help/changelog.view.dart index a8520418..c4f05891 100644 --- a/lib/src/visual/views/settings/help/changelog.view.dart +++ b/lib/src/visual/views/settings/help/changelog.view.dart @@ -112,7 +112,7 @@ class _ChangeLogViewState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Text(context.lang.openChangeLog), - Switch( + Switch.adaptive( value: !userService.currentUser.hideChangeLog, onChanged: (_) => UserService.update( (u) => u.hideChangeLog = !u.hideChangeLog, diff --git a/lib/src/visual/views/settings/help/contact_us.view.dart b/lib/src/visual/views/settings/help/contact_us.view.dart index 47916631..bbaeb18d 100644 --- a/lib/src/visual/views/settings/help/contact_us.view.dart +++ b/lib/src/visual/views/settings/help/contact_us.view.dart @@ -243,9 +243,9 @@ $debugLogToken ? SizedBox( height: 12, width: 12, - child: CircularProgressIndicator( + child: CircularProgressIndicator.adaptive( strokeWidth: 2, - color: Theme.of(context).colorScheme.inversePrimary, + valueColor: AlwaysStoppedAnimation(Theme.of(context).colorScheme.inversePrimary), ), ) : const FaIcon(FontAwesomeIcons.angleRight), @@ -291,7 +291,7 @@ class _IncludeDebugLogState extends State { Widget build(BuildContext context) { return Row( children: [ - Checkbox( + Checkbox.adaptive( value: widget.isChecked, materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, onChanged: (value) { diff --git a/lib/src/visual/views/settings/help/faq.view.dart b/lib/src/visual/views/settings/help/faq.view.dart index 83a56626..9e73e859 100644 --- a/lib/src/visual/views/settings/help/faq.view.dart +++ b/lib/src/visual/views/settings/help/faq.view.dart @@ -117,7 +117,7 @@ class _FaqViewState extends State { appBar: AppBar( title: Text(context.lang.settingsHelpFAQ), ), - body: const Center(child: CircularProgressIndicator()), + body: const Center(child: CircularProgressIndicator.adaptive()), ); } diff --git a/lib/src/visual/views/settings/notification.view.dart b/lib/src/visual/views/settings/notification.view.dart index 2a5343f9..c8e3696e 100644 --- a/lib/src/visual/views/settings/notification.view.dart +++ b/lib/src/visual/views/settings/notification.view.dart @@ -123,7 +123,7 @@ class _NotificationViewState extends State { ? const SizedBox( width: 16, height: 16, - child: CircularProgressIndicator( + child: CircularProgressIndicator.adaptive( strokeWidth: 2, ), ) @@ -138,7 +138,7 @@ class _NotificationViewState extends State { ? const SizedBox( width: 16, height: 16, - child: CircularProgressIndicator( + child: CircularProgressIndicator.adaptive( strokeWidth: 2, ), ) diff --git a/lib/src/visual/views/settings/privacy/block_users.view.dart b/lib/src/visual/views/settings/privacy/block_users.view.dart index 3947133c..3523a740 100644 --- a/lib/src/visual/views/settings/privacy/block_users.view.dart +++ b/lib/src/visual/views/settings/privacy/block_users.view.dart @@ -119,7 +119,7 @@ class UserList extends StatelessWidget { ], ), leading: AvatarIcon(contactId: user.userId, fontSize: 15), - trailing: Checkbox( + trailing: Checkbox.adaptive( value: user.blocked, onChanged: (value) async { await block(context, user.userId, value); diff --git a/lib/src/visual/views/settings/privacy/user_discovery/components/user_discovery_setup.comp.dart b/lib/src/visual/views/settings/privacy/user_discovery/components/user_discovery_setup.comp.dart index cb474d59..56a1a897 100644 --- a/lib/src/visual/views/settings/privacy/user_discovery/components/user_discovery_setup.comp.dart +++ b/lib/src/visual/views/settings/privacy/user_discovery/components/user_discovery_setup.comp.dart @@ -292,7 +292,7 @@ class UserDiscoverySetupComp extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - SwitchListTile( + SwitchListTile.adaptive( value: state.isUserDiscoveryEnabled, onChanged: (val) => state.update(() { state.isUserDiscoveryEnabled = val; @@ -323,7 +323,7 @@ class UserDiscoverySetupComp extends StatelessWidget { ), ), ), - SwitchListTile( + SwitchListTile.adaptive( value: state.isManualApprovalEnabled, onChanged: (val) => state.update( () => state.isManualApprovalEnabled = val, @@ -547,7 +547,7 @@ class UserDiscoverySetupComp extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - SwitchListTile( + SwitchListTile.adaptive( value: state.sharePromotion, onChanged: (val) => state.update(() { state.sharePromotion = val; diff --git a/lib/src/visual/views/settings/subscription/select_additional_users.view.dart b/lib/src/visual/views/settings/subscription/select_additional_users.view.dart index 051d4982..6f5b45b8 100644 --- a/lib/src/visual/views/settings/subscription/select_additional_users.view.dart +++ b/lib/src/visual/views/settings/subscription/select_additional_users.view.dart @@ -195,7 +195,7 @@ class _SelectAdditionalUsers extends State { contactId: user.userId, fontSize: 13, ), - trailing: Checkbox( + trailing: Checkbox.adaptive( value: selectedUsers.contains(user.userId) | _alreadySelected.contains(user.userId), diff --git a/lib/src/visual/views/settings/subscription/subscription.view.dart b/lib/src/visual/views/settings/subscription/subscription.view.dart index a0964385..c6f73b38 100644 --- a/lib/src/visual/views/settings/subscription/subscription.view.dart +++ b/lib/src/visual/views/settings/subscription/subscription.view.dart @@ -330,7 +330,7 @@ class _PlanCardState extends State { ? const SizedBox( width: 10, height: 10, - child: CircularProgressIndicator(strokeWidth: 1), + child: CircularProgressIndicator.adaptive(strokeWidth: 1), ) : null, label: Text( @@ -350,7 +350,7 @@ class _PlanCardState extends State { ? const SizedBox( width: 10, height: 10, - child: CircularProgressIndicator(strokeWidth: 1), + child: CircularProgressIndicator.adaptive(strokeWidth: 1), ) : null, label: Text( diff --git a/lib/src/visual/views/shared/select_contacts.view.dart b/lib/src/visual/views/shared/select_contacts.view.dart index 3564e050..ff67b08f 100644 --- a/lib/src/visual/views/shared/select_contacts.view.dart +++ b/lib/src/visual/views/shared/select_contacts.view.dart @@ -208,7 +208,7 @@ class _SelectAdditionalUsers extends State { contactId: user.userId, fontSize: 13, ), - trailing: Checkbox( + trailing: Checkbox.adaptive( value: selectedUsers.contains(user.userId) | _alreadySelected.contains(user.userId), diff --git a/lib/src/visual/views/user_study/user_study_questionnaire.view.dart b/lib/src/visual/views/user_study/user_study_questionnaire.view.dart index ed86d82e..997c328a 100644 --- a/lib/src/visual/views/user_study/user_study_questionnaire.view.dart +++ b/lib/src/visual/views/user_study/user_study_questionnaire.view.dart @@ -176,7 +176,7 @@ class _UserStudyQuestionnaireViewState 'Welche der folgenden Messenger hast du schon einmal benutzt?', ), ..._messengerOptions.map( - (m) => CheckboxListTile( + (m) => CheckboxListTile.adaptive( title: Text(m), visualDensity: const VisualDensity(vertical: -4), value: (_responses['messengers'] as List).contains(m),