Merge branch 'main' into feat/delete-account

flutter_news_example/api/lib/src/data/static_news_data.dart

@@ -85,7 +85,7 @@ final popularArticles = <NewsItem>[
     url: Uri.parse(
       'https://nbc-2.com/news/2022/05/19/boeing-makes-third-attempt-to-launch-its-starliner-capsule-to-the-iss',
     ),
-  )
+  ),
 ];
 
 /// List of relevant search articles.
@@ -116,7 +116,7 @@ final relevantArticles = <NewsItem>[
     url: Uri.parse(
       'https://www.cnn.com/2022/05/24/health/what-is-monkeypox-virus-explainer-update-wellness',
     ),
-  )
+  ),
 ];
 
 /// Technology news items.
@@ -1232,7 +1232,7 @@ final scienceVideoItems = <NewsItem>[
     url: Uri.parse(
       'https://www.cbsnews.com/news/black-hole-audio-perseus-galaxy-cluster',
     ),
-  )
+  ),
 ];
 
 /// Top news feed blocks.

flutter_news_example/api/packages/news_blocks/lib/src/block_action.dart

@@ -13,7 +13,7 @@ enum BlockActionType {
   unknown
 }
 
-/// {@macro block_action}
+/// {@template block_action}
 /// A class which represents an action that can occur
 /// when interacting with a block.
 /// {@endtemplate}

flutter_news_example/api/packages/news_blocks/test/src/block_action_converter_test.dart

@@ -10,7 +10,7 @@ void main() {
 
       const actions = <BlockAction>[
         NavigateToArticleAction(articleId: 'articleId'),
-        NavigateToFeedCategoryAction(category: Category.top)
+        NavigateToFeedCategoryAction(category: Category.top),
       ];
 
       for (final action in actions) {

flutter_news_example/api/packages/news_blocks/test/src/news_block_test.dart

@@ -146,7 +146,7 @@ void main() {
               publishedAt: DateTime(2022, 3, 12),
               imageUrl: 'imageUrl',
               title: 'title',
-            )
+            ),
           ],
         );
 

flutter_news_example/api/packages/news_blocks/test/src/post_grid_group_block_test.dart

@@ -14,7 +14,7 @@ void main() {
             publishedAt: DateTime(2022, 3, 12),
             imageUrl: 'imageUrl',
             title: 'title',
-          )
+          ),
         ],
       );
 

flutter_news_example/api/test/src/client/flutter_news_example_api_client_test.dart

@@ -801,7 +801,7 @@ void main() {
               name: SubscriptionPlan.premium,
               cost: SubscriptionCost(annual: 4200, monthly: 42),
               benefits: ['benefit'],
-            )
+            ),
           ],
         );
         when(() => httpClient.get(any())).thenAnswer(

flutter_news_example/lib/article/view/article_page.dart

@@ -126,7 +126,7 @@ class ArticleView extends StatelessWidget {
                             .add(ShareRequested(uri: uri)),
                       ),
                     ),
-                  if (!isSubscriber) const ArticleSubscribeButton()
+                  if (!isSubscriber) const ArticleSubscribeButton(),
                 ],
               ),
               body: ArticleThemeOverride(

flutter_news_example/lib/article/widgets/article_trailing_content.dart

@@ -56,7 +56,7 @@ class ArticleTrailingContent extends StatelessWidget {
           const SliverPadding(
             padding: EdgeInsets.all(AppSpacing.lg),
             sliver: SliverToBoxAdapter(child: ArticleComments()),
-          )
+          ),
         ],
         if (isArticlePreview) ...[
           SliverList(
@@ -70,7 +70,7 @@ class ArticleTrailingContent extends StatelessWidget {
               ],
             ),
           ),
-        ]
+        ],
       ],
     );
   }

flutter_news_example/lib/home/view/home_page.dart

@@ -24,7 +24,7 @@ class HomePage extends StatelessWidget {
             newsRepository: context.read<NewsRepository>(),
           ),
         ),
-        BlocProvider(create: (_) => HomeCubit())
+        BlocProvider(create: (_) => HomeCubit()),
       ],
       child: const HomeView(),
     );

flutter_news_example/lib/login/view/login_with_email_page.dart

@@ -24,7 +24,7 @@ class LoginWithEmailPage extends StatelessWidget {
               key: const Key('loginWithEmailPage_closeIcon'),
               icon: const Icon(Icons.close),
               onPressed: () => Navigator.pop(context),
-            )
+            ),
           ],
         ),
         body: const LoginWithEmailForm(),

flutter_news_example/lib/login/widgets/login_form.dart

@@ -69,7 +69,7 @@ class _LoginContent extends StatelessWidget {
               const SizedBox(height: AppSpacing.lg),
               _TwitterLoginButton(),
               const SizedBox(height: AppSpacing.lg),
-              _ContinueWithEmailLoginButton()
+              _ContinueWithEmailLoginButton(),
             ],
           ),
         );

flutter_news_example/lib/magic_link_prompt/view/magic_link_prompt_page.dart

@@ -25,7 +25,7 @@ class MagicLinkPromptPage extends StatelessWidget {
             icon: const Icon(Icons.close),
             onPressed: () => Navigator.of(context)
                 .popUntil((route) => route.settings.name == LoginModal.name),
-          )
+          ),
         ],
       ),
       body: MagicLinkPromptView(

flutter_news_example/lib/magic_link_prompt/view/magic_link_prompt_view.dart

@@ -30,7 +30,7 @@ class MagicLinkPromptView extends StatelessWidget {
                 const SizedBox(height: AppSpacing.xxxlg),
                 MagicLinkPromptSubtitle(email: email),
                 const Spacer(),
-                MagicLinkPromptOpenEmailButton()
+                MagicLinkPromptOpenEmailButton(),
               ],
             ),
           ),

flutter_news_example/lib/navigation/widgets/nav_drawer_sections.dart

@@ -33,7 +33,7 @@ class NavDrawerSections extends StatelessWidget {
                     .read<CategoriesBloc>()
                     .add(CategorySelected(category: category));
               },
-            )
+            ),
         ],
       ],
     );

flutter_news_example/lib/onboarding/widgets/onboarding_view_item.dart

@@ -70,7 +70,7 @@ class OnboardingViewItem extends StatelessWidget {
                   const Spacer(),
                   primaryButton,
                   const SizedBox(height: AppSpacing.sm),
-                  secondaryButton
+                  secondaryButton,
                 ],
               ),
             ),

flutter_news_example/lib/search/view/search_page.dart

@@ -105,7 +105,7 @@ class _SearchViewState extends State<SearchView> {
             ),
             ...state.articles.map<Widget>(
               (newsBlock) => CategoryFeedItem(block: newsBlock),
-            )
+            ),
           ],
         );
       },

flutter_news_example/lib/slideshow/view/slideshow_view.dart

@@ -37,9 +37,9 @@ class SlideshowView extends StatelessWidget {
                     },
                   ),
                 ),
-              if (!isSubscriber) const ArticleSubscribeButton()
+              if (!isSubscriber) const ArticleSubscribeButton(),
             ],
-          )
+          ),
         ],
       ),
       backgroundColor: AppColors.darkBackground,

flutter_news_example/lib/subscriptions/widgets/subscribe_modal.dart

@@ -110,7 +110,7 @@ class _SubscribeModalState extends State<SubscribeModal> {
                   ),
                 ),
                 const SizedBox(height: AppSpacing.sm),
-              ]
+              ],
             ],
           ),
         ),

flutter_news_example/lib/subscriptions/widgets/subscription_card.dart

@@ -131,7 +131,7 @@ class SubscriptionCard extends StatelessWidget {
                     if (isLoggedIn)
                       Text(l10n.subscriptionPurchaseButton)
                     else
-                      Text(l10n.subscriptionUnauthenticatedPurchaseButton)
+                      Text(l10n.subscriptionUnauthenticatedPurchaseButton),
                   ],
                 ),
               ),

flutter_news_example/lib/terms_of_service/view/terms_of_service_page.dart

@@ -26,7 +26,7 @@ class TermsOfServicePage extends StatelessWidget {
               vertical: AppSpacing.xs,
             ),
           ),
-          SizedBox(height: AppSpacing.lg)
+          SizedBox(height: AppSpacing.lg),
         ],
       ),
     );

flutter_news_example/packages/app_ui/gallery/lib/widgets/app_back_button_page.dart

@@ -31,7 +31,7 @@ class _AppBackButtonPageState extends State<AppBackButtonPage> {
               value: _isLight,
               onChanged: (_) => setState(() => _isLight = !_isLight),
             ),
-            const Text('Default/light')
+            const Text('Default/light'),
           ],
         ),
       ),

flutter_news_example/packages/authentication_client/authentication_client/lib/src/authentication_client.dart

@@ -21,7 +21,7 @@ class SendLoginEmailLinkFailure extends AuthenticationException {
   const SendLoginEmailLinkFailure(super.error);
 }
 
-/// {@template is is_log_in_email_link_failure}
+/// {@template is_log_in_email_link_failure}
 /// Thrown during the validation of the email link process if a failure occurs.
 /// {@endtemplate}
 class IsLogInWithEmailLinkFailure extends AuthenticationException {

flutter_news_example/packages/in_app_purchase_repository/lib/src/in_app_purchase_repository.dart

@@ -87,6 +87,7 @@ class InAppPurchaseBuyNonConsumableFailure extends InAppPurchaseFailure {
 ///     flag set to true, which means that we need to deliver the content of the
 ///     product to the user and mark the purchase as completed using [completePurchase](https://pub.dev/documentation/in_app_purchase_platform_interface/latest/in_app_purchase_platform_interface/InAppPurchasePlatform/completePurchase.html)
 ///     method.
+/// {@endtemplate}
 class InAppPurchaseRepository {
   /// {@macro in_app_purchase_repository}
   InAppPurchaseRepository({

flutter_news_example/packages/in_app_purchase_repository/test/src/in_app_purchase_repository_test.dart

@@ -471,7 +471,7 @@ void main() {
             emitsInOrder(
               <Matcher>[
                 isA<PurchasePurchased>(),
-                emitsError(isA<PurchaseFailed>())
+                emitsError(isA<PurchaseFailed>()),
               ],
             ),
           );
@@ -550,7 +550,7 @@ void main() {
                 purchaseDetails.copyWith(
                   status: PurchaseStatus.pending,
                   pendingCompletePurchase: true,
-                )
+                ),
               ],
             ]),
           );
@@ -613,7 +613,7 @@ void main() {
                 purchaseDetails.copyWith(
                   status: PurchaseStatus.pending,
                   pendingCompletePurchase: true,
-                )
+                ),
               ],
             ]),
           );

flutter_news_example/packages/news_blocks_ui/lib/src/slideshow.dart

@@ -52,7 +52,7 @@ class _SlideshowState extends State<Slideshow> {
             controller: _controller,
             navigationLabel: widget.navigationLabel,
           ),
-          const SizedBox(height: AppSpacing.lg)
+          const SizedBox(height: AppSpacing.lg),
         ],
       ),
     );
@@ -197,7 +197,7 @@ class SlideshowItem extends StatelessWidget {
               color: AppColors.mediumEmphasisPrimary,
             ),
           ),
-        )
+        ),
       ],
     );
   }

flutter_news_example/packages/news_blocks_ui/lib/src/trending_story.dart

@@ -34,7 +34,7 @@ class TrendingStory extends StatelessWidget {
             style: theme.labelSmall?.apply(color: AppColors.secondary),
           ),
         ),
-        PostSmall(block: block.content)
+        PostSmall(block: block.content),
       ],
     );
   }

flutter_news_example/packages/news_blocks_ui/lib/src/widgets/lock_icon.dart

@@ -28,7 +28,7 @@ class LockIcon extends StatelessWidget {
               color: Colors.black.withOpacity(0.15),
               offset: const Offset(0, 1),
               blurRadius: 3,
-            )
+            ),
           ],
         ),
       ),

flutter_news_example/packages/news_blocks_ui/lib/src/widgets/post_content.dart

@@ -86,7 +86,7 @@ class PostContent extends StatelessWidget {
                   premiumText: premiumText,
                   isVideoContent: isVideoContent,
                 ),
-              ]
+              ],
             ],
           ),
           Text(

flutter_news_example/packages/purchase_client/lib/src/products.dart

@@ -9,5 +9,5 @@ final Map<String, ProductDetails> availableProducts = {
     price: r'$14.99',
     rawPrice: 14.99,
     currencyCode: 'USD',
-  )
+  ),
 };

flutter_news_example/packages/user_repository/lib/src/user_repository.dart

@@ -43,6 +43,7 @@ class IncrementAppOpenedCountFailure extends UserFailure {
 
 /// {@template fetch_current_subscription_failure}
 /// An exception thrown when fetching current subscription fails.
+/// {@endtemplate}
 class FetchCurrentSubscriptionFailure extends UserFailure {
   /// {@macro fetch_current_subscription_failure}
   const FetchCurrentSubscriptionFailure(super.error);

flutter_news_example/test/app/bloc/app_bloc_test.dart

@@ -343,7 +343,7 @@ void main() {
           AppState(
             showLoginOverlay: true,
             status: AppStatus.unauthenticated,
-          )
+          ),
         ],
         verify: (_) {
           verify(

flutter_news_example/test/app/routes/routes_test.dart

@@ -14,7 +14,7 @@ void main() {
             (p) => p.child,
             'child',
             isA<OnboardingPage>(),
-          )
+          ),
         ],
       );
     });
@@ -27,7 +27,7 @@ void main() {
             (p) => p.child,
             'child',
             isA<HomePage>(),
-          )
+          ),
         ],
       );
     });
@@ -40,7 +40,7 @@ void main() {
             (p) => p.child,
             'child',
             isA<HomePage>(),
-          )
+          ),
         ],
       );
     });

flutter_news_example/test/article/bloc/article_bloc_test.dart

@@ -145,7 +145,7 @@ void main() {
             contentTotalCount: articleResponse.totalCount,
             relatedArticles: relatedArticlesResponse.relatedArticles,
             hasMoreContent: false,
-          )
+          ),
         ],
       );