diff --git a/lib/api/translate/data/languages.dart b/lib/api/translate/data/languages.dart
index 5d9710805..e4b8eca4a 100644
--- a/lib/api/translate/data/languages.dart
+++ b/lib/api/translate/data/languages.dart
@@ -104,7 +104,7 @@ const kTranslateLanguages = {
   'xh': 'Xhosa',
   'yi': 'Yiddish',
   'yo': 'Yoruba',
-  'zu': 'Zulu'
+  'zu': 'Zulu',
 };
 
 /// Returns the language code used by the translate service from the app
diff --git a/lib/components/home/tab_configuration/widgets/home_tab_icon_dialog.dart b/lib/components/home/tab_configuration/widgets/home_tab_icon_dialog.dart
index b3d4e5046..0245f5016 100644
--- a/lib/components/home/tab_configuration/widgets/home_tab_icon_dialog.dart
+++ b/lib/components/home/tab_configuration/widgets/home_tab_icon_dialog.dart
@@ -19,8 +19,8 @@ class HomeTabIconDialog extends StatelessWidget {
         runSpacing: 4,
         children: [
           if (entry.name.isNotEmpty) _IconButton(iconName: entry.name[0]),
-          for (String iconName in HomeTabEntryIcon.iconNameMap.keys)
-            _IconButton(iconName: iconName)
+          for (final String iconName in HomeTabEntryIcon.iconNameMap.keys)
+            _IconButton(iconName: iconName),
         ],
       ),
     );
diff --git a/lib/components/home/widgets/home_drawer.dart b/lib/components/home/widgets/home_drawer.dart
index 1980ad65e..9d593468e 100644
--- a/lib/components/home/widgets/home_drawer.dart
+++ b/lib/components/home/widgets/home_drawer.dart
@@ -136,7 +136,7 @@ class _AuthenticatedUser extends ConsumerWidget {
                     ),
                   ],
                 ),
-              )
+              ),
             ],
           ),
         ),
diff --git a/lib/components/list/show/widgets/twitter_lists.dart b/lib/components/list/show/widgets/twitter_lists.dart
index df2dee78a..7c561b12f 100644
--- a/lib/components/list/show/widgets/twitter_lists.dart
+++ b/lib/components/list/show/widgets/twitter_lists.dart
@@ -169,7 +169,7 @@ void _showListActionBottomSheet(
             queryParams: {'name': list.name},
           );
         },
-      )
+      ),
     ],
   );
 }
diff --git a/lib/components/retweeters/retweeters_page.dart b/lib/components/retweeters/retweeters_page.dart
index 5a3dc3c6f..203c48d81 100644
--- a/lib/components/retweeters/retweeters_page.dart
+++ b/lib/components/retweeters/retweeters_page.dart
@@ -21,7 +21,7 @@ class RetweetersPage extends ConsumerWidget {
           child: LegacyUserList(
             state.whenOrNull(data: (users) => users.toList()) ?? [],
             beginSlivers: const [
-              HarpySliverAppBar(title: Text('retweeted by'))
+              HarpySliverAppBar(title: Text('retweeted by')),
             ],
             endSlivers: [
               ...?state.whenOrNull(
diff --git a/lib/components/search/tweet/tweet_search_page.dart b/lib/components/search/tweet/tweet_search_page.dart
index 6e7c5bfbd..1b7335ec3 100644
--- a/lib/components/search/tweet/tweet_search_page.dart
+++ b/lib/components/search/tweet/tweet_search_page.dart
@@ -82,7 +82,7 @@ class _TweetSearchPageState extends ConsumerState<TweetSearchPage> {
                             notifier: notifier,
                           ),
                         ),
-                      )
+                      ),
                     ],
                     loading: (_) => const [
                       VerticalSpacer.normalSliver,
diff --git a/lib/components/search/tweet/widgets/tweet_search_filter.dart b/lib/components/search/tweet/widgets/tweet_search_filter.dart
index e4ed1c119..156ec3af7 100644
--- a/lib/components/search/tweet/widgets/tweet_search_filter.dart
+++ b/lib/components/search/tweet/widgets/tweet_search_filter.dart
@@ -94,7 +94,7 @@ class _InvalidFilterInfo extends StatelessWidget {
                           color: theme.colorScheme.onBackground.withOpacity(.7),
                         ),
                       ),
-                    )
+                    ),
                   ],
                 ),
               )
diff --git a/lib/components/settings/display/display_settings_page.dart b/lib/components/settings/display/display_settings_page.dart
index 1e62e2f6e..a581a0024 100644
--- a/lib/components/settings/display/display_settings_page.dart
+++ b/lib/components/settings/display/display_settings_page.dart
@@ -43,7 +43,7 @@ class DisplaySettingsPage extends ConsumerWidget {
               Padding(
                 padding: theme.spacing.edgeInsets.copyWith(top: 0),
                 child: const _DisplaySettingsList(),
-              )
+              ),
             ]),
           ),
           const SliverBottomPadding(),
diff --git a/lib/components/settings/theme/theme_settings_page.dart b/lib/components/settings/theme/theme_settings_page.dart
index 5a1799b72..e8bab3136 100644
--- a/lib/components/settings/theme/theme_settings_page.dart
+++ b/lib/components/settings/theme/theme_settings_page.dart
@@ -276,7 +276,7 @@ class _LockedProThemes extends ConsumerWidget {
             child: LockedProThemeCard(harpyTheme),
           ),
           VerticalSpacer.small,
-        ]
+        ],
       ]),
     );
   }
diff --git a/lib/components/settings/theme/widgets/theme_card.dart b/lib/components/settings/theme/widgets/theme_card.dart
index 2b0a867e1..9553c303f 100644
--- a/lib/components/settings/theme/widgets/theme_card.dart
+++ b/lib/components/settings/theme/widgets/theme_card.dart
@@ -196,7 +196,7 @@ class _ThemeCardBase extends StatelessWidget {
           ? harpyTheme.colors.backgroundColors.toList()
           : [
               harpyTheme.colors.backgroundColors.first,
-              harpyTheme.colors.backgroundColors.first
+              harpyTheme.colors.backgroundColors.first,
             ],
     );
 
diff --git a/lib/components/setup/widgets/setup_appearance_content.dart b/lib/components/setup/widgets/setup_appearance_content.dart
index 1415dce4c..d178a84db 100644
--- a/lib/components/setup/widgets/setup_appearance_content.dart
+++ b/lib/components/setup/widgets/setup_appearance_content.dart
@@ -70,7 +70,7 @@ class _Layout extends ConsumerWidget {
               ),
             ),
           ],
-        )
+        ),
       ],
     );
   }
diff --git a/lib/components/timeline/filter/widgets/timeline_filter_card.dart b/lib/components/timeline/filter/widgets/timeline_filter_card.dart
index 3eca8a448..074dce2a2 100644
--- a/lib/components/timeline/filter/widgets/timeline_filter_card.dart
+++ b/lib/components/timeline/filter/widgets/timeline_filter_card.dart
@@ -160,7 +160,7 @@ class _AppliedFiltersText extends StatelessWidget {
               style: style,
             ),
             if (filter != filters.last) TextSpan(text: ', ', style: style),
-          ]
+          ],
         ],
       ),
       maxLines: 1,
diff --git a/lib/components/trends/widgets/trends_location_selection_dialog.dart b/lib/components/trends/widgets/trends_location_selection_dialog.dart
index e264ceef9..be0fb97d0 100644
--- a/lib/components/trends/widgets/trends_location_selection_dialog.dart
+++ b/lib/components/trends/widgets/trends_location_selection_dialog.dart
@@ -69,7 +69,7 @@ class _LocationSelectionDialogState
               padding: theme.spacing.edgeInsets,
               alignment: AlignmentDirectional.center,
               child: const CircularProgressIndicator(),
-            )
+            ),
         ],
       ),
     );
diff --git a/lib/components/trends/widgets/trends_selection_header.dart b/lib/components/trends/widgets/trends_selection_header.dart
index 20c0bb76e..03840bdd8 100644
--- a/lib/components/trends/widgets/trends_selection_header.dart
+++ b/lib/components/trends/widgets/trends_selection_header.dart
@@ -45,7 +45,7 @@ class TrendsSelectionHeader extends ConsumerWidget {
                       UserScrollDirection.of(context)?.idle();
                       notifier.load();
                     },
-            )
+            ),
           ],
         ),
       ),
diff --git a/lib/components/tweet/widgets/card_content/tweet_card_link_preview.dart b/lib/components/tweet/widgets/card_content/tweet_card_link_preview.dart
index 98a95e262..377e07840 100644
--- a/lib/components/tweet/widgets/card_content/tweet_card_link_preview.dart
+++ b/lib/components/tweet/widgets/card_content/tweet_card_link_preview.dart
@@ -218,7 +218,7 @@ class _LinkPreviewText extends StatelessWidget {
             maxLines: 1,
             overflow: TextOverflow.visible,
             style: theme.textTheme.bodySmall?.apply(fontSizeDelta: -4),
-          )
+          ),
         ],
       ),
     );
diff --git a/lib/components/tweet/widgets/card_content/tweet_card_name.dart b/lib/components/tweet/widgets/card_content/tweet_card_name.dart
index 87661dcbe..557484afc 100644
--- a/lib/components/tweet/widgets/card_content/tweet_card_name.dart
+++ b/lib/components/tweet/widgets/card_content/tweet_card_name.dart
@@ -44,7 +44,7 @@ class TweetCardName extends ConsumerWidget {
                 CupertinoIcons.checkmark_seal_fill,
                 size: 16 + style.sizeDelta,
               ),
-            ]
+            ],
           ],
         ),
       ),
diff --git a/lib/components/tweet/widgets/card_content/tweet_card_top_row.dart b/lib/components/tweet/widgets/card_content/tweet_card_top_row.dart
index b82324be7..8f35ebaf0 100644
--- a/lib/components/tweet/widgets/card_content/tweet_card_top_row.dart
+++ b/lib/components/tweet/widgets/card_content/tweet_card_top_row.dart
@@ -96,7 +96,7 @@ class TweetCardTopRow extends ConsumerWidget {
                             ),
                         ],
                       ),
-                    )
+                    ),
                   ],
                 ),
               ),
diff --git a/lib/components/tweet/widgets/media/tweet_images.dart b/lib/components/tweet/widgets/media/tweet_images.dart
index 46ca09d8f..43f19d8ab 100644
--- a/lib/components/tweet/widgets/media/tweet_images.dart
+++ b/lib/components/tweet/widgets/media/tweet_images.dart
@@ -152,7 +152,7 @@ Widget _flightShuttleBuilder(
     animation: animation,
     builder: (_, __) => ClipRRect(
       clipBehavior: Clip.hardEdge,
-      borderRadius: tween.evaluate(animation),
+      borderRadius: tween.evaluate(animation)!,
       child: hero.child,
     ),
   );
diff --git a/lib/components/widgets/badge.dart b/lib/components/widgets/badge.dart
index 6f50a2aa5..2339fae74 100644
--- a/lib/components/widgets/badge.dart
+++ b/lib/components/widgets/badge.dart
@@ -32,7 +32,7 @@ class HarpyBadge extends StatelessWidget {
           Transform.translate(
             offset: offset,
             child: IgnorePointer(child: badge),
-          )
+          ),
       ],
     );
   }
diff --git a/lib/components/widgets/filter/filter_list_entry.dart b/lib/components/widgets/filter/filter_list_entry.dart
index 6167ea036..627f673e1 100644
--- a/lib/components/widgets/filter/filter_list_entry.dart
+++ b/lib/components/widgets/filter/filter_list_entry.dart
@@ -76,9 +76,9 @@ class _FilterListEntryState extends ConsumerState<FilterListEntry> {
                   materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
                   onDeleted: () => widget.onDeleted(i),
                 ),
-              )
+              ),
           ],
-        )
+        ),
       ];
     }
 
diff --git a/lib/components/widgets/harpy_photo_gallery.dart b/lib/components/widgets/harpy_photo_gallery.dart
index b26766943..1986621f7 100644
--- a/lib/components/widgets/harpy_photo_gallery.dart
+++ b/lib/components/widgets/harpy_photo_gallery.dart
@@ -63,7 +63,7 @@ Widget borderRadiusFlightShuttleBuilder(
     animation: animation,
     builder: (_, __) => ClipRRect(
       clipBehavior: Clip.hardEdge,
-      borderRadius: tween.evaluate(animation),
+      borderRadius: tween.evaluate(animation)!,
       child: hero.child,
     ),
   );
@@ -75,9 +75,7 @@ PhotoViewScaleState _scaleStateCycle(PhotoViewScaleState actual) {
     case PhotoViewScaleState.covering:
     case PhotoViewScaleState.originalSize:
     case PhotoViewScaleState.zoomedOut:
-      return PhotoViewScaleState.zoomOne;
-    case PhotoViewScaleState.zoomOne:
-    case PhotoViewScaleState.zoomTwo:
+      return PhotoViewScaleState.zoomedIn;
     case PhotoViewScaleState.zoomedIn:
       return PhotoViewScaleState.initial;
   }
diff --git a/lib/components/widgets/harpy_radio_dialog_tile.dart b/lib/components/widgets/harpy_radio_dialog_tile.dart
index 6c9f2e77b..a282a0b8b 100644
--- a/lib/components/widgets/harpy_radio_dialog_tile.dart
+++ b/lib/components/widgets/harpy_radio_dialog_tile.dart
@@ -52,7 +52,7 @@ class HarpyRadioDialogTile<T> extends ConsumerWidget {
                     Navigator.of(context).pop();
                     if (value != groupValue) onChanged?.call(value);
                   },
-                )
+                ),
             ],
           ),
         ),
diff --git a/lib/components/widgets/loading_shimmer/tweet_list_loading_shimmer.dart b/lib/components/widgets/loading_shimmer/tweet_list_loading_shimmer.dart
index a7ff544d5..3f26018d0 100644
--- a/lib/components/widgets/loading_shimmer/tweet_list_loading_shimmer.dart
+++ b/lib/components/widgets/loading_shimmer/tweet_list_loading_shimmer.dart
@@ -62,7 +62,7 @@ class TweetPlaceholder extends StatelessWidget {
                   PlaceholderBox(widthFactor: .5, height: 15),
                 ],
               ),
-            )
+            ),
           ],
         ),
         VerticalSpacer.normal,
diff --git a/lib/components/widgets/tab_bar/harpy_tab_bar.dart b/lib/components/widgets/tab_bar/harpy_tab_bar.dart
index 61b3b84e9..9e9aee923 100644
--- a/lib/components/widgets/tab_bar/harpy_tab_bar.dart
+++ b/lib/components/widgets/tab_bar/harpy_tab_bar.dart
@@ -148,7 +148,7 @@ class _HarpyTapBarState extends ConsumerState<HarpyTabBar> {
               if (i != widget.tabs.length - 1) HorizontalSpacer.small,
             ],
             if (widget.endWidgets != null) ...[
-              for (Widget widget in widget.endWidgets!) ...[
+              for (final Widget widget in widget.endWidgets!) ...[
                 HorizontalSpacer.small,
                 widget,
               ],
diff --git a/test/api/twitter/handle_tweets_test.dart b/test/api/twitter/handle_tweets_test.dart
index ab0fcee24..35eaa4486 100644
--- a/test/api/twitter/handle_tweets_test.dart
+++ b/test/api/twitter/handle_tweets_test.dart
@@ -53,7 +53,7 @@ void main() {
           Tweet()
             ..idStr = '2'
             ..inReplyToStatusIdStr = '1',
-          Tweet()..idStr = '1'
+          Tweet()..idStr = '1',
         ]);
 
         expect(tweets.length, equals(1));
diff --git a/test/components/tweet/tweet_card_test.dart b/test/components/tweet/tweet_card_test.dart
index 149635143..38f5c1836 100644
--- a/test/components/tweet/tweet_card_test.dart
+++ b/test/components/tweet/tweet_card_test.dart
@@ -307,7 +307,7 @@ void main() {
                     ..aspectRatio = [16, 9]
                     ..variants = [])
                   ..mediaUrlHttps = 'blue.png',
-              )
+              ),
             ],
           ),
         ),