Fixes after review

example/lib/app.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:language_tool/language_tool.dart';
 import 'package:languagetool_textfield/languagetool_textfield.dart';
 
-/// Main screen widget demonstrating library usage example
+/// A main screen widget demonstrating library usage example
 class App extends StatefulWidget {
  /// Creates a new instance of main screen widget
  const App({super.key});
@@ -12,7 +12,7 @@ class App extends StatefulWidget {
 }
 
 class _AppState extends State<App> {
- final LangToolService _langToolService = LangToolService(LanguageTool());
+ final _langToolService = LangToolService(LanguageTool());
 
  @override
  void initState() {

lib/presentation/language_tool_text_field.dart

@@ -1,28 +1,30 @@
 import 'package:flutter/material.dart';
 import 'package:languagetool_textfield/domain/language_check_service.dart';
 import 'package:languagetool_textfield/domain/mistake.dart';
-import 'package:languagetool_textfield/presentation/widgets/custom_text_field_controller.dart';
+import 'package:languagetool_textfield/presentation/widgets/language_tool_text_editing_controller.dart';
 
 class LanguageToolTextField extends StatefulWidget {
  final LanguageCheckService langService;
- final TextStyle style;
+ final TextStyle? style;
  final InputDecoration? decoration;
  final Widget Function()? mistakeBuilder;
+ final LanguageToolTextEditingController? controller;
 
  const LanguageToolTextField({
  Key? key,
  required this.langService,
  required this.style,
  this.decoration,
  this.mistakeBuilder,
+ this.controller,
  }) : super(key: key);
 
  @override
  State<LanguageToolTextField> createState() => _LanguageToolTextFieldState();
 }
 
 class _LanguageToolTextFieldState extends State<LanguageToolTextField> {
- final _textFieldController = CustomTextFieldController(
+ final _textFieldController = LanguageToolTextEditingController(
  text: 'OkayOkayOkay',
  mistakes: [
  const Mistake(
@@ -65,13 +67,14 @@ class _LanguageToolTextFieldState extends State<LanguageToolTextField> {
  textCapitalization: TextCapitalization.none,
  keyboardType: TextInputType.multiline,
  maxLines: null,
+ style: widget.style,
  decoration: widget.decoration ??
  InputDecoration(
  focusedBorder: _textFieldBorder,
  enabledBorder: _textFieldBorder,
  border: _textFieldBorder,
  ),
- controller: _textFieldController,
+ controller: widget.controller ?? _textFieldController,
  );
  }
 }

lib/presentation/widgets/custom_text_field_controller.dart → lib/presentation/widgets/language_tool_text_editing_controller.dart

@@ -1,14 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:languagetool_textfield/domain/mistake.dart';
 
-/// Custom controller for an editable text field, that supports
+/// A custom controller for an editable text field, that supports
 /// mistakes highlighting.
-class CustomTextFieldController extends TextEditingController {
- /// List of mistakes in text.
+class LanguageToolTextEditingController extends TextEditingController {
+ /// A list of mistakes in the text.
  final List<Mistake> mistakes;
 
  /// Creates a controller for an editable text field.
- CustomTextFieldController({
+ LanguageToolTextEditingController({
  String? text,
  this.mistakes = const [],
  }) : super(text: text);
@@ -19,7 +19,7 @@ class CustomTextFieldController extends TextEditingController {
  TextStyle? style,
  required bool withComposing,
  }) {
- final List<TextSpan> children = [];
+ final children = <TextSpan>[];
  const underlineThickness = 2.0;
  const backgroundOpacity = 0.2;
 
@@ -29,19 +29,24 @@ class CustomTextFieldController extends TextEditingController {
 
  for (int i = 0; i < mistakes.length; i++) {
  final mistake = mistakes[i];
- final previousMistakePosition =
- i > 0 ? mistakes[i - 1].offset + mistakes[i - 1].length : 0;
+ int previousMistakePosition = 0;
+ if (i > 0) {
+ final previousMistake = mistakes[i - 1];
+ previousMistakePosition =
+ previousMistake.offset + previousMistake.length;
+ }
  final mistakeStart = mistake.offset;
  final mistakeEnd = mistakeStart + mistake.length;
 
  children.add(
  TextSpan(text: text.substring(previousMistakePosition, mistakeStart)),
  );
 
+ final textStyle = style ?? const TextStyle();
  children.add(
  TextSpan(
  text: text.substring(mistakeStart, mistakeEnd),
- style: TextStyle(
+ style: textStyle.copyWith(
  decoration: TextDecoration.underline,
  decorationColor: Colors.red,
  decorationThickness: underlineThickness,
@@ -50,7 +55,7 @@ class CustomTextFieldController extends TextEditingController {
  ),
  );
 
- if (mistake == mistakes.last) {
+ if (i == mistakes.length - 1) {
  children.add(
  TextSpan(
  text: text.substring(