flutter/flutter-wonderous-app
1
0
Fork 0
mirror of https://github.com/gskinnerTeam/flutter-wonderous-app.git synced 2025-05-31 13:36:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/routing_fixes

Browse Source 
# Conflicts:
#	lib/router.dart
#	pubspec.lock
#	pubspec.yaml
This commit is contained in:
Shawn
2024-01-18 12:04:11 -07:00
parent 76eba1e3e9 54cfee18c3
commit fa640e005d
33 changed files with 674 additions and 1108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/ui/common/controls/circle_buttons.dart
View File

@ -120,6 +120,21 @@ class BackBtn extends StatelessWidget {
@override
Widget build(BuildContext context) {
<<<<<<< HEAD
return CircleIconBtn(
icon: icon,
bgColor: bgColor,
color: iconColor,
onPressed: onPressed ?? () {
final nav = Navigator.of(context);
if(nav.canPop()){
Navigator.pop(context);
} else {
context.go(ScreenPaths.home);
}
},
semanticLabel: semanticLabel ?? $strings.circleButtonsSemanticBack,
=======
return FullscreenKeyboardListener(
onKeyDown: (event) => _handleKeyDown(context, event),
child: CircleIconBtn(
@ -129,6 +144,7 @@ class BackBtn extends StatelessWidget {
onPressed: () => _handleOnPressed(context),
semanticLabel: semanticLabel ?? $strings.circleButtonsSemanticBack,
),
>>>>>>> main
);
}