Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,82 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:survey_admin/presentation/widgets/customization_items/customization_widgets/customization_text_field.dart';

class DivisionsCustomizationItem extends StatelessWidget {
class DivisionsCustomizationItem extends StatefulWidget {
final int maxValue;
final int initialValue;
final void Function(int divisions) onChanged;

const DivisionsCustomizationItem({
required this.onChanged,
required this.initialValue,
required this.maxValue,
super.key,
});

@override
State<DivisionsCustomizationItem> createState() =>
_DivisionsCustomizationItemState();
}

class _DivisionsCustomizationItemState
extends State<DivisionsCustomizationItem> {
late TextEditingController _controller;
late FocusNode _focusNode;

@override
void initState() {
super.initState();
_controller = TextEditingController(text: widget.initialValue.toString());
_focusNode = FocusNode()..addListener(_onFocusChange);
}

void _onFocusChange() {
if (!_focusNode.hasFocus) {
_controller
..text = widget.initialValue.toString()
..selection = TextSelection.collapsed(offset: _controller.text.length);
}
}

String? _validator(String? value) {
final divisions = int.tryParse(value ?? '');

return divisions != null && (divisions > widget.maxValue || divisions == 0)
? 'Divisions count should be between 0 and ${widget.maxValue}'
: null;
}

bool _canCallParentOnChanged(int value) =>
value <= widget.maxValue && value != 0;

@override
void dispose() {
_focusNode.dispose();
_controller.dispose();
super.dispose();
}

@override
Widget build(BuildContext context) {
const lengthInputFormatter = 3;
_controller
..text = widget.initialValue.toString()
..selection = TextSelection.collapsed(offset: _controller.text.length);

return CustomizationTextField.int(
initialValue: initialValue.toString(),
controller: _controller,
focusNode: _focusNode,
validator: _validator,
autovalidateMode: AutovalidateMode.onUserInteraction,
inputFormatters: [
LengthLimitingTextInputFormatter(lengthInputFormatter),
],
onChanged: (value) => onChanged(int.parse(value!)),
onChanged: (value) {
final divisions = int.parse(value!);
if (_canCallParentOnChanged(divisions)) {
widget.onChanged(divisions);
}
},
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ class SliderContentCustomizationTab extends CustomizationTab {
minValue: min,
maxValue: max,
initialValue: min,
divisions: max - min,
),
),
),
Expand All @@ -68,7 +69,8 @@ class SliderContentCustomizationTab extends CustomizationTab {
title: context.localization.divisions,
children: [
DivisionsCustomizationItem(
initialValue: editable.initialValue,
maxValue: editable.maxValue - editable.minValue,
initialValue: editable.divisions,
onChanged: (divisions) => onChange(
editable.copyWith(divisions: divisions),
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ void main() {
await tester.pumpWidget(
AppTester(
child: DivisionsCustomizationItem(
onChanged: (int? divisions) {}, initialValue: 10,
maxValue: 20,
initialValue: 10,
onChanged: (int? divisions) {},
),
),
);
Expand All @@ -23,6 +25,7 @@ void main() {
await tester.pumpWidget(
AppTester(
child: DivisionsCustomizationItem(
maxValue: 20,
initialValue: 11,
onChanged: (int? divisions) => divisions,
),
Expand All @@ -45,6 +48,7 @@ void main() {
await tester.pumpWidget(
AppTester(
child: DivisionsCustomizationItem(
maxValue: 20,
initialValue: 2,
onChanged: (int? divisions) => divisions,
),
Expand All @@ -61,6 +65,7 @@ void main() {
await tester.pumpWidget(
AppTester(
child: DivisionsCustomizationItem(
maxValue: 20,
initialValue: 2,
onChanged: (int? divisions) => divisions,
),
Expand All @@ -79,6 +84,7 @@ void main() {
await tester.pumpWidget(
AppTester(
child: DivisionsCustomizationItem(
maxValue: 33333,
initialValue: 22222,
onChanged: (int? divisions) => divisions,
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ void main() {
await tester.pumpWidget(page);
await tester.enterText(
find.widgetWithText(CustomizationItemsContainer, 'Divisions'),
'1234',
'0010',
);
expect(find.text('1234'), findsNothing);
expect(data.divisions, 123);
expect(find.text('0010'), findsNothing);
expect(data.divisions, 1);
});

testWidgets('Input min,max for Value(num)', (tester) async {
Expand Down
2 changes: 0 additions & 2 deletions core/.flutter-plugins

This file was deleted.

1 change: 0 additions & 1 deletion core/.flutter-plugins-dependencies

This file was deleted.

2 changes: 2 additions & 0 deletions core/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,7 @@ migrate_working_dir/
/pubspec.lock
**/doc/api/
.dart_tool/
.flutter-plugins
.flutter-plugins-dependencies
.packages
build/
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,26 @@ class SliderQuestionPage extends StatefulWidget {
class _SliderQuestionPageState extends State<SliderQuestionPage> {
late double _answer;

/// Stores the last question data for correct work in admin.
SliderQuestionData? _oldQuestionData;

@override
void initState() {
super.initState();
_initVariables();
}

void _initVariables() {
_oldQuestionData = widget.data;
_answer = widget.answer?.answer ?? widget.data.initialValue.toDouble();
}

@override
Widget build(BuildContext context) {
if (_oldQuestionData != widget.data) {
_initVariables();
}

final theme = widget.data.theme ??
Theme.of(context).extension<SliderQuestionTheme>()!;
return Scaffold(
Expand Down