Lemmy
/
lemmur-app-android
mirror of https://github.com/krawieck/lemmur/
1
0
Fork 0
Code Issues Releases Wiki Activity

Use `CircularProgressIndicator.adaptive` where possible (#269)

This commit is contained in:
Filip Krawczyk 2021-10-24 16:28:25 +02:00 committed by GitHub
parent a38574c314
commit 08cd26867b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pages/communities_tab.dart
View File

@ -93,7 +93,7 @@ class CommunitiesTab extends HookWidget {
return Scaffold( return Scaffold(
appBar: AppBar(), appBar: AppBar(),
body: const Center( body: const Center(
child: CircularProgressIndicator(), child: CircularProgressIndicator.adaptive(),
), ),
); );
} }
@ -277,7 +277,9 @@ class _CommunitySubscribeToggle extends HookWidget {
), ),
child: delayed.loading child: delayed.loading
? const SizedBox( ? const SizedBox(
width: 20, height: 20, child: CircularProgressIndicator()) width: 20,
height: 20,
child: CircularProgressIndicator.adaptive())
: Icon( : Icon(
subbed.value ? Icons.done : Icons.add, subbed.value ? Icons.done : Icons.add,
color: subbed.value color: subbed.value

5
lib/pages/community.dart
View File

@ -96,7 +96,8 @@ class CommunityPage extends HookWidget {
child: Text('ERROR: ${fullCommunitySnap.error}'), child: Text('ERROR: ${fullCommunitySnap.error}'),
) )
] else ] else
const CircularProgressIndicator(semanticsLabel: 'loading') const CircularProgressIndicator.adaptive(
semanticsLabel: 'loading')
], ],
), ),
), ),
@ -505,7 +506,7 @@ class _FollowButton extends HookWidget {
child: SizedBox( child: SizedBox(
height: 15, height: 15,
width: 15, width: 15,
child: CircularProgressIndicator(), child: CircularProgressIndicator.adaptive(),
), ),
) )
: ElevatedButton.icon( : ElevatedButton.icon(

6
lib/pages/create_post.dart
View File

@ -170,7 +170,7 @@ class CreatePostPage extends HookWidget {
return const [ return const [
DropdownMenuItem( DropdownMenuItem(
value: -1, value: -1,
child: CircularProgressIndicator(), child: CircularProgressIndicator.adaptive(),
) )
]; ];
} }
@ -262,7 +262,7 @@ class CreatePostPage extends HookWidget {
const SizedBox(width: 5), const SizedBox(width: 5),
IconButton( IconButton(
icon: imageUploadLoading.value icon: imageUploadLoading.value
? const CircularProgressIndicator() ? const CircularProgressIndicator.adaptive()
: Icon(pictrsDeleteToken.value == null : Icon(pictrsDeleteToken.value == null
? Icons.add_photo_alternate ? Icons.add_photo_alternate
: Icons.close), : Icons.close),
@ -335,7 +335,7 @@ class CreatePostPage extends HookWidget {
onPressed: onPressed:
delayed.pending ? () {} : loggedInAction(handleSubmit), delayed.pending ? () {} : loggedInAction(handleSubmit),
child: delayed.loading child: delayed.loading
? const CircularProgressIndicator() ? const CircularProgressIndicator.adaptive()
: Text(_isEdit : Text(_isEdit
? L10n.of(context)!.edit ? L10n.of(context)!.edit
: L10n.of(context)!.post), : L10n.of(context)!.post),

5
lib/pages/instance.dart
View File

@ -58,7 +58,8 @@ class InstancePage extends HookWidget {
] else if (siteSnap.hasData && siteSnap.data!.siteView == null) ] else if (siteSnap.hasData && siteSnap.data!.siteView == null)
const Text('ERROR') const Text('ERROR')
else else
const CircularProgressIndicator(semanticsLabel: 'loading') const CircularProgressIndicator.adaptive(
semanticsLabel: 'loading')
], ],
), ),
), ),
@ -325,7 +326,7 @@ class _AboutTab extends HookWidget {
else else
const Padding( const Padding(
padding: EdgeInsets.symmetric(vertical: 10), padding: EdgeInsets.symmetric(vertical: 10),
child: CircularProgressIndicator(), child: CircularProgressIndicator.adaptive(),
), ),
ListTile( ListTile(
title: const Center(child: Text('See all')), title: const Center(child: Text('See all')),

6
lib/pages/manage_account.dart
View File

@ -77,7 +77,7 @@ class ManageAccountPage extends HookWidget {
return Center(child: Text('Error: ${userSnap.error?.toString()}')); return Center(child: Text('Error: ${userSnap.error?.toString()}'));
} }
if (!userSnap.hasData) { if (!userSnap.hasData) {
return const Center(child: CircularProgressIndicator()); return const Center(child: CircularProgressIndicator.adaptive());
} }
return _ManageAccount(user: userSnap.data!); return _ManageAccount(user: userSnap.data!);
@ -367,7 +367,7 @@ class _ManageAccount extends HookWidget {
? const SizedBox( ? const SizedBox(
width: 20, width: 20,
height: 20, height: 20,
child: CircularProgressIndicator(), child: CircularProgressIndicator.adaptive(),
) )
: Text(L10n.of(context)!.save), : Text(L10n.of(context)!.save),
), ),
@ -490,7 +490,7 @@ class _ImagePicker extends HookWidget {
? const SizedBox( ? const SizedBox(
height: 20, height: 20,
width: 20, width: 20,
child: CircularProgressIndicator()) child: CircularProgressIndicator.adaptive())
: Row( : Row(
children: const [Text('upload'), Icon(Icons.publish)], children: const [Text('upload'), Icon(Icons.publish)],
), ),

2
lib/pages/media_view.dart
View File

@ -147,7 +147,7 @@ class MediaViewPage extends HookWidget {
imageProvider: ExtendedNetworkImageProvider(url, cache: true), imageProvider: ExtendedNetworkImageProvider(url, cache: true),
heroAttributes: PhotoViewHeroAttributes(tag: url), heroAttributes: PhotoViewHeroAttributes(tag: url),
loadingBuilder: (context, event) => loadingBuilder: (context, event) =>
const Center(child: CircularProgressIndicator()), const Center(child: CircularProgressIndicator.adaptive()),
), ),
), ),
), ),

3
lib/pages/modlog_page.dart
View File

@ -56,7 +56,8 @@ class ModlogPage extends HookWidget {
future: modlogFut, future: modlogFut,
builder: (context, snapshot) { builder: (context, snapshot) {
if (!snapshot.hasData) { if (!snapshot.hasData) {
return const Center(child: CircularProgressIndicator()); return const Center(
child: CircularProgressIndicator.adaptive());
} else if (snapshot.hasError) { } else if (snapshot.hasError) {
return Center( return Center(
child: Text('Error: ${snapshot.error?.toString()}')); child: Text('Error: ${snapshot.error?.toString()}'));

2
lib/pages/settings/add_account.dart
View File

@ -157,7 +157,7 @@ class AddAccountPage extends HookWidget {
: SizedBox( : SizedBox(
width: 20, width: 20,
height: 20, height: 20,
child: CircularProgressIndicator( child: CircularProgressIndicator.adaptive(
valueColor: valueColor:
AlwaysStoppedAnimation<Color>(theme.canvasColor), AlwaysStoppedAnimation<Color>(theme.canvasColor),
), ),

2
lib/pages/settings/add_instance.dart
View File

@ -120,7 +120,7 @@ class AddInstancePage extends HookWidget {
: SizedBox( : SizedBox(
height: 20, height: 20,
width: 20, width: 20,
child: CircularProgressIndicator( child: CircularProgressIndicator.adaptive(
valueColor: valueColor:
AlwaysStoppedAnimation<Color>(theme.canvasColor), AlwaysStoppedAnimation<Color>(theme.canvasColor),
), ),

2
lib/pages/settings/settings.dart
View File

@ -240,7 +240,7 @@ class _AccountOptions extends HookWidget {
? const SizedBox( ? const SizedBox(
height: 25, height: 25,
width: 25, width: 25,
child: CircularProgressIndicator(), child: CircularProgressIndicator.adaptive(),
) )
: const Icon(Icons.cloud_download), : const Icon(Icons.cloud_download),
title: const Text('Import settings to lemmur'), title: const Text('Import settings to lemmur'),

2
lib/pages/user.dart
View File

@ -32,7 +32,7 @@ class UserPage extends HookWidget {
} else if (userDetailsSnap.hasError) { } else if (userDetailsSnap.hasError) {
return const Center(child: Text('Could not find that user.')); return const Center(child: Text('Could not find that user.'));
} else { } else {
return const Center(child: CircularProgressIndicator()); return const Center(child: CircularProgressIndicator.adaptive());
} }
}(); }();

2
lib/pages/write_message.dart
View File

@ -124,7 +124,7 @@ class WriteMessagePage extends HookWidget {
? const SizedBox( ? const SizedBox(
height: 20, height: 20,
width: 20, width: 20,
child: CircularProgressIndicator()) child: CircularProgressIndicator.adaptive())
: Text(submit), : Text(submit),
), ),
), ),

3
lib/widgets/comment/comment.dart
View File

@ -256,7 +256,8 @@ class _CommentWidget extends StatelessWidget {
if (store.votingState.isLoading) if (store.votingState.isLoading)
SizedBox.fromSize( SizedBox.fromSize(
size: const Size.square(16), size: const Size.square(16),
child: const CircularProgressIndicator(), child: const CircularProgressIndicator
.adaptive(),
) )
else if (configStore.showScores) else if (configStore.showScores)
Text( Text(

2
lib/widgets/comment/comment_more_menu_button.dart
View File

@ -145,7 +145,7 @@ class _CommentMoreMenuPopup extends HookWidget {
? const SizedBox( ? const SizedBox(
height: 20, height: 20,
width: 20, width: 20,
child: CircularProgressIndicator(), child: CircularProgressIndicator.adaptive(),
) )
: const Icon(Icons.block), : const Icon(Icons.block),
title: Text( title: Text(

4
lib/widgets/infinite_scroll.dart
View File

@ -52,8 +52,8 @@ class InfiniteScroll<T> extends HookWidget {
this.batchSize = 10, this.batchSize = 10,
this.leading = const SizedBox.shrink(), this.leading = const SizedBox.shrink(),
this.padding, this.padding,
this.loadingWidget = this.loadingWidget = const ListTile(
const ListTile(title: Center(child: CircularProgressIndicator())), title: Center(child: CircularProgressIndicator.adaptive())),
required this.itemBuilder, required this.itemBuilder,
required this.fetcher, required this.fetcher,
this.controller, this.controller,

2
lib/widgets/tile_action.dart
View File

@ -34,7 +34,7 @@ class TileAction extends StatelessWidget {
icon: delayedLoading?.loading ?? loading icon: delayedLoading?.loading ?? loading
? SizedBox.fromSize( ? SizedBox.fromSize(
size: const Size.square(22), size: const Size.square(22),
child: const CircularProgressIndicator(), child: const CircularProgressIndicator.adaptive(),
) )
: Icon( : Icon(
icon, icon,

2
lib/widgets/user_profile.dart
View File

@ -48,7 +48,7 @@ class UserProfile extends HookWidget {
}, [userId, instanceHost]); }, [userId, instanceHost]);
if (!userDetailsSnap.hasData) { if (!userDetailsSnap.hasData) {
return const Center(child: CircularProgressIndicator()); return const Center(child: CircularProgressIndicator.adaptive());
} else if (userDetailsSnap.hasError) { } else if (userDetailsSnap.hasError) {
return Center( return Center(
child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [ child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [

2
lib/widgets/write_comment.dart
View File

@ -123,7 +123,7 @@ class WriteComment extends HookWidget {
onPressed: onPressed:
delayed.pending ? () {} : loggedInAction(handleSubmit), delayed.pending ? () {} : loggedInAction(handleSubmit),
child: delayed.loading child: delayed.loading
? const CircularProgressIndicator() ? const CircularProgressIndicator.adaptive()
: Text(_isEdit : Text(_isEdit
? L10n.of(context)!.edit ? L10n.of(context)!.edit
: L10n.of(context)!.post), : L10n.of(context)!.post),