Merge branch 'dev' of https://gitlab.com/Didvan/didvan-app into dev

lib/utils/action_sheet.dart

@@ -17,6 +17,7 @@ class ActionSheetUtils {
 
   static Future<void> showLogoLoadingIndicator() async {
     await showDialog(
+      barrierDismissible: false,
       context: context,
       builder: (context) => Padding(
         padding: EdgeInsets.symmetric(

lib/views/authentication/screens/password.dart

@@ -76,7 +76,9 @@ class _PasswordInputState extends State<PasswordInput> {
     final token = await state.login(userProvider);
     if (token != null) {
       log(token);
+      ActionSheetUtils.showLogoLoadingIndicator();
       await ServerDataProvider.getData();
+      ActionSheetUtils.pop();
       Navigator.of(context).pushReplacementNamed(Routes.home);
       _showResetPasswordDialog();
     }

lib/views/home/studio/studio_details/studio_details.mobile.dart

@@ -145,8 +145,8 @@ class _StudioDetailsState extends State<StudioDetails> {
                         child: Stack(
                           children: [
                             WebView(
-                              backgroundColor:
-                                  Theme.of(context).colorScheme.black,
+                              zoomEnabled: false,
+                              backgroundColor: Colors.black,
                               allowsInlineMediaPlayback: true,
                               initialUrl: Uri.dataFromString(
                                 '''

lib/views/home/studio/studio_details/widgets/studio_details_widget.dart

@@ -141,7 +141,8 @@ class StudioDetailsWidget extends StatelessWidget {
                         ),
                       );
                     }
-                    return Column(
+                    return SingleChildScrollView(
+                      child: Column(
                         children: [
                           if (state.studio.relatedContents.isEmpty)
                             for (var i = 0; i < 3; i++)
@@ -168,6 +169,7 @@ class StudioDetailsWidget extends StatelessWidget {
                               ),
                             ),
                         ],
+                      ),
                     );
                   },
                 ),

lib/views/home/studio/widgets/slider.dart

@@ -97,6 +97,7 @@ class _StudioSliderState extends State<StudioSlider> {
                             ),
                           ),
                         ),
+                        if (state.videosSelected)
                           Container(
                             height: 52,
                             width: 52,