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

Improve navigation back

Browse Source
This commit is contained in:
fhkhd
2024-03-13 19:20:21 +03:30
parent 3db8ae3cfe
commit 92e02cc84e
10 changed files with 308 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/pages/CyclePages/cycle_result_screen.dart
+19 -11
View File
@@ -77,7 +77,12 @@ class _CycleResultScreenState extends State<CycleResultScreen> {
), ),
appBar: AppBar( appBar: AppBar(
titleSpacing: -10, titleSpacing: -10,
title: Text('Home', style: TextStyle(color: Colors.white,),), title: Text(
'Home',
style: TextStyle(
color: Colors.white,
),
),
backgroundColor: Colors.black, backgroundColor: Colors.black,
leading: IconButton( leading: IconButton(
icon: Icon( icon: Icon(
@@ -85,7 +90,7 @@ class _CycleResultScreenState extends State<CycleResultScreen> {
color: Colors.white, color: Colors.white,
size: 35, size: 35,
), ),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pushNamed(Routes.homePage),
), ),
), ),
body: Consumer<ConnectivityProvider>( body: Consumer<ConnectivityProvider>(
@@ -198,9 +203,8 @@ class _CycleResultScreenState extends State<CycleResultScreen> {
color: Colors.black, color: Colors.black,
), ),
) )
: : cycleResults.items?.length != 0
cycleResults.items?.length != 0 ? ? ListView.builder(
ListView.builder(
controller: sc, controller: sc,
itemBuilder: (context, index) { itemBuilder: (context, index) {
String labels = ''; String labels = '';
@@ -216,17 +220,21 @@ class _CycleResultScreenState extends State<CycleResultScreen> {
3); // remove extra , 3); // remove extra ,
} }
return CycleItemBox( return CycleItemBox(
deviceBlockSize: _deviceBlockSize, deviceBlockSize:
item: cycleResults.items?[index], _deviceBlockSize,
item:
cycleResults.items?[index],
labels: labels, labels: labels,
); );
}, },
itemCount: cycleResults.items?.length, itemCount:
cycleResults.items?.length,
shrinkWrap: true, shrinkWrap: true,
) : )
Container( : Container(
child: Center( child: Center(
child: Text("There is no item to show."), child: Text(
"There is no item to show."),
), ),
); );
}, },
lib/pages/ItemPages/item_result_screen.dart
+11 -8
View File
@@ -122,7 +122,7 @@ class _ItemResultScreenState extends State<ItemResultScreen> {
color: Colors.white, color: Colors.white,
size: 35, size: 35,
), ),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pushNamed(Routes.homePage),
), ),
), ),
body: Consumer<ConnectivityProvider>( body: Consumer<ConnectivityProvider>(
@@ -251,22 +251,25 @@ class _ItemResultScreenState extends State<ItemResultScreen> {
color: Colors.black, color: Colors.black,
), ),
) )
: itemResults.items?.length != 0 ? : itemResults.items?.length != 0
ListView.builder( ? ListView.builder(
controller: sc, controller: sc,
itemBuilder: (context, index) { itemBuilder: (context, index) {
// remove extra , // remove extra ,
return ItemItemBox( return ItemItemBox(
deviceBlockSize: _deviceBlockSize, deviceBlockSize:
_deviceBlockSize,
item: itemResults.items?[index], item: itemResults.items?[index],
); );
}, },
itemCount: itemResults.items?.length, itemCount:
itemResults.items?.length,
shrinkWrap: true, shrinkWrap: true,
) : )
Container( : Container(
child: Center( child: Center(
child: Text("There is no item to show."), child: Text(
"There is no item to show."),
), ),
); );
}, },
lib/pages/LabelPages/label_result_screen.dart
+1 -1
View File
@@ -85,7 +85,7 @@ class _LabelResultScreenState extends State<LabelResultScreen> {
color: Colors.white, color: Colors.white,
size: 35, size: 35,
), ),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pushNamed(Routes.homePage),
), ),
), ),
body: Consumer<ConnectivityProvider>( body: Consumer<ConnectivityProvider>(
lib/pages/MyItemsPages/Result/my_items_result_screen.dart
+2 -1
View File
@@ -55,7 +55,8 @@ class _MyItemsResultScreenState extends State<MyItemsResultScreen>
color: Colors.white, color: Colors.white,
size: 35, size: 35,
), ),
onPressed: () => Navigator.of(context).pop(), onPressed: () =>
Navigator.of(context).pushNamed(Routes.homePage),
), ),
// bottom: TabBar( // bottom: TabBar(
// controller: _tabController, // controller: _tabController,
lib/pages/MyPackagesPages/Result/my_packages_result_screen.dart
+2 -1
View File
@@ -55,7 +55,8 @@ class _MyPackagesResultScreenState extends State<MyPackagesResultScreen>
color: Colors.white, color: Colors.white,
size: 35, size: 35,
), ),
onPressed: () => Navigator.of(context).pop(), onPressed: () =>
Navigator.of(context).pushNamed(Routes.homePage),
), ),
// bottom: TabBar( // bottom: TabBar(
// controller: _tabController, // controller: _tabController,
lib/pages/PackagePages/package_result_screen.dart
+2 -2
View File
@@ -122,8 +122,8 @@ class _PackageResultScreenState extends State<PackageResultScreen> {
color: Colors.white, color: Colors.white,
size: 35, size: 35,
), ),
onPressed: () => Navigator.of(context).pop(), onPressed: () =>
), Navigator.of(context).pushNamed(Routes.homePage)),
), ),
body: Consumer<ConnectivityProvider>(builder: (ct, connection, _) { body: Consumer<ConnectivityProvider>(builder: (ct, connection, _) {
return connection.conStatus != 'offline' return connection.conStatus != 'offline'
lib/pages/TestPages/test_result_screen.dart
+1 -1
View File
@@ -96,7 +96,7 @@ class _TestResultScreenState extends State<TestResultScreen> {
color: Colors.white, color: Colors.white,
size: 35, size: 35,
), ),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pushNamed(Routes.homePage),
), ),
), ),
body: Consumer<ConnectivityProvider>( body: Consumer<ConnectivityProvider>(
lib/pages/TestPages/test_verify_screen.dart
+33 -21
View File
@@ -25,6 +25,7 @@ class _TestVerifyScreenState extends State<TestVerifyScreen> {
ScrollController? sc; ScrollController? sc;
bool _isInit = true; bool _isInit = true;
// List<TestResult> _data = []; // List<TestResult> _data = [];
@override @override
@@ -90,7 +91,7 @@ class _TestVerifyScreenState extends State<TestVerifyScreen> {
color: Colors.white, color: Colors.white,
size: 35, size: 35,
), ),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pushNamed(Routes.homePage),
), ),
), ),
body: Padding( body: Padding(
@@ -285,6 +286,7 @@ class TestItemBox extends StatelessWidget {
super(key: key); super(key: key);
final Map<String, dynamic> userData; final Map<String, dynamic> userData;
final double _deviceBlockSize; final double _deviceBlockSize;
// final String _id; // final String _id;
@override @override
@@ -355,8 +357,8 @@ class TestItemBox extends StatelessWidget {
Row( Row(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[ children: <Widget>[
item.verified == 'None' ? item.verified == 'None'
Row( ? Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
InkWell( InkWell(
@@ -369,8 +371,10 @@ class TestItemBox extends StatelessWidget {
'Are you sure for verify this test?'), 'Are you sure for verify this test?'),
actions: <Widget>[ actions: <Widget>[
Consumer<TestResultsProvider>(builder: Consumer<TestResultsProvider>(builder:
(context, testResultsProvider, child) { (context, testResultsProvider,
return testResultsProvider.isloadingButton child) {
return testResultsProvider
.isloadingButton
? CircularProgressIndicator( ? CircularProgressIndicator(
color: Colors.black, color: Colors.black,
) )
@@ -383,7 +387,8 @@ class TestItemBox extends StatelessWidget {
context, context,
listen: false) listen: false)
.changeVerification( .changeVerification(
item.id, 'Verified') item.id,
'Verified')
.then((result) { .then((result) {
if (result) { if (result) {
print('true'); print('true');
@@ -393,11 +398,12 @@ class TestItemBox extends StatelessWidget {
.popAndPushNamed(Routes .popAndPushNamed(Routes
.testVerifyScreen); .testVerifyScreen);
Fluttertoast.showToast( Fluttertoast.showToast(
msg: "Test is verified.", msg:
toastLength: "Test is verified.",
Toast.LENGTH_SHORT, toastLength: Toast
gravity: .LENGTH_SHORT,
ToastGravity.BOTTOM, gravity: ToastGravity
.BOTTOM,
); );
testResultsProvider testResultsProvider
.resetLoadingButton(); .resetLoadingButton();
@@ -443,8 +449,8 @@ class TestItemBox extends StatelessWidget {
'Are you sure for reject this test?'), 'Are you sure for reject this test?'),
actions: <Widget>[ actions: <Widget>[
Consumer<TestResultsProvider>( Consumer<TestResultsProvider>(
builder: builder: (context,
(context, testResultsProvider, _) { testResultsProvider, _) {
return testResultsProvider return testResultsProvider
.isloadingButton .isloadingButton
? CircularProgressIndicator( ? CircularProgressIndicator(
@@ -465,16 +471,21 @@ class TestItemBox extends StatelessWidget {
if (result) { if (result) {
print('true'); print('true');
} }
Navigator.of(ctx).pop(); Navigator.of(ctx)
.pop();
Navigator.of(context) Navigator.of(context)
.popAndPushNamed(Routes .popAndPushNamed(
Routes
.testVerifyScreen); .testVerifyScreen);
Fluttertoast.showToast( Fluttertoast
msg: "Test is rejected.", .showToast(
toastLength: msg:
Toast.LENGTH_SHORT, "Test is rejected.",
toastLength: Toast
.LENGTH_SHORT,
gravity: gravity:
ToastGravity.BOTTOM, ToastGravity
.BOTTOM,
); );
testResultsProvider testResultsProvider
.resetLoadingButton(); .resetLoadingButton();
@@ -509,7 +520,8 @@ class TestItemBox extends StatelessWidget {
), ),
), ),
], ],
) : Container(), )
: Container(),
SizedBox( SizedBox(
width: _deviceBlockSize, width: _deviceBlockSize,
), ),
lib/pages/my_info_screen.dart
+2 -1
View File
@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
import 'package:fluttertoast/fluttertoast.dart'; import 'package:fluttertoast/fluttertoast.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import '../config/routes.dart';
import '../providers/auth.dart'; import '../providers/auth.dart';
class MyInfoScreen extends StatefulWidget { class MyInfoScreen extends StatefulWidget {
@@ -63,7 +64,7 @@ class _MyInfoScreenState extends State<MyInfoScreen> {
color: Colors.white, color: Colors.white,
size: 35, size: 35,
), ),
onPressed: () => Navigator.of(context).pop(), onPressed: () => Navigator.of(context).pushNamed(Routes.homePage),
), ),
), ),
body: Consumer<ConnectivityProvider>( body: Consumer<ConnectivityProvider>(
lib/widgets/MyPackagesScreens/Detail/my_packages_detail_box_widget.dart
+1 -3
View File
@@ -337,9 +337,7 @@ class MyPackageDetailsDataBox extends StatelessWidget {
SizedBox( SizedBox(
height: 10.0, height: 10.0,
), ),
userData['roles']?.contains('User') ?? false TransferDestroyButton(
? Container()
: TransferDestroyButton(
deviceBlockSize: _deviceBlockSize, deviceBlockSize: _deviceBlockSize,
firstColor: kPink, firstColor: kPink,
secondColor: kPinkSub, secondColor: kPinkSub,