@@ -11,7 +11,6 @@ import 'package:todoapp/ui/components/widgets/task/taskslist/tasks_screen_state.
1111import 'package:todoapp/ui/components/widgets/task/taskslist/tasks_viewmodel.dart' ;
1212import 'package:todoapp/ui/l10n/app_localizations.dart' ;
1313import 'package:todoapp/ui/screens/tasks/tasks_screen_callbacks.dart' ;
14- import 'package:todoapp/ui/screens/tasks/tasks_screen_text_values.dart' ;
1514import 'package:todoapp/ui/todo_app_router_config.gr.dart' ;
1615import 'package:todoapp/util/di/dependency_startup_launcher.dart' ;
1716import 'package:todoapp/util/navigation_provider.dart' ;
@@ -41,18 +40,6 @@ class TasksScreen extends StatelessWidget {
4140 );
4241 viewModel.updateTasks (checklist.id);
4342
44- final tasksScreenTextValues = TasksScreenTextValues (
45- tasksRefresh: AppLocalizations .of (context)! .tasks_refresh,
46- removeTaskDialogTitle:
47- AppLocalizations .of (context)! .remove_task_dialog_title,
48- removeTaskDialogDesc:
49- AppLocalizations .of (context)! .remove_task_dialog_desc,
50- yes: AppLocalizations .of (context)! .yes,
51- no: AppLocalizations .of (context)! .no,
52- emptyTasksMessage: AppLocalizations .of (context)! .empty_tasks,
53- sortMessage: AppLocalizations .of (context)! .sort_message,
54- );
55-
5643 return BlocProvider (
5744 create: (_) => viewModel,
5845 child: BlocBuilder <TasksViewModel , TasksScreenState >(
@@ -61,7 +48,6 @@ class TasksScreen extends StatelessWidget {
6148 uiState: uiState,
6249 checklistId: checklist.id,
6350 checklistName: checklist.title,
64- tasksScreenTextValues: tasksScreenTextValues,
6551 callbacks: TasksScreenCallbacks (
6652 onCompleteTask: viewModel.onCompleteTask,
6753 onRemoveTask: viewModel.onRemoveTask,
@@ -82,7 +68,6 @@ class TasksScaffold extends StatelessWidget {
8268 final TasksScreenState uiState;
8369 final int ? checklistId;
8470 final String checklistName;
85- final TasksScreenTextValues tasksScreenTextValues;
8671 final TasksScreenCallbacks callbacks;
8772 final NavigatorProvider navigatorProvider;
8873
@@ -91,7 +76,6 @@ class TasksScaffold extends StatelessWidget {
9176 required this .uiState,
9277 required this .checklistId,
9378 required this .checklistName,
94- required this .tasksScreenTextValues,
9579 required this .navigatorProvider,
9680 required this .callbacks,
9781 });
@@ -105,13 +89,15 @@ class TasksScaffold extends StatelessWidget {
10589
10690 @override
10791 Widget build (BuildContext context) {
92+ final localizations = AppLocalizations .of (context)! ;
93+
10894 return Scaffold (
10995 backgroundColor: Theme .of (context).colorScheme.surface,
11096 appBar: CustomAppBarWidget (
11197 title: checklistName,
11298 actions: _buildTopBarActions (
11399 context: context,
114- sortedMessage: tasksScreenTextValues.sortMessage ,
100+ sortedMessage: localizations.sort_message ,
115101 onShare: callbacks.onShare,
116102 showShareButton: uiState.showShareIcon,
117103 onSort: callbacks.onSort,
@@ -134,7 +120,7 @@ class TasksScaffold extends StatelessWidget {
134120 ),
135121 child: TasksListWidget (
136122 tasks: uiState.tasks,
137- emptyTasksMessage: tasksScreenTextValues.emptyTasksMessage ,
123+ emptyTasksMessage: localizations.empty_tasks ,
138124 onReorder: callbacks.onReorder,
139125 onRemoveTask: (task) =>
140126 _showConfirmationDialogToRemoveTask (context, task),
@@ -162,13 +148,15 @@ class TasksScaffold extends StatelessWidget {
162148 }
163149
164150 void _showConfirmationDialogToRemoveTask (BuildContext context, Task task) {
151+ final localizations = AppLocalizations .of (context)! ;
152+
165153 showDialog (
166154 context: context,
167155 builder: (BuildContext context) => ConfirmationAlertDialogWidget (
168- title: tasksScreenTextValues.removeTaskDialogTitle ,
169- description: tasksScreenTextValues.removeTaskDialogDesc ,
170- secondaryButtonText: tasksScreenTextValues .no,
171- primaryButtonText: tasksScreenTextValues .yes,
156+ title: localizations.remove_task_dialog_title ,
157+ description: localizations.remove_task_dialog_desc ,
158+ secondaryButtonText: localizations .no,
159+ primaryButtonText: localizations .yes,
172160 onSecondaryButtonPressed: () => {
173161 navigatorProvider.onPop (context, null ),
174162 },
@@ -223,6 +211,8 @@ class TasksScaffold extends StatelessWidget {
223211 required int ? checklistId,
224212 Task ? task,
225213 }) async {
214+ final localizations = AppLocalizations .of (context)! ;
215+
226216 bool ? result = await navigatorProvider.push (
227217 context,
228218 TaskRoute (
@@ -236,7 +226,7 @@ class TasksScaffold extends StatelessWidget {
236226 ScaffoldMessenger .of (context).showSnackBar (
237227 SnackBar (
238228 content: Text (
239- tasksScreenTextValues.tasksRefresh ,
229+ localizations.tasks_refresh ,
240230 ),
241231 ),
242232 );
0 commit comments