From a67e252667ede028e7c1b6f8b79624c769b75fd6 Mon Sep 17 00:00:00 2001 From: MohammadTaha Basiri Date: Sun, 6 Feb 2022 18:06:26 +0330 Subject: [PATCH] D1APP-48 category model name changed --- lib/models/category.dart | 6 +++--- lib/models/radar_details_data.dart | 6 +++--- lib/models/radar_overview.dart | 6 +++--- lib/pages/home/widgets/floating_navigation_bar.dart | 2 +- lib/pages/home/widgets/radar_overview.dart | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/models/category.dart b/lib/models/category.dart index 6968552..3faf75a 100644 --- a/lib/models/category.dart +++ b/lib/models/category.dart @@ -1,10 +1,10 @@ -class Category { +class CategoryData { final int id; final String label; - const Category({required this.id, required this.label}); + const CategoryData({required this.id, required this.label}); - factory Category.fromJson(Map json) => Category( + factory CategoryData.fromJson(Map json) => CategoryData( id: json['id'], label: json['label'], ); diff --git a/lib/models/radar_details_data.dart b/lib/models/radar_details_data.dart index 70be8d0..d075e09 100644 --- a/lib/models/radar_details_data.dart +++ b/lib/models/radar_details_data.dart @@ -16,7 +16,7 @@ class RadarDetailsData { int comments; final List tags; final List contents; - final List categories; + final List categories; final int order; final List relatedContents = []; @@ -54,9 +54,9 @@ class RadarDetailsData { (content) => Content.fromJson(content), ), ), - categories: List.from( + categories: List.from( json['categories'].map( - (cat) => Category.fromJson(cat), + (cat) => CategoryData.fromJson(cat), ), ), ); diff --git a/lib/models/radar_overview.dart b/lib/models/radar_overview.dart index ba3469e..db1cb54 100644 --- a/lib/models/radar_overview.dart +++ b/lib/models/radar_overview.dart @@ -4,7 +4,7 @@ import 'category.dart'; class RadarOverviewData extends OverviewData { final bool forManagers; - final List categories; + final List categories; final int timeToRead; int comments; bool marked; @@ -40,9 +40,9 @@ class RadarOverviewData extends OverviewData { forManagers: json['forManagers'], marked: json['marked'], comments: json['comments'], - categories: List.from( + categories: List.from( json['categories'].map( - (category) => Category.fromJson(category), + (category) => CategoryData.fromJson(category), ), ), ); diff --git a/lib/pages/home/widgets/floating_navigation_bar.dart b/lib/pages/home/widgets/floating_navigation_bar.dart index 5d8b867..86e7db1 100644 --- a/lib/pages/home/widgets/floating_navigation_bar.dart +++ b/lib/pages/home/widgets/floating_navigation_bar.dart @@ -23,7 +23,7 @@ class FloatingNavigationBar extends StatefulWidget { final int comments; final int id; final String title; - final List? categories; + final List? categories; final void Function(bool value) onMarkChanged; const FloatingNavigationBar({ diff --git a/lib/pages/home/widgets/radar_overview.dart b/lib/pages/home/widgets/radar_overview.dart index 35be2a4..a16a339 100644 --- a/lib/pages/home/widgets/radar_overview.dart +++ b/lib/pages/home/widgets/radar_overview.dart @@ -88,7 +88,7 @@ class RadarOverview extends StatelessWidget { ), const Spacer(), DidvanText( - '${DateTimeUtils.momentGenerator(radar.createdAt)} | خواندن ${radar.timeToRead} دقیقه', + '${DateTimeUtils.momentGenerator(radar.createdAt)} | خواندن در ${radar.timeToRead} دقیقه', style: Theme.of(context).textTheme.overline, color: Theme.of(context).colorScheme.caption, ),