This commit is contained in:
MohammadTaha Basiri 2022-12-08 00:41:50 +03:30
parent b1ce815c66
commit 8f0b95ae81
9 changed files with 104 additions and 228 deletions

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 30 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 30 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 30 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 30 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 19 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View File

@ -3,7 +3,6 @@ import 'dart:async';
import 'package:bot_toast/bot_toast.dart'; import 'package:bot_toast/bot_toast.dart';
import 'package:didvan/config/design_config.dart'; import 'package:didvan/config/design_config.dart';
import 'package:didvan/config/theme_data.dart'; import 'package:didvan/config/theme_data.dart';
import 'package:didvan/constants/assets.dart';
import 'package:didvan/models/enums.dart'; import 'package:didvan/models/enums.dart';
import 'package:didvan/models/view/action_sheet_data.dart'; import 'package:didvan/models/view/action_sheet_data.dart';
import 'package:didvan/models/view/alert_data.dart'; import 'package:didvan/models/view/alert_data.dart';
@ -11,7 +10,7 @@ import 'package:didvan/views/widgets/didvan/button.dart';
import 'package:didvan/views/widgets/didvan/text.dart'; import 'package:didvan/views/widgets/didvan/text.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:rive/rive.dart'; import 'package:flutter_spinkit/flutter_spinkit.dart';
class ActionSheetUtils { class ActionSheetUtils {
static late BuildContext context; static late BuildContext context;
@ -31,11 +30,10 @@ class ActionSheetUtils {
await showDialog( await showDialog(
barrierDismissible: false, barrierDismissible: false,
context: context, context: context,
builder: (context) => Center( builder: (context) => SpinKitChasingDots(
child: SizedBox( color: DesignConfig.isDark
width: mediaQueryData.size.width * 0.4, ? Theme.of(context).colorScheme.primary
child: RiveAnimation.asset(Assets.logoLoadingAnimation), : Theme.of(context).colorScheme.navigation,
),
), ),
); );
} }

View File

@ -1,6 +1,7 @@
import 'dart:developer'; import 'dart:developer';
import 'package:didvan/config/design_config.dart'; import 'package:didvan/config/design_config.dart';
import 'package:didvan/config/theme_data.dart';
import 'package:didvan/main.dart'; import 'package:didvan/main.dart';
import 'package:didvan/providers/media.dart'; import 'package:didvan/providers/media.dart';
import 'package:didvan/providers/server_data.dart'; import 'package:didvan/providers/server_data.dart';
@ -59,11 +60,16 @@ class _SplashState extends State<Splash> {
children: [ children: [
const SizedBox(height: 70), const SizedBox(height: 70),
const Expanded( const Expanded(
child: DidvanVerticalLogo(), child: Padding(
padding: EdgeInsets.symmetric(horizontal: 40),
child: DidvanVerticalLogo(),
),
), ),
if (!_errorOccured) if (!_errorOccured)
SpinKitSpinningLines( SpinKitChasingDots(
color: Theme.of(context).colorScheme.primary, color: DesignConfig.isDark
? Theme.of(context).colorScheme.primary
: Theme.of(context).colorScheme.navigation,
), ),
if (_errorOccured) const SizedBox(height: 30), if (_errorOccured) const SizedBox(height: 30),
if (_errorOccured) if (_errorOccured)

View File

@ -8,7 +8,13 @@ class DidvanHorizontalLogo extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SvgPicture.asset(_asset); return Padding(
padding: EdgeInsets.only(bottom: type == 'studio' ? 0 : 4),
child: SvgPicture.asset(
_asset,
height: 76,
),
);
} }
String get _asset { String get _asset {