Fix lint warnings

daohoangson · daohoangson · commit 548614ad7997 · 2023-08-12T10:07:07.000+07:00
diff --git a/lib/src/api.dart b/lib/src/api.dart
@@ -108,10 +108,10 @@ void _setupApiCompleter<T>(
   ApiOnError? onError,
   VoidCallback? onComplete,
 ) {
-  var f = completer.future;
+  Future<void> f = completer.future;
 
   if (onSuccess != null) {
-    f = f.then(
+    f = completer.future.then(
       (data) => (caller.canReceiveCallback) ? onSuccess(data) : data,
     );
   }
diff --git a/lib/src/screens/initial_path.dart b/lib/src/screens/initial_path.dart
@@ -32,6 +32,7 @@ class _InitialPathState extends State<InitialPathScreen>
       defaultWidget: widget.defaultWidget,
     ).catchError((error) async {
       await showApiErrorDialog(context, error);
+      return const SizedBox.shrink();
     }).then((built) {
       if (built != null) return built;
 
diff --git a/lib/src/widgets/app_bar.dart b/lib/src/widgets/app_bar.dart
@@ -68,15 +68,15 @@ class AppBarDrawerHeader extends StatelessWidget {
 
   TextSpan _compileUserRank(BuildContext context, User user) => TextSpan(
         text: " ${user.rank?.rankName ?? ''}",
-        style: Theme.of(context).textTheme.subtitle1?.copyWith(
+        style: Theme.of(context).textTheme.titleMedium?.copyWith(
               color: Theme.of(context).hintColor,
               fontWeight: FontWeight.bold,
             ),
       );
 
   TextSpan _compileUsername(BuildContext context, User user) => TextSpan(
         text: user.username ?? '',
-        style: Theme.of(context).textTheme.headline6?.copyWith(
+        style: Theme.of(context).textTheme.titleLarge?.copyWith(
               color: Theme.of(context).colorScheme.secondary,
             ),
       );
diff --git a/lib/src/widgets/attachment_editor.dart b/lib/src/widgets/attachment_editor.dart
@@ -107,7 +107,7 @@ class AttachmentEditorState extends State<AttachmentEditorWidget> {
         message: l(context).pickGallery,
         child: InkWell(
           child: Container(
-            color: Theme.of(context).backgroundColor,
+            color: Theme.of(context).colorScheme.background,
             padding: const EdgeInsets.symmetric(horizontal: 5.0),
             child: AspectRatio(
               aspectRatio: 1.0,
diff --git a/lib/src/widgets/font_control.dart b/lib/src/widgets/font_control.dart
@@ -137,7 +137,7 @@ class _FontControlState extends State<FontControlWidget> with RouteAware {
 
   void _menuOpen() {
     final overlayEntry = _overlayEntry = _buildOverlayEntry();
-    Overlay.of(context)?.insert(overlayEntry);
+    Overlay.of(context).insert(overlayEntry);
     _isMenuOpen = true;
   }
 }
diff --git a/lib/src/widgets/home/header.dart b/lib/src/widgets/home/header.dart
@@ -10,7 +10,7 @@ class HeaderWidget extends StatelessWidget {
         padding: const EdgeInsets.all(10.0),
         child: Text(
           text,
-          style: Theme.of(context).textTheme.headline6,
+          style: Theme.of(context).textTheme.titleLarge,
         ),
       );
 }
diff --git a/lib/src/widgets/home/thread.dart b/lib/src/widgets/home/thread.dart
@@ -41,7 +41,7 @@ class HomeThreadWidget extends StatelessWidget {
                       _buildTitle(),
                       const SizedBox(height: 5),
                       isWide
-                          ? _buildSnippet(theme.textTheme.caption)
+                          ? _buildSnippet(theme.textTheme.bodySmall)
                           : const SizedBox.shrink(),
                     ],
                   ),
@@ -89,7 +89,7 @@ class HomeThreadWidget extends StatelessWidget {
       overflow: TextOverflow.ellipsis,
       text: TextSpan(
         children: spans,
-        style: theme.textTheme.caption,
+        style: theme.textTheme.bodySmall,
       ),
     );
   }
diff --git a/lib/src/widgets/home/top_5.dart b/lib/src/widgets/home/top_5.dart
@@ -147,7 +147,7 @@ class _HomeTop5WidgetThread extends StatelessWidget {
       overflow: TextOverflow.ellipsis,
       text: TextSpan(
         children: spans,
-        style: theme.textTheme.caption,
+        style: theme.textTheme.bodySmall,
       ),
     );
   }
diff --git a/lib/src/widgets/html/galleria.dart b/lib/src/widgets/html/galleria.dart
@@ -81,7 +81,7 @@ class _GalleriaItem {
                 style: p
                     .getDependency<ThemeData>()
                     .textTheme
-                    .caption
+                    .bodySmall
                     ?.copyWith(color: kCaptionColor)));
             _description = wf.buildColumnPlaceholder(meta, widgets);
             return [];
diff --git a/lib/src/widgets/html/lb_trigger.dart b/lib/src/widgets/html/lb_trigger.dart
@@ -218,7 +218,7 @@ class _ScreenState extends State<_Screen> {
                 l(context).navXOfY(index + 1, widget.sources.length),
                 style: Theme.of(context)
                     .textTheme
-                    .caption
+                    .bodySmall
                     ?.copyWith(color: kCaptionColor),
               ),
         TextButton(
@@ -241,11 +241,14 @@ class _ScreenState extends State<_Screen> {
 
     Widget child = const SizedBox.shrink();
     if (source is _LbTriggerVideo) {
-      child = VideoPlayer(
-        aspectRatio: source.aspectRatio,
-        autoPlay: true,
-        url: source.url,
-      );
+      final sourceUri = Uri.tryParse(source.url);
+      if (sourceUri != null) {
+        child = VideoPlayer(
+          aspectRatio: source.aspectRatio,
+          autoPlay: true,
+          uri: sourceUri,
+        );
+      }
     }
 
     return PhotoViewGalleryPageOptions.customChild(child: child);
diff --git a/lib/src/widgets/image.dart b/lib/src/widgets/image.dart
@@ -79,7 +79,9 @@ class ThreadImageWidget extends StatelessWidget {
 
     if (link.isEmpty) {
       return DecoratedBox(
-        decoration: BoxDecoration(color: Theme.of(context).backgroundColor),
+        decoration: BoxDecoration(
+          color: Theme.of(context).colorScheme.background,
+        ),
         child: const AspectRatio(aspectRatio: kThreadImageAspectRatio),
       );
     }
diff --git a/lib/src/widgets/notifications.dart b/lib/src/widgets/notifications.dart
@@ -104,7 +104,7 @@ class _NotificationsState extends State<NotificationsWidget> {
   }
 
   Widget _buildInfo(BuildContext context, api.Notification n) {
-    final style = Theme.of(context).textTheme.caption;
+    final style = Theme.of(context).textTheme.bodySmall;
     final timestamp = Text(
       formatTimestamp(context, n.notificationCreateDate),
       style: style,
diff --git a/lib/src/widgets/poll.dart b/lib/src/widgets/poll.dart
@@ -46,7 +46,7 @@ class _PollState extends State<PollWidget> {
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
-          Text(poll.pollQuestion ?? '', style: theme.textTheme.headline6),
+          Text(poll.pollQuestion ?? '', style: theme.textTheme.titleLarge),
           _PollResponsesWidget(
             canVote: canVote,
             hasResults: poll.permissions?.result == true,
diff --git a/lib/src/widgets/post/body.dart b/lib/src/widgets/post/body.dart
@@ -14,7 +14,7 @@ class _PostBodyWidget extends StatelessWidget {
               padding: const EdgeInsets.all(kPostBodyPadding),
               child: Text(
                 l(context).postDeleted,
-                style: Theme.of(context).textTheme.caption?.copyWith(
+                style: Theme.of(context).textTheme.bodySmall?.copyWith(
                       decoration: TextDecoration.lineThrough,
                     ),
               ),
@@ -40,7 +40,7 @@ class _PostBodyWidget extends StatelessWidget {
 }
 
 TextStyle? _getPostBodyTextStyle(BuildContext context, bool isFirstPost) {
-  final themeStyle = Theme.of(context).textTheme.bodyText2;
+  final themeStyle = Theme.of(context).textTheme.bodyMedium;
   if (themeStyle == null) return null;
 
   final size = themeStyle.fontSize;
diff --git a/lib/src/widgets/post/builders.dart b/lib/src/widgets/post/builders.dart
@@ -15,7 +15,7 @@ Widget buildPostButton(
   GestureTapCallback? onTap,
 }) {
   final theme = Theme.of(context);
-  final fontSize = theme.textTheme.button?.fontSize;
+  final fontSize = theme.textTheme.labelLarge?.fontSize;
 
   Widget button = TextButton(
     onPressed: onTap,
@@ -95,7 +95,7 @@ Widget buildPosterInfo(
   String? userRank,
 }) {
   final theme = Theme.of(context);
-  final style = theme.textTheme.caption;
+  final style = theme.textTheme.bodySmall;
   final children = <Widget>[
     RichText(
       text: TextSpan(
diff --git a/lib/src/widgets/post/first.dart b/lib/src/widgets/post/first.dart
@@ -40,7 +40,7 @@ class _FirstPostWidget extends StatelessWidget {
                   child: Text(
                     threadTitle,
                     maxLines: null,
-                    style: Theme.of(context).textTheme.headline6,
+                    style: Theme.of(context).textTheme.titleLarge,
                   ),
                 ),
           isCustomPost
diff --git a/lib/src/widgets/post/list.dart b/lib/src/widgets/post/list.dart
@@ -161,7 +161,7 @@ class PostsState extends State<PostsWidget> {
                       ? (TapGestureRecognizer()..onTap = onTap)
                       : null,
                 ),
-                style: Theme.of(context).textTheme.caption,
+                style: Theme.of(context).textTheme.bodySmall,
               ),
             ),
           ),
diff --git a/lib/src/widgets/post/replies.dart b/lib/src/widgets/post/replies.dart
@@ -132,7 +132,7 @@ class _PostReplyHiddenWidgetState extends State<_PostReplyHiddenWidget> {
         data,
         maxLines: 1,
         overflow: TextOverflow.ellipsis,
-        style: Theme.of(context).textTheme.caption,
+        style: Theme.of(context).textTheme.bodySmall,
       );
 }
 
diff --git a/lib/src/widgets/post_editor.dart b/lib/src/widgets/post_editor.dart
@@ -167,19 +167,19 @@ class _PostEditorState extends State<PostEditorWidget> {
       child: RichText(
         text: TextSpan(
           text: l(context).postReplyingToAt,
-          style: textTheme.bodyText2,
+          style: textTheme.bodyMedium,
           children: [
             if (posterUsername.isNotEmpty)
               TextSpan(
                 text: '$posterUsername ',
-                style: textTheme.bodyText2?.copyWith(
+                style: textTheme.bodyMedium?.copyWith(
                   color: theme.colorScheme.secondary,
                   fontWeight: FontWeight.bold,
                 ),
               ),
             TextSpan(
               text: postBodyPlainText.replaceAll('\n', ' '),
-              style: textTheme.caption,
+              style: textTheme.bodySmall,
             ),
           ],
         ),
diff --git a/lib/src/widgets/thread/navigation.dart b/lib/src/widgets/thread/navigation.dart
@@ -53,7 +53,7 @@ class _ThreadNavigationState extends State<ThreadNavigationWidget> {
         child: Icon(
           FontAwesomeIcons.caretRight,
           size: _kThreadNavigationFontSize,
-          color: Theme.of(context).textTheme.caption?.color,
+          color: Theme.of(context).textTheme.bodySmall?.color,
         ),
       );
 
@@ -84,7 +84,7 @@ class _ThreadNavigationState extends State<ThreadNavigationWidget> {
       child: Center(
         child: Text(
           data,
-          style: Theme.of(context).textTheme.caption?.copyWith(
+          style: Theme.of(context).textTheme.bodySmall?.copyWith(
                 height: 1,
                 fontSize: _kThreadNavigationFontSize,
               ),
diff --git a/lib/src/widgets/thread/widget.dart b/lib/src/widgets/thread/widget.dart
@@ -120,7 +120,7 @@ class ThreadWidget extends StatelessWidget {
 
   Widget _buildInfo(BuildContext context) {
     final theme = Theme.of(context);
-    final style = theme.textTheme.subtitle1;
+    final style = theme.textTheme.titleMedium;
 
     return Row(
       children: <Widget>[
@@ -134,7 +134,7 @@ class ThreadWidget extends StatelessWidget {
               const SizedBox(height: _kThreadWidgetPadding / 4),
               Text(
                 formatTimestamp(context, thread.threadCreateDate),
-                style: theme.textTheme.caption,
+                style: theme.textTheme.bodySmall,
                 textScaleFactor: 1,
               ),
             ],
@@ -341,7 +341,7 @@ class _ThreadWidgetActionsState extends State<_ThreadWidgetActions> {
     final post = this.post;
     if (post == null) return null;
 
-    final textStyle = Theme.of(context).textTheme.caption;
+    final textStyle = Theme.of(context).textTheme.bodySmall;
     return AnimatedBuilder(
       animation: post,
       builder: (_, __) {
diff --git a/lib/src/widgets/tinhte/background_post.dart b/lib/src/widgets/tinhte/background_post.dart
@@ -69,7 +69,7 @@ class BackgroundPost extends StatelessWidget {
           child: Center(
             child: TinhteHtmlWidget(
               "<center>$postBodyHtml</center>",
-              textStyle: theme.textTheme.headline6,
+              textStyle: theme.textTheme.titleLarge,
             ),
           ),
         ),
diff --git a/lib/src/widgets/tinhte/home_channels.dart b/lib/src/widgets/tinhte/home_channels.dart
@@ -37,7 +37,7 @@ class ChannelsWidget extends StatelessWidget {
     required String label,
     GestureTapCallback? onTap,
   }) {
-    final style = Theme.of(context).textTheme.caption;
+    final style = Theme.of(context).textTheme.bodySmall;
     final fontSize = style?.fontSize;
 
     return InkWell(
diff --git a/lib/src/widgets/tinhte/home_top_threads.dart b/lib/src/widgets/tinhte/home_top_threads.dart
@@ -123,7 +123,7 @@ class _ThreadWidget extends StatelessWidget {
               if (viewCount > 0)
                 TextSpan(text: " ${l(context).statsXViews(viewCount)}")
             ],
-            style: theme.textTheme.caption,
+            style: theme.textTheme.bodySmall,
           ),
           maxLines: 1,
           overflow: TextOverflow.ellipsis,
diff --git a/lib/src/widgets/tinhte/tinhte_fact.dart b/lib/src/widgets/tinhte/tinhte_fact.dart
@@ -52,7 +52,7 @@ class TinhteFact extends StatelessWidget {
                   child: Text(
                     thread.threadTitle ?? '',
                     maxLines: null,
-                    style: theme.textTheme.headline6?.copyWith(
+                    style: theme.textTheme.titleLarge?.copyWith(
                       color: theme.colorScheme.secondary,
                       fontWeight: FontWeight.bold,
                     ),
@@ -62,7 +62,7 @@ class TinhteFact extends StatelessWidget {
                 _buildContents(),
                 TinhteHtmlWidget(
                   "<center>${firstPost?.postBodyHtml ?? ''}</center>",
-                  textStyle: theme.textTheme.bodyText2,
+                  textStyle: theme.textTheme.bodyMedium,
                 ),
               ],
             ),
@@ -87,11 +87,14 @@ class TinhteFact extends StatelessWidget {
       final aspectRatio = video.aspectRatio;
       final videoUrl = video.links?.xVideoUrl;
       if (aspectRatio != null && videoUrl != null) {
-        return VideoPlayer(
-          aspectRatio: aspectRatio,
-          autoPlay: autoPlayVideo,
-          url: videoUrl,
-        );
+        final videoUri = Uri.tryParse(videoUrl);
+        if (videoUri != null) {
+          return VideoPlayer(
+            aspectRatio: aspectRatio,
+            autoPlay: autoPlayVideo,
+            uri: videoUri,
+          );
+        }
       }
     }
 
diff --git a/lib/src/widgets/user/member_view_header.dart b/lib/src/widgets/user/member_view_header.dart
@@ -52,12 +52,12 @@ class MemberViewHeader extends StatelessWidget {
               children: <Widget>[
                 Text(
                   user.username ?? '#${user.userId}',
-                  style: theme.textTheme.subtitle1
+                  style: theme.textTheme.titleMedium
                       ?.copyWith(fontWeight: FontWeight.bold),
                 ),
                 Text(
                   "${l(context).userRegisterDate}: ${formatTimestamp(context, user.userRegisterDate)}",
-                  style: theme.textTheme.caption,
+                  style: theme.textTheme.bodySmall,
                 ),
               ],
             ),
@@ -69,7 +69,7 @@ class MemberViewHeader extends StatelessWidget {
 
   Widget _buildStats(BuildContext context) {
     final theme = Theme.of(context);
-    final style = theme.textTheme.caption;
+    final style = theme.textTheme.bodySmall;
     return Column(
       children: <Widget>[
         Row(
diff --git a/lib/src/widgets/video_player.dart b/lib/src/widgets/video_player.dart
diff --git a/packages/api/lib/batch_job.dart b/packages/api/lib/batch_job.dart
diff --git a/packages/api/lib/node.dart b/packages/api/lib/node.dart

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ class _FontControlState extends State<FontControlWidget> with RouteAware {`
`137`	`137`
`138`	`138`	`void _menuOpen() {`
`139`	`139`	`final overlayEntry = _overlayEntry = _buildOverlayEntry();`
`140`		`- Overlay.of(context)?.insert(overlayEntry);`
	`140`	`+ Overlay.of(context).insert(overlayEntry);`
`141`	`141`	`_isMenuOpen = true;`
`142`	`142`	`}`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class HeaderWidget extends StatelessWidget {`
`10`	`10`	`padding: const EdgeInsets.all(10.0),`
`11`	`11`	`child: Text(`
`12`	`12`	`text,`
`13`		`- style: Theme.of(context).textTheme.headline6,`
	`13`	`+ style: Theme.of(context).textTheme.titleLarge,`
`14`	`14`	`),`
`15`	`15`	`);`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ class _HomeTop5WidgetThread extends StatelessWidget {`
`147`	`147`	`overflow: TextOverflow.ellipsis,`
`148`	`148`	`text: TextSpan(`
`149`	`149`	`children: spans,`
`150`		`- style: theme.textTheme.caption,`
	`150`	`+ style: theme.textTheme.bodySmall,`
`151`	`151`	`),`
`152`	`152`	`);`
`153`	`153`	`}`