sindhu/absensi_sas_flutter
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

step 15 : fix route navigator, not fixed

Browse Source
This commit is contained in:
sindhu
2024-01-26 23:37:16 +07:00
parent 0596fd4a75
commit a38a983561
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/screen/home/home_screen.dart
View File

@@ -153,13 +153,14 @@ class HomeScreen extends HookConsumerWidget {
} else if (next is CheckDistanceStateDone) { } else if (next is CheckDistanceStateDone) {
isLoadingProsesCheckDistance.value = false; isLoadingProsesCheckDistance.value = false;
if (varCurrentDistanceProvider?.selfie == "TRUE") { if (next.model.selfie == "TRUE") {
ref.read(currentPageProvider.notifier).update((state) => -1); ref.read(currentPageProvider.notifier).update((state) => 99);
Navigator.of(context).pushNamed(presensiSelfieRoute); // Navigator.of(context).pop();
Navigator.of(context).restorablePushNamed(presensiSelfieRoute);
} else { } else {
if (varCurrentDistanceProvider?.selfie == "FALSE") { if (next.model.selfie == "FALSE") {
ref.read(currentPageProvider.notifier).update((state) => -1); ref.read(currentPageProvider.notifier).update((state) => 99);
Navigator.of(context).pushNamed(presensiRoute); Navigator.of(context).restorablePushNamed(presensiRoute);
} }
} }
} }
@@ -197,7 +198,7 @@ class HomeScreen extends HookConsumerWidget {
) )
: FloatingActionButton( : FloatingActionButton(
onPressed: () async { onPressed: () async {
requestLocationPermission(); await requestLocationPermission();
}, },
backgroundColor: Color(0xFFFFFFFF), backgroundColor: Color(0xFFFFFFFF),
shape: CircleBorder(), shape: CircleBorder(),

4
lib/widget/custom_drawer.dart
View File

@@ -134,7 +134,7 @@ class CustomDrawer extends HookConsumerWidget {
// Handle navigation to Home screen // Handle navigation to Home screen
Navigator.pop(context); Navigator.pop(context);
ref.read(currentPageProvider.state).update((state) => 0); ref.read(currentPageProvider.state).update((state) => 0);
Navigator.pushNamed(context, homeRoute); Navigator.of(context).popAndPushNamed(homeRoute);
}, },
), ),
@@ -170,7 +170,7 @@ class CustomDrawer extends HookConsumerWidget {
alignment: Alignment.bottomRight, alignment: Alignment.bottomRight,
child: Text( child: Text(
'Versi ${Constant.version}', 'Versi ${Constant.version}',
style: Constant.titleH1_700(context: context) style: Constant.logintitle_700(context: context)
.copyWith(color: Constant.textLightGrey), .copyWith(color: Constant.textLightGrey),
), ),
), ),