Skip to content

Commit e91694f

Browse files
gnpricechrisbobbe
authored andcommitted
autocomplete [nfc]: Cut "candidate" type param from AutocompleteField
Now that AutocompleteView doesn't have such a type parameter, AutocompleteField doesn't need it.
1 parent 6dec95d commit e91694f

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

lib/widgets/autocomplete.dart

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import 'package:flutter/material.dart';
22

3-
import '../api/model/model.dart';
43
import 'content.dart';
54
import 'store.dart';
65
import '../model/autocomplete.dart';
76
import '../model/compose.dart';
87
import '../model/narrow.dart';
98
import 'compose_box.dart';
109

11-
abstract class AutocompleteField<QueryT extends AutocompleteQuery, ResultT extends AutocompleteResult, CandidateT> extends StatefulWidget {
10+
abstract class AutocompleteField<QueryT extends AutocompleteQuery, ResultT extends AutocompleteResult> extends StatefulWidget {
1211
const AutocompleteField({
1312
super.key,
1413
required this.controller,
@@ -27,10 +26,10 @@ abstract class AutocompleteField<QueryT extends AutocompleteQuery, ResultT exten
2726
AutocompleteView<QueryT, ResultT> initViewModel(BuildContext context);
2827

2928
@override
30-
State<AutocompleteField<QueryT, ResultT, CandidateT>> createState() => _AutocompleteFieldState<QueryT, ResultT, CandidateT>();
29+
State<AutocompleteField<QueryT, ResultT>> createState() => _AutocompleteFieldState<QueryT, ResultT>();
3130
}
3231

33-
class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends AutocompleteResult, CandidateT> extends State<AutocompleteField<QueryT, ResultT, CandidateT>> with PerAccountStoreAwareStateMixin<AutocompleteField<QueryT, ResultT, CandidateT>> {
32+
class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends AutocompleteResult> extends State<AutocompleteField<QueryT, ResultT>> with PerAccountStoreAwareStateMixin<AutocompleteField<QueryT, ResultT>> {
3433
AutocompleteView<QueryT, ResultT>? _viewModel;
3534

3635
void _initViewModel() {
@@ -71,7 +70,7 @@ class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends
7170
}
7271

7372
@override
74-
void didUpdateWidget(covariant AutocompleteField<QueryT, ResultT, CandidateT> oldWidget) {
73+
void didUpdateWidget(covariant AutocompleteField<QueryT, ResultT> oldWidget) {
7574
super.didUpdateWidget(oldWidget);
7675
if (widget.controller != oldWidget.controller) {
7776
oldWidget.controller.removeListener(_handleControllerChange);
@@ -145,7 +144,7 @@ class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends
145144
}
146145
}
147146

148-
class ComposeAutocomplete extends AutocompleteField<MentionAutocompleteQuery, MentionAutocompleteResult, User> {
147+
class ComposeAutocomplete extends AutocompleteField<MentionAutocompleteQuery, MentionAutocompleteResult> {
149148
const ComposeAutocomplete({
150149
super.key,
151150
required this.narrow,
@@ -218,7 +217,7 @@ class ComposeAutocomplete extends AutocompleteField<MentionAutocompleteQuery, Me
218217
}
219218
}
220219

221-
class TopicAutocomplete extends AutocompleteField<TopicAutocompleteQuery, TopicAutocompleteResult, String> {
220+
class TopicAutocomplete extends AutocompleteField<TopicAutocompleteQuery, TopicAutocompleteResult> {
222221
const TopicAutocomplete({
223222
super.key,
224223
required this.streamId,

0 commit comments

Comments
 (0)