From 5796e41d2aebc98b5494555b895d46f816f53668 Mon Sep 17 00:00:00 2001 From: Krille Fear Date: Sun, 10 Oct 2021 13:38:06 +0200 Subject: [PATCH] CircularProgressIndicator.adaptive( --- lib/pages/key_verification_dialog.dart | 8 ++------ lib/pages/views/archive_view.dart | 3 ++- lib/pages/views/chat_encryption_settings_view.dart | 4 +++- lib/pages/views/chat_permissions_settings_view.dart | 4 +++- lib/pages/views/chat_view.dart | 6 ++++-- lib/pages/views/device_settings_view.dart | 5 +++-- lib/pages/views/homeserver_picker_view.dart | 7 +++++-- lib/pages/views/invitation_selection_view.dart | 2 +- lib/pages/views/search_view.dart | 4 +++- lib/pages/views/settings_3pid_view.dart | 3 ++- lib/pages/views/settings_notifications_view.dart | 4 +++- lib/pages/views/video_viewer_view.dart | 2 +- lib/widgets/connection_status_header.dart | 2 +- lib/widgets/event_content/audio_player.dart | 2 +- lib/widgets/event_content/image_bubble.dart | 2 +- lib/widgets/profile_bottom_sheet.dart | 3 ++- 16 files changed, 37 insertions(+), 24 deletions(-) diff --git a/lib/pages/key_verification_dialog.dart b/lib/pages/key_verification_dialog.dart index 393f7d2f..b801177b 100644 --- a/lib/pages/key_verification_dialog.dart +++ b/lib/pages/key_verification_dialog.dart @@ -222,9 +222,7 @@ class _KeyVerificationPageState extends State { children: [ Image.asset('assets/verification.png', fit: BoxFit.contain), const SizedBox(height: 16), - PlatformInfos.isCupertinoStyle - ? CupertinoActivityIndicator() - : CircularProgressIndicator(), + CircularProgressIndicator.adaptive(strokeWidth: 2), const SizedBox(height: 16), Text( L10n.of(context).waitingPartnerAcceptRequest, @@ -307,9 +305,7 @@ class _KeyVerificationPageState extends State { body = Column( mainAxisSize: MainAxisSize.min, children: [ - PlatformInfos.isCupertinoStyle - ? CupertinoActivityIndicator() - : CircularProgressIndicator(), + CircularProgressIndicator.adaptive(strokeWidth: 2), SizedBox(height: 10), Text( acceptText, diff --git a/lib/pages/views/archive_view.dart b/lib/pages/views/archive_view.dart index a430699e..efb224fa 100644 --- a/lib/pages/views/archive_view.dart +++ b/lib/pages/views/archive_view.dart @@ -37,7 +37,8 @@ class ArchiveView extends StatelessWidget { )); } if (!snapshot.hasData) { - return Center(child: CircularProgressIndicator()); + return Center( + child: CircularProgressIndicator.adaptive(strokeWidth: 2)); } else { controller.archive = snapshot.data; if (controller.archive.isEmpty) { diff --git a/lib/pages/views/chat_encryption_settings_view.dart b/lib/pages/views/chat_encryption_settings_view.dart index aa3d434c..4731a51b 100644 --- a/lib/pages/views/chat_encryption_settings_view.dart +++ b/lib/pages/views/chat_encryption_settings_view.dart @@ -54,7 +54,9 @@ class ChatEncryptionSettingsView extends StatelessWidget { ); } if (!snapshot.hasData) { - return Center(child: CircularProgressIndicator()); + return Center( + child: + CircularProgressIndicator.adaptive(strokeWidth: 2)); } final deviceKeys = snapshot.data; return ListView.builder( diff --git a/lib/pages/views/chat_permissions_settings_view.dart b/lib/pages/views/chat_permissions_settings_view.dart index 9014e8ba..4aa9f81a 100644 --- a/lib/pages/views/chat_permissions_settings_view.dart +++ b/lib/pages/views/chat_permissions_settings_view.dart @@ -104,7 +104,9 @@ class ChatPermissionsSettingsView extends StatelessWidget { future: room.client.getCapabilities(), builder: (context, snapshot) { if (!snapshot.hasData) { - return Center(child: CircularProgressIndicator()); + return Center( + child: CircularProgressIndicator.adaptive( + strokeWidth: 2)); } final String roomVersion = room .getState(EventTypes.RoomCreate) diff --git a/lib/pages/views/chat_view.dart b/lib/pages/views/chat_view.dart index 33867f18..239cec33 100644 --- a/lib/pages/views/chat_view.dart +++ b/lib/pages/views/chat_view.dart @@ -243,7 +243,8 @@ class ChatView extends StatelessWidget { builder: (BuildContext context, snapshot) { if (controller.timeline == null) { return Center( - child: CircularProgressIndicator(strokeWidth: 2), + child: CircularProgressIndicator.adaptive( + strokeWidth: 2), ); } @@ -279,7 +280,8 @@ class ChatView extends StatelessWidget { return i == controller.filteredEvents.length + 1 ? controller.timeline.isRequestingHistory ? Center( - child: CircularProgressIndicator(), + child: CircularProgressIndicator + .adaptive(), ) : controller.canLoadMore ? Center( diff --git a/lib/pages/views/device_settings_view.dart b/lib/pages/views/device_settings_view.dart index 4331fd4f..af5a59f8 100644 --- a/lib/pages/views/device_settings_view.dart +++ b/lib/pages/views/device_settings_view.dart @@ -33,7 +33,8 @@ class DevicesSettingsView extends StatelessWidget { ); } if (!snapshot.hasData || controller.devices == null) { - return Center(child: CircularProgressIndicator()); + return Center( + child: CircularProgressIndicator.adaptive(strokeWidth: 2)); } return Column( children: [ @@ -55,7 +56,7 @@ class DevicesSettingsView extends StatelessWidget { style: TextStyle(color: Colors.red), ), trailing: controller.loadingDeletingDevices - ? CircularProgressIndicator() + ? CircularProgressIndicator.adaptive(strokeWidth: 2) : Icon(Icons.delete_outline), onTap: controller.loadingDeletingDevices ? null diff --git a/lib/pages/views/homeserver_picker_view.dart b/lib/pages/views/homeserver_picker_view.dart index cc5f64db..a04da018 100644 --- a/lib/pages/views/homeserver_picker_view.dart +++ b/lib/pages/views/homeserver_picker_view.dart @@ -49,7 +49,8 @@ class HomeserverPickerView extends StatelessWidget { child: FluffyBanner(), ), controller.isLoading - ? Center(child: CircularProgressIndicator()) + ? Center( + child: CircularProgressIndicator.adaptive(strokeWidth: 2)) : controller.error != null ? Center( child: Padding( @@ -76,7 +77,9 @@ class HomeserverPickerView extends StatelessWidget { ); } if (!snapshot.hasData) { - return Center(child: CircularProgressIndicator()); + return Center( + child: CircularProgressIndicator.adaptive( + strokeWidth: 2)); } return Padding( padding: const EdgeInsets.symmetric( diff --git a/lib/pages/views/invitation_selection_view.dart b/lib/pages/views/invitation_selection_view.dart index 3ba086de..cc460cf3 100644 --- a/lib/pages/views/invitation_selection_view.dart +++ b/lib/pages/views/invitation_selection_view.dart @@ -62,7 +62,7 @@ class InvitationSelectionView extends StatelessWidget { builder: (BuildContext context, snapshot) { if (!snapshot.hasData) { return Center( - child: CircularProgressIndicator(), + child: CircularProgressIndicator.adaptive(strokeWidth: 2), ); } final contacts = snapshot.data; diff --git a/lib/pages/views/search_view.dart b/lib/pages/views/search_view.dart index 89de0c3d..1a1b01fd 100644 --- a/lib/pages/views/search_view.dart +++ b/lib/pages/views/search_view.dart @@ -139,7 +139,9 @@ class SearchView extends StatelessWidget { ); } if (snapshot.connectionState != ConnectionState.done) { - return Center(child: CircularProgressIndicator()); + return Center( + child: CircularProgressIndicator.adaptive( + strokeWidth: 2)); } final publicRoomsResponse = snapshot.data; if (publicRoomsResponse.chunk.isEmpty) { diff --git a/lib/pages/views/settings_3pid_view.dart b/lib/pages/views/settings_3pid_view.dart index 90b5849a..86caddd9 100644 --- a/lib/pages/views/settings_3pid_view.dart +++ b/lib/pages/views/settings_3pid_view.dart @@ -39,7 +39,8 @@ class Settings3PidView extends StatelessWidget { ); } if (!snapshot.hasData) { - return Center(child: CircularProgressIndicator()); + return Center( + child: CircularProgressIndicator.adaptive(strokeWidth: 2)); } final identifier = snapshot.data; return Column( diff --git a/lib/pages/views/settings_notifications_view.dart b/lib/pages/views/settings_notifications_view.dart index d0554ac1..79b78b99 100644 --- a/lib/pages/views/settings_notifications_view.dart +++ b/lib/pages/views/settings_notifications_view.dart @@ -99,7 +99,9 @@ class SettingsNotificationsView extends StatelessWidget { ); } if (snapshot.connectionState != ConnectionState.done) { - Center(child: CircularProgressIndicator()); + Center( + child: CircularProgressIndicator.adaptive( + strokeWidth: 2)); } final pushers = snapshot.data ?? []; return ListView.builder( diff --git a/lib/pages/views/video_viewer_view.dart b/lib/pages/views/video_viewer_view.dart index 66fce981..f7b0c53f 100644 --- a/lib/pages/views/video_viewer_view.dart +++ b/lib/pages/views/video_viewer_view.dart @@ -41,7 +41,7 @@ class VideoViewerView extends StatelessWidget { child: controller.error != null ? Text(controller.error.toString()) : (controller.chewieController == null - ? CircularProgressIndicator(strokeWidth: 2) + ? CircularProgressIndicator.adaptive(strokeWidth: 2) : Chewie( controller: controller.chewieController, )), diff --git a/lib/widgets/connection_status_header.dart b/lib/widgets/connection_status_header.dart index 45981ead..65f1f4e2 100644 --- a/lib/widgets/connection_status_header.dart +++ b/lib/widgets/connection_status_header.dart @@ -56,7 +56,7 @@ class _ConnectionStatusHeaderState extends State { SizedBox( width: 24, height: 24, - child: CircularProgressIndicator( + child: CircularProgressIndicator.adaptive( strokeWidth: 2, value: _connected ? 1.0 : _status.progress, ), diff --git a/lib/widgets/event_content/audio_player.dart b/lib/widgets/event_content/audio_player.dart index 160d2f6c..632caf37 100644 --- a/lib/widgets/event_content/audio_player.dart +++ b/lib/widgets/event_content/audio_player.dart @@ -135,7 +135,7 @@ class _AudioPlayerState extends State { Container( width: 30, child: status == AudioPlayerStatus.downloading - ? CircularProgressIndicator(strokeWidth: 2) + ? CircularProgressIndicator.adaptive(strokeWidth: 2) : IconButton( icon: Icon( audioPlayer.state == PlayerState.PLAYING diff --git a/lib/widgets/event_content/image_bubble.dart b/lib/widgets/event_content/image_bubble.dart index 0ac3bfcf..78909c99 100644 --- a/lib/widgets/event_content/image_bubble.dart +++ b/lib/widgets/event_content/image_bubble.dart @@ -249,7 +249,7 @@ class _ImageBubbleState extends State { children: [ if (blurhash != null) blurhash, Center( - child: child ?? CircularProgressIndicator(strokeWidth: 2), + child: child ?? CircularProgressIndicator.adaptive(strokeWidth: 2), ), ], ); diff --git a/lib/widgets/profile_bottom_sheet.dart b/lib/widgets/profile_bottom_sheet.dart index 11c7a176..c09b5618 100644 --- a/lib/widgets/profile_bottom_sheet.dart +++ b/lib/widgets/profile_bottom_sheet.dart @@ -79,7 +79,8 @@ class ProfileBottomSheet extends StatelessWidget { child: snapshot.hasError ? Text(snapshot.error .toLocalizedString(context)) - : CircularProgressIndicator(), + : CircularProgressIndicator.adaptive( + strokeWidth: 2), ) : ContentBanner( profile.avatarUrl,