vodorod/umbrix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 1 Wiki Activity

fix: bug of back button in rtl flutter 3.24

Browse Source
This commit is contained in:
Hiddify
2024-08-20 01:52:44 -04:00
parent 1c65c35172
commit 4726c8ad8b
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/features/common/nested_app_bar.dart
View File

@@ -1,13 +1,14 @@
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:hiddify/bootstrap.dart';
import 'package:hiddify/core/router/router.dart';
import 'package:hiddify/features/common/adaptive_root_scaffold.dart';
import 'package:hiddify/utils/utils.dart';
bool showDrawerButton(BuildContext context) {
if (!useMobileRouter) return true;
final String location = GoRouterState.of(context).uri.path;
if (location == const HomeRoute().location ||
location == const ProfilesOverviewRoute().location) return true;
if (location == const HomeRoute().location || location == const ProfilesOverviewRoute().location) return true;
if (location.startsWith(const ProxiesRoute().location)) return true;
return false;
}
@@ -33,14 +34,19 @@ class NestedAppBar extends StatelessWidget {
RootScaffold.canShowDrawer(context);
return SliverAppBar(
leading: (RootScaffold.stateKey.currentState?.hasDrawer ?? false) &&
showDrawerButton(context)
leading: (RootScaffold.stateKey.currentState?.hasDrawer ?? false) && showDrawerButton(context)
? DrawerButton(
onPressed: () {
RootScaffold.stateKey.currentState?.openDrawer();
},
)
: null,
: IconButton(
icon: Icon(context.isRtl ? Icons.arrow_forward : Icons.arrow_back),
padding: EdgeInsets.only(right: context.isRtl ? 50 : 0),
onPressed: () {
Navigator.of(context).pop(); // Pops the current route off the navigator stack
},
),
title: title,
actions: actions,
pinned: pinned,