fix some isuues

This commit is contained in:
Amir Hossein Mousavi 2024-04-14 17:02:53 +03:30
parent dd04590128
commit 366f270a8e
11 changed files with 24 additions and 31 deletions

View File

@ -222,7 +222,7 @@ class HomeState extends CoreProvier {
), ),
CategoryData( CategoryData(
id: 5, id: 5,
label: 'زیست محیطی', label: 'زیستمحیطی',
asset: Assets.enviromentalCategoryIcon, asset: Assets.enviromentalCategoryIcon,
), ),
CategoryData( CategoryData(

View File

@ -119,7 +119,7 @@ class InfographyScreenState extends CoreProvier {
), ),
CategoryData( CategoryData(
id: 5, id: 5,
label: 'زیست محیطی', label: 'زیستمحیطی',
asset: Assets.enviromentalCategoryIcon, asset: Assets.enviromentalCategoryIcon,
), ),
CategoryData( CategoryData(

View File

@ -167,7 +167,7 @@ class _MainPageGeneralItemState extends State<MainPageGeneralItem> {
child: DidvanText( child: DidvanText(
widget.content.title, widget.content.title,
style: Theme.of(context).textTheme.bodyLarge, style: Theme.of(context).textTheme.bodyLarge,
maxLines: 2, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
), ),
@ -194,6 +194,7 @@ class _MainPageGeneralItemState extends State<MainPageGeneralItem> {
child: Padding( child: Padding(
padding: const EdgeInsets.only(left: 12, right: 12, bottom: 8), padding: const EdgeInsets.only(left: 12, right: 12, bottom: 8),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [ children: [
Icon( Icon(
widget.content.marked widget.content.marked
@ -203,14 +204,6 @@ class _MainPageGeneralItemState extends State<MainPageGeneralItem> {
? Theme.of(context).colorScheme.secondary ? Theme.of(context).colorScheme.secondary
: Theme.of(context).colorScheme.caption, : 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<MainPageGeneralItem> {
Widget _subtitleItem(int i, BuildContext context) => Row( Widget _subtitleItem(int i, BuildContext context) => Row(
mainAxisAlignment: mainAxisAlignment:
i == 0 ? MainAxisAlignment.start : MainAxisAlignment.end, i == 0 ? MainAxisAlignment.start : MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Icon( Icon(
_generateSubtitleIcon(i), _generateSubtitleIcon(i),

View File

@ -100,9 +100,7 @@ class InfographyItem extends StatelessWidget {
padding: const EdgeInsets.all(12), padding: const EdgeInsets.all(12),
child: Column( child: Column(
children: [ children: [
Padding( Align(
padding: const EdgeInsets.symmetric(horizontal: 8.0),
child: Align(
alignment: Alignment.centerRight, alignment: Alignment.centerRight,
child: DidvanText( child: DidvanText(
title, title,
@ -111,7 +109,6 @@ class InfographyItem extends StatelessWidget {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
), ),
),
const SizedBox(height: 8), const SizedBox(height: 8),
Padding( Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0), padding: const EdgeInsets.symmetric(vertical: 8.0),

View File

@ -94,6 +94,7 @@ class MainPagePodcastItem extends StatelessWidget {
DidvanIcons.calendar_day_light, DidvanIcons.calendar_day_light,
size: 16, size: 16,
), ),
const SizedBox(width: 4),
DidvanText( DidvanText(
DateTime.parse(content.subtitles[0]) DateTime.parse(content.subtitles[0])
.toPersianDateStr(), .toPersianDateStr(),

View File

@ -205,7 +205,7 @@ class _RadarState extends State<Radar> {
child: SearchField( child: SearchField(
focusNode: _focusNode, focusNode: _focusNode,
isFiltered: state.filtering, isFiltered: state.filtering,
title: 'افق', title: 'پویش‌های افق',
onChanged: _onChanged, onChanged: _onChanged,
onFilterButtonPressed: _showFilterBottomSheet, onFilterButtonPressed: _showFilterBottomSheet,
), ),

View File

@ -120,7 +120,7 @@ class RadarState extends CoreProvier {
), ),
CategoryData( CategoryData(
id: 5, id: 5,
label: 'زیست محیطی', label: 'زیستمحیطی',
asset: Assets.enviromentalCategoryIcon, asset: Assets.enviromentalCategoryIcon,
), ),
CategoryData( CategoryData(

View File

@ -1,7 +1,6 @@
import 'package:didvan/models/overview_data.dart'; import 'package:didvan/models/overview_data.dart';
import 'package:didvan/models/requests/news.dart'; import 'package:didvan/models/requests/news.dart';
import 'package:didvan/routes/routes.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/bookmark_button.dart';
import 'package:didvan/views/widgets/didvan/card.dart'; import 'package:didvan/views/widgets/didvan/card.dart';
import 'package:didvan/views/widgets/didvan/divider.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/shimmer_placeholder.dart';
import 'package:didvan/views/widgets/skeleton_image.dart'; import 'package:didvan/views/widgets/skeleton_image.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:persian_number_utility/persian_number_utility.dart';
class NewsOverview extends StatelessWidget { class NewsOverview extends StatelessWidget {
final OverviewData news; final OverviewData news;
@ -73,7 +73,7 @@ class NewsOverview extends StatelessWidget {
style: Theme.of(context).textTheme.bodySmall, style: Theme.of(context).textTheme.bodySmall,
), ),
DidvanText( DidvanText(
' - ${DateTimeUtils.momentGenerator(news.createdAt)}', ' - ${DateTime.parse(news.createdAt).toPersianDateStr()}',
style: Theme.of(context).textTheme.bodySmall, style: Theme.of(context).textTheme.bodySmall,
), ),
], ],

View File

@ -4,7 +4,6 @@ import 'package:didvan/models/enums.dart';
import 'package:didvan/models/overview_data.dart'; import 'package:didvan/models/overview_data.dart';
import 'package:didvan/models/requests/studio.dart'; import 'package:didvan/models/requests/studio.dart';
import 'package:didvan/providers/media.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/podcasts/studio_details/studio_details_state.dart';
import 'package:didvan/views/widgets/bookmark_button.dart'; import 'package:didvan/views/widgets/bookmark_button.dart';
import 'package:didvan/views/widgets/duration_widget.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/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:persian_number_utility/persian_number_utility.dart';
class PodcastOverview extends StatelessWidget { class PodcastOverview extends StatelessWidget {
final OverviewData podcast; final OverviewData podcast;
@ -60,7 +60,7 @@ class PodcastOverview extends StatelessWidget {
), ),
const SizedBox(height: 4), const SizedBox(height: 4),
DidvanText( DidvanText(
DateTimeUtils.momentGenerator(podcast.createdAt), DateTime.parse(podcast.createdAt).toPersianDateStr(),
style: Theme.of(context).textTheme.labelSmall, style: Theme.of(context).textTheme.labelSmall,
color: Theme.of(context).colorScheme.caption, color: Theme.of(context).colorScheme.caption,
), ),

View File

@ -3,7 +3,6 @@ import 'package:didvan/constants/app_icons.dart';
import 'package:didvan/models/overview_data.dart'; import 'package:didvan/models/overview_data.dart';
import 'package:didvan/models/requests/radar.dart'; import 'package:didvan/models/requests/radar.dart';
import 'package:didvan/routes/routes.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/bookmark_button.dart';
import 'package:didvan/views/widgets/didvan/card.dart'; import 'package:didvan/views/widgets/didvan/card.dart';
import 'package:didvan/views/widgets/didvan/divider.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/shimmer_placeholder.dart';
import 'package:didvan/views/widgets/skeleton_image.dart'; import 'package:didvan/views/widgets/skeleton_image.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:persian_number_utility/persian_number_utility.dart';
class RadarOverview extends StatelessWidget { class RadarOverview extends StatelessWidget {
final OverviewData radar; final OverviewData radar;
@ -87,7 +87,7 @@ class RadarOverview extends StatelessWidget {
), ),
const Spacer(), const Spacer(),
DidvanText( DidvanText(
'${DateTimeUtils.momentGenerator(radar.createdAt)} | خواندن در ${radar.timeToRead} دقیقه', '${DateTime.parse(radar.createdAt).toPersianDateStr()} | خواندن در ${radar.timeToRead} دقیقه',
style: Theme.of(context).textTheme.labelSmall, style: Theme.of(context).textTheme.labelSmall,
color: Theme.of(context).colorScheme.caption, color: Theme.of(context).colorScheme.caption,
), ),

View File

@ -3,7 +3,6 @@ import 'package:didvan/constants/app_icons.dart';
import 'package:didvan/models/overview_data.dart'; import 'package:didvan/models/overview_data.dart';
import 'package:didvan/models/requests/studio.dart'; import 'package:didvan/models/requests/studio.dart';
import 'package:didvan/routes/routes.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/bookmark_button.dart';
import 'package:didvan/views/widgets/duration_widget.dart'; import 'package:didvan/views/widgets/duration_widget.dart';
import 'package:didvan/views/widgets/didvan/card.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/shimmer_placeholder.dart';
import 'package:didvan/views/widgets/skeleton_image.dart'; import 'package:didvan/views/widgets/skeleton_image.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:persian_number_utility/persian_number_utility.dart';
class VideoOverview extends StatelessWidget { class VideoOverview extends StatelessWidget {
final OverviewData video; final OverviewData video;
@ -75,6 +75,7 @@ class VideoOverview extends StatelessWidget {
), ),
const SizedBox(height: 4), const SizedBox(height: 4),
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
const Icon( const Icon(
DidvanIcons.calendar_day_regular, DidvanIcons.calendar_day_regular,
@ -82,7 +83,7 @@ class VideoOverview extends StatelessWidget {
), ),
const SizedBox(width: 4), const SizedBox(width: 4),
DidvanText( DidvanText(
DateTimeUtils.momentGenerator(video.createdAt), DateTime.parse(video.createdAt).toPersianDateStr(),
style: Theme.of(context).textTheme.labelSmall, style: Theme.of(context).textTheme.labelSmall,
color: Theme.of(context).colorScheme.caption, color: Theme.of(context).colorScheme.caption,
), ),