diff --git a/lib/views/home/home_state.dart b/lib/views/home/home_state.dart index e0514d5..d23dac2 100644 --- a/lib/views/home/home_state.dart +++ b/lib/views/home/home_state.dart @@ -222,7 +222,7 @@ class HomeState extends CoreProvier { ), CategoryData( id: 5, - label: 'زیست محیطی', + label: 'زیست‌محیطی', asset: Assets.enviromentalCategoryIcon, ), CategoryData( diff --git a/lib/views/home/infography/infography_screen_state.dart b/lib/views/home/infography/infography_screen_state.dart index 43756d0..b4a963a 100644 --- a/lib/views/home/infography/infography_screen_state.dart +++ b/lib/views/home/infography/infography_screen_state.dart @@ -119,7 +119,7 @@ class InfographyScreenState extends CoreProvier { ), CategoryData( id: 5, - label: 'زیست محیطی', + label: 'زیست‌محیطی', asset: Assets.enviromentalCategoryIcon, ), CategoryData( diff --git a/lib/views/home/main/widgets/general_item.dart b/lib/views/home/main/widgets/general_item.dart index e236269..751d547 100644 --- a/lib/views/home/main/widgets/general_item.dart +++ b/lib/views/home/main/widgets/general_item.dart @@ -167,7 +167,7 @@ class _MainPageGeneralItemState extends State { child: DidvanText( widget.content.title, style: Theme.of(context).textTheme.bodyLarge, - maxLines: 2, + maxLines: 1, overflow: TextOverflow.ellipsis, ), ), @@ -194,6 +194,7 @@ class _MainPageGeneralItemState extends State { child: Padding( padding: const EdgeInsets.only(left: 12, right: 12, bottom: 8), child: Row( + mainAxisAlignment: MainAxisAlignment.end, children: [ Icon( widget.content.marked @@ -203,14 +204,6 @@ class _MainPageGeneralItemState extends State { ? Theme.of(context).colorScheme.secondary : Theme.of(context).colorScheme.caption, ), - DidvanText( - widget.content.marked - ? 'به رصدهای من افزوده شد!' - : 'افزودن به رصدهای من', - color: widget.content.marked - ? Theme.of(context).colorScheme.secondary - : Theme.of(context).colorScheme.caption, - ), ], ), ), @@ -224,6 +217,7 @@ class _MainPageGeneralItemState extends State { Widget _subtitleItem(int i, BuildContext context) => Row( mainAxisAlignment: i == 0 ? MainAxisAlignment.start : MainAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.start, children: [ Icon( _generateSubtitleIcon(i), diff --git a/lib/views/home/main/widgets/infography_item.dart b/lib/views/home/main/widgets/infography_item.dart index 69fbb1a..81e0a0b 100644 --- a/lib/views/home/main/widgets/infography_item.dart +++ b/lib/views/home/main/widgets/infography_item.dart @@ -100,16 +100,13 @@ class InfographyItem extends StatelessWidget { padding: const EdgeInsets.all(12), child: Column( children: [ - Padding( - padding: const EdgeInsets.symmetric(horizontal: 8.0), - child: Align( - alignment: Alignment.centerRight, - child: DidvanText( - title, - style: Theme.of(context).textTheme.bodyLarge, - maxLines: 1, - overflow: TextOverflow.ellipsis, - ), + Align( + alignment: Alignment.centerRight, + child: DidvanText( + title, + style: Theme.of(context).textTheme.bodyLarge, + maxLines: 1, + overflow: TextOverflow.ellipsis, ), ), const SizedBox(height: 8), diff --git a/lib/views/home/main/widgets/podcast_item.dart b/lib/views/home/main/widgets/podcast_item.dart index d8bd232..c9e4fcc 100644 --- a/lib/views/home/main/widgets/podcast_item.dart +++ b/lib/views/home/main/widgets/podcast_item.dart @@ -94,6 +94,7 @@ class MainPagePodcastItem extends StatelessWidget { DidvanIcons.calendar_day_light, size: 16, ), + const SizedBox(width: 4), DidvanText( DateTime.parse(content.subtitles[0]) .toPersianDateStr(), diff --git a/lib/views/radar/radar.dart b/lib/views/radar/radar.dart index abe196f..193697d 100644 --- a/lib/views/radar/radar.dart +++ b/lib/views/radar/radar.dart @@ -205,7 +205,7 @@ class _RadarState extends State { child: SearchField( focusNode: _focusNode, isFiltered: state.filtering, - title: 'افق', + title: 'پویش‌های افق', onChanged: _onChanged, onFilterButtonPressed: _showFilterBottomSheet, ), diff --git a/lib/views/radar/radar_state.dart b/lib/views/radar/radar_state.dart index 347125d..d953525 100644 --- a/lib/views/radar/radar_state.dart +++ b/lib/views/radar/radar_state.dart @@ -120,7 +120,7 @@ class RadarState extends CoreProvier { ), CategoryData( id: 5, - label: 'زیست محیطی', + label: 'زیست‌محیطی', asset: Assets.enviromentalCategoryIcon, ), CategoryData( diff --git a/lib/views/widgets/overview/news.dart b/lib/views/widgets/overview/news.dart index dda7009..ef33771 100644 --- a/lib/views/widgets/overview/news.dart +++ b/lib/views/widgets/overview/news.dart @@ -1,7 +1,6 @@ import 'package:didvan/models/overview_data.dart'; import 'package:didvan/models/requests/news.dart'; import 'package:didvan/routes/routes.dart'; -import 'package:didvan/utils/date_time.dart'; import 'package:didvan/views/widgets/bookmark_button.dart'; import 'package:didvan/views/widgets/didvan/card.dart'; import 'package:didvan/views/widgets/didvan/divider.dart'; @@ -9,6 +8,7 @@ import 'package:didvan/views/widgets/didvan/text.dart'; import 'package:didvan/views/widgets/shimmer_placeholder.dart'; import 'package:didvan/views/widgets/skeleton_image.dart'; import 'package:flutter/material.dart'; +import 'package:persian_number_utility/persian_number_utility.dart'; class NewsOverview extends StatelessWidget { final OverviewData news; @@ -73,7 +73,7 @@ class NewsOverview extends StatelessWidget { style: Theme.of(context).textTheme.bodySmall, ), DidvanText( - ' - ${DateTimeUtils.momentGenerator(news.createdAt)}', + ' - ${DateTime.parse(news.createdAt).toPersianDateStr()}', style: Theme.of(context).textTheme.bodySmall, ), ], diff --git a/lib/views/widgets/overview/podcast.dart b/lib/views/widgets/overview/podcast.dart index f9c9ba9..0b38d68 100644 --- a/lib/views/widgets/overview/podcast.dart +++ b/lib/views/widgets/overview/podcast.dart @@ -4,7 +4,6 @@ import 'package:didvan/models/enums.dart'; import 'package:didvan/models/overview_data.dart'; import 'package:didvan/models/requests/studio.dart'; import 'package:didvan/providers/media.dart'; -import 'package:didvan/utils/date_time.dart'; import 'package:didvan/views/podcasts/studio_details/studio_details_state.dart'; import 'package:didvan/views/widgets/bookmark_button.dart'; import 'package:didvan/views/widgets/duration_widget.dart'; @@ -17,6 +16,7 @@ import 'package:didvan/views/widgets/skeleton_image.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; +import 'package:persian_number_utility/persian_number_utility.dart'; class PodcastOverview extends StatelessWidget { final OverviewData podcast; @@ -60,7 +60,7 @@ class PodcastOverview extends StatelessWidget { ), const SizedBox(height: 4), DidvanText( - DateTimeUtils.momentGenerator(podcast.createdAt), + DateTime.parse(podcast.createdAt).toPersianDateStr(), style: Theme.of(context).textTheme.labelSmall, color: Theme.of(context).colorScheme.caption, ), diff --git a/lib/views/widgets/overview/radar.dart b/lib/views/widgets/overview/radar.dart index e7c65c8..939d9e7 100644 --- a/lib/views/widgets/overview/radar.dart +++ b/lib/views/widgets/overview/radar.dart @@ -3,7 +3,6 @@ import 'package:didvan/constants/app_icons.dart'; import 'package:didvan/models/overview_data.dart'; import 'package:didvan/models/requests/radar.dart'; import 'package:didvan/routes/routes.dart'; -import 'package:didvan/utils/date_time.dart'; import 'package:didvan/views/widgets/bookmark_button.dart'; import 'package:didvan/views/widgets/didvan/card.dart'; import 'package:didvan/views/widgets/didvan/divider.dart'; @@ -12,6 +11,7 @@ import 'package:didvan/views/widgets/didvan/text.dart'; import 'package:didvan/views/widgets/shimmer_placeholder.dart'; import 'package:didvan/views/widgets/skeleton_image.dart'; import 'package:flutter/material.dart'; +import 'package:persian_number_utility/persian_number_utility.dart'; class RadarOverview extends StatelessWidget { final OverviewData radar; @@ -87,7 +87,7 @@ class RadarOverview extends StatelessWidget { ), const Spacer(), DidvanText( - '${DateTimeUtils.momentGenerator(radar.createdAt)} | خواندن در ${radar.timeToRead} دقیقه', + '${DateTime.parse(radar.createdAt).toPersianDateStr()} | خواندن در ${radar.timeToRead} دقیقه', style: Theme.of(context).textTheme.labelSmall, color: Theme.of(context).colorScheme.caption, ), diff --git a/lib/views/widgets/overview/video.dart b/lib/views/widgets/overview/video.dart index 57e2c5c..73c61df 100644 --- a/lib/views/widgets/overview/video.dart +++ b/lib/views/widgets/overview/video.dart @@ -3,7 +3,6 @@ import 'package:didvan/constants/app_icons.dart'; import 'package:didvan/models/overview_data.dart'; import 'package:didvan/models/requests/studio.dart'; import 'package:didvan/routes/routes.dart'; -import 'package:didvan/utils/date_time.dart'; import 'package:didvan/views/widgets/bookmark_button.dart'; import 'package:didvan/views/widgets/duration_widget.dart'; import 'package:didvan/views/widgets/didvan/card.dart'; @@ -12,6 +11,7 @@ import 'package:didvan/views/widgets/didvan/text.dart'; import 'package:didvan/views/widgets/shimmer_placeholder.dart'; import 'package:didvan/views/widgets/skeleton_image.dart'; import 'package:flutter/material.dart'; +import 'package:persian_number_utility/persian_number_utility.dart'; class VideoOverview extends StatelessWidget { final OverviewData video; @@ -75,6 +75,7 @@ class VideoOverview extends StatelessWidget { ), const SizedBox(height: 4), Row( + crossAxisAlignment: CrossAxisAlignment.start, children: [ const Icon( DidvanIcons.calendar_day_regular, @@ -82,7 +83,7 @@ class VideoOverview extends StatelessWidget { ), const SizedBox(width: 4), DidvanText( - DateTimeUtils.momentGenerator(video.createdAt), + DateTime.parse(video.createdAt).toPersianDateStr(), style: Theme.of(context).textTheme.labelSmall, color: Theme.of(context).colorScheme.caption, ),