From 8f0b95ae81680dd3d4a65ec8df4c4a94159682bb Mon Sep 17 00:00:00 2001 From: MohammadTaha Basiri Date: Thu, 8 Dec 2022 00:41:50 +0330 Subject: [PATCH] new logo --- .../images/logos/logo-horizontal-dark.svg | 58 ++++++------------ .../images/logos/logo-horizontal-light.svg | 60 +++++-------------- .../images/logos/logo-vertical-dark.svg | 57 +++++------------- .../images/logos/logo-vertical-light.svg | 60 +++++-------------- lib/assets/images/logos/studio-dark.svg | 28 ++++----- lib/assets/images/logos/studio-light.svg | 37 ++++-------- lib/utils/action_sheet.dart | 12 ++-- lib/views/splash/splash.dart | 12 +++- .../widgets/logos/didvan_vertical_logo.dart | 8 ++- 9 files changed, 104 insertions(+), 228 deletions(-) diff --git a/lib/assets/images/logos/logo-horizontal-dark.svg b/lib/assets/images/logos/logo-horizontal-dark.svg index 95d2d09..5efe34a 100644 --- a/lib/assets/images/logos/logo-horizontal-dark.svg +++ b/lib/assets/images/logos/logo-horizontal-dark.svg @@ -1,44 +1,22 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - + + + diff --git a/lib/assets/images/logos/logo-horizontal-light.svg b/lib/assets/images/logos/logo-horizontal-light.svg index 4657fce..2bf1eb7 100644 --- a/lib/assets/images/logos/logo-horizontal-light.svg +++ b/lib/assets/images/logos/logo-horizontal-light.svg @@ -1,47 +1,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/lib/assets/images/logos/logo-vertical-dark.svg b/lib/assets/images/logos/logo-vertical-dark.svg index db6df03..597637e 100644 --- a/lib/assets/images/logos/logo-vertical-dark.svg +++ b/lib/assets/images/logos/logo-vertical-dark.svg @@ -1,44 +1,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/lib/assets/images/logos/logo-vertical-light.svg b/lib/assets/images/logos/logo-vertical-light.svg index b79519f..98056f6 100644 --- a/lib/assets/images/logos/logo-vertical-light.svg +++ b/lib/assets/images/logos/logo-vertical-light.svg @@ -1,47 +1,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/lib/assets/images/logos/studio-dark.svg b/lib/assets/images/logos/studio-dark.svg index 3d0e67d..b9612af 100644 --- a/lib/assets/images/logos/studio-dark.svg +++ b/lib/assets/images/logos/studio-dark.svg @@ -1,22 +1,14 @@ + - - - - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/lib/assets/images/logos/studio-light.svg b/lib/assets/images/logos/studio-light.svg index 73d14b1..d3b5dc4 100644 --- a/lib/assets/images/logos/studio-light.svg +++ b/lib/assets/images/logos/studio-light.svg @@ -1,25 +1,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/lib/utils/action_sheet.dart b/lib/utils/action_sheet.dart index b23009a..4a43f85 100644 --- a/lib/utils/action_sheet.dart +++ b/lib/utils/action_sheet.dart @@ -3,7 +3,6 @@ import 'dart:async'; import 'package:bot_toast/bot_toast.dart'; import 'package:didvan/config/design_config.dart'; import 'package:didvan/config/theme_data.dart'; -import 'package:didvan/constants/assets.dart'; import 'package:didvan/models/enums.dart'; import 'package:didvan/models/view/action_sheet_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:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:rive/rive.dart'; +import 'package:flutter_spinkit/flutter_spinkit.dart'; class ActionSheetUtils { static late BuildContext context; @@ -31,11 +30,10 @@ class ActionSheetUtils { await showDialog( barrierDismissible: false, context: context, - builder: (context) => Center( - child: SizedBox( - width: mediaQueryData.size.width * 0.4, - child: RiveAnimation.asset(Assets.logoLoadingAnimation), - ), + builder: (context) => SpinKitChasingDots( + color: DesignConfig.isDark + ? Theme.of(context).colorScheme.primary + : Theme.of(context).colorScheme.navigation, ), ); } diff --git a/lib/views/splash/splash.dart b/lib/views/splash/splash.dart index 85d77f2..1f6f484 100644 --- a/lib/views/splash/splash.dart +++ b/lib/views/splash/splash.dart @@ -1,6 +1,7 @@ import 'dart:developer'; import 'package:didvan/config/design_config.dart'; +import 'package:didvan/config/theme_data.dart'; import 'package:didvan/main.dart'; import 'package:didvan/providers/media.dart'; import 'package:didvan/providers/server_data.dart'; @@ -59,11 +60,16 @@ class _SplashState extends State { children: [ const SizedBox(height: 70), const Expanded( - child: DidvanVerticalLogo(), + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 40), + child: DidvanVerticalLogo(), + ), ), if (!_errorOccured) - SpinKitSpinningLines( - color: Theme.of(context).colorScheme.primary, + SpinKitChasingDots( + color: DesignConfig.isDark + ? Theme.of(context).colorScheme.primary + : Theme.of(context).colorScheme.navigation, ), if (_errorOccured) const SizedBox(height: 30), if (_errorOccured) diff --git a/lib/views/widgets/logos/didvan_vertical_logo.dart b/lib/views/widgets/logos/didvan_vertical_logo.dart index 75cf9d5..875cb81 100644 --- a/lib/views/widgets/logos/didvan_vertical_logo.dart +++ b/lib/views/widgets/logos/didvan_vertical_logo.dart @@ -8,7 +8,13 @@ class DidvanHorizontalLogo extends StatelessWidget { @override 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 {