flutter 3 changes applied

2022-05-17 16:11:42 +04:30 · 2022-05-17 16:11:42 +04:30 · f841c12f7a
parent b92369e600
commit f841c12f7a
12 changed files with 37 additions and 38 deletions
--- a/.fandogh/fandogh.yaml
+++ b/.fandogh/fandogh.yaml
@ -3,11 +3,11 @@ name: app-test
 spec:
  allow_http: false
  disable_default_domains: true
-  image: app:2.1.1.17
+  image: app:2.1.1.18
  image_pull_policy: IfNotPresent
  path: /
  replicas: 1
  resources:
    memory: 100Mi
  domains:
-    - name: web.didvan.app
+    - name: web.didvan.app
--- a/lib/views/home/comments/widgets/comment.dart
+++ b/lib/views/home/comments/widgets/comment.dart
@ -191,7 +191,7 @@ class CommentState extends State<Comment> {
        content: Column(
          children: [
            if (comment.user.id != context.read<UserProvider>().user.id)
-              MenuItem(
+              MenuOption(
                title: 'گزارش محتوای نامناسب',
                onTap: () {
                  state.reportComment(comment.id);
@ -200,7 +200,7 @@ class CommentState extends State<Comment> {
                icon: DidvanIcons.alert_regular,
              ),
            if (comment.user.id == context.read<UserProvider>().user.id)
-              MenuItem(
+              MenuOption(
                title: 'حذف نظر',
                color: Theme.of(context).colorScheme.secondary,
                onTap: () {
--- a/lib/views/home/settings/bookmarks/bookmarks.dart
+++ b/lib/views/home/settings/bookmarks/bookmarks.dart
@ -59,28 +59,28 @@ class _BookmarksState extends State<Bookmarks> {
          child: DidvanCard(
            child: Column(
              children: [
-                MenuItem(
+                MenuOption(
                  onTap: () => _onCategorySelected('radar'),
                  title: 'تحلیل‌های رادار',
                  icon: DidvanIcons.radar_regular,
                  iconSize: 24,
                ),
                const DidvanDivider(),
-                MenuItem(
+                MenuOption(
                  onTap: () => _onCategorySelected('news'),
                  title: 'اخبار',
                  icon: DidvanIcons.news_regular,
                  iconSize: 24,
                ),
                const DidvanDivider(),
-                MenuItem(
+                MenuOption(
                  onTap: () => _onCategorySelected('video'),
                  title: 'ویدئو‌ها',
                  icon: DidvanIcons.video_regular,
                  iconSize: 24,
                ),
                const DidvanDivider(),
-                MenuItem(
+                MenuOption(
                  onTap: () => _onCategorySelected('podcast'),
                  title: 'پادکست‌ها',
                  icon: DidvanIcons.podcast_regular,
--- a/lib/views/home/settings/general_settings/settings.dart
+++ b/lib/views/home/settings/general_settings/settings.dart
@ -50,7 +50,7 @@ class _GeneralSettingsState extends State<GeneralSettings> {
          appBarData: AppBarData(hasBack: true, title: 'تنظیمات'),
          children: [
            DidvanCard(
-              child: MenuItem(
+              child: MenuOption(
                title: 'زمان دریافت اعلان',
                onTap: () => _pickTimeRange(context),
                icon: DidvanIcons.notification_regular,
@ -71,7 +71,7 @@ class _GeneralSettingsState extends State<GeneralSettings> {
            DidvanCard(
              child: Column(
                children: [
-                  MenuItem(
+                  MenuOption(
                    suffix: DesignConfig.fontFamily == 'Dana-FA'
                        ? 'دانا'
                        : 'ایران سنس',
@ -79,7 +79,7 @@ class _GeneralSettingsState extends State<GeneralSettings> {
                    onTap: _showFontFamilyBottomSheet,
                  ),
                  const DidvanDivider(),
-                  MenuItem(
+                  MenuOption(
                    suffix: _fontScaleSuffix,
                    title: 'اندازه متن',
                    onTap: _showFontScaleBottomSheet,
--- a/lib/views/home/settings/profile/profile.dart
+++ b/lib/views/home/settings/profile/profile.dart
@ -118,7 +118,7 @@ class _ProfileState extends State<Profile> {
                        //   onChanged: (value) => {},
                        // ),
                        const DidvanDivider(),
-                        MenuItem(
+                        MenuOption(
                          title: 'تغییر رمز عبور',
                          onTap: () => Navigator.of(context).pushNamed(
                            Routes.authenticaion,
--- a/lib/views/home/settings/profile/widgets/profile_photo.dart
+++ b/lib/views/home/settings/profile/widgets/profile_photo.dart
@ -93,13 +93,13 @@ class _ProfilePhotoState extends State<ProfilePhoto> {
              padding: const EdgeInsets.only(right: 20),
              child: Column(
                children: [
-                  MenuItem(
+                  MenuOption(
                    title: 'دوربین',
                    onTap: () => _setProfilePhoto(ImageSource.camera),
                    icon: DidvanIcons.camera_regular,
                  ),
                  const DidvanDivider(),
-                  MenuItem(
+                  MenuOption(
                    title: 'گالری',
                    onTap: () => _setProfilePhoto(ImageSource.gallery),
                    icon: DidvanIcons.gallery_file_regular,
@ -108,7 +108,7 @@ class _ProfilePhotoState extends State<ProfilePhoto> {
              ),
            ),
            const DidvanDivider(),
-            MenuItem(
+            MenuOption(
              title: 'حذف تصویر',
              onTap: () => _setProfilePhoto(null),
              icon: DidvanIcons.trash_solid,
--- a/lib/views/home/settings/settings.dart
+++ b/lib/views/home/settings/settings.dart
@ -33,35 +33,35 @@ class Settings extends StatelessWidget {
          DidvanCard(
            child: Column(
              children: [
-                MenuItem(
+                MenuOption(
                  title: 'پیام‌ها',
                  icon: DidvanIcons.message_regular,
                  onTap: () =>
                      Navigator.of(context).pushNamed(Routes.directList),
                ),
                const DidvanDivider(),
-                MenuItem(
+                MenuOption(
                  title: 'ویرایش پروفایل',
                  icon: DidvanIcons.user_edit_regular,
                  suffix: context.read<UserProvider>().user.fullName,
                  onTap: () => Navigator.of(context).pushNamed(Routes.profile),
                ),
                const DidvanDivider(),
-                MenuItem(
+                MenuOption(
                  title: 'تنظیمات',
                  icon: DidvanIcons.setting_regular,
                  onTap: () =>
                      Navigator.of(context).pushNamed(Routes.generalSettings),
                ),
                const DidvanDivider(),
-                MenuItem(
+                MenuOption(
                  title: 'نشان شده‌ها',
                  icon: DidvanIcons.bookmark_regular,
                  onTap: () =>
                      Navigator.of(context).pushNamed(Routes.bookmarks),
                ),
                const DidvanDivider(),
-                MenuItem(
+                MenuOption(
                  title: 'خروج از حساب کاربری',
                  icon: DidvanIcons.sign_out_regular,
                  color: Theme.of(context).colorScheme.secondary,
@ -84,13 +84,13 @@ class Settings extends StatelessWidget {
            child: Column(
              crossAxisAlignment: CrossAxisAlignment.start,
              children: [
-                MenuItem(
+                MenuOption(
                  icon: DidvanIcons.didvan_solid,
                  title: 'معرفی دیدوان',
                  onTap: () => launch('https://didvan.app/#info'),
                ),
                const DidvanDivider(),
-                MenuItem(
+                MenuOption(
                  icon: DidvanIcons.support_regular,
                  title: 'پیام به پشتیبانی',
                  onTap: () {
@ -101,7 +101,7 @@ class Settings extends StatelessWidget {
                  },
                ),
                const DidvanDivider(),
-                MenuItem(
+                MenuOption(
                  icon: DidvanIcons.alert_regular,
                  title: 'حریم خصوصی',
                  onTap: () =>
--- a/lib/views/home/widgets/floating_navigation_bar.dart
+++ b/lib/views/home/widgets/floating_navigation_bar.dart
@ -207,7 +207,7 @@ class _FloatingNavigationBarState extends State<FloatingNavigationBar> {
            for (var i = 0; i < categories.length; i++) ...[
              Padding(
                padding: const EdgeInsets.only(right: 20),
-                child: MenuItem(
+                child: MenuOption(
                  titleWidget: DidvanChip(label: categories[i].label),
                  onTap: () {
                    Navigator.of(context).pop();
@ -237,7 +237,7 @@ class _FloatingNavigationBarState extends State<FloatingNavigationBar> {
                ),
            ],
            const DidvanDivider(),
-            MenuItem(
+            MenuOption(
              title: 'گزارش اشکال',
              onTap: () {
                Navigator.of(context).pop();
--- a/lib/views/home/widgets/menu_item.dart
+++ b/lib/views/home/widgets/menu_item.dart
@ -3,7 +3,7 @@ import 'package:didvan/constants/app_icons.dart';
 import 'package:didvan/views/widgets/didvan/text.dart';
 import 'package:flutter/material.dart';

-class MenuItem extends StatelessWidget {
+class MenuOption extends StatelessWidget {
  final String? title;
  final Widget? titleWidget;
  final IconData? icon;
@ -12,7 +12,7 @@ class MenuItem extends StatelessWidget {
  final VoidCallback onTap;
  final Widget? trailing;
  final Color? color;
-  MenuItem({
+  MenuOption({
    Key? key,
    required this.onTap,
    this.title,
--- a/lib/views/widgets/didvan/bnb.dart
+++ b/lib/views/widgets/didvan/bnb.dart
@ -3,7 +3,6 @@ import 'package:didvan/config/design_config.dart';
 import 'package:didvan/config/theme_data.dart';
 import 'package:didvan/constants/app_icons.dart';
 import 'package:didvan/models/enums.dart';
-import 'package:didvan/models/view/action_sheet_data.dart';
 import 'package:didvan/services/media/media.dart';
 import 'package:didvan/utils/action_sheet.dart';
 import 'package:didvan/views/home/studio/studio_details/studio_details_state.dart';
--- a/lib/views/widgets/didvan/switch.dart
+++ b/lib/views/widgets/didvan/switch.dart
@ -30,7 +30,7 @@ class _DidvanSwitchState extends State<DidvanSwitch> {

  @override
  Widget build(BuildContext context) {
-    return MenuItem(
+    return MenuOption(
      title: widget.title,
      onTap: () {
        setState(
--- a/pubspec.lock
+++ b/pubspec.lock
@ -105,7 +105,7 @@ packages:
      name: collection
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
  cross_file:
    dependency: transitive
    description:
@ -161,7 +161,7 @@ packages:
      name: fake_async
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
  ffi:
    dependency: transitive
    description:
@ -440,7 +440,7 @@ packages:
      name: js
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.6.3"
+    version: "0.6.4"
  lints:
    dependency: transitive
    description:
@ -461,7 +461,7 @@ packages:
      name: material_color_utilities
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.1.3"
+    version: "0.1.4"
  meta:
    dependency: transitive
    description:
@ -496,7 +496,7 @@ packages:
      name: path
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
  path_drawing:
    dependency: transitive
    description:
@ -711,7 +711,7 @@ packages:
      name: source_span
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
  sqflite:
    dependency: transitive
    description:
@ -767,7 +767,7 @@ packages:
      name: test_api
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "0.4.8"
+    version: "0.4.9"
  typed_data:
    dependency: transitive
    description:
@ -858,7 +858,7 @@ packages:
      name: vector_math
      url: "https://pub.dartlang.org"
    source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
  visibility_detector:
    dependency: transitive
    description:
@ -951,5 +951,5 @@ packages:
    source: hosted
    version: "5.3.1"
 sdks:
-  dart: ">=2.16.0 <3.0.0"
+  dart: ">=2.17.0-0 <3.0.0"
  flutter: ">=2.10.0"