GitLab
/
fluffychat
mirror of https://gitlab.com/famedly/fluffychat.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CircularProgressIndicator.adaptive(

This commit is contained in:
Krille Fear 2021-10-10 13:38:06 +02:00
parent eca3905e0c
commit 4ab57c2900
16 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/pages/key_verification_dialog.dart
View File

@ -222,9 +222,7 @@ class _KeyVerificationPageState extends State<KeyVerificationDialog> {
children: <Widget>[ children: <Widget>[
Image.asset('assets/verification.png', fit: BoxFit.contain), Image.asset('assets/verification.png', fit: BoxFit.contain),
const SizedBox(height: 16), const SizedBox(height: 16),
PlatformInfos.isCupertinoStyle CircularProgressIndicator.adaptive(strokeWidth: 2),
? CupertinoActivityIndicator()
: CircularProgressIndicator(),
const SizedBox(height: 16), const SizedBox(height: 16),
Text( Text(
L10n.of(context).waitingPartnerAcceptRequest, L10n.of(context).waitingPartnerAcceptRequest,
@ -307,9 +305,7 @@ class _KeyVerificationPageState extends State<KeyVerificationDialog> {
body = Column( body = Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
PlatformInfos.isCupertinoStyle CircularProgressIndicator.adaptive(strokeWidth: 2),
? CupertinoActivityIndicator()
: CircularProgressIndicator(),
SizedBox(height: 10), SizedBox(height: 10),
Text( Text(
acceptText, acceptText,

3
lib/pages/views/archive_view.dart
View File

@ -37,7 +37,8 @@ class ArchiveView extends StatelessWidget {
)); ));
} }
if (!snapshot.hasData) { if (!snapshot.hasData) {
return Center(child: CircularProgressIndicator()); return Center(
child: CircularProgressIndicator.adaptive(strokeWidth: 2));
} else { } else {
controller.archive = snapshot.data; controller.archive = snapshot.data;
if (controller.archive.isEmpty) { if (controller.archive.isEmpty) {

4
lib/pages/views/chat_encryption_settings_view.dart
View File

@ -54,7 +54,9 @@ class ChatEncryptionSettingsView extends StatelessWidget {
); );
} }
if (!snapshot.hasData) { if (!snapshot.hasData) {
return Center(child: CircularProgressIndicator()); return Center(
child:
CircularProgressIndicator.adaptive(strokeWidth: 2));
} }
final deviceKeys = snapshot.data; final deviceKeys = snapshot.data;
return ListView.builder( return ListView.builder(

4
lib/pages/views/chat_permissions_settings_view.dart
View File

@ -104,7 +104,9 @@ class ChatPermissionsSettingsView extends StatelessWidget {
future: room.client.getCapabilities(), future: room.client.getCapabilities(),
builder: (context, snapshot) { builder: (context, snapshot) {
if (!snapshot.hasData) { if (!snapshot.hasData) {
return Center(child: CircularProgressIndicator()); return Center(
child: CircularProgressIndicator.adaptive(
strokeWidth: 2));
} }
final String roomVersion = room final String roomVersion = room
.getState(EventTypes.RoomCreate) .getState(EventTypes.RoomCreate)

6
lib/pages/views/chat_view.dart
View File

@ -243,7 +243,8 @@ class ChatView extends StatelessWidget {
builder: (BuildContext context, snapshot) { builder: (BuildContext context, snapshot) {
if (controller.timeline == null) { if (controller.timeline == null) {
return Center( 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 return i == controller.filteredEvents.length + 1
? controller.timeline.isRequestingHistory ? controller.timeline.isRequestingHistory
? Center( ? Center(
child: CircularProgressIndicator(), child: CircularProgressIndicator
.adaptive(),
) )
: controller.canLoadMore : controller.canLoadMore
? Center( ? Center(

5
lib/pages/views/device_settings_view.dart
View File

@ -33,7 +33,8 @@ class DevicesSettingsView extends StatelessWidget {
); );
} }
if (!snapshot.hasData || controller.devices == null) { if (!snapshot.hasData || controller.devices == null) {
return Center(child: CircularProgressIndicator()); return Center(
child: CircularProgressIndicator.adaptive(strokeWidth: 2));
} }
return Column( return Column(
children: <Widget>[ children: <Widget>[
@ -55,7 +56,7 @@ class DevicesSettingsView extends StatelessWidget {
style: TextStyle(color: Colors.red), style: TextStyle(color: Colors.red),
), ),
trailing: controller.loadingDeletingDevices trailing: controller.loadingDeletingDevices
? CircularProgressIndicator() ? CircularProgressIndicator.adaptive(strokeWidth: 2)
: Icon(Icons.delete_outline), : Icon(Icons.delete_outline),
onTap: controller.loadingDeletingDevices onTap: controller.loadingDeletingDevices
? null ? null

7
lib/pages/views/homeserver_picker_view.dart
View File

@ -49,7 +49,8 @@ class HomeserverPickerView extends StatelessWidget {
child: FluffyBanner(), child: FluffyBanner(),
), ),
controller.isLoading controller.isLoading
? Center(child: CircularProgressIndicator()) ? Center(
child: CircularProgressIndicator.adaptive(strokeWidth: 2))
: controller.error != null : controller.error != null
? Center( ? Center(
child: Padding( child: Padding(
@ -76,7 +77,9 @@ class HomeserverPickerView extends StatelessWidget {
); );
} }
if (!snapshot.hasData) { if (!snapshot.hasData) {
return Center(child: CircularProgressIndicator()); return Center(
child: CircularProgressIndicator.adaptive(
strokeWidth: 2));
} }
return Padding( return Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(

2
lib/pages/views/invitation_selection_view.dart
View File

@ -62,7 +62,7 @@ class InvitationSelectionView extends StatelessWidget {
builder: (BuildContext context, snapshot) { builder: (BuildContext context, snapshot) {
if (!snapshot.hasData) { if (!snapshot.hasData) {
return Center( return Center(
child: CircularProgressIndicator(), child: CircularProgressIndicator.adaptive(strokeWidth: 2),
); );
} }
final contacts = snapshot.data; final contacts = snapshot.data;

4
lib/pages/views/search_view.dart
View File

@ -139,7 +139,9 @@ class SearchView extends StatelessWidget {
); );
} }
if (snapshot.connectionState != ConnectionState.done) { if (snapshot.connectionState != ConnectionState.done) {
return Center(child: CircularProgressIndicator()); return Center(
child: CircularProgressIndicator.adaptive(
strokeWidth: 2));
} }
final publicRoomsResponse = snapshot.data; final publicRoomsResponse = snapshot.data;
if (publicRoomsResponse.chunk.isEmpty) { if (publicRoomsResponse.chunk.isEmpty) {

3
lib/pages/views/settings_3pid_view.dart
View File

@ -39,7 +39,8 @@ class Settings3PidView extends StatelessWidget {
); );
} }
if (!snapshot.hasData) { if (!snapshot.hasData) {
return Center(child: CircularProgressIndicator()); return Center(
child: CircularProgressIndicator.adaptive(strokeWidth: 2));
} }
final identifier = snapshot.data; final identifier = snapshot.data;
return Column( return Column(

4
lib/pages/views/settings_notifications_view.dart
View File

@ -99,7 +99,9 @@ class SettingsNotificationsView extends StatelessWidget {
); );
} }
if (snapshot.connectionState != ConnectionState.done) { if (snapshot.connectionState != ConnectionState.done) {
Center(child: CircularProgressIndicator()); Center(
child: CircularProgressIndicator.adaptive(
strokeWidth: 2));
} }
final pushers = snapshot.data ?? []; final pushers = snapshot.data ?? [];
return ListView.builder( return ListView.builder(

2
lib/pages/views/video_viewer_view.dart
View File

@ -41,7 +41,7 @@ class VideoViewerView extends StatelessWidget {
child: controller.error != null child: controller.error != null
? Text(controller.error.toString()) ? Text(controller.error.toString())
: (controller.chewieController == null : (controller.chewieController == null
? CircularProgressIndicator(strokeWidth: 2) ? CircularProgressIndicator.adaptive(strokeWidth: 2)
: Chewie( : Chewie(
controller: controller.chewieController, controller: controller.chewieController,
)), )),

2
lib/widgets/connection_status_header.dart
View File

@ -56,7 +56,7 @@ class _ConnectionStatusHeaderState extends State<ConnectionStatusHeader> {
SizedBox( SizedBox(
width: 24, width: 24,
height: 24, height: 24,
child: CircularProgressIndicator( child: CircularProgressIndicator.adaptive(
strokeWidth: 2, strokeWidth: 2,
value: _connected ? 1.0 : _status.progress, value: _connected ? 1.0 : _status.progress,
), ),

2
lib/widgets/event_content/audio_player.dart
View File

@ -135,7 +135,7 @@ class _AudioPlayerState extends State<AudioPlayerWidget> {
Container( Container(
width: 30, width: 30,
child: status == AudioPlayerStatus.downloading child: status == AudioPlayerStatus.downloading
? CircularProgressIndicator(strokeWidth: 2) ? CircularProgressIndicator.adaptive(strokeWidth: 2)
: IconButton( : IconButton(
icon: Icon( icon: Icon(
audioPlayer.state == PlayerState.PLAYING audioPlayer.state == PlayerState.PLAYING

2
lib/widgets/event_content/image_bubble.dart
View File

@ -249,7 +249,7 @@ class _ImageBubbleState extends State<ImageBubble> {
children: <Widget>[ children: <Widget>[
if (blurhash != null) blurhash, if (blurhash != null) blurhash,
Center( Center(
child: child ?? CircularProgressIndicator(strokeWidth: 2), child: child ?? CircularProgressIndicator.adaptive(strokeWidth: 2),
), ),
], ],
); );

3
lib/widgets/profile_bottom_sheet.dart
View File

@ -79,7 +79,8 @@ class ProfileBottomSheet extends StatelessWidget {
child: snapshot.hasError child: snapshot.hasError
? Text(snapshot.error ? Text(snapshot.error
.toLocalizedString(context)) .toLocalizedString(context))
: CircularProgressIndicator(), : CircularProgressIndicator.adaptive(
strokeWidth: 2),
) )
: ContentBanner( : ContentBanner(
profile.avatarUrl, profile.avatarUrl,