Merge branch 'main' into feature-updateVideoDetailStructure

lib/pages/video/detail/introduction/view.dart

@@ -4,6 +4,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
+import 'package:lottie/lottie.dart';
 import 'package:pilipala/common/constants.dart';
 import 'package:pilipala/common/widgets/http_error.dart';
 import 'package:pilipala/pages/video/detail/index.dart';
@@ -96,11 +97,14 @@ class _VideoIntroPanelState extends State<VideoIntroPanel>
             );
           }
         } else {
-          return const SliverToBoxAdapter(
+          return SliverToBoxAdapter(
             child: SizedBox(
               height: 100,
               child: Center(
-                child: CircularProgressIndicator(),
+                child: Lottie.asset(
+                  'assets/loading.json',
+                  width: 200,
+                ),
               ),
             ),
           );
@@ -589,8 +593,4 @@ class _VideoInfoState extends State<VideoInfo> with TickerProviderStateMixin {
       );
     });
   }
-
-  // Widget StaffPanel(BuildContext context, videoIntroController) {
-  //   return
-  // }
 }

lib/pages/video/detail/introduction/widgets/fav_panel.dart

@@ -29,7 +29,7 @@ class _FavPanelState extends State<FavPanel> {
   Widget build(BuildContext context) {
     return Container(
       height: sheetHeight,
-      color: Theme.of(context).colorScheme.background,
+      color: Theme.of(context).colorScheme.surface,
       child: Column(
         children: [
           AppBar(

lib/pages/video/detail/introduction/widgets/group_panel.dart

@@ -57,7 +57,7 @@ class _GroupPanelState extends State<GroupPanel> {
   Widget build(BuildContext context) {
     return Container(
       height: sheetHeight,
-      color: Theme.of(context).colorScheme.background,
+      color: Theme.of(context).colorScheme.surface,
       child: Column(
         children: <Widget>[
           AppBar(

lib/pages/video/detail/introduction/widgets/menu_row.dart

@@ -12,7 +12,7 @@ class MenuRow extends StatelessWidget {
   Widget build(BuildContext context) {
     return Container(
       width: double.infinity,
-      color: Theme.of(context).colorScheme.background,
+      color: Theme.of(context).colorScheme.surface,
       padding: const EdgeInsets.only(top: 9, bottom: 9, left: 12),
       child: SingleChildScrollView(
         scrollDirection: Axis.horizontal,
@@ -84,7 +84,7 @@ class MenuRow extends StatelessWidget {
                   style: TextStyle(
                       fontSize: 13,
                       color: selectStatus
-                          ? Theme.of(context).colorScheme.onBackground
+                          ? Theme.of(context).colorScheme.onSurface
                           : Theme.of(context).colorScheme.outline),
                 ),
               ),