cssd-doc/cssd
1
0
Fork 0
mirror of https://git.meshkee.com/applications/cssd.git synced 2026-10-13 19:28:57 +03:30
Code Issues Packages Projects Releases Wiki Activity

Improve back button function in all screens

Browse Source
This commit is contained in:
hanie.khodkari
2025-03-19 18:38:40 +03:30
parent d99ecb2783
commit 58cd3d9f3f
35 changed files with 4715 additions and 5007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/pages/CyclePages/cycle_add_screen.dart
+13 -34
View File
@@ -75,19 +75,7 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return Consumer<CyclesProvider>(builder: (context, cyclesProvider, _) {
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
// cyclesProvider.resetLoadingButton();
// Navigator.pushReplacementNamed(
// context,
// Routes.cycleResultScreen,
// );
// return true;
},
child: SafeArea(
return SafeArea(
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -156,8 +144,7 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
controller: striizerIdCTRL,
decoration: InputDecoration(
icon: Icon(
FontAwesomeIcons
.sortNumericDown,
FontAwesomeIcons.sortNumericDown,
size: 7 * _deviceBlockSize,
),
labelStyle: TextStyle(
@@ -178,11 +165,9 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
),
keyboardType:
TextInputType.visiblePassword,
textInputAction:
TextInputAction.next,
textInputAction: TextInputAction.next,
onFieldSubmitted: (_) {
FocusScope.of(context)
.requestFocus(
FocusScope.of(context).requestFocus(
_cycleNumberFocusNode);
},
),
@@ -195,16 +180,13 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
(String result) {
if (result == 'cancel') {
print('cancel');
} else if (result ==
'error') {
} else if (result == 'error') {
print('error');
} else if (result ==
'access') {
} else if (result == 'access') {
print('access');
} else {
print(result);
striizerIdCTRL.text =
result;
striizerIdCTRL.text = result;
}
},
);
@@ -258,8 +240,8 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
keyboardType: TextInputType.number,
textInputAction: TextInputAction.next,
onFieldSubmitted: (_) {
FocusScope.of(context).requestFocus(
_descriptionFocosNode);
FocusScope.of(context)
.requestFocus(_descriptionFocosNode);
},
),
SizedBox(
@@ -273,8 +255,7 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
height: 20.0,
),
Container(
margin:
EdgeInsets.symmetric(vertical: 10),
margin: EdgeInsets.symmetric(vertical: 10),
child: Text(
'Labels included',
style: TextStyle(
@@ -289,8 +270,7 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
ListView.builder(
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemBuilder: (ctx, index) =>
AddLabelBox(
itemBuilder: (ctx, index) => AddLabelBox(
text: 'Select Labels included',
iconColor: kPinkSub,
deviceBlockSize: _deviceBlockSize,
@@ -301,8 +281,7 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
cycleProvider.initialLabelValue,
index: index,
hasRemoveButton:
cycleProvider.labelValues.length >
1
cycleProvider.labelValues.length > 1
? true
: false,
),
@@ -365,7 +344,7 @@ class _CycleAddScreenState extends State<CycleAddScreen> {
),
),
),
),);
);
});
}
}
lib/pages/CyclePages/cycle_detail_screen.dart
+1 -8
View File
@@ -52,13 +52,7 @@ class _CycleDetailScreenState extends State<CycleDetailScreen> {
// final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
},
child: SafeArea(
return SafeArea(
child: Scaffold(
appBar: AppBar(
titleSpacing: -10,
@@ -97,7 +91,6 @@ class _CycleDetailScreenState extends State<CycleDetailScreen> {
: ConnectionErrorBox();
}),
),
),
);
}
}
lib/pages/CyclePages/cycle_filter_screen.dart
+1 -13
View File
@@ -91,18 +91,7 @@ class _CycleFilterScreenState extends State<CycleFilterScreen> {
// final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
// Navigator.pushReplacementNamed(
// context,
// Routes.cycleResultScreen,
// );
// return true;
},
child: SafeArea(
return SafeArea(
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -357,7 +346,6 @@ class _CycleFilterScreenState extends State<CycleFilterScreen> {
),
),
),
),
);
}
}
lib/pages/CyclePages/cycle_result_screen.dart
+1 -1
View File
@@ -323,7 +323,7 @@ class CycleResultFloatingButton extends StatelessWidget {
InkWell(
customBorder: CircleBorder(),
onTap: () {
Navigator.of(context).pushReplacementNamed(Routes.cycleAddScreen);
Navigator.of(context).pushNamed(Routes.cycleAddScreen);
},
child: Container(
padding: EdgeInsets.all(_deviceBlockSize),
lib/pages/CyclePages/cycle_scan_screen.dart
+1 -8
View File
@@ -28,13 +28,7 @@ class _CycleScanScreenState extends State<CycleScanScreen> {
// final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
},
child: SafeArea(
return SafeArea(
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -205,7 +199,6 @@ class _CycleScanScreenState extends State<CycleScanScreen> {
),
),
),
),
);
}
}
lib/pages/ItemPages/item_add_screen.dart
+1 -13
View File
@@ -115,18 +115,7 @@ class _ItemAddScreenState extends State<ItemAddScreen> {
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
final itemProviderObject = Provider.of<ItemProvider>(context);
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
// Navigator.pushReplacementNamed(
// context,
// Routes.itemResultScreen,
// );
// return true;
},
child: SafeArea(
return SafeArea(
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -393,7 +382,6 @@ class _ItemAddScreenState extends State<ItemAddScreen> {
),
),
),
),
);
}
}
lib/pages/ItemPages/item_filter_screen.dart
+1 -13
View File
@@ -84,18 +84,7 @@ class _ItemFilterScreenState extends State<ItemFilterScreen> {
final _media = MediaQuery.of(context);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
// Navigator.pushReplacementNamed(
// context,
// Routes.itemResultScreen,
// );
// return true;
},
child: SafeArea(
return SafeArea(
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -413,7 +402,6 @@ class _ItemFilterScreenState extends State<ItemFilterScreen> {
),
),
),
),
);
}
}
lib/pages/ItemPages/item_result_screen.dart
+1 -1
View File
@@ -352,7 +352,7 @@ class ItemResultFloatingButton extends StatelessWidget {
InkWell(
customBorder: CircleBorder(),
onTap: () {
Navigator.of(context).pushReplacementNamed(Routes.itemAddScreen);
Navigator.of(context).pushNamed(Routes.itemAddScreen);
},
child: Container(
padding: EdgeInsets.all(_deviceBlockSize),
lib/pages/ItemPages/item_scan_screen.dart
+1 -9
View File
@@ -5,7 +5,6 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart';
import '../../config/routes.dart';
import '../../providers/connectivity.dart';
import '../../widgets/Global/internet_error.dart';
@@ -26,13 +25,7 @@ class _ItemScanScreenState extends State<ItemScanScreen> {
// final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
},
child: SafeArea(
return SafeArea(
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -203,7 +196,6 @@ class _ItemScanScreenState extends State<ItemScanScreen> {
),
),
),
),
);
}
}
lib/pages/LabelPages/label_add_screen.dart
+8 -24
View File
@@ -77,19 +77,7 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
// String initialLabelValue;
return Consumer<LabelsProvider>(
builder: (context, labelsProvider, _) {
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
// labelsProvider.resetLoadingButton();
// Navigator.pushReplacementNamed(
// context,
// Routes.labelResultScreen,
// );
// return true;
},
child: SafeArea(
return SafeArea(
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -175,8 +163,7 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
horizontal: 3),
labelStyle: TextStyle(
fontWeight: FontWeight.w100,
fontSize:
4 * _deviceBlockSize,
fontSize: 4 * _deviceBlockSize,
),
),
style: TextStyle(
@@ -322,8 +309,7 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
Consumer<LabelsProvider>(
builder: (ctx, labelProvider, _) {
return ListView.builder(
physics:
NeverScrollableScrollPhysics(),
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemBuilder: (ctx, index) =>
AddPackageBox(
@@ -333,12 +319,12 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
values: labelProvider
.packageValues[index],
vals: labelProvider.packageVals,
initialLabelValue: labelProvider
.initialPackageValue,
initialLabelValue:
labelProvider.initialPackageValue,
index: index,
),
itemCount: labelProvider
.packageValues.length,
itemCount:
labelProvider.packageValues.length,
);
}),
SizedBox(
@@ -365,8 +351,7 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
lotNumberCTRL: lotNumberCTRL,
cycleNumberCTRL: cycleNumberCTRL,
sDateCTRL: sDateCTRL,
packageValue:
Provider.of<LabelsProvider>(
packageValue: Provider.of<LabelsProvider>(
context,
listen: false,
).packageValues,
@@ -386,7 +371,6 @@ class _LabelAddScreenState extends State<LabelAddScreen> {
),
),
),
),
);
},
);
lib/pages/LabelPages/label_detail_screen.dart
+1 -8
View File
@@ -52,13 +52,7 @@ class _LabelDetailScreenState extends State<LabelDetailScreen> {
// final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
},
child: SafeArea(
return SafeArea(
child: Scaffold(
appBar: AppBar(
titleSpacing: -10,
@@ -97,7 +91,6 @@ class _LabelDetailScreenState extends State<LabelDetailScreen> {
: ConnectionErrorBox();
}),
),
),
);
}
}
lib/pages/LabelPages/label_filter_screen.dart
+1 -13
View File
@@ -80,18 +80,7 @@ class _LabelFilterScreenState extends State<LabelFilterScreen> {
final _media = MediaQuery.of(context);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
// Navigator.pushReplacementNamed(
// context,
// Routes.labelResultScreen,
// );
// return true;
},
child: SafeArea(
return SafeArea(
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -336,7 +325,6 @@ class _LabelFilterScreenState extends State<LabelFilterScreen> {
),
),
),
),
);
}
}
lib/pages/LabelPages/label_scan_screen.dart
+1 -8
View File
@@ -30,13 +30,7 @@ class _LabelScanScreenState extends State<LabelScanScreen> {
// final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
},
child: SafeArea(
return SafeArea(
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -105,7 +99,6 @@ class _LabelScanScreenState extends State<LabelScanScreen> {
),
),
),
),
);
}
}
lib/pages/MyItemsPages/my_items_detail_screen.dart
+1 -8
View File
@@ -52,13 +52,7 @@ class _MyItemsDetailScreenState extends State<MyItemsDetailScreen> {
final _media = MediaQuery.of(context);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
},
child: SafeArea(
return SafeArea(
child: Scaffold(
appBar: AppBar(
titleSpacing: -10,
@@ -104,7 +98,6 @@ class _MyItemsDetailScreenState extends State<MyItemsDetailScreen> {
},
),
),
),
);
}
}
lib/pages/MyItemsPages/my_items_filter_screen.dart
+1 -13
View File
@@ -53,18 +53,7 @@ class _MyItemsFilterScreenState extends State<MyItemsFilterScreen> {
final _media = MediaQuery.of(context);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
// Navigator.pushReplacementNamed(
// context,
// Routes.myItemsResultScreen,
// );
// return true;
},
child: SafeArea(
return SafeArea(
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -371,7 +360,6 @@ class _MyItemsFilterScreenState extends State<MyItemsFilterScreen> {
),
),
),
),
);
}
}
lib/pages/MyItemsPages/my_items_scan_screen.dart
+1 -8
View File
@@ -26,13 +26,7 @@ class _MyItemsScanScreenState extends State<MyItemsScanScreen> {
// final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5);
final double _deviceWidth = _media.size.width;
final double _deviceBlockSize = _deviceWidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
},
child: SafeArea(
return SafeArea(
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -203,7 +197,6 @@ class _MyItemsScanScreenState extends State<MyItemsScanScreen> {
),
),
),
),
);
}
}
lib/pages/MyItemsPages/my_items_transfer_screen.dart
+6 -16
View File
@@ -79,13 +79,7 @@ class _ItemsTransferScreenState extends State<ItemsTransferScreen> {
final _media = MediaQuery.of(context);
final double _deviceWidth = _media.size.width;
final double _deviceBlockSize = _deviceWidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
},
child: SafeArea(
return SafeArea(
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -138,8 +132,7 @@ class _ItemsTransferScreenState extends State<ItemsTransferScreen> {
deviceBlockSize: _deviceBlockSize,
textInputType: TextInputType.visiblePassword,
onChanged: (value) {
Provider.of<UsersProvider>(context,
listen: false)
Provider.of<UsersProvider>(context, listen: false)
.searchUsers(value);
},
),
@@ -229,8 +222,7 @@ class _ItemsTransferScreenState extends State<ItemsTransferScreen> {
SizedBox(
height: 10.0,
),
ItemCard(
_deviceBlockSize, itemData!),
ItemCard(_deviceBlockSize, itemData!),
SizedBox(
height: 5.0,
),
@@ -244,8 +236,8 @@ class _ItemsTransferScreenState extends State<ItemsTransferScreen> {
TransferDataBox(
deviceBlockSize:
_deviceBlockSize,
user: Provider.of<
UsersProvider>(
user:
Provider.of<UsersProvider>(
context)
.selectedUserForItems,
)
@@ -292,8 +284,7 @@ class _ItemsTransferScreenState extends State<ItemsTransferScreen> {
);
},
text: 'Transfer',
isLoadingButton:
myItemProvider
isLoadingButton: myItemProvider
.isloadingButton,
);
},
@@ -325,7 +316,6 @@ class _ItemsTransferScreenState extends State<ItemsTransferScreen> {
),
),
),
),
);
}
lib/pages/MyPackagesPages/my_packages_detail_screen.dart
+1 -8
View File
@@ -52,13 +52,7 @@ class _MyPackagesDetailScreenState extends State<MyPackagesDetailScreen> {
final _media = MediaQuery.of(context);
final double _deviceWidth = _media.size.width;
final double _deviceBlockSize = _deviceWidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
},
child: SafeArea(
return SafeArea(
child: Scaffold(
appBar: AppBar(
titleSpacing: -10,
@@ -104,7 +98,6 @@ class _MyPackagesDetailScreenState extends State<MyPackagesDetailScreen> {
},
),
),
),
);
}
}
lib/pages/MyPackagesPages/my_packages_filter_screen.dart
+1 -13
View File
@@ -51,18 +51,7 @@ class _MyPackageFilterScreenState extends State<MyPackageFilterScreen> {
final _media = MediaQuery.of(context);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
// Navigator.pushReplacementNamed(
// context,
// Routes.myPackagesResultScreen,
// );
// return true;
},
child: SafeArea(
return SafeArea(
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -306,7 +295,6 @@ class _MyPackageFilterScreenState extends State<MyPackageFilterScreen> {
),
),
),
),
);
}
}
lib/pages/MyPackagesPages/my_packages_scan_screen.dart
+1 -8
View File
@@ -26,13 +26,7 @@ class _MyPackagesScanScreenState extends State<MyPackagesScanScreen> {
// final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5);
final double _deviceWidth = _media.size.width;
final double _deviceBlockSize = _deviceWidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
},
child: SafeArea(
return SafeArea(
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -203,7 +197,6 @@ class _MyPackagesScanScreenState extends State<MyPackagesScanScreen> {
),
),
),
),
);
}
}
lib/pages/MyPackagesPages/my_packages_transfer_screen.dart
+8 -20
View File
@@ -74,13 +74,7 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
final _media = MediaQuery.of(context);
final double _deviceWidth = _media.size.width;
final double _deviceBlockSize = _deviceWidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
},
child: SafeArea(
return SafeArea(
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -133,8 +127,7 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
deviceBlockSize: _deviceBlockSize,
textInputType: TextInputType.visiblePassword,
onChanged: (value) {
Provider.of<UsersProvider>(context,
listen: false)
Provider.of<UsersProvider>(context, listen: false)
.searchUsers(value);
},
),
@@ -155,11 +148,10 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
itemBuilder: (context, index) {
return TransferDataBox(
deviceBlockSize: _deviceBlockSize,
user:
userResults.usersBox?[index],
user: userResults.usersBox?[index],
clickColor: kDarkPurple,
isClicked: userResults
.selectedUserIndex ==
isClicked:
userResults.selectedUserIndex ==
index,
onTap: (userId) {
Provider.of<UsersProvider>(
@@ -175,13 +167,11 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
context,
listen: false)
.selectedUserForPackages =
userResults
.usersBox?[index];
userResults.usersBox?[index];
},
);
},
itemCount:
userResults.usersBox?.length,
itemCount: userResults.usersBox?.length,
shrinkWrap: true,
);
},
@@ -232,8 +222,7 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
deviceBlockSize:
_deviceBlockSize,
user: Provider.of<
UsersProvider>(
context)
UsersProvider>(context)
.selectedUserForPackages,
)
],
@@ -290,7 +279,6 @@ class _PackageTransferScreenState extends State<PackageTransferScreen> {
),
),
),
),
);
}
lib/pages/PackagePages/package_add_screen.dart
+11 -28
View File
@@ -66,19 +66,7 @@ class _PackageAddScreenState extends State<PackageAddScreen> {
final double _deviceBlockSize = _devicewidth / 100;
return Consumer<PackageProvider>(
builder: (context, packageProvider, _) {
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
// packageProvider.resetLoadingButton();
// Navigator.pushReplacementNamed(
// context,
// Routes.packageResultScreen,
// );
// return true;
},
child: SafeArea(
return SafeArea(
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -163,8 +151,8 @@ class _PackageAddScreenState extends State<PackageAddScreen> {
keyboardType: TextInputType.text,
textInputAction: TextInputAction.next,
onFieldSubmitted: (_) {
FocusScope.of(context).requestFocus(
_packageUdiFocusNode);
FocusScope.of(context)
.requestFocus(_packageUdiFocusNode);
},
),
SizedBox(
@@ -208,8 +196,7 @@ class _PackageAddScreenState extends State<PackageAddScreen> {
// height: 20,
// ),
Container(
margin:
EdgeInsets.symmetric(vertical: 5),
margin: EdgeInsets.symmetric(vertical: 5),
child: Text(
'Items included',
style: TextStyle(
@@ -222,19 +209,17 @@ class _PackageAddScreenState extends State<PackageAddScreen> {
Consumer<PackageProvider>(
builder: (ctx, packageProvider, _) =>
ListView.builder(
physics:
NeverScrollableScrollPhysics(),
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemBuilder: (ctx, index) =>
AddItemBox(
itemBuilder: (ctx, index) => AddItemBox(
text: 'Select Items Included',
iconColor: kPurpleSub,
deviceBlockSize: _deviceBlockSize,
values: packageProvider
.itemValues[index],
values:
packageProvider.itemValues[index],
vals: packageProvider.itemVals,
initialItemValue: packageProvider
.initialItemValue,
initialItemValue:
packageProvider.initialItemValue,
index: index,
hasRemoveButton: packageProvider
.itemValues.length >
@@ -279,8 +264,7 @@ class _PackageAddScreenState extends State<PackageAddScreen> {
),
PackageAddSaveButton(
form: _form,
itemValues:
Provider.of<PackageProvider>(
itemValues: Provider.of<PackageProvider>(
context,
listen: false,
).itemValues,
@@ -302,7 +286,6 @@ class _PackageAddScreenState extends State<PackageAddScreen> {
),
),
),
),
);
},
);
lib/pages/PackagePages/package_detail_screen.dart
+1 -8
View File
@@ -47,13 +47,7 @@ class _PackageDetailScreenState extends State<PackageDetailScreen> {
final _media = MediaQuery.of(context);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pop();
},
child: SafeArea(
return SafeArea(
child: Scaffold(
appBar: AppBar(
titleSpacing: -10,
@@ -104,7 +98,6 @@ class _PackageDetailScreenState extends State<PackageDetailScreen> {
},
),
),
),
);
}
}
lib/pages/PackagePages/package_filter_screen.dart
+1 -13
View File
@@ -78,18 +78,7 @@ class _PackageFilterScreenState extends State<PackageFilterScreen> {
final _media = MediaQuery.of(context);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
// Navigator.pushReplacementNamed(
// context,
// Routes.packageResultScreen,
// );
// return true;
},
child: SafeArea(
return SafeArea(
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -301,7 +290,6 @@ class _PackageFilterScreenState extends State<PackageFilterScreen> {
),
),
),
),
);
}
}
lib/pages/PackagePages/package_result_screen.dart
+1 -1
View File
@@ -327,7 +327,7 @@ class PackageResultFloatingButton extends StatelessWidget {
InkWell(
customBorder: CircleBorder(),
onTap: () {
Navigator.of(context).pushReplacementNamed(Routes.packageAddScreen);
Navigator.of(context).pushNamed(Routes.packageAddScreen);
},
child: Container(
padding: EdgeInsets.all(_deviceBlockSize),
lib/pages/PackagePages/package_scan_screen.dart
+1 -8
View File
@@ -26,13 +26,7 @@ class _PackageScanScreenState extends State<PackageScanScreen> {
// final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
},
child: SafeArea(
return SafeArea(
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -203,7 +197,6 @@ class _PackageScanScreenState extends State<PackageScanScreen> {
),
),
),
),
);
}
}
lib/pages/TestPages/test_add_screen.dart
+8 -23
View File
@@ -49,18 +49,7 @@ class _TestResultAddScreenState extends State<TestResultAddScreen> {
// final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
// Navigator.pushReplacementNamed(
// context,
// Routes.testResultScreen,
// );
// return true;
},
child: SafeArea(
return SafeArea(
child: Scaffold(
appBar: AppBar(
titleSpacing: -10,
@@ -78,8 +67,8 @@ class _TestResultAddScreenState extends State<TestResultAddScreen> {
size: 35,
),
// padding: EdgeInsets.all(0),
onPressed: () => Navigator.of(context)
.popAndPushNamed(Routes.testResultScreen),
onPressed: () =>
Navigator.of(context).popAndPushNamed(Routes.testResultScreen),
),
),
body: Consumer<ConnectivityProvider>(
@@ -92,8 +81,8 @@ class _TestResultAddScreenState extends State<TestResultAddScreen> {
),
)
: ListView(
padding: EdgeInsets.symmetric(
horizontal: 20, vertical: 20),
padding:
EdgeInsets.symmetric(horizontal: 20, vertical: 20),
children: <Widget>[
Container(
padding: EdgeInsets.only(
@@ -170,8 +159,7 @@ class _TestResultAddScreenState extends State<TestResultAddScreen> {
),
),
Row(
crossAxisAlignment:
CrossAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.end,
children: <Widget>[
Text(
'OR',
@@ -206,8 +194,7 @@ class _TestResultAddScreenState extends State<TestResultAddScreen> {
decoration: InputDecoration(
isDense: true,
icon: Icon(
FontAwesomeIcons
.sortNumericDown,
FontAwesomeIcons.sortNumericDown,
),
labelText: 'Enter a Test Code',
labelStyle: TextStyle(
@@ -258,8 +245,7 @@ class _TestResultAddScreenState extends State<TestResultAddScreen> {
Routes.formTestResultScreen,
arguments: testCodeCTRL.text,
);
} else if (testTypeCTRL.text !=
'') {
} else if (testTypeCTRL.text != '') {
Provider.of<TestResultsProvider>(
context,
listen: false,
@@ -288,7 +274,6 @@ class _TestResultAddScreenState extends State<TestResultAddScreen> {
},
),
),
),
);
}
lib/pages/TestPages/test_detail_screen.dart
+1 -8
View File
@@ -44,13 +44,7 @@ class _TestDetailsScreenState extends State<TestDetailsScreen> {
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
// print(datas);
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
},
child: SafeArea(
return SafeArea(
child: Scaffold(
appBar: AppBar(
titleSpacing: -10,
@@ -87,7 +81,6 @@ class _TestDetailsScreenState extends State<TestDetailsScreen> {
},
),
),
),
);
}
}
lib/pages/TestPages/test_filter_screen.dart
+1 -13
View File
@@ -128,18 +128,7 @@ class _TestFilterScreenState extends State<TestFilterScreen> {
// final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
// Navigator.pushReplacementNamed(
// context,
// Routes.testResultScreen,
// );
// return true;
},
child: SafeArea(
return SafeArea(
child: GestureDetector(
onTap: () {
FocusManager.instance.primaryFocus?.unfocus();
@@ -423,7 +412,6 @@ class _TestFilterScreenState extends State<TestFilterScreen> {
),
),
),
),
);
}
}
lib/pages/TestPages/test_form_page.dart
+1 -13
View File
@@ -96,18 +96,7 @@ class _FormPageState extends State<FormPage> {
@override
Widget build(BuildContext context) {
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
// Navigator.pushReplacementNamed(
// context,
// Routes.testResultAddScreen,
// );
// return true;
},
child: SafeArea(
return SafeArea(
child: Scaffold(
appBar: AppBar(
centerTitle: true,
@@ -197,7 +186,6 @@ class _FormPageState extends State<FormPage> {
),
),
),
),
);
}
lib/pages/TestPages/test_result_screen.dart
+1 -1
View File
@@ -128,7 +128,7 @@ class _TestResultScreenState extends State<TestResultScreen> {
InkWell(
onTap: () {
Navigator.of(context)
.popAndPushNamed(Routes.testFilterScreen);
.pushNamed(Routes.testFilterScreen);
},
child: Container(
padding: EdgeInsets.all(7),
lib/pages/TestPages/test_scan_screen.dart
+1 -8
View File
@@ -27,13 +27,7 @@ class _TestScanScreenState extends State<TestScanScreen> {
// final double _pixelRatio = (_media.size.height / _media.size.width * 7 / 5);
final double _devicewidth = _media.size.width;
final double _deviceBlockSize = _devicewidth / 100;
return PopScope(
canPop: false,
onPopInvoked: (didPop) {
if (didPop) return;
Navigator.of(context).pushNamed(Routes.homePage);
},
child: SafeArea(
return SafeArea(
child: Scaffold(
appBar: AppBar(
titleSpacing: -10,
@@ -195,7 +189,6 @@ class _TestScanScreenState extends State<TestScanScreen> {
},
),
),
),
);
}
}
lib/widgets/CycleScreens/Result/banner.dart
+1 -1
View File
@@ -34,7 +34,7 @@ class ResultBanner extends StatelessWidget {
InkWell(
customBorder: CircleBorder(),
onTap: () {
Navigator.of(context).popAndPushNamed(push);
Navigator.of(context).pushNamed(push);
},
child: Container(
padding: EdgeInsets.all(5),
lib/widgets/LabelScreens/Result/floating_buttons.dart
+1 -1
View File
@@ -41,7 +41,7 @@ class LabelFloatingButtons extends StatelessWidget {
InkWell(
customBorder: CircleBorder(),
onTap: () {
Navigator.of(context).pushReplacementNamed(Routes.labelAddScreen);
Navigator.of(context).pushNamed(Routes.labelAddScreen);
},
child: Container(
padding: EdgeInsets.all(5),
lib/widgets/TestResultScreens/Main/floating_button.dart
+1 -2
View File
@@ -41,8 +41,7 @@ class TestResultFloatingButton extends StatelessWidget {
InkWell(
customBorder: CircleBorder(),
onTap: () {
Navigator.of(context)
.pushReplacementNamed(Routes.testResultAddScreen);
Navigator.of(context).pushNamed(Routes.testResultAddScreen);
},
child: Container(
padding: EdgeInsets.all(_deviceBlockSize),