pushe removed + studio appbar

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

lib/constants/assets.dart

@@ -8,11 +8,13 @@ class Assets {
   static const String _baseEmptyStatesPath = _basePath + '/images/empty_states';
   static const String _baseAnimationsPath = _basePath + '/animations';
   static const String _baseRecordsPath = _basePath + '/images/records';
+  static const String _baseLogosPath = _basePath + '/images/logos';
 
   static String get verticalLogoWithText =>
-      _baseImagesPath + '/logos/logo-vertical-$_themeSuffix.svg';
+      _baseLogosPath + '/logo-vertical-$_themeSuffix.svg';
   static String get horizontalLogoWithText =>
-      _baseImagesPath + '/logos/logo-horizontal-$_themeSuffix.svg';
+      _baseLogosPath + '/logo-horizontal-$_themeSuffix.svg';
+  static String get studioLogo => _baseLogosPath + '/studio-$_themeSuffix.svg';
 
   static String get logoLoadingAnimation =>
       _baseAnimationsPath + '/indicator-$_themeSuffix.riv';

lib/pages/home/studio/studio.dart

@@ -1,7 +1,8 @@
 import 'package:didvan/config/theme_data.dart';
+import 'package:didvan/constants/app_icons.dart';
 import 'package:didvan/constants/assets.dart';
 import 'package:didvan/pages/home/widgets/logo_app_bar.dart';
-import 'package:didvan/widgets/state_handlers/empty_state.dart';
+import 'package:didvan/widgets/didvan/icon_button.dart';
 import 'package:flutter/material.dart';
 
 class Studio extends StatelessWidget {
@@ -11,14 +12,17 @@ class Studio extends StatelessWidget {
   Widget build(BuildContext context) {
     return Column(
       children: [
-        const LogoAppBar(),
-        Expanded(
-          child: EmptyState(
-            asset: Assets.emptyStudio,
-            title: 'استودیو آینده',
-            subtitle: 'به زودی...',
-            titleColor: Theme.of(context).colorScheme.title,
-          ),
+        Row(
+          children: [
+            const Expanded(child: LogoAppBar(type: 'studio')),
+            Padding(
+              padding: EdgeInsets.only(top: MediaQuery.of(context).padding.top),
+              child: DidvanIconButton(
+                icon: DidvanIcons.bookmark_regular,
+                onPressed: () {},
+              ),
+            ),
+          ],
         ),
       ],
     );

lib/pages/home/widgets/logo_app_bar.dart

@@ -2,22 +2,25 @@ import 'package:didvan/widgets/logos/didvan_vertical_logo.dart';
 import 'package:flutter/material.dart';
 
 class LogoAppBar extends StatelessWidget {
+  final String? type;
   final bool hasExtraPadding;
-  const LogoAppBar({Key? key, this.hasExtraPadding = true}) : super(key: key);
+  const LogoAppBar({Key? key, this.hasExtraPadding = true, this.type})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     final MediaQueryData d = MediaQuery.of(context);
     final double extraPadding = hasExtraPadding ? 0 : 16;
     return Container(
+      margin: EdgeInsets.only(top: d.padding.top),
       padding: EdgeInsets.only(
-        left: 140 - extraPadding,
-        top: d.padding.top + 16 - extraPadding,
+        left: (type == null ? 140 : 0) - extraPadding,
+        top: 16 - extraPadding,
         bottom: 16 - extraPadding,
         right: 16 - extraPadding,
       ),
       alignment: Alignment.centerRight,
-      child: const DidvanHorizontalLogo(),
+      child: DidvanHorizontalLogo(type: type),
     );
   }
 }

lib/widgets/logos/didvan_vertical_logo.dart

@@ -3,10 +3,19 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
 
 class DidvanHorizontalLogo extends StatelessWidget {
-  const DidvanHorizontalLogo({Key? key}) : super(key: key);
+  final String? type;
+  const DidvanHorizontalLogo({Key? key, this.type}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    return SvgPicture.asset(Assets.horizontalLogoWithText);
+    return SvgPicture.asset(_asset);
+  }
+
+  String get _asset {
+    if (type == 'studio') {
+      return Assets.studioLogo;
+    } else {
+      return Assets.horizontalLogoWithText;
+    }
   }
 }

pubspec.lock

@@ -546,6 +546,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "6.0.2"
+  pushe_flutter:
+    dependency: "direct main"
+    description:
+      name: pushe_flutter
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.5.2"
   record:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -61,7 +61,7 @@ dependencies:
   url_launcher: ^6.0.18
   transparent_image: ^2.0.0
   audio_video_progress_bar: ^0.10.0
-  
+  pushe_flutter: ^2.5.1-nullsafety.1
 
 dev_dependencies:
   flutter_test:
@@ -91,6 +91,8 @@ flutter:
     - lib/assets/images/logos/logo-vertical-light.svg
     - lib/assets/images/logos/logo-horizontal-dark.svg
     - lib/assets/images/logos/logo-horizontal-light.svg
+    - lib/assets/images/logos/studio-dark.svg
+    - lib/assets/images/logos/studio-light.svg
     - lib/assets/images/categories/business-light.svg
     - lib/assets/images/categories/economic-light.svg
     - lib/assets/images/categories/enviromental-light.svg