Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve share pgn #951

Merged
merged 2 commits into from
Sep 9, 2024
Merged

Improve share pgn #951

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03c5f21
improve share pgn
HaonRekcef Aug 31, 2024
9e59e48
move initialization to initState()
HaonRekcef Sep 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 86 additions & 14 deletions lib/src/view/analysis/analysis_share_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:collection/collection.dart';
import 'package:fast_immutable_collections/fast_immutable_collections.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
Expand Down Expand Up @@ -50,18 +51,85 @@ const Set<String> _ratingHeaders = {
'BlackRatingDiff',
};

class _EditPgnTagsForm extends ConsumerWidget {
class _EditPgnTagsForm extends ConsumerStatefulWidget {
const _EditPgnTagsForm(this.pgn, this.options);

final String pgn;
final AnalysisOptions options;

@override
Widget build(BuildContext context, WidgetRef ref) {
final ctrlProvider = analysisControllerProvider(pgn, options);
_EditPgnTagsFormState createState() => _EditPgnTagsFormState();
}

class _EditPgnTagsFormState extends ConsumerState<_EditPgnTagsForm> {
final Map<String, TextEditingController> _controllers = {};
final Map<String, FocusNode> _focusNodes = {};

@override
void initState() {
super.initState();
final ctrlProvider = analysisControllerProvider(widget.pgn, widget.options);
final pgnHeaders = ref.read(ctrlProvider).pgnHeaders;

for (final entry in pgnHeaders.entries) {
_controllers[entry.key] = TextEditingController(text: entry.value);
_focusNodes[entry.key] = FocusNode();
_focusNodes[entry.key]!.addListener(() {
if (!_focusNodes[entry.key]!.hasFocus) {
ref.read(ctrlProvider.notifier).updatePgnHeader(
entry.key,
_controllers[entry.key]!.text,
);
}
});
}
}

@override
void dispose() {
for (final controller in _controllers.values) {
controller.dispose();
}
for (final focusNode in _focusNodes.values) {
focusNode.dispose();
}
super.dispose();
}

@override
Widget build(BuildContext context) {
final ctrlProvider = analysisControllerProvider(widget.pgn, widget.options);
final pgnHeaders = ref.watch(ctrlProvider.select((c) => c.pgnHeaders));
final showRatingAsync = ref.watch(showRatingsPrefProvider);

/// Moves focus to the next field or shows a picker for 'Result'.
void focusAndSelectNextField(int index, IMap<String, String> pgnHeaders) {
if (index + 1 < pgnHeaders.entries.length) {
final nextEntry = pgnHeaders.entries.elementAt(index + 1);
if (nextEntry.key == 'Result') {
showChoicePicker(
context,
choices: ['1-0', '0-1', '1/2-1/2', '*'],
selectedItem: nextEntry.value,
labelBuilder: (choice) => Text(choice),
onSelectedItemChanged: (choice) {
ref
.read(ctrlProvider.notifier)
.updatePgnHeader(nextEntry.key, choice);
_controllers[nextEntry.key]!.text = choice;
focusAndSelectNextField(index + 1, pgnHeaders);
},
);
} else {
_focusNodes[nextEntry.key]!.requestFocus();
_controllers[nextEntry.key]!.selection = TextSelection(
baseOffset: 0,
extentOffset: _controllers[nextEntry.key]!.text.length,
);
}
}
}

return showRatingAsync.maybeWhen(
data: (showRatings) {
return SafeArea(
Expand Down Expand Up @@ -93,6 +161,7 @@ class _EditPgnTagsForm extends ConsumerWidget {
const SizedBox(width: 8),
Expanded(
child: AdaptiveTextField(
focusNode: _focusNodes[e.key],
cupertinoDecoration: BoxDecoration(
color: CupertinoColors.tertiarySystemBackground,
border: Border.all(
Expand All @@ -101,21 +170,18 @@ class _EditPgnTagsForm extends ConsumerWidget {
),
borderRadius: BorderRadius.circular(8),
),
controller: TextEditingController.fromValue(
TextEditingValue(
text: e.value,
selection: TextSelection(
baseOffset: 0,
extentOffset: e.value.length,
),
),
),
controller: _controllers[e.key],
textInputAction: TextInputAction.next,
keyboardType:
e.key == 'WhiteElo' || e.key == 'BlackElo'
? TextInputType.number
: TextInputType.text,
onTap: () {
_controllers[e.key]!.selection = TextSelection(
baseOffset: 0,
extentOffset:
_controllers[e.key]!.text.length,
);
if (e.key == 'Result') {
showChoicePicker(
context,
Expand All @@ -126,6 +192,11 @@ class _EditPgnTagsForm extends ConsumerWidget {
ref
.read(ctrlProvider.notifier)
.updatePgnHeader(e.key, choice);
_controllers[e.key]!.text = choice;
focusAndSelectNextField(
index,
pgnHeaders,
);
},
);
}
Expand All @@ -134,6 +205,7 @@ class _EditPgnTagsForm extends ConsumerWidget {
ref
.read(ctrlProvider.notifier)
.updatePgnHeader(e.key, value);
focusAndSelectNextField(index, pgnHeaders);
},
),
),
Expand All @@ -154,8 +226,8 @@ class _EditPgnTagsForm extends ConsumerWidget {
text: ref
.read(
analysisControllerProvider(
pgn,
options,
widget.pgn,
widget.options,
).notifier,
)
.makeGamePgn(),
Expand Down