From f841c12f7a7507ab4792de6852d4405fd8a4c965 Mon Sep 17 00:00:00 2001 From: MohammadTaha Basiri Date: Tue, 17 May 2022 16:11:42 +0430 Subject: [PATCH] flutter 3 changes applied --- .fandogh/fandogh.yaml | 4 ++-- lib/views/home/comments/widgets/comment.dart | 4 ++-- .../home/settings/bookmarks/bookmarks.dart | 8 ++++---- .../settings/general_settings/settings.dart | 6 +++--- lib/views/home/settings/profile/profile.dart | 2 +- .../profile/widgets/profile_photo.dart | 6 +++--- lib/views/home/settings/settings.dart | 16 ++++++++-------- .../home/widgets/floating_navigation_bar.dart | 4 ++-- lib/views/home/widgets/menu_item.dart | 4 ++-- lib/views/widgets/didvan/bnb.dart | 1 - lib/views/widgets/didvan/switch.dart | 2 +- pubspec.lock | 18 +++++++++--------- 12 files changed, 37 insertions(+), 38 deletions(-) diff --git a/.fandogh/fandogh.yaml b/.fandogh/fandogh.yaml index 717f4be..98722a9 100644 --- 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 \ No newline at end of file + - name: web.didvan.app diff --git a/lib/views/home/comments/widgets/comment.dart b/lib/views/home/comments/widgets/comment.dart index cc50380..4181abd 100644 --- a/lib/views/home/comments/widgets/comment.dart +++ b/lib/views/home/comments/widgets/comment.dart @@ -191,7 +191,7 @@ class CommentState extends State { content: Column( children: [ if (comment.user.id != context.read().user.id) - MenuItem( + MenuOption( title: 'گزارش محتوای نامناسب', onTap: () { state.reportComment(comment.id); @@ -200,7 +200,7 @@ class CommentState extends State { icon: DidvanIcons.alert_regular, ), if (comment.user.id == context.read().user.id) - MenuItem( + MenuOption( title: 'حذف نظر', color: Theme.of(context).colorScheme.secondary, onTap: () { diff --git a/lib/views/home/settings/bookmarks/bookmarks.dart b/lib/views/home/settings/bookmarks/bookmarks.dart index 01ae4fe..186bb45 100644 --- a/lib/views/home/settings/bookmarks/bookmarks.dart +++ b/lib/views/home/settings/bookmarks/bookmarks.dart @@ -59,28 +59,28 @@ class _BookmarksState extends State { 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, diff --git a/lib/views/home/settings/general_settings/settings.dart b/lib/views/home/settings/general_settings/settings.dart index 5ecbc3d..30a78ad 100644 --- 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 { 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 { DidvanCard( child: Column( children: [ - MenuItem( + MenuOption( suffix: DesignConfig.fontFamily == 'Dana-FA' ? 'دانا' : 'ایران سنس', @@ -79,7 +79,7 @@ class _GeneralSettingsState extends State { onTap: _showFontFamilyBottomSheet, ), const DidvanDivider(), - MenuItem( + MenuOption( suffix: _fontScaleSuffix, title: 'اندازه متن', onTap: _showFontScaleBottomSheet, diff --git a/lib/views/home/settings/profile/profile.dart b/lib/views/home/settings/profile/profile.dart index ca9acf6..a74689a 100644 --- a/lib/views/home/settings/profile/profile.dart +++ b/lib/views/home/settings/profile/profile.dart @@ -118,7 +118,7 @@ class _ProfileState extends State { // onChanged: (value) => {}, // ), const DidvanDivider(), - MenuItem( + MenuOption( title: 'تغییر رمز عبور', onTap: () => Navigator.of(context).pushNamed( Routes.authenticaion, diff --git a/lib/views/home/settings/profile/widgets/profile_photo.dart b/lib/views/home/settings/profile/widgets/profile_photo.dart index 00e1e01..865d898 100644 --- 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 { 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 { ), ), const DidvanDivider(), - MenuItem( + MenuOption( title: 'حذف تصویر', onTap: () => _setProfilePhoto(null), icon: DidvanIcons.trash_solid, diff --git a/lib/views/home/settings/settings.dart b/lib/views/home/settings/settings.dart index f01c82a..adde21a 100644 --- 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().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: () => diff --git a/lib/views/home/widgets/floating_navigation_bar.dart b/lib/views/home/widgets/floating_navigation_bar.dart index 754e40d..9f61a37 100644 --- 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 { 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 { ), ], const DidvanDivider(), - MenuItem( + MenuOption( title: 'گزارش اشکال', onTap: () { Navigator.of(context).pop(); diff --git a/lib/views/home/widgets/menu_item.dart b/lib/views/home/widgets/menu_item.dart index d0612c7..ba3292b 100644 --- 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, diff --git a/lib/views/widgets/didvan/bnb.dart b/lib/views/widgets/didvan/bnb.dart index b142dd9..542331e 100644 --- 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'; diff --git a/lib/views/widgets/didvan/switch.dart b/lib/views/widgets/didvan/switch.dart index 558a2f7..8f592e0 100644 --- a/lib/views/widgets/didvan/switch.dart +++ b/lib/views/widgets/didvan/switch.dart @@ -30,7 +30,7 @@ class _DidvanSwitchState extends State { @override Widget build(BuildContext context) { - return MenuItem( + return MenuOption( title: widget.title, onTap: () { setState( diff --git a/pubspec.lock b/pubspec.lock index 3823c80..c3bc526 100644 --- 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"