Skip to content

Commit c71f2fb

Browse files
authored
Merge pull request #245 from Shruti78/Shruti_Murthy
Removed depriciated package onPopInvoked
2 parents 24e8f54 + 3cb0273 commit c71f2fb

File tree

4 files changed

+211
-182
lines changed

4 files changed

+211
-182
lines changed

android/.settings/org.eclipse.buildship.core.prefs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
arguments=--init-script /var/folders/87/sjnhgg2s1dn1b0l2r0jrgxx80000gn/T/d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script /var/folders/87/sjnhgg2s1dn1b0l2r0jrgxx80000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
1+
arguments=--init-script /home/shruti/.config/Code/User/globalStorage/redhat.java/1.38.0/config_linux/org.eclipse.osgi/58/0/.cp/gradle/init/init.gradle --init-script /home/shruti/.config/Code/User/globalStorage/redhat.java/1.38.0/config_linux/org.eclipse.osgi/58/0/.cp/gradle/protobuf/init.gradle
22
auto.sync=false
33
build.scans.enabled=false
44
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
55
connection.project.dir=
66
eclipse.preferences.version=1
77
gradle.user.home=
8-
java.home=/opt/homebrew/Cellar/openjdk/21.0.2/libexec/openjdk.jdk/Contents/Home
8+
java.home=/usr/lib/jvm/java-11-openjdk-amd64
99
jvm.arguments=
1010
offline.mode=false
1111
override.workspace.settings=true

lib/presentation/auth/auth_screen.dart

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,17 @@ class _AuthScreenState extends State<AuthScreen>
6969
final authCubit = BlocProvider.of<AuthCubit>(context);
7070
return PopScope(
7171
canPop: false,
72-
onPopInvoked: (didPop) async {
73-
bool? popped = await onPopHome();
74-
75-
if (popped == true) {
76-
await SystemNavigator.pop();
77-
}
78-
},
72+
onPopInvokedWithResult: (bool didPop, Object? result) async {
73+
if (didPop) {
74+
return;
75+
}
76+
77+
bool? popped = await onPopHome();
78+
if (popped == true) {
79+
await SystemNavigator.pop();
80+
}
81+
return;
82+
},
7983
child: BlocConsumer<AuthCubit, AuthState>(
8084
listener: (context, state) {
8185
if (state is SuccessState) {

lib/presentation/home/home_screen.dart

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,17 @@ class _HomeScreenState extends State<HomeScreen> {
9999
Widget build(BuildContext context) {
100100
return PopScope(
101101
canPop: false,
102-
onPopInvoked: (didPop) async {
103-
bool? popped = await _onPopHome(context);
102+
onPopInvokedWithResult: (bool didPop, Object? result) async {
103+
if (didPop) {
104+
return;
105+
}
106+
107+
bool? popped = await _onPopHome(context);
108+
if (popped == true) {
109+
await SystemNavigator.pop();
110+
}
111+
},
104112

105-
if (popped == true) {
106-
await SystemNavigator.pop();
107-
}
108-
},
109113
child: BlocConsumer<HomeCubit, HomeState>(
110114
listener: (context, state) {
111115
if (state is LoadedHomeState) {

0 commit comments

Comments
 (0)