Mr.Rahmani
/
didvan-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

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

This commit is contained in:
MohammadTaha Basiri 2022-04-03 13:14:13 +04:30
parent 3a0622939e 939dd9b358
commit 56370e443f
5 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/utils/action_sheet.dart
View File

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

2
lib/views/authentication/screens/password.dart
View File

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

4
lib/views/home/studio/studio_details/studio_details.mobile.dart
View File

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

42
lib/views/home/studio/studio_details/widgets/studio_details_widget.dart
View File

@ -141,33 +141,35 @@ class StudioDetailsWidget extends StatelessWidget {
), ),
); );
} }
return Column( return SingleChildScrollView(
children: [ child: Column(
if (state.studio.relatedContents.isEmpty) children: [
for (var i = 0; i < 3; i++) if (state.studio.relatedContents.isEmpty)
for (var i = 0; i < 3; i++)
Padding(
padding: const EdgeInsets.only(
bottom: 8,
left: 16,
right: 16,
),
child: MultitypeOverview.placeholder,
),
for (var i = 0;
i < state.studio.relatedContents.length;
i++)
Padding( Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
bottom: 8, bottom: 8,
left: 16, left: 16,
right: 16, right: 16,
), ),
child: MultitypeOverview.placeholder, child: MultitypeOverview(
item: state.studio.relatedContents[i],
onMarkChanged: (id, value) {},
),
), ),
for (var i = 0; ],
i < state.studio.relatedContents.length; ),
i++)
Padding(
padding: const EdgeInsets.only(
bottom: 8,
left: 16,
right: 16,
),
child: MultitypeOverview(
item: state.studio.relatedContents[i],
onMarkChanged: (id, value) {},
),
),
],
); );
}, },
), ),

31
lib/views/home/studio/widgets/slider.dart
View File

@ -97,22 +97,23 @@ class _StudioSliderState extends State<StudioSlider> {
), ),
), ),
), ),
Container( if (state.videosSelected)
height: 52, Container(
width: 52, height: 52,
decoration: BoxDecoration( width: 52,
shape: BoxShape.circle, decoration: BoxDecoration(
color: Theme.of(context) shape: BoxShape.circle,
.colorScheme color: Theme.of(context)
.secondary .colorScheme
.withOpacity(0.7), .secondary
.withOpacity(0.7),
),
child: Icon(
DidvanIcons.play_solid,
color: Theme.of(context).colorScheme.white,
size: 48,
),
), ),
child: Icon(
DidvanIcons.play_solid,
color: Theme.of(context).colorScheme.white,
size: 48,
),
),
], ],
), ),
), ),