From cbfebd09812ecb8fcee6b23f0662be52c8493667 Mon Sep 17 00:00:00 2001 From: MohammadTaha Basiri Date: Fri, 9 Dec 2022 22:18:29 +0330 Subject: [PATCH] bug fix --- lib/generated_plugin_registrant.dart | 31 +++++++++++++++++++ lib/providers/server_data.dart | 4 ++- lib/services/storage/storage.dart | 4 +-- lib/utils/date_time.dart | 10 +++--- .../authentication/authentication_state.dart | 2 +- .../widgets/authentication_layout.dart | 5 ++- lib/views/home/comments/comments.dart | 2 +- .../statistic_details/statistic_details.dart | 13 +++----- .../statistic/widgets/statistic_overview.dart | 2 +- lib/views/home/studio/studio.dart | 2 -- .../studio_details/studio_details.web.dart | 3 +- .../widgets/audio/audio_player_widget.dart | 2 +- lib/views/home/widgets/categories_list.dart | 16 +++++----- .../home/widgets/floating_navigation_bar.dart | 26 ++++++++++++++++ lib/views/home/widgets/overview/news.dart | 2 +- lib/views/splash/splash.dart | 6 +--- lib/views/widgets/animated_visibility.dart | 2 +- lib/views/widgets/didvan/page_view.dart | 5 ++- .../widgets/state_handlers/state_handler.dart | 1 - 19 files changed, 92 insertions(+), 46 deletions(-) create mode 100644 lib/generated_plugin_registrant.dart diff --git a/lib/generated_plugin_registrant.dart b/lib/generated_plugin_registrant.dart new file mode 100644 index 0000000..7b9ff2b --- /dev/null +++ b/lib/generated_plugin_registrant.dart @@ -0,0 +1,31 @@ +// +// Generated file. Do not edit. +// + +// ignore_for_file: directives_ordering +// ignore_for_file: lines_longer_than_80_chars +// ignore_for_file: depend_on_referenced_packages + +import 'package:assets_audio_player_web/web/assets_audio_player_web.dart'; +import 'package:firebase_core_web/firebase_core_web.dart'; +import 'package:firebase_messaging_web/firebase_messaging_web.dart'; +import 'package:flutter_secure_storage_web/flutter_secure_storage_web.dart'; +import 'package:image_picker_for_web/image_picker_for_web.dart'; +import 'package:record_web/record_web.dart'; +import 'package:url_launcher_web/url_launcher_web.dart'; +import 'package:wakelock_web/wakelock_web.dart'; + +import 'package:flutter_web_plugins/flutter_web_plugins.dart'; + +// ignore: public_member_api_docs +void registerPlugins(Registrar registrar) { + AssetsAudioPlayerWebPlugin.registerWith(registrar); + FirebaseCoreWeb.registerWith(registrar); + FirebaseMessagingWeb.registerWith(registrar); + FlutterSecureStorageWeb.registerWith(registrar); + ImagePickerPlugin.registerWith(registrar); + RecordPluginWeb.registerWith(registrar); + UrlLauncherPlugin.registerWith(registrar); + WakelockWeb.registerWith(registrar); + registrar.registerMessageHandler(); +} diff --git a/lib/providers/server_data.dart b/lib/providers/server_data.dart index 4aac55f..d5b2da0 100644 --- a/lib/providers/server_data.dart +++ b/lib/providers/server_data.dart @@ -10,7 +10,9 @@ class ServerDataProvider { } static int labelToTypeId(String label) { - if (label.contains('پشتیبانی اپلیکیشن')) { + if (label.contains('می‌خواهم بیشتر بدانم')) { + return 9; + } else if (label.contains('پشتیبانی اپلیکیشن')) { return 8; } else if (label.contains('پشتیبانی محتوا')) { return 7; diff --git a/lib/services/storage/storage.dart b/lib/services/storage/storage.dart index ed607e8..1793d6e 100644 --- a/lib/services/storage/storage.dart +++ b/lib/services/storage/storage.dart @@ -14,12 +14,12 @@ class StorageService { required String subDirectory, required String name, }) async { - final dir = io.Directory(appDocsDir + '/$subDirectory'); + final dir = io.Directory('$appDocsDir/$subDirectory'); if (!await dir.exists()) { await dir.create(recursive: true); } final file = await io.File( - appDocsDir + '/$subDirectory/$name', + '$appDocsDir/$subDirectory/$name', ).create(recursive: true); await file.writeAsBytes(bytes); } diff --git a/lib/utils/date_time.dart b/lib/utils/date_time.dart index 3e50c93..57c26eb 100644 --- a/lib/utils/date_time.dart +++ b/lib/utils/date_time.dart @@ -91,24 +91,24 @@ class DateTimeUtils { double interval = seconds / 31536000; if (interval > 1) { - return interval.floor().toString() + " سال پیش"; + return "${interval.floor()} سال پیش"; } interval = seconds / 2592000; if (interval > 1) { - return interval.floor().toString() + " ماه پیش"; + return "${interval.floor()} ماه پیش"; } interval = seconds / 86400; if (interval > 1) { if (interval.floor() == 1) return 'دیروز'; - return interval.floor().toString() + " روز پیش"; + return "${interval.floor()} روز پیش"; } interval = seconds / 3600; if (interval > 1) { - return interval.floor().toString() + " ساعت پیش"; + return "${interval.floor()} ساعت پیش"; } interval = seconds / 60; if (interval > 1) { - return interval.floor().toString() + " دقیقه پیش"; + return "${interval.floor()} دقیقه پیش"; } return 'هم اکنون'; // return seconds.floor().toString() + " ثانیه پیش"; diff --git a/lib/views/authentication/authentication_state.dart b/lib/views/authentication/authentication_state.dart index 441d661..15bc772 100644 --- a/lib/views/authentication/authentication_state.dart +++ b/lib/views/authentication/authentication_state.dart @@ -60,7 +60,7 @@ class AuthenticationState extends CoreProvier { Future sendOtpToken() async { final service = RequestService( - RequestHelper.otp + '?username=$username', + '${RequestHelper.otp}?username=$username', useAutherization: false, ); await service.httpGet(); diff --git a/lib/views/authentication/widgets/authentication_layout.dart b/lib/views/authentication/widgets/authentication_layout.dart index e3fceca..b1fb3f4 100644 --- a/lib/views/authentication/widgets/authentication_layout.dart +++ b/lib/views/authentication/widgets/authentication_layout.dart @@ -1,5 +1,6 @@ import 'package:didvan/views/authentication/widgets/authentication_app_bar.dart'; import 'package:didvan/views/widgets/logos/didvan_horizontal_logo.dart'; +import 'package:didvan/views/widgets/logos/didvan_vertical_logo.dart'; import 'package:flutter/material.dart'; class AuthenticationLayout extends StatelessWidget { @@ -39,9 +40,7 @@ class AuthenticationLayout extends StatelessWidget { bottom: 40, ), sliver: const SliverToBoxAdapter( - child: DidvanVerticalLogo( - height: 200, - ), + child: DidvanHorizontalLogo(), ), ), SliverPadding( diff --git a/lib/views/home/comments/comments.dart b/lib/views/home/comments/comments.dart index 7803230..fbeb4bf 100644 --- a/lib/views/home/comments/comments.dart +++ b/lib/views/home/comments/comments.dart @@ -23,7 +23,7 @@ class Comments extends StatefulWidget { }) : super(key: key); @override - _CommentsState createState() => _CommentsState(); + State createState() => _CommentsState(); } class _CommentsState extends State { diff --git a/lib/views/home/statistic/statistic_details/statistic_details.dart b/lib/views/home/statistic/statistic_details/statistic_details.dart index bab72b0..4175aae 100644 --- a/lib/views/home/statistic/statistic_details/statistic_details.dart +++ b/lib/views/home/statistic/statistic_details/statistic_details.dart @@ -72,7 +72,7 @@ class _StatisticDetailsState extends State { ), const SizedBox(height: 20), Padding( - padding: const EdgeInsets.symmetric(horizontal: 16), + padding: const EdgeInsets.symmetric(horizontal: 60), child: SizedBox( width: double.infinity, height: 120, @@ -89,13 +89,10 @@ class _StatisticDetailsState extends State { Theme.of(context).colorScheme.navigation, getTooltipItems: (data) => [ LineTooltipItem( - state.datas[data.first.spotIndex].tEn! + - '\n' + - intl.NumberFormat("###,000", "en_US") - .format( - data.first.bar - .spots[data.first.spotIndex].y, - ), + '${state.datas[data.first.spotIndex].tEn!}\n${intl.NumberFormat("###,000", "en_US").format( + data.first.bar + .spots[data.first.spotIndex].y, + )}', Theme.of(context) .textTheme .caption! diff --git a/lib/views/home/statistic/widgets/statistic_overview.dart b/lib/views/home/statistic/widgets/statistic_overview.dart index acb392b..8ff4d11 100644 --- a/lib/views/home/statistic/widgets/statistic_overview.dart +++ b/lib/views/home/statistic/widgets/statistic_overview.dart @@ -97,7 +97,7 @@ class StatisticOverview extends StatelessWidget { if (_hasDiff) const SizedBox(width: 4), if (_hasDiff) DidvanText( - statistic.data.dp.toString() + '%', + '${statistic.data.dp}%', style: Theme.of(context).textTheme.caption, color: _diffColor(context), ), diff --git a/lib/views/home/studio/studio.dart b/lib/views/home/studio/studio.dart index b4d9885..e8f6e1e 100644 --- a/lib/views/home/studio/studio.dart +++ b/lib/views/home/studio/studio.dart @@ -16,12 +16,10 @@ import 'package:didvan/views/home/widgets/overview/podcast.dart'; import 'package:didvan/views/home/widgets/overview/video.dart'; import 'package:didvan/views/home/widgets/search_field.dart'; import 'package:didvan/views/widgets/animated_visibility.dart'; -import 'package:didvan/views/widgets/didvan/checkbox.dart'; import 'package:didvan/views/widgets/didvan/divider.dart'; import 'package:didvan/views/widgets/didvan/icon_button.dart'; import 'package:didvan/views/widgets/didvan/radial_button.dart'; import 'package:didvan/views/widgets/item_title.dart'; -import 'package:didvan/views/widgets/logos/didvan_vertical_logo.dart'; import 'package:didvan/views/widgets/state_handlers/empty_result.dart'; import 'package:didvan/views/widgets/state_handlers/sliver_state_handler.dart'; import 'package:flutter/material.dart'; diff --git a/lib/views/home/studio/studio_details/studio_details.web.dart b/lib/views/home/studio/studio_details/studio_details.web.dart index f7f5d94..92786ff 100644 --- a/lib/views/home/studio/studio_details/studio_details.web.dart +++ b/lib/views/home/studio/studio_details/studio_details.web.dart @@ -46,8 +46,7 @@ class _StudioDetailsState extends State { (int viewId) => html.IFrameElement() ..allowFullscreen = true ..src = Uri.dataFromString( - '' + - state.studio.iframe!, + '${state.studio.iframe!}', mimeType: 'text/html', ).toString() ..style.border = 'none', diff --git a/lib/views/home/widgets/audio/audio_player_widget.dart b/lib/views/home/widgets/audio/audio_player_widget.dart index fd9c772..c04b5e6 100644 --- a/lib/views/home/widgets/audio/audio_player_widget.dart +++ b/lib/views/home/widgets/audio/audio_player_widget.dart @@ -222,7 +222,7 @@ class AudioPlayerWidget extends StatelessWidget { ), const SizedBox(height: 24), DidvanText( - timerValue.toString() + ' دقیقه', + '$timerValue دقیقه', style: Theme.of(context).textTheme.headline3, ), const SizedBox(height: 12), diff --git a/lib/views/home/widgets/categories_list.dart b/lib/views/home/widgets/categories_list.dart index 5a718be..df6e8db 100644 --- a/lib/views/home/widgets/categories_list.dart +++ b/lib/views/home/widgets/categories_list.dart @@ -121,14 +121,6 @@ class _CategoriesListState extends State { width: 100, padding: const EdgeInsets.all(4), alignment: Alignment.center, - child: FittedBox( - fit: BoxFit.scaleDown, - child: DidvanText( - category.label, - fontWeight: FontWeight.w600, - color: Theme.of(context).colorScheme.focusedBorder, - ), - ), decoration: BoxDecoration( color: widget.selectedCats.length == 1 && widget.selectedCats.contains(category) || @@ -140,6 +132,14 @@ class _CategoriesListState extends State { ), borderRadius: DesignConfig.lowBorderRadius, ), + child: FittedBox( + fit: BoxFit.scaleDown, + child: DidvanText( + category.label, + fontWeight: FontWeight.w600, + color: Theme.of(context).colorScheme.focusedBorder, + ), + ), ), ); } diff --git a/lib/views/home/widgets/floating_navigation_bar.dart b/lib/views/home/widgets/floating_navigation_bar.dart index 9f61a37..c3d8122 100644 --- a/lib/views/home/widgets/floating_navigation_bar.dart +++ b/lib/views/home/widgets/floating_navigation_bar.dart @@ -260,6 +260,32 @@ class _FloatingNavigationBarState extends State { }, icon: DidvanIcons.description_regular, ), + if (widget.isRadar) ...[ + const DidvanDivider(), + MenuOption( + title: 'می‌خواهم بیشتر بدانم', + icon: DidvanIcons.info_circle_regular, + onTap: () { + Navigator.of(context).pop(); + Navigator.of(context).pushNamed( + Routes.direct, + arguments: { + 'radarAttachment': RadarAttachment( + id: widget.item.id, + title: widget.item.title, + description: widget.item.contents.first.text, + timeToRead: widget.item.timeToRead, + image: widget.item.image, + forManagers: widget.item.forManagers, + categories: widget.item.categories, + createdAt: widget.item.createdAt, + ), + 'type': 'می‌خواهم بیشتر بدانم' + }, + ); + }, + ), + ], ], ), title: 'موارد بیشتر', diff --git a/lib/views/home/widgets/overview/news.dart b/lib/views/home/widgets/overview/news.dart index 6a8db98..44e03cb 100644 --- a/lib/views/home/widgets/overview/news.dart +++ b/lib/views/home/widgets/overview/news.dart @@ -73,7 +73,7 @@ class NewsOverview extends StatelessWidget { style: Theme.of(context).textTheme.caption, ), DidvanText( - ' - ' + DateTimeUtils.momentGenerator(news.createdAt), + ' - ${DateTimeUtils.momentGenerator(news.createdAt)}', style: Theme.of(context).textTheme.caption, ), ], diff --git a/lib/views/splash/splash.dart b/lib/views/splash/splash.dart index 10dad53..dea28df 100644 --- a/lib/views/splash/splash.dart +++ b/lib/views/splash/splash.dart @@ -1,7 +1,6 @@ import 'dart:developer'; import 'package:didvan/config/design_config.dart'; -import 'package:didvan/config/theme_data.dart'; import 'package:didvan/constants/assets.dart'; import 'package:didvan/main.dart'; import 'package:didvan/providers/media.dart'; @@ -14,12 +13,9 @@ import 'package:didvan/services/network/request.dart'; import 'package:didvan/services/storage/storage.dart'; import 'package:didvan/utils/action_sheet.dart'; import 'package:didvan/views/widgets/didvan/button.dart'; -import 'package:didvan/views/widgets/logos/didvan_horizontal_logo.dart'; -import 'package:didvan/views/widgets/logos/didvan_vertical_logo.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:flutter_spinkit/flutter_spinkit.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:provider/provider.dart'; import 'package:universal_html/html.dart' as html; @@ -28,7 +24,7 @@ class Splash extends StatefulWidget { const Splash({Key? key}) : super(key: key); @override - _SplashState createState() => _SplashState(); + State createState() => _SplashState(); } class _SplashState extends State { diff --git a/lib/views/widgets/animated_visibility.dart b/lib/views/widgets/animated_visibility.dart index 0c058e8..6165249 100644 --- a/lib/views/widgets/animated_visibility.dart +++ b/lib/views/widgets/animated_visibility.dart @@ -25,7 +25,7 @@ class AnimatedVisibility extends StatefulWidget { }) : super(key: key); @override - _AnimatedVisibilityState createState() => _AnimatedVisibilityState(); + State createState() => _AnimatedVisibilityState(); } class _AnimatedVisibilityState extends State diff --git a/lib/views/widgets/didvan/page_view.dart b/lib/views/widgets/didvan/page_view.dart index a0b7b66..b8bbab7 100644 --- a/lib/views/widgets/didvan/page_view.dart +++ b/lib/views/widgets/didvan/page_view.dart @@ -9,7 +9,6 @@ import 'package:didvan/routes/routes.dart'; import 'package:didvan/utils/action_sheet.dart'; import 'package:didvan/utils/date_time.dart'; import 'package:didvan/views/home/direct/widgets/audio_widget.dart'; -import 'package:didvan/views/home/widgets/audio/audio_slider.dart'; import 'package:didvan/views/home/widgets/overview/multitype.dart'; import 'package:didvan/views/home/widgets/tag_item.dart'; import 'package:didvan/views/widgets/animated_visibility.dart'; @@ -387,7 +386,7 @@ class _DidvanPageViewState extends State { style: Theme.of(context).textTheme.caption, ), DidvanText( - ' - ' + DateTimeUtils.momentGenerator(item.createdAt), + ' - ${DateTimeUtils.momentGenerator(item.createdAt)}', style: Theme.of(context).textTheme.caption, ), ], @@ -400,7 +399,7 @@ class _DidvanPageViewState extends State { style: Theme.of(context).textTheme.caption, ), DidvanText( - ' - ' + DateTimeUtils.momentGenerator(item.createdAt), + ' - ${DateTimeUtils.momentGenerator(item.createdAt)}', style: Theme.of(context).textTheme.caption, ), ], diff --git a/lib/views/widgets/state_handlers/state_handler.dart b/lib/views/widgets/state_handlers/state_handler.dart index 020a5a0..7cf88f5 100644 --- a/lib/views/widgets/state_handlers/state_handler.dart +++ b/lib/views/widgets/state_handlers/state_handler.dart @@ -3,7 +3,6 @@ import 'package:didvan/models/enums.dart'; import 'package:didvan/providers/core.dart'; import 'package:didvan/views/widgets/state_handlers/empty_connection.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_spinkit/flutter_spinkit.dart'; class StateHandler extends StatelessWidget { final T state;