Upgrade to flutter 3.7

robertodoering · Feb 4, 2023 · de7b1b9 · de7b1b9
1 parent c480935
commit de7b1b9
Show file tree

Hide file tree

Showing 63 changed files with 628 additions and 424 deletions.
diff --git a/lib/components/about/about_page.dart b/lib/components/about/about_page.dart
@@ -112,7 +112,7 @@ class _SummaryCard extends ConsumerWidget {
  leading: const Icon(Icons.history),
  title: Text(
  'version $version',
- style: theme.textTheme.subtitle1,
+ style: theme.textTheme.titleMedium,
  ),
  borderRadius: BorderRadius.only(
  topLeft: theme.shape.radius,
@@ -163,7 +163,7 @@ class _DonationCard extends ConsumerWidget {
  child: Text(
  'if you like harpy, please consider supporting the '
  'development with a donation',
- style: theme.textTheme.subtitle2,
+ style: theme.textTheme.titleSmall,
  ),
  ),
  RbyListTile(
@@ -218,7 +218,7 @@ class _ProCard extends ConsumerWidget {
  const TextSpan(text: ' in the play store'),
  ],
  ),
- style: theme.textTheme.subtitle2,
+ style: theme.textTheme.titleSmall,
  ),
  ),
  RbyListTile(

diff --git a/lib/components/changelog/widget/changelog_dialog.dart b/lib/components/changelog/widget/changelog_dialog.dart
@@ -22,6 +22,7 @@ class ChangelogDialog extends StatelessWidget {
  await ref.read(currentChangelogProvider.future).handleError();
 
  if (data != null) {
+ // ignore: use_build_context_synchronously
  showDialog<void>(
  context: ref.context,
  builder: (_) => ChangelogDialog(data: data),

diff --git a/lib/components/changelog/widget/changelog_widget.dart b/lib/components/changelog/widget/changelog_widget.dart
@@ -22,7 +22,7 @@ class ChangelogWidget extends StatelessWidget {
  if (data.title != null) ...[
  Text(
  data.title!,
- style: theme.textTheme.subtitle1,
+ style: theme.textTheme.titleMedium,
  ),
  VerticalSpacer.normal,
  ],
@@ -61,7 +61,7 @@ class _ChangelogDate extends StatelessWidget {
 
  return Text(
  l10n.formatShortDate(date.toLocal()),
- style: theme.textTheme.subtitle2,
+ style: theme.textTheme.titleSmall,
  );
  }
 }

diff --git a/lib/components/components.dart b/lib/components/components.dart
@@ -36,7 +36,6 @@ export 'home/home_page.dart';
 export 'home/tab_configuration/model/default_home_tab_entries.dart';
 export 'home/tab_configuration/model/home_tab_configuration.dart';
 export 'home/tab_configuration/model/home_tab_entry.dart';
-export 'home/tab_configuration/model/home_tab_entry.dart';
 export 'home/tab_configuration/provider/home_tab_configuration_provider.dart';
 export 'home/tab_configuration/widgets/home_tab_add_list_card.dart';
 export 'home/tab_configuration/widgets/home_tab_customization.dart';
@@ -71,7 +70,6 @@ export 'pages/user/user_page.dart';
 export 'pagination/paginated_users/paginated_users_page.dart';
 export 'pagination/paginated_users/provider/paginated_users_provider.dart';
 export 'pagination/provider/paginated_notifier_mixin.dart';
-export 'pagination/provider/paginated_notifier_mixin.dart';
 export 'replies/provider/replies_provider.dart';
 export 'retweeters/provider/retweeters_provider.dart';
 export 'retweeters/retweeters_page.dart';
@@ -257,7 +255,6 @@ export 'widgets/loading_shimmer/sliver_loading_shimmer.dart';
 export 'widgets/loading_shimmer/trends_list_loading_shimmer.dart';
 export 'widgets/loading_shimmer/tweet_list_info_message_loading_shimmer.dart';
 export 'widgets/loading_shimmer/tweet_list_loading_shimmer.dart';
-export 'widgets/loading_shimmer/tweet_list_loading_shimmer.dart';
 export 'widgets/loading_shimmer/user_list_loading_shimmer.dart';
 export 'widgets/scroll_direction_listener.dart';
 export 'widgets/scroll_to_top.dart';

diff --git a/lib/components/compose/post_tweet/provider/post_tweet_provider.dart b/lib/components/compose/post_tweet/provider/post_tweet_provider.dart
@@ -37,7 +37,6 @@ class PostTweetNotifier extends StateNotifier<PostTweetState> with LoggerMixin {
 
  Future<void> post(
  String text, {
-
  /// The tweet hyperlink of the quoted tweet if this tweet is a quote.
  String? attachmentUrl,
 

diff --git a/lib/components/compose/post_tweet/widgets/post_tweet_dialog.dart b/lib/components/compose/post_tweet/widgets/post_tweet_dialog.dart
@@ -137,7 +137,7 @@ class _StateMessage extends StatelessWidget {
  VerticalSpacer.small,
  Text(
  state.additionalInfo!,
- style: theme.textTheme.bodyText1,
+ style: theme.textTheme.bodyLarge,
  ),
  ],
  ],

diff --git a/lib/components/compose/widgets/compose_max_length.dart b/lib/components/compose/widgets/compose_max_length.dart
@@ -52,8 +52,8 @@ class _ComposeMaxLengthState extends State<ComposeMaxLength> {
  final theme = Theme.of(context);
 
  final style = _count <= 280
- ? theme.textTheme.bodyText1
- : theme.textTheme.bodyText1?.copyWith(color: theme.errorColor);
+ ? theme.textTheme.bodyLarge
+ : theme.textTheme.bodyLarge?.copyWith(color: theme.colorScheme.error);
 
  return Text('$_count / 280', style: style);
  }

diff --git a/lib/components/compose/widgets/compose_text_field.dart b/lib/components/compose/widgets/compose_text_field.dart
@@ -25,7 +25,7 @@ class ComposeTextField extends ConsumerWidget {
  child: TextField(
  controller: _controller,
  focusNode: _focusNode,
- style: theme.textTheme.bodyText1,
+ style: theme.textTheme.bodyLarge,
  maxLines: null,
  textCapitalization: TextCapitalization.sentences,
  decoration: InputDecoration(

diff --git a/lib/components/compose/widgets/compose_tweet_card_with_parent.dart b/lib/components/compose/widgets/compose_tweet_card_with_parent.dart
@@ -68,7 +68,7 @@ class _ParentTweetCard extends ConsumerWidget {
  Expanded(
  child: Text(
  label,
- style: theme.textTheme.subtitle1,
+ style: theme.textTheme.titleMedium,
  ),
  ),
  ],

diff --git a/lib/components/custom_api/custom_api_page.dart b/lib/components/custom_api/custom_api_page.dart
@@ -107,7 +107,7 @@ class _Table extends ConsumerWidget {
  children: [
  Text(
  'key',
- style: theme.textTheme.bodyText1!.copyWith(
+ style: theme.textTheme.bodyLarge!.copyWith(
  color: theme.colorScheme.primary,
  ),
  ),
@@ -119,7 +119,7 @@ class _Table extends ConsumerWidget {
  children: [
  Text(
  'secret',
- style: theme.textTheme.bodyText1!.copyWith(
+ style: theme.textTheme.bodyLarge!.copyWith(
  color: theme.colorScheme.primary,
  ),
  ),

diff --git a/lib/components/error/error_page.dart b/lib/components/error/error_page.dart
@@ -29,7 +29,7 @@ class ErrorPage extends StatelessWidget {
  children: [
  Text(
  'oops! something went wrong',
- style: theme.textTheme.subtitle2,
+ style: theme.textTheme.titleSmall,
  ),
  VerticalSpacer.normal,
  RbyButton.text(

diff --git a/lib/components/home/tab_configuration/widgets/home_tab_reorder_card.dart b/lib/components/home/tab_configuration/widgets/home_tab_reorder_card.dart
@@ -172,7 +172,7 @@ class _HomeTabNameTextFieldState extends State<_HomeTabNameTextField> {
  borderSide: BorderSide(color: theme.dividerColor),
  ),
  ),
- style: theme.textTheme.subtitle1,
+ style: theme.textTheme.titleMedium,
  onChanged: widget.onChanged,
  );
  }

diff --git a/lib/components/home/widgets/home_drawer.dart b/lib/components/home/widgets/home_drawer.dart
@@ -127,12 +127,12 @@ class _AuthenticatedUser extends ConsumerWidget {
  children: [
  Text(
  user.name,
- style: theme.textTheme.headline5,
+ style: theme.textTheme.headlineSmall,
  ),
  VerticalSpacer.small,
  Text(
  '@${user.handle}',
- style: theme.textTheme.subtitle1,
+ style: theme.textTheme.titleMedium,
  ),
  ],
  ),

diff --git a/lib/components/home/widgets/home_tab_bar.dart b/lib/components/home/widgets/home_tab_bar.dart
@@ -85,7 +85,7 @@ class _MentionsTab extends ConsumerWidget {
  cardColor: harpyTheme.colors.alternateCardColor,
  );
 
- return Badge(
+ return HarpyBadge(
  show: state.hasNewMentions,
  child: child,
  );
@@ -99,7 +99,7 @@ class _HomeCustomizationTab extends ConsumerWidget {
  Widget build(BuildContext context, WidgetRef ref) {
  final iconTheme = IconTheme.of(context);
 
- return Badge.custom(
+ return HarpyBadge.custom(
  // analyzer false positive
  // ignore: avoid_redundant_argument_values
  show: isFree,

diff --git a/lib/components/list/show/widgets/twitter_list_card.dart b/lib/components/list/show/widgets/twitter_list_card.dart
@@ -60,7 +60,7 @@ class _ListCardTitle extends StatelessWidget {
  Flexible(
  child: Text(
  list.name,
- style: theme.textTheme.subtitle2,
+ style: theme.textTheme.titleSmall,
  softWrap: false,
  overflow: TextOverflow.fade,
  ),
@@ -87,7 +87,7 @@ class _ListDescription extends StatelessWidget {
 
  return Text(
  list.description,
- style: theme.textTheme.bodyText1,
+ style: theme.textTheme.bodyLarge,
  maxLines: 1,
  overflow: TextOverflow.ellipsis,
  );
@@ -119,7 +119,7 @@ class _ListUser extends StatelessWidget {
  Flexible(
  child: Text(
  list.user!.name,
- style: theme.textTheme.bodyText1,
+ style: theme.textTheme.bodyLarge,
  softWrap: false,
  overflow: TextOverflow.fade,
  ),
@@ -128,7 +128,7 @@ class _ListUser extends StatelessWidget {
  Text(
  '@${list.user!.handle}',
  textDirection: TextDirection.ltr,
- style: theme.textTheme.bodyText1,
+ style: theme.textTheme.bodyLarge,
  softWrap: false,
  overflow: TextOverflow.fade,
  ),

diff --git a/lib/components/pages/user/widgets/user_page_avatar.dart b/lib/components/pages/user/widgets/user_page_avatar.dart
@@ -28,7 +28,7 @@ class _UserPageAvatar extends State<UserPageAvatar> {
  void didChangeDependencies() {
  super.didChangeDependencies();
 
- _controller ??= PrimaryScrollController.of(context)
+ _controller ??= PrimaryScrollController.maybeOf(context)
  ?..addListener(_scrollListener);
  }
 
@@ -70,7 +70,7 @@ class _UserPageAvatar extends State<UserPageAvatar> {
  Positioned.fill(
  child: DecoratedBox(
  decoration: BoxDecoration(
- color: theme.backgroundColor,
+ color: theme.colorScheme.background,
  shape: BoxShape.circle,
  ),
  ),

diff --git a/lib/components/pages/user/widgets/user_page_banner.dart b/lib/components/pages/user/widgets/user_page_banner.dart
@@ -22,7 +22,7 @@ class _UserPageBannerState extends State<UserPageBanner> {
  void didChangeDependencies() {
  super.didChangeDependencies();
 
- _controller ??= PrimaryScrollController.of(context)
+ _controller ??= PrimaryScrollController.maybeOf(context)
  ?..addListener(_listener);
  }
 

diff --git a/lib/components/pages/user/widgets/user_page_info.dart b/lib/components/pages/user/widgets/user_page_info.dart
@@ -124,7 +124,7 @@ class _Handle extends ConsumerWidget {
  child: Text(
  handle,
  textDirection: TextDirection.ltr,
- style: theme.textTheme.subtitle1,
+ style: theme.textTheme.titleMedium,
  ),
  ),
  ),

diff --git a/lib/components/pages/user/widgets/user_page_metadata.dart b/lib/components/pages/user/widgets/user_page_metadata.dart
@@ -76,7 +76,7 @@ class _UrlEntry extends ConsumerWidget {
  onLongPress: () => defaultOnUrlLongPress(ref, url),
  child: Text(
  url.displayUrl,
- style: theme.textTheme.bodyText1!.copyWith(
+ style: theme.textTheme.bodyLarge!.copyWith(
  color: theme.colorScheme.secondary,
  fontWeight: FontWeight.bold,
  ),
@@ -102,7 +102,7 @@ class _Entry extends StatelessWidget {
  return IconTheme(
  data: theme.iconTheme.copyWith(size: theme.iconTheme.size! - 4),
  child: DefaultTextStyle(
- style: theme.textTheme.bodyText1!,
+ style: theme.textTheme.bodyLarge!,
  child: Row(
  children: [
  icon,

diff --git a/lib/components/search/search_page.dart b/lib/components/search/search_page.dart
@@ -52,7 +52,12 @@ class SearchPageContent extends StatelessWidget {
  ]),
  ),
  ),
- SliverToBoxAdapter(child: Divider(height: theme.spacing.base * 2)),
+ SliverToBoxAdapter(
+ child: Divider(
+ height: theme.spacing.base * 2,
+ color: theme.dividerColor,
+ ),
+ ),
  const TrendsSelectionHeader(),
  VerticalSpacer.normalSliver,
  const TrendsList(),

diff --git a/lib/components/settings/theme/custom_theme/widgets/custom_theme_background_colors.dart b/lib/components/settings/theme/custom_theme/widgets/custom_theme_background_colors.dart
@@ -20,7 +20,7 @@ class CustomThemeBackgroundColors extends ConsumerWidget {
  mainAxisSize: MainAxisSize.min,
  crossAxisAlignment: CrossAxisAlignment.start,
  children: [
- Text('background colors', style: theme.textTheme.headline4),
+ Text('background colors', style: theme.textTheme.headlineMedium),
  VerticalSpacer.normal,
  _ReorderableBackgroundColors(notifier: notifier),
  _AddBackgroundColor(notifier: notifier),

diff --git a/lib/components/settings/theme/theme_settings_page.dart b/lib/components/settings/theme/theme_settings_page.dart
@@ -256,12 +256,15 @@ class _LockedProThemes extends ConsumerWidget {
 
  return SliverList(
  delegate: SliverChildListDelegate.fixed([
- Divider(height: theme.spacing.base * 2),
+ Divider(
+ height: theme.spacing.base * 2,
+ color: theme.dividerColor,
+ ),
  Padding(
  padding: theme.spacing.symmetric(horizontal: true),
  child: Text(
  'only available for harpy pro',
- style: theme.textTheme.subtitle2?.copyWith(
+ style: theme.textTheme.titleSmall?.copyWith(
  color: theme.colorScheme.onBackground.withOpacity(.8),
  ),
  ),

diff --git a/lib/components/settings/theme/widgets/theme_card.dart b/lib/components/settings/theme/widgets/theme_card.dart
@@ -49,7 +49,7 @@ class ThemeCard extends ConsumerWidget {
  final theme = Theme.of(context);
  final brightness = ref.watch(platformBrightnessProvider);
 
- final style = harpyTheme.themeData.textTheme.subtitle2!;
+ final style = harpyTheme.themeData.textTheme.titleSmall!;
 
  Color? borderColor;
 
@@ -125,7 +125,7 @@ class LockedProThemeCard extends ConsumerWidget {
  Widget build(BuildContext context, WidgetRef ref) {
  final theme = Theme.of(context);
 
- final style = harpyTheme.themeData.textTheme.subtitle2!;
+ final style = harpyTheme.themeData.textTheme.titleSmall!;
 
  return _ThemeCardBase(
  harpyTheme: harpyTheme,
@@ -249,11 +249,11 @@ void _showThemeSelectionBottomSheet(
  ),
  if (onDelete != null)
  RbyListTile(
- leading: Icon(CupertinoIcons.delete, color: theme.errorColor),
+ leading: Icon(CupertinoIcons.delete, color: theme.colorScheme.error),
  title: Text(
  'delete',
  style: TextStyle(
- color: theme.errorColor,
+ color: theme.colorScheme.error,
  fontWeight: FontWeight.bold,
  ),
  ),

diff --git a/lib/components/setup/widgets/setup_appearance_content.dart b/lib/components/setup/widgets/setup_appearance_content.dart
@@ -44,7 +44,7 @@ class _Layout extends ConsumerWidget {
  return Column(
  crossAxisAlignment: CrossAxisAlignment.stretch,
  children: [
- Text('layout', style: theme.textTheme.headline5),
+ Text('layout', style: theme.textTheme.headlineSmall),
  const _AnimatedVerticalSpacer(),
  Row(
  children: [
@@ -102,7 +102,7 @@ class _Theme extends ConsumerWidget {
  children: [
  Text(
  'theme',
- style: theme.textTheme.headline5,
+ style: theme.textTheme.headlineSmall,
  ),
  const _AnimatedVerticalSpacer(),
  if (materialYouLightData != null) ...[