Krow/Krow-workspace
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Replace Navigator.pop with Modular.to.popSafe for consistent navigation handling

Browse Source
This commit is contained in:
Achintha Isuru
2026-03-04 13:08:39 -05:00
parent b20039ae84
commit 867ff8d61c
9 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/mobile/apps/client/lib/src/widgets/session_listener.dart
View File

@@ -104,7 +104,7 @@ class _SessionListenerState extends State<SessionListener> {
actions: <Widget>[ actions: <Widget>[
TextButton( TextButton(
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Modular.to.popSafe();
_proceedToLogin(); _proceedToLogin();
}, },
child: const Text('Log In'), child: const Text('Log In'),
@@ -134,7 +134,7 @@ class _SessionListenerState extends State<SessionListener> {
), ),
TextButton( TextButton(
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Modular.to.popSafe();;
_proceedToLogin(); _proceedToLogin();
}, },
child: const Text('Log Out'), child: const Text('Log Out'),

4
apps/mobile/apps/staff/lib/src/widgets/session_listener.dart
View File

@@ -104,7 +104,7 @@ class _SessionListenerState extends State<SessionListener> {
actions: <Widget>[ actions: <Widget>[
TextButton( TextButton(
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Modular.to.popSafe();;
_proceedToLogin(); _proceedToLogin();
}, },
child: const Text('Log In'), child: const Text('Log In'),
@@ -134,7 +134,7 @@ class _SessionListenerState extends State<SessionListener> {
), ),
TextButton( TextButton(
onPressed: () { onPressed: () {
Navigator.of(context).pop(); Modular.to.popSafe();;
_proceedToLogin(); _proceedToLogin();
}, },
child: const Text('Log Out'), child: const Text('Log Out'),

3
apps/mobile/packages/features/client/reports/lib/src/presentation/pages/coverage_report_page.dart
View File

@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_modular/flutter_modular.dart'; import 'package:flutter_modular/flutter_modular.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:krow_core/core.dart';
import 'package:krow_domain/krow_domain.dart'; import 'package:krow_domain/krow_domain.dart';
class CoverageReportPage extends StatefulWidget { class CoverageReportPage extends StatefulWidget {
@@ -62,7 +63,7 @@ class _CoverageReportPageState extends State<CoverageReportPage> {
Row( Row(
children: <Widget>[ children: <Widget>[
GestureDetector( GestureDetector(
onTap: () => Navigator.of(context).pop(), onTap: () => Modular.to.popSafe(),
child: Container( child: Container(
width: 40, width: 40,
height: 40, height: 40,

9
apps/mobile/packages/features/client/reports/lib/src/presentation/pages/daily_ops_report_page.dart
View File

@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_modular/flutter_modular.dart'; import 'package:flutter_modular/flutter_modular.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:krow_core/core.dart';
import 'package:krow_domain/krow_domain.dart'; import 'package:krow_domain/krow_domain.dart';
class DailyOpsReportPage extends StatefulWidget { class DailyOpsReportPage extends StatefulWidget {
@@ -92,7 +93,7 @@ class _DailyOpsReportPageState extends State<DailyOpsReportPage> {
Row( Row(
children: <Widget>[ children: <Widget>[
GestureDetector( GestureDetector(
onTap: () => Navigator.of(context).pop(), onTap: () => Modular.to.popSafe(),
child: Container( child: Container(
width: 40, width: 40,
height: 40, height: 40,
@@ -434,7 +435,7 @@ class _OpsStatCard extends StatelessWidget {
), ),
), ),
UiChip(label: subValue), //UiChip(label: subValue),
// Colored pill badge (matches prototype) // Colored pill badge (matches prototype)
Container( Container(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
@@ -443,12 +444,12 @@ class _OpsStatCard extends StatelessWidget {
), ),
decoration: BoxDecoration( decoration: BoxDecoration(
color: color.withOpacity(0.12), color: color.withOpacity(0.12),
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(4),
), ),
child: Text( child: Text(
subValue, subValue,
style: TextStyle( style: TextStyle(
fontSize: 10, fontSize: 12,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: color, color: color,
), ),

6
apps/mobile/packages/features/client/reports/lib/src/presentation/pages/forecast_report_page.dart
View File

@@ -2,6 +2,7 @@
import 'package:client_reports/src/presentation/blocs/forecast/forecast_bloc.dart'; import 'package:client_reports/src/presentation/blocs/forecast/forecast_bloc.dart';
import 'package:client_reports/src/presentation/blocs/forecast/forecast_event.dart'; import 'package:client_reports/src/presentation/blocs/forecast/forecast_event.dart';
import 'package:client_reports/src/presentation/blocs/forecast/forecast_state.dart'; import 'package:client_reports/src/presentation/blocs/forecast/forecast_state.dart';
import 'package:krow_core/core.dart';
import 'package:krow_domain/krow_domain.dart'; import 'package:krow_domain/krow_domain.dart';
import 'package:core_localization/core_localization.dart'; import 'package:core_localization/core_localization.dart';
import 'package:design_system/design_system.dart'; import 'package:design_system/design_system.dart';
@@ -85,7 +86,7 @@ class _ForecastReportPageState extends State<ForecastReportPage> {
(ForecastWeek week) => _WeeklyBreakdownItem(week: week), (ForecastWeek week) => _WeeklyBreakdownItem(week: week),
), ),
const SizedBox(height: 40), const SizedBox(height: UiConstants.space24),
], ],
), ),
), ),
@@ -123,7 +124,7 @@ class _ForecastReportPageState extends State<ForecastReportPage> {
Row( Row(
children: <Widget>[ children: <Widget>[
GestureDetector( GestureDetector(
onTap: () => Navigator.of(context).pop(), onTap: () => Modular.to.popSafe(),
child: Container( child: Container(
width: 40, width: 40,
height: 40, height: 40,
@@ -183,6 +184,7 @@ class _ForecastReportPageState extends State<ForecastReportPage> {
final TranslationsClientReportsForecastReportEn t = context.t.client_reports.forecast_report; final TranslationsClientReportsForecastReportEn t = context.t.client_reports.forecast_report;
return GridView.count( return GridView.count(
crossAxisCount: 2, crossAxisCount: 2,
padding: EdgeInsets.zero,
shrinkWrap: true, shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
mainAxisSpacing: 12, mainAxisSpacing: 12,

3
apps/mobile/packages/features/client/reports/lib/src/presentation/pages/no_show_report_page.dart
View File

@@ -1,4 +1,5 @@
// ignore_for_file: always_specify_types, depend_on_referenced_packages, dead_code, dead_null_aware_expression, unused_local_variable, unused_import, sort_constructors_first, prefer_final_fields, prefer_const_constructors, deprecated_member_use, implicit_call_tearoffs // ignore_for_file: always_specify_types, depend_on_referenced_packages, dead_code, dead_null_aware_expression, unused_local_variable, unused_import, sort_constructors_first, prefer_final_fields, prefer_const_constructors, deprecated_member_use, implicit_call_tearoffs
import 'package:krow_core/core.dart';
import 'package:krow_domain/krow_domain.dart'; import 'package:krow_domain/krow_domain.dart';
import 'package:client_reports/src/presentation/blocs/no_show/no_show_bloc.dart'; import 'package:client_reports/src/presentation/blocs/no_show/no_show_bloc.dart';
import 'package:client_reports/src/presentation/blocs/no_show/no_show_event.dart'; import 'package:client_reports/src/presentation/blocs/no_show/no_show_event.dart';
@@ -66,7 +67,7 @@ class _NoShowReportPageState extends State<NoShowReportPage> {
Row( Row(
children: <Widget>[ children: <Widget>[
GestureDetector( GestureDetector(
onTap: () => Navigator.of(context).pop(), onTap: () => Modular.to.popSafe(),
child: Container( child: Container(
width: 40, width: 40,
height: 40, height: 40,

3
apps/mobile/packages/features/client/reports/lib/src/presentation/pages/performance_report_page.dart
View File

@@ -6,6 +6,7 @@ import 'package:design_system/design_system.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_modular/flutter_modular.dart'; import 'package:flutter_modular/flutter_modular.dart';
import 'package:krow_core/core.dart';
import 'package:krow_domain/krow_domain.dart'; import 'package:krow_domain/krow_domain.dart';
class PerformanceReportPage extends StatefulWidget { class PerformanceReportPage extends StatefulWidget {
@@ -141,7 +142,7 @@ class _PerformanceReportPageState extends State<PerformanceReportPage> {
Row( Row(
children: <Widget>[ children: <Widget>[
GestureDetector( GestureDetector(
onTap: () => Navigator.of(context).pop(), onTap: () => Modular.to.popSafe(),
child: Container( child: Container(
width: 40, width: 40,
height: 40, height: 40,

5
apps/mobile/packages/features/client/reports/lib/src/presentation/pages/spend_report_page.dart
View File

@@ -8,6 +8,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_modular/flutter_modular.dart'; import 'package:flutter_modular/flutter_modular.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:krow_core/core.dart';
import 'package:krow_domain/krow_domain.dart'; import 'package:krow_domain/krow_domain.dart';
class SpendReportPage extends StatefulWidget { class SpendReportPage extends StatefulWidget {
@@ -34,7 +35,7 @@ class _SpendReportPageState extends State<SpendReportPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BlocProvider( return BlocProvider<SpendBloc>(
create: (BuildContext context) => Modular.get<SpendBloc>() create: (BuildContext context) => Modular.get<SpendBloc>()
..add(LoadSpendReport(startDate: _startDate, endDate: _endDate)), ..add(LoadSpendReport(startDate: _startDate, endDate: _endDate)),
child: Scaffold( child: Scaffold(
@@ -70,7 +71,7 @@ class _SpendReportPageState extends State<SpendReportPage> {
Row( Row(
children: <Widget>[ children: <Widget>[
GestureDetector( GestureDetector(
onTap: () => Navigator.of(context).pop(), onTap: () => Modular.to.popSafe(),
child: Container( child: Container(
width: 40, width: 40,
height: 40, height: 40,

2
apps/mobile/packages/features/staff/authentication/lib/src/presentation/pages/phone_verification_page.dart
View File

@@ -155,7 +155,7 @@ class _PhoneVerificationPageState extends State<PhoneVerificationPage> {
BlocProvider.of<AuthBloc>( BlocProvider.of<AuthBloc>(
context, context,
).add(AuthResetRequested(mode: widget.mode)); ).add(AuthResetRequested(mode: widget.mode));
Navigator.of(context).pop(); Modular.to.popSafe();;
}, },
), ),
body: SafeArea( body: SafeArea(