diff --git a/lib/pages/CyclePages/cycle_result_screen.dart b/lib/pages/CyclePages/cycle_result_screen.dart index f2cf80c..121f70c 100755 --- a/lib/pages/CyclePages/cycle_result_screen.dart +++ b/lib/pages/CyclePages/cycle_result_screen.dart @@ -198,7 +198,9 @@ class _CycleResultScreenState extends State { color: Colors.black, ), ) - : ListView.builder( + : + cycleResults.items?.length != null ? + ListView.builder( controller: sc, itemBuilder: (context, index) { String labels = ''; @@ -221,7 +223,12 @@ class _CycleResultScreenState extends State { }, itemCount: cycleResults.items?.length, shrinkWrap: true, - ); + ) : + Container( + child: Center( + child: Text("There is no item to show."), + ), + ); }, ), ), diff --git a/lib/pages/ItemPages/item_result_screen.dart b/lib/pages/ItemPages/item_result_screen.dart index fb53244..344266e 100755 --- a/lib/pages/ItemPages/item_result_screen.dart +++ b/lib/pages/ItemPages/item_result_screen.dart @@ -251,7 +251,8 @@ class _ItemResultScreenState extends State { color: Colors.black, ), ) - : ListView.builder( + : itemResults.items?.length != null ? + ListView.builder( controller: sc, itemBuilder: (context, index) { // remove extra , @@ -262,7 +263,12 @@ class _ItemResultScreenState extends State { }, itemCount: itemResults.items?.length, shrinkWrap: true, - ); + ) : + Container( + child: Center( + child: Text("There is no item to show."), + ), + ); }, ), ), diff --git a/lib/pages/LabelPages/label_result_screen.dart b/lib/pages/LabelPages/label_result_screen.dart index bb0e44d..8a7bb22 100755 --- a/lib/pages/LabelPages/label_result_screen.dart +++ b/lib/pages/LabelPages/label_result_screen.dart @@ -72,7 +72,12 @@ class _LabelResultScreenState extends State { ), 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( @@ -171,16 +176,24 @@ class _LabelResultScreenState extends State { color: Colors.black, ), ) - : ListView.builder( - controller: sc, - itemBuilder: (context, index) => - LabelItemBox( - deviceBlockSize: _deviceBlockSize, - item: labelResults.items?[index], - ), - itemCount: labelResults.items?.length, - shrinkWrap: true, - ); + : labelResults.items?.length != null + ? ListView.builder( + controller: sc, + itemBuilder: (context, index) => + LabelItemBox( + deviceBlockSize: _deviceBlockSize, + item: labelResults.items?[index], + ), + itemCount: + labelResults.items?.length, + shrinkWrap: true, + ) + : Container( + child: Center( + child: Text( + "There is no item to show."), + ), + ); }, ), ), diff --git a/lib/pages/MyItemsPages/Result/my_items_mine_screen.dart b/lib/pages/MyItemsPages/Result/my_items_mine_screen.dart index 7073365..5150eef 100755 --- a/lib/pages/MyItemsPages/Result/my_items_mine_screen.dart +++ b/lib/pages/MyItemsPages/Result/my_items_mine_screen.dart @@ -13,6 +13,7 @@ import 'package:provider/provider.dart'; class MyItemsMineScreen extends StatefulWidget { final bool? isAdmin; + const MyItemsMineScreen({ Key? key, this.isAdmin, @@ -39,23 +40,23 @@ class _MyItemsMineScreenState extends State { var myItemResults = Provider.of(context); myItemResults.setLoading(); myItemResults.resetPageNumber(); - myItemResults.getMyItems().then( - (_) { - myItemResults.resetLoading(); - sc!.addListener( - () { - if (sc!.position.pixels == sc!.position.maxScrollExtent && - searchCTRL.text == '') { - var myItemResults = Provider.of( - context, - listen: false, - ); - myItemResults.getMyItems(); - } - }, - ); - }, - ); + myItemResults.getMyItems().then( + (_) { + myItemResults.resetLoading(); + sc!.addListener( + () { + if (sc!.position.pixels == sc!.position.maxScrollExtent && + searchCTRL.text == '') { + var myItemResults = Provider.of( + context, + listen: false, + ); + myItemResults.getMyItems(); + } + }, + ); + }, + ); } _isInit = false; super.didChangeDependencies(); @@ -158,7 +159,7 @@ class _MyItemsMineScreenState extends State { textInputType: TextInputType.visiblePassword, deviceBlockSize: _deviceBlockSize, onChanged: (value) { - Provider.of(context, listen: false) + Provider.of(context, listen: false) .searchMyItems(value); }, ), @@ -174,27 +175,34 @@ class _MyItemsMineScreenState extends State { color: Colors.black, ), ) - : ListView.builder( - controller: sc, - itemBuilder: (context, index) { - return MyItemsItemDataBox( - deviceBlockSize: _deviceBlockSize, - isAdmin: - userData['roles']?.contains('User') + : itemResults.originalMyItems?.length != null + ? ListView.builder( + controller: sc, + itemBuilder: (context, index) { + return MyItemsItemDataBox( + deviceBlockSize: _deviceBlockSize, + isAdmin: userData['roles'] + ?.contains('User') ? false : true, - items: itemResults.myItems?[index], - push: () { - Navigator.pushNamed(context, - Routes.myItemsHistoryScreen, - arguments: - itemResults.myItems?[index]); - }, - ); - }, - itemCount: itemResults.myItems?.length, - shrinkWrap: true, - ); + items: itemResults.myItems?[index], + push: () { + Navigator.pushNamed(context, + Routes.myItemsHistoryScreen, + arguments: itemResults + .myItems?[index]); + }, + ); + }, + itemCount: itemResults.myItems?.length, + shrinkWrap: true, + ) + : Container( + child: Center( + child: + Text("There is no item to show."), + ), + ); }, ), ), diff --git a/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart b/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart index 7e08606..63280e3 100755 --- a/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart +++ b/lib/pages/MyPackagesPages/Result/my_packages_mine_screen.dart @@ -1,4 +1,3 @@ - // ignore_for_file: public_member_api_docs, sort_constructors_first import 'package:cssd/config/routes.dart'; import 'package:cssd/providers/auth.dart'; @@ -40,23 +39,23 @@ class _MyPackagesMineScreenState extends State { var myPackageResults = Provider.of(context); myPackageResults.setLoading(); myPackageResults.resetPageNumber(); - myPackageResults.getMyPackages().then( - (_) { - myPackageResults.resetLoading(); - sc!.addListener( - () { - if (sc!.position.pixels == sc!.position.maxScrollExtent && - searchCTRL.text == '') { - var myPackageResults = Provider.of( - context, - listen: false, - ); - myPackageResults.getMyPackages(); - } - }, - ); - }, - ); + myPackageResults.getMyPackages().then( + (_) { + myPackageResults.resetLoading(); + sc!.addListener( + () { + if (sc!.position.pixels == sc!.position.maxScrollExtent && + searchCTRL.text == '') { + var myPackageResults = Provider.of( + context, + listen: false, + ); + myPackageResults.getMyPackages(); + } + }, + ); + }, + ); } _isInit = false; super.didChangeDependencies(); @@ -131,7 +130,7 @@ class _MyPackagesMineScreenState extends State { text: 'package', deviceBlockSize: _deviceBlockSize, onChanged: (value) { - Provider.of(context, listen: false) + Provider.of(context, listen: false) .searchMyPackages(value); }, ), @@ -147,28 +146,36 @@ class _MyPackagesMineScreenState extends State { color: Colors.black, ), ) - : ListView.builder( - controller: sc, - itemBuilder: (context, index) { - return MyPackagesItemDataBox( - deviceBlockSize: _deviceBlockSize, - isAdmin: - userData['roles']?.contains('User') + : packageResults.originalMyPackages?.length != + null + ? ListView.builder( + controller: sc, + itemBuilder: (context, index) { + return MyPackagesItemDataBox( + deviceBlockSize: _deviceBlockSize, + isAdmin: userData['roles'] + ?.contains('User') ? false : true, - packages: - packageResults.myPackages?[index], - push: () { - Navigator.pushNamed(context, - Routes.myPackagesHistoryScreen, - arguments: packageResults - .myPackages?[index]); + packages: + packageResults.myPackages?[index], + push: () { + Navigator.pushNamed(context, + Routes.myPackagesHistoryScreen, + arguments: packageResults + .myPackages?[index]); + }, + ); }, - ); - }, - itemCount: packageResults.myPackages?.length, - shrinkWrap: true, - ); + itemCount: + packageResults.myPackages?.length, + shrinkWrap: true, + ) + : Container( + child: Center( + child: Text("There is no item to show."), + ), + ); }, ), ), diff --git a/lib/pages/PackagePages/package_result_screen.dart b/lib/pages/PackagePages/package_result_screen.dart index 2f564fa..b540a71 100755 --- a/lib/pages/PackagePages/package_result_screen.dart +++ b/lib/pages/PackagePages/package_result_screen.dart @@ -39,23 +39,25 @@ class _PackageResultScreenState extends State { void initState() { sc = new ScrollController(); super.initState(); - IsolateNameServer.registerPortWithName(_port.sendPort, 'downloader_send_port'); + IsolateNameServer.registerPortWithName( + _port.sendPort, 'downloader_send_port'); _port.listen((dynamic data) { - String id = data[0]; - DownloadTaskStatus status = data[1]; - int progress = data[2]; - if (status == DownloadTaskStatus.complete) { - print('Downloaded'); - } - setState((){ }); - }); + String id = data[0]; + DownloadTaskStatus status = data[1]; + int progress = data[2]; + if (status == DownloadTaskStatus.complete) { + print('Downloaded'); + } + setState(() {}); + }); - FlutterDownloader.registerCallback(downloadCallback); + FlutterDownloader.registerCallback(downloadCallback); } @pragma('vm:entry-point') static void downloadCallback(String id, int status, int progress) { - final SendPort? send = IsolateNameServer.lookupPortByName('downloader_send_port'); + final SendPort? send = + IsolateNameServer.lookupPortByName('downloader_send_port'); send!.send([id, status, progress]); } @@ -107,7 +109,12 @@ class _PackageResultScreenState extends State { ), 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( @@ -209,27 +216,36 @@ class _PackageResultScreenState extends State { color: Colors.black, ), ) - : ListView.builder( - controller: sc, - itemBuilder: (context, index) { - // String items = ''; - // for (var item in packageResults - // .items![index].items) { - // items += item; - // items += ' , '; - // } - // items = items.substring( - // 0, - // items.length - 3, - // ); // remove extra , - return PackageItemBox( - deviceBlockSize: _deviceBlockSize, - item: packageResults.items?[index], + : packageResults.items?.length != null + ? ListView.builder( + controller: sc, + itemBuilder: (context, index) { + // String items = ''; + // for (var item in packageResults + // .items![index].items) { + // items += item; + // items += ' , '; + // } + // items = items.substring( + // 0, + // items.length - 3, + // ); // remove extra , + return PackageItemBox( + deviceBlockSize: _deviceBlockSize, + item: + packageResults.items?[index], + ); + }, + itemCount: + packageResults.items?.length, + shrinkWrap: true, + ) + : Container( + child: Center( + child: Text( + "There is no item to show."), + ), ); - }, - itemCount: packageResults.items?.length, - shrinkWrap: true, - ); }, ), ), @@ -261,27 +277,28 @@ class PackageResultFloatingButton extends StatelessWidget { children: [ if (userData['roles'].contains('Supervisor') || userData['roles'].contains('Admin')) - InkWell( - customBorder: CircleBorder(), - onTap: () async { - var status = await Permission.storage.request(); - if (status.isGranted) { - Provider.of(context, listen: false).exportPackages(); - } - }, - child: Container( - padding: EdgeInsets.all(_deviceBlockSize), - decoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.black, - ), - child: Icon( - Icons.import_export, - size: 10 * _deviceBlockSize, - color: Colors.white, + InkWell( + customBorder: CircleBorder(), + onTap: () async { + var status = await Permission.storage.request(); + if (status.isGranted) { + Provider.of(context, listen: false) + .exportPackages(); + } + }, + child: Container( + padding: EdgeInsets.all(_deviceBlockSize), + decoration: BoxDecoration( + shape: BoxShape.circle, + color: Colors.black, + ), + child: Icon( + Icons.import_export, + size: 10 * _deviceBlockSize, + color: Colors.white, + ), ), ), - ), SizedBox( width: 2 * _deviceBlockSize, ), diff --git a/lib/pages/TestPages/test_result_screen.dart b/lib/pages/TestPages/test_result_screen.dart index 715fa00..e23af02 100755 --- a/lib/pages/TestPages/test_result_screen.dart +++ b/lib/pages/TestPages/test_result_screen.dart @@ -278,16 +278,24 @@ class _TestResultScreenState extends State { color: Colors.black, ), ) - : ListView.builder( - controller: sc, - itemBuilder: (context, index) => - TestItemBox( - deviceBlockSize: _deviceBlockSize, - item: testResults.items![index], - ), - itemCount: testResults.items?.length, - shrinkWrap: true, - ); + : testResults.items?.length != null + ? ListView.builder( + controller: sc, + itemBuilder: (context, index) => + TestItemBox( + deviceBlockSize: _deviceBlockSize, + item: testResults.items![index], + ), + itemCount: + testResults.items?.length, + shrinkWrap: true, + ) + : Container( + child: Center( + child: Text( + "There is no item to show."), + ), + ); }, ), ), diff --git a/lib/pages/TestPages/test_verify_screen.dart b/lib/pages/TestPages/test_verify_screen.dart index cc9e9e8..7aa2c61 100755 --- a/lib/pages/TestPages/test_verify_screen.dart +++ b/lib/pages/TestPages/test_verify_screen.dart @@ -230,7 +230,8 @@ class _TestVerifyScreenState extends State { color: Colors.black, ), ) - : ListView.builder( + : testResults.items?.length != null ? + ListView.builder( controller: sc, itemBuilder: (context, index) => (testResults.items![index].verified == 'None' && @@ -246,7 +247,12 @@ class _TestVerifyScreenState extends State { : Container(), itemCount: testResults.items?.length, shrinkWrap: true, - ); + ) : + Container( + child: Center( + child: Text("There is no item to show."), + ), + ); }, ), ), diff --git a/lib/widgets/MyPackagesScreens/Result/my_packages_data_box_widget.dart b/lib/widgets/MyPackagesScreens/Result/my_packages_data_box_widget.dart index f0c7430..d9970ab 100755 --- a/lib/widgets/MyPackagesScreens/Result/my_packages_data_box_widget.dart +++ b/lib/widgets/MyPackagesScreens/Result/my_packages_data_box_widget.dart @@ -91,7 +91,7 @@ class MyPackagesItemDataBox extends StatelessWidget { ), if (isAdmin) Container( - width: 30 * _deviceBlockSize, + width: 50 * _deviceBlockSize, child: Row( children: [ Text(