Skip to content

Commit 3532d14

Browse files
authored
Merge pull request #66 from flutter-news-app-full-source-code/rename-dashboard-fature-to-overview
Rename dashboard fature to overview
2 parents 7cce217 + d6cbbc7 commit 3532d14

18 files changed

+151
-150
lines changed

lib/app/view/app.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import 'package:flutter_news_app_web_dashboard_full_source_code/app/config/app_e
1313
import 'package:flutter_news_app_web_dashboard_full_source_code/app_configuration/bloc/app_configuration_bloc.dart';
1414
import 'package:flutter_news_app_web_dashboard_full_source_code/authentication/bloc/authentication_bloc.dart';
1515
import 'package:flutter_news_app_web_dashboard_full_source_code/content_management/bloc/content_management_bloc.dart';
16-
import 'package:flutter_news_app_web_dashboard_full_source_code/dashboard/bloc/dashboard_bloc.dart';
1716
import 'package:flutter_news_app_web_dashboard_full_source_code/l10n/app_localizations.dart';
17+
import 'package:flutter_news_app_web_dashboard_full_source_code/overview/bloc/overview_bloc.dart';
1818
import 'package:flutter_news_app_web_dashboard_full_source_code/router/router.dart';
1919
import 'package:flutter_news_app_web_dashboard_full_source_code/shared/shared.dart';
2020
import 'package:go_router/go_router.dart';
@@ -118,7 +118,7 @@ class App extends StatelessWidget {
118118
)..add(const SharedDataRequested()),
119119
),
120120
BlocProvider(
121-
create: (context) => DashboardBloc(
121+
create: (context) => OverviewBloc(
122122
dashboardSummaryRepository: context
123123
.read<DataRepository<DashboardSummary>>(),
124124
headlinesRepository: context.read<DataRepository<Headline>>(),

lib/app/view/app_shell.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AppShell extends StatelessWidget {
2727
final l10n = AppLocalizationsX(context).l10n;
2828
return Scaffold(
2929
appBar: AppBar(
30-
title: Text(l10n.dashboard),
30+
title: Text(l10n.overview),
3131
actions: [
3232
PopupMenuButton<String>(
3333
onSelected: (value) {
@@ -73,7 +73,7 @@ class AppShell extends StatelessWidget {
7373
NavigationDestination(
7474
icon: const Icon(Icons.dashboard_outlined),
7575
selectedIcon: const Icon(Icons.dashboard),
76-
label: l10n.dashboard,
76+
label: l10n.overview,
7777
),
7878
NavigationDestination(
7979
icon: const Icon(Icons.folder_open_outlined),

lib/app_configuration/view/app_configuration_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1280,7 +1280,7 @@ class _FeedDecoratorFormState extends State<_FeedDecoratorForm> {
12801280
Map<AppUserRole, FeedDecoratorRoleConfig>.from(
12811281
decoratorConfig.visibleTo,
12821282
);
1283-
if (value == true) {
1283+
if (value ?? false) {
12841284
newVisibleTo[role] = const FeedDecoratorRoleConfig(
12851285
daysBetweenViews: 7,
12861286
);

lib/dashboard/bloc/dashboard_event.dart

Lines changed: 0 additions & 17 deletions
This file was deleted.

lib/l10n/app_localizations.dart

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,11 @@ abstract class AppLocalizations {
212212
/// **'Verify Code'**
213213
String get emailCodeVerificationButtonLabel;
214214

215-
/// Label for the dashboard navigation item
215+
/// Label for the dashboard overview navigation item
216216
///
217217
/// In en, this message translates to:
218-
/// **'Dashboard'**
219-
String get dashboard;
218+
/// **'Overview'**
219+
String get overview;
220220

221221
/// Label for the content management navigation item
222222
///
@@ -1388,43 +1388,43 @@ abstract class AppLocalizations {
13881388
/// **'Draft'**
13891389
String get contentStatusDraft;
13901390

1391-
/// Label for the total headlines summary card on the dashboard
1391+
/// Label for the total headlines summary card on the dashboard overview
13921392
///
13931393
/// In en, this message translates to:
13941394
/// **'Total Headlines'**
13951395
String get totalHeadlines;
13961396

1397-
/// Label for the total topics summary card on the dashboard
1397+
/// Label for the total topics summary card on the dashboard overview
13981398
///
13991399
/// In en, this message translates to:
14001400
/// **'Total Topics'**
14011401
String get totalTopics;
14021402

1403-
/// Label for the total sources summary card on the dashboard
1403+
/// Label for the total sources summary card on the dashboard overview
14041404
///
14051405
/// In en, this message translates to:
14061406
/// **'Total Sources'**
14071407
String get totalSources;
14081408

1409-
/// Headline for the dashboard loading state
1409+
/// Headline for the dashboard overview loading state
14101410
///
14111411
/// In en, this message translates to:
1412-
/// **'Loading Dashboard'**
1413-
String get loadingDashboard;
1412+
/// **'Loading Dashboard Overview...'**
1413+
String get loadingOverview;
14141414

1415-
/// Subheadline for the dashboard loading state
1415+
/// Subheadline for the dashboard overview loading state
14161416
///
14171417
/// In en, this message translates to:
14181418
/// **'Fetching latest statistics...'**
1419-
String get loadingDashboardSubheadline;
1419+
String get loadingOverviewSubheadline;
14201420

1421-
/// Error message when dashboard data fails to load
1421+
/// Error message when dashboard overview data fails to load
14221422
///
14231423
/// In en, this message translates to:
1424-
/// **'Failed to load dashboard data.'**
1425-
String get dashboardLoadFailure;
1424+
/// **'Failed to load dashboard overview data.'**
1425+
String get overviewLoadFailure;
14261426

1427-
/// Title for the recent headlines card on the dashboard
1427+
/// Title for the recent headlines card on the dashboard overview
14281428
///
14291429
/// In en, this message translates to:
14301430
/// **'Recent Headlines'**
@@ -1442,13 +1442,13 @@ abstract class AppLocalizations {
14421442
/// **'No recent headlines to display.'**
14431443
String get noRecentHeadlines;
14441444

1445-
/// Title for the system status card on the dashboard
1445+
/// Title for the system status card on the dashboard overview
14461446
///
14471447
/// In en, this message translates to:
14481448
/// **'System Status'**
14491449
String get systemStatus;
14501450

1451-
/// Title for the quick actions card on the dashboard
1451+
/// Title for the quick actions card on the dashboard overview
14521452
///
14531453
/// In en, this message translates to:
14541454
/// **'Quick Actions'**

lib/l10n/app_localizations_ar.dart

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class AppLocalizationsAr extends AppLocalizations {
7777
String get emailCodeVerificationButtonLabel => 'التحقق من الرمز';
7878

7979
@override
80-
String get dashboard => 'لوحة القيادة';
80+
String get overview => 'نظرة عامة';
8181

8282
@override
8383
String get contentManagement => 'إدارة المحتوى';
@@ -737,13 +737,14 @@ class AppLocalizationsAr extends AppLocalizations {
737737
String get totalSources => 'إجمالي المصادر';
738738

739739
@override
740-
String get loadingDashboard => 'جاري تحميل لوحة القيادة';
740+
String get loadingOverview => 'جاري تحميل نظرة عامة على لوحة القيادة';
741741

742742
@override
743-
String get loadingDashboardSubheadline => 'جاري جلب أحدث الإحصائيات...';
743+
String get loadingOverviewSubheadline => 'جاري جلب أحدث الإحصائيات...';
744744

745745
@override
746-
String get dashboardLoadFailure => 'فشل تحميل بيانات لوحة القيادة.';
746+
String get overviewLoadFailure =>
747+
'فشل تحميل بيانات نظرة عامة على لوحة القيادة.';
747748

748749
@override
749750
String get recentHeadlines => 'أحدث العناوين';

lib/l10n/app_localizations_en.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class AppLocalizationsEn extends AppLocalizations {
7676
String get emailCodeVerificationButtonLabel => 'Verify Code';
7777

7878
@override
79-
String get dashboard => 'Dashboard';
79+
String get overview => 'Overview';
8080

8181
@override
8282
String get contentManagement => 'Content Management';
@@ -736,13 +736,13 @@ class AppLocalizationsEn extends AppLocalizations {
736736
String get totalSources => 'Total Sources';
737737

738738
@override
739-
String get loadingDashboard => 'Loading Dashboard';
739+
String get loadingOverview => 'Loading Dashboard Overview...';
740740

741741
@override
742-
String get loadingDashboardSubheadline => 'Fetching latest statistics...';
742+
String get loadingOverviewSubheadline => 'Fetching latest statistics...';
743743

744744
@override
745-
String get dashboardLoadFailure => 'Failed to load dashboard data.';
745+
String get overviewLoadFailure => 'Failed to load dashboard overview data.';
746746

747747
@override
748748
String get recentHeadlines => 'Recent Headlines';

lib/l10n/arb/app_ar.arb

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@
9191
"@emailCodeVerificationButtonLabel": {
9292
"description": "تسمية زر التحقق من الرمز"
9393
},
94-
"dashboard": "لوحة القيادة",
95-
"@dashboard": {
96-
"description": "تسمية عنصر التنقل للوحة القيادة"
94+
"overview": "نظرة عامة",
95+
"@overview": {
96+
"description": "تسمية عنصر التنقل لنظرة عامة على لوحة القيادة"
9797
},
9898
"contentManagement": "إدارة المحتوى",
9999
"@contentManagement": {
@@ -882,31 +882,31 @@
882882
"@contentStatusDraft": {},
883883
"totalHeadlines": "إجمالي العناوين",
884884
"@totalHeadlines": {
885-
"description": "تسمية بطاقة ملخص إجمالي العناوين في لوحة القيادة"
885+
"description": "تسمية بطاقة ملخص إجمالي العناوين في نظرة عامة على لوحة القيادة"
886886
},
887887
"totalTopics": "إجمالي المواضيع",
888888
"@totalTopics": {
889-
"description": "تسمية بطاقة ملخص إجمالي المواضيع في لوحة القيادة"
889+
"description": "تسمية بطاقة ملخص إجمالي المواضيع في نظرة عامة على لوحة القيادة"
890890
},
891891
"totalSources": "إجمالي المصادر",
892892
"@totalSources": {
893-
"description": "تسمية بطاقة ملخص إجمالي المصادر في لوحة القيادة"
893+
"description": "تسمية بطاقة ملخص إجمالي المصادر في نظرة عامة على لوحة القيادة"
894894
},
895-
"loadingDashboard": "جاري تحميل لوحة القيادة",
896-
"@loadingDashboard": {
897-
"description": "عنوان حالة تحميل لوحة القيادة"
895+
"loadingOverview": "جاري تحميل نظرة عامة على لوحة القيادة",
896+
"@loadingOverview": {
897+
"description": "عنوان حالة تحميل نظرة عامة على لوحة القيادة"
898898
},
899-
"loadingDashboardSubheadline": "جاري جلب أحدث الإحصائيات...",
900-
"@loadingDashboardSubheadline": {
901-
"description": "عنوان فرعي لحالة تحميل لوحة القيادة"
899+
"loadingOverviewSubheadline": "جاري جلب أحدث الإحصائيات...",
900+
"@loadingOverviewSubheadline": {
901+
"description": "عنوان فرعي لحالة تحميل نظرة عامة على لوحة القيادة"
902902
},
903-
"dashboardLoadFailure": "فشل تحميل بيانات لوحة القيادة.",
904-
"@dashboardLoadFailure": {
905-
"description": "رسالة خطأ عند فشل تحميل بيانات لوحة القيادة"
903+
"overviewLoadFailure": "فشل تحميل بيانات نظرة عامة على لوحة القيادة.",
904+
"@overviewLoadFailure": {
905+
"description": "رسالة خطأ عند فشل تحميل بيانات نظرة عامة على لوحة القيادة"
906906
},
907907
"recentHeadlines": "أحدث العناوين",
908908
"@recentHeadlines": {
909-
"description": "عنوان بطاقة أحدث العناوين في لوحة القيادة"
909+
"description": "عنوان بطاقة أحدث العناوين في نظرة عامة على لوحة القيادة"
910910
},
911911
"viewAll": "عرض الكل",
912912
"@viewAll": {
@@ -918,11 +918,11 @@
918918
},
919919
"systemStatus": "حالة النظام",
920920
"@systemStatus": {
921-
"description": "عنوان بطاقة حالة النظام في لوحة القيادة"
921+
"description": "عنوان بطاقة حالة النظام في نظرة عامة على لوحة القيادة"
922922
},
923923
"quickActions": "إجراءات سريعة",
924924
"@quickActions": {
925-
"description": "عنوان بطاقة الإجراءات السريعة في لوحة القيادة"
925+
"description": "عنوان بطاقة الإجراءات السريعة في نظرة عامة على لوحة القيادة"
926926
},
927927
"createHeadlineAction": "إنشاء عنوان",
928928
"@createHeadlineAction": {

lib/l10n/arb/app_en.arb

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@
9191
"@emailCodeVerificationButtonLabel": {
9292
"description": "Button label for verifying the code"
9393
},
94-
"dashboard": "Dashboard",
95-
"@dashboard": {
96-
"description": "Label for the dashboard navigation item"
94+
"overview": "Overview",
95+
"@overview": {
96+
"description": "Label for the dashboard overview navigation item"
9797
},
9898
"contentManagement": "Content Management",
9999
"@contentManagement": {
@@ -882,31 +882,31 @@
882882
"@contentStatusDraft": {},
883883
"totalHeadlines": "Total Headlines",
884884
"@totalHeadlines": {
885-
"description": "Label for the total headlines summary card on the dashboard"
885+
"description": "Label for the total headlines summary card on the dashboard overview"
886886
},
887887
"totalTopics": "Total Topics",
888888
"@totalTopics": {
889-
"description": "Label for the total topics summary card on the dashboard"
889+
"description": "Label for the total topics summary card on the dashboard overview"
890890
},
891891
"totalSources": "Total Sources",
892892
"@totalSources": {
893-
"description": "Label for the total sources summary card on the dashboard"
893+
"description": "Label for the total sources summary card on the dashboard overview"
894894
},
895-
"loadingDashboard": "Loading Dashboard",
896-
"@loadingDashboard": {
897-
"description": "Headline for the dashboard loading state"
895+
"loadingOverview": "Loading Dashboard Overview...",
896+
"@loadingOverview": {
897+
"description": "Headline for the dashboard overview loading state"
898898
},
899-
"loadingDashboardSubheadline": "Fetching latest statistics...",
900-
"@loadingDashboardSubheadline": {
901-
"description": "Subheadline for the dashboard loading state"
899+
"loadingOverviewSubheadline": "Fetching latest statistics...",
900+
"@loadingOverviewSubheadline": {
901+
"description": "Subheadline for the dashboard overview loading state"
902902
},
903-
"dashboardLoadFailure": "Failed to load dashboard data.",
904-
"@dashboardLoadFailure": {
905-
"description": "Error message when dashboard data fails to load"
903+
"overviewLoadFailure": "Failed to load dashboard overview data.",
904+
"@overviewLoadFailure": {
905+
"description": "Error message when dashboard overview data fails to load"
906906
},
907907
"recentHeadlines": "Recent Headlines",
908908
"@recentHeadlines": {
909-
"description": "Title for the recent headlines card on the dashboard"
909+
"description": "Title for the recent headlines card on the dashboard overview"
910910
},
911911
"viewAll": "View All",
912912
"@viewAll": {
@@ -918,11 +918,11 @@
918918
},
919919
"systemStatus": "System Status",
920920
"@systemStatus": {
921-
"description": "Title for the system status card on the dashboard"
921+
"description": "Title for the system status card on the dashboard overview"
922922
},
923923
"quickActions": "Quick Actions",
924924
"@quickActions": {
925-
"description": "Title for the quick actions card on the dashboard"
925+
"description": "Title for the quick actions card on the dashboard overview"
926926
},
927927
"createHeadlineAction": "Create Headline",
928928
"@createHeadlineAction": {

lib/main.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:flutter_news_app_web_dashboard_full_source_code/app/config/confi
66
import 'package:flutter_news_app_web_dashboard_full_source_code/bootstrap.dart';
77

88
// Define the current application environment (production/development/demo).
9-
const AppEnvironment appEnvironment = AppEnvironment.demo;
9+
const AppEnvironment appEnvironment = AppEnvironment.development;
1010

1111
@JS('removeSplashFromWeb')
1212
external void removeSplashFromWeb();

0 commit comments

Comments
 (0)