flixcoo/cabo-counter
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge pull request #161 from flixcoo/bug/159-keyboard-behaviour-correction

Browse Source 
Keyboard behaviour correction
This commit is contained in:
Felix Kirchner
2025-08-17 22:19:28 +02:00
committed by GitHub
parent 932e372589 a58a1eb766
commit ba636e2920
2 changed files with 278 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/presentation/views/home/active_game/round_view.dart
View File

@@ -42,6 +42,8 @@ class _RoundViewState extends State<RoundView> {
(index) => FocusNode(),
);
late List<GlobalKey> _textFieldKeys;
@override
void initState() {
print('=== Runde ${widget.roundNumber} geöffnet ===');
@@ -62,6 +64,11 @@ class _RoundViewState extends State<RoundView> {
gameSession.roundList[widget.roundNumber - 1].kamikazePlayerIndex;
}
_textFieldKeys = List.generate(
widget.gameSession.players.length,
(index) => GlobalKey(),
);
super.initState();
}
@@ -75,7 +82,6 @@ class _RoundViewState extends State<RoundView> {
return CupertinoPageScaffold(
resizeToAvoidBottomInset: false,
navigationBar: CupertinoNavigationBar(
transitionBetweenRoutes: true,
leading: CupertinoButton(
padding: EdgeInsets.zero,
onPressed: () => {
@@ -91,11 +97,11 @@ class _RoundViewState extends State<RoundView> {
CupertinoIcons.lock,
size: 25,
))),
child: Stack(
child: Column(
children: [
Positioned.fill(
Expanded(
child: SingleChildScrollView(
padding: EdgeInsets.only(bottom: 100 + bottomInset),
padding: EdgeInsets.only(bottom: 20 + bottomInset),
child: SafeArea(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
@@ -195,6 +201,7 @@ class _RoundViewState extends State<RoundView> {
' ${AppLocalizations.of(context).points}'),
trailing: SizedBox(
width: 100,
key: _textFieldKeys[originalIndex],
child: CupertinoTextField(
maxLength: 3,
focusNode: _focusNodeList[originalIndex],
@@ -248,11 +255,8 @@ class _RoundViewState extends State<RoundView> {
),
),
),
Positioned(
left: 0,
right: 0,
bottom: bottomInset,
child: KeyboardVisibilityBuilder(builder: (context, visible) {
KeyboardVisibilityBuilder(
builder: (context, visible) {
if (!visible) {
return Container(
height: 80,
@@ -284,8 +288,8 @@ class _RoundViewState extends State<RoundView> {
} else {
return const SizedBox.shrink();
}
}),
)
},
),
],
),
);
@@ -371,8 +375,21 @@ class _RoundViewState extends State<RoundView> {
final currentPos = originalIndices.indexOf(index);
if (currentPos < originalIndices.length - 1) {
final nextIndex = originalIndices[currentPos + 1];
FocusScope.of(context)
.requestFocus(_focusNodeList[originalIndices[currentPos + 1]]);
final scrollContext = _textFieldKeys[nextIndex].currentContext;
if (scrollContext != null) {
WidgetsBinding.instance.addPostFrameCallback((_) {
Scrollable.ensureVisible(
scrollContext,
duration: const Duration(milliseconds: 300),
curve: Curves.easeOut,
alignment: 0.55,
);
});
}
} else {
_focusNodeList[index].unfocus();
}

49
lib/presentation/views/home/create_game_view.dart
View File

@@ -77,7 +77,15 @@ class _CreateGameViewState extends State<CreateGameView> {
@override
Widget build(BuildContext context) {
return CupertinoPageScaffold(
return PopScope(
canPop: false,
onPopInvokedWithResult: (bool didPop, dynamic result) async {
if (!didPop) {
await _keyboardDelay();
if (context.mounted) Navigator.pop(context);
}
},
child: CupertinoPageScaffold(
resizeToAvoidBottomInset: false,
navigationBar: CupertinoNavigationBar(
previousPageTitle: AppLocalizations.of(context).games,
@@ -129,6 +137,9 @@ class _CreateGameViewState extends State<CreateGameView> {
],
),
onTap: () async {
await _keyboardDelay();
if (context.mounted) {
final selectedMode = await Navigator.push(
context,
CupertinoPageRoute(
@@ -142,6 +153,7 @@ class _CreateGameViewState extends State<CreateGameView> {
setState(() {
gameMode = selectedMode ?? gameMode;
});
}
},
),
),
@@ -197,12 +209,13 @@ class _CreateGameViewState extends State<CreateGameView> {
'${AppLocalizations.of(context).player} ${index + 1}',
padding: const EdgeInsets.all(12),
decoration: const BoxDecoration(),
textInputAction:
index + 1 < _playerNameTextControllers.length
textInputAction: index + 1 <
_playerNameTextControllers.length
? TextInputAction.next
: TextInputAction.done,
onSubmitted: (_) {
if (index + 1 < _playerNameFocusNodes.length) {
if (index + 1 <
_playerNameFocusNodes.length) {
_playerNameFocusNodes[index + 1]
.requestFocus();
} else {
@@ -268,13 +281,15 @@ class _CreateGameViewState extends State<CreateGameView> {
],
),
onPressed: () {
if (_playerNameTextControllers.length < maxPlayers) {
if (_playerNameTextControllers.length <
maxPlayers) {
setState(() {
_playerNameTextControllers
.add(TextEditingController());
_playerNameFocusNodes.add(FocusNode());
});
WidgetsBinding.instance.addPostFrameCallback((_) {
WidgetsBinding.instance
.addPostFrameCallback((_) {
_playerNameFocusNodes.last.requestFocus();
});
} else {
@@ -296,13 +311,9 @@ class _CreateGameViewState extends State<CreateGameView> {
color: CustomTheme.primaryColor,
),
),
onPressed: () {
FocusScope.of(context).unfocus();
Future.delayed(
const Duration(
milliseconds: Constants.kKeyboardDelay), () {
onPressed: () async {
await _keyboardDelay();
_checkAllGameAttributes();
});
},
),
),
@@ -319,7 +330,7 @@ class _CreateGameViewState extends State<CreateGameView> {
})
],
),
)));
))));
}
/// Returns a widget that displays the currently selected game mode in the View.
@@ -460,6 +471,18 @@ class _CreateGameViewState extends State<CreateGameView> {
);
}
/// If the keyboard is visible, this method will unfocus the current text field
/// to prevent the keyboard from interfering with the navigation bar.
Future<void> _keyboardDelay() async {
if (!KeyboardVisibilityController().isVisible) {
return;
} else {
FocusScope.of(context).unfocus();
await Future.delayed(
const Duration(milliseconds: Constants.kKeyboardDelay));
}
}
@override
void dispose() {
_gameTitleTextController.dispose();