diff --git a/lib/pages/MyItemsPages/Result/my_items_requests_screen.dart b/lib/pages/MyItemsPages/Result/my_items_requests_screen.dart index def3cc5..26e0d62 100755 --- a/lib/pages/MyItemsPages/Result/my_items_requests_screen.dart +++ b/lib/pages/MyItemsPages/Result/my_items_requests_screen.dart @@ -11,6 +11,7 @@ import 'package:provider/provider.dart'; class MyItemsRequestsScreen extends StatefulWidget { final bool? isAdmin; + const MyItemsRequestsScreen({ Key? key, this.isAdmin, @@ -35,7 +36,7 @@ class _MyItemsRequestsScreenState extends State { var itemResults = Provider.of(context); itemResults.setLoading(); itemResults.resetPageNumber(); - itemResults.getMyItemRequests().then( + itemResults.getMyItemRequests().then( (_) { itemResults.resetLoading(); sc?.addListener( @@ -93,23 +94,30 @@ class _MyItemsRequestsScreenState extends State { color: Colors.black, ), ) - : ListView.builder( - controller: sc, - itemBuilder: (context, index) { - return RequestsDataBox( - deviceBlockSize: _deviceBlockSize, - isAdmin: - userData['roles']?.contains('User') - ? false - : true, - item: itemResults - .originalMyItemsRequests?[index], + : itemResults.myItems?.length != null + ? ListView.builder( + controller: sc, + itemBuilder: (context, index) { + return RequestsDataBox( + deviceBlockSize: _deviceBlockSize, + isAdmin: userData['roles'] + ?.contains('User') + ? false + : true, + item: itemResults + .originalMyItemsRequests?[index], + ); + }, + itemCount: itemResults + .originalMyItemsRequests?.length, + shrinkWrap: true, + ) + : Container( + child: Center( + child: + Text("There is no item to show."), + ), ); - }, - itemCount: itemResults - .originalMyItemsRequests?.length, - shrinkWrap: true, - ); }, ), ), diff --git a/lib/pages/MyItemsPages/my_items_transfer_screen.dart b/lib/pages/MyItemsPages/my_items_transfer_screen.dart index 866bc9a..13bd214 100755 --- a/lib/pages/MyItemsPages/my_items_transfer_screen.dart +++ b/lib/pages/MyItemsPages/my_items_transfer_screen.dart @@ -149,37 +149,48 @@ class _ItemsTransferScreenState extends State { color: Colors.black, ), ) - : ListView.builder( - controller: sc, - itemBuilder: (context, index) { - return TransferDataBox( - deviceBlockSize: _deviceBlockSize, - user: userResults.usersBox?[index], - clickColor: kDarkBlue, - isClicked: - userResults.selectedUserIndex == + : userResults.usersBox?.length != null + ? ListView.builder( + controller: sc, + itemBuilder: (context, index) { + return TransferDataBox( + deviceBlockSize: + _deviceBlockSize, + user: userResults + .usersBox?[index], + clickColor: kDarkBlue, + isClicked: userResults + .selectedUserIndex == index, - onTap: (userId) { - Provider.of( - context, - listen: false, - ).selectUser(index); - print(userId); - Provider.of( - context, - listen: false) - .saveUserId = userId; - Provider.of( + onTap: (userId) { + Provider.of( + context, + listen: false, + ).selectUser(index); + print(userId); + Provider.of( context, listen: false) - .selectedUserForItems = - userResults.usersBox?[index]; + .saveUserId = userId; + Provider.of( + context, + listen: false) + .selectedUserForItems = + userResults + .usersBox?[index]; + }, + ); }, + itemCount: + userResults.usersBox?.length, + shrinkWrap: true, + ) + : Container( + child: Center( + child: Text( + "There is no user to show."), + ), ); - }, - itemCount: userResults.usersBox?.length, - shrinkWrap: true, - ); }, ), ), @@ -265,9 +276,12 @@ class _ItemsTransferScreenState extends State { myItemProvider .resetLoadingButton(); Fluttertoast.showToast( - msg: "The item is transferred.", - toastLength: Toast.LENGTH_SHORT, - gravity: ToastGravity.BOTTOM, + msg: + "The item is transferred.", + toastLength: + Toast.LENGTH_SHORT, + gravity: + ToastGravity.BOTTOM, ); }, text: 'Transfer', diff --git a/lib/pages/MyPackagesPages/Result/my_packages_requests_screen.dart b/lib/pages/MyPackagesPages/Result/my_packages_requests_screen.dart index 708f608..2b380e3 100755 --- a/lib/pages/MyPackagesPages/Result/my_packages_requests_screen.dart +++ b/lib/pages/MyPackagesPages/Result/my_packages_requests_screen.dart @@ -36,22 +36,22 @@ class _MyPackagesRequestsScreenState extends State { var packageResults = Provider.of(context); packageResults.setLoading(); packageResults.resetPageNumber(); - packageResults.getMyPackageRequests().then( - (_) { - packageResults.resetLoading(); - sc?.addListener( - () { - if (sc!.position.pixels == sc!.position.maxScrollExtent) { - var packageResults = Provider.of( - context, - listen: false, - ); - packageResults.getMyPackageRequests(); - } - }, - ); - }, - ); + packageResults.getMyPackageRequests().then( + (_) { + packageResults.resetLoading(); + sc?.addListener( + () { + if (sc!.position.pixels == sc!.position.maxScrollExtent) { + var packageResults = Provider.of( + context, + listen: false, + ); + packageResults.getMyPackageRequests(); + } + }, + ); + }, + ); } _isInit = false; super.didChangeDependencies(); @@ -94,23 +94,31 @@ class _MyPackagesRequestsScreenState extends State { color: Colors.black, ), ) - : ListView.builder( - controller: sc, - itemBuilder: (context, index) { - return PackageRequestsDataBox( - deviceBlockSize: _deviceBlockSize, - isAdmin: - userData['roles']?.contains('User') + : packageResults.myPackages?.length != null + ? ListView.builder( + controller: sc, + itemBuilder: (context, index) { + return PackageRequestsDataBox( + deviceBlockSize: _deviceBlockSize, + isAdmin: userData['roles'] + ?.contains('User') ? false : true, - package: packageResults - .originalMyPackagesRequests?[index], + package: packageResults + .originalMyPackagesRequests?[ + index], + ); + }, + itemCount: packageResults + .originalMyPackagesRequests?.length, + shrinkWrap: true, + ) + : Container( + child: Center( + child: + Text("There is no item to show."), + ), ); - }, - itemCount: packageResults - .originalMyPackagesRequests?.length, - shrinkWrap: true, - ); }, ), ), diff --git a/lib/pages/TestPages/test_verify_screen.dart b/lib/pages/TestPages/test_verify_screen.dart index 1c5d3e9..13f1888 100755 --- a/lib/pages/TestPages/test_verify_screen.dart +++ b/lib/pages/TestPages/test_verify_screen.dart @@ -77,7 +77,12 @@ class _TestVerifyScreenState extends State { child: Scaffold( appBar: AppBar( titleSpacing: -10, - title: Text('Home', style: TextStyle(color: Colors.white,),), + title: Text( + 'Home', + style: TextStyle( + color: Colors.white, + ), + ), backgroundColor: Colors.black, leading: IconButton( icon: Icon( @@ -231,29 +236,30 @@ class _TestVerifyScreenState extends State { color: Colors.black, ), ) - : testResults.items?.length != null ? - ListView.builder( - controller: sc, - itemBuilder: (context, index) => - (testResults.items![index].verified == 'None' && - userData['roles'] - .contains('Supervisor')) || - userData['roles'].contains('Admin') - ? TestItemBox( - deviceBlockSize: _deviceBlockSize, - item: testResults.items![index], - id: testResults.items![index].id, - userData: userData, - ) - : Container(), - itemCount: testResults.items?.length, - shrinkWrap: true, - ) : - Container( - child: Center( - child: Text("There is no item to show."), - ), - ); + : testResults.items?.length != null + ? ListView.builder( + controller: sc, + itemBuilder: (context, index) => + (testResults.items![index].verified == + 'None' && + userData['roles'] + .contains('Supervisor')) || + userData['roles'].contains('Admin') + ? TestItemBox( + deviceBlockSize: _deviceBlockSize, + item: testResults.items![index], + id: testResults.items![index].id, + userData: userData, + ) + : Container(), + itemCount: testResults.items?.length, + shrinkWrap: true, + ) + : Container( + child: Center( + child: Text("There is no item to show."), + ), + ); }, ), ),