Skip to content

autocomplete [nfc]: Cut disused CandidateT type parameters #908

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

Merged
merged 3 commits into from
Aug 23, 2024
Merged

autocomplete [nfc]: Cut disused CandidateT type parameters #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b544b4f
autocomplete [nfc]: Fix RawAutocomplete types in comment
gnprice Aug 22, 2024
567048f
autocomplete [nfc]: Cut "candidate" type param from AutocompleteView
gnprice Aug 22, 2024
5518136
autocomplete [nfc]: Cut "candidate" type param from AutocompleteField
gnprice Aug 22, 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
6 changes: 3 additions & 3 deletions lib/model/autocomplete.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ class AutocompleteViewManager {
/// * On reassemble, call [reassemble].
/// * When the object will no longer be used, call [dispose] to free
/// resources on the [PerAccountStore].
abstract class AutocompleteView<QueryT extends AutocompleteQuery, ResultT extends AutocompleteResult, CandidateT> extends ChangeNotifier {
abstract class AutocompleteView<QueryT extends AutocompleteQuery, ResultT extends AutocompleteResult> extends ChangeNotifier {
AutocompleteView({required this.store});

final PerAccountStore store;
Expand Down Expand Up @@ -284,7 +284,7 @@ abstract class AutocompleteView<QueryT extends AutocompleteQuery, ResultT extend
}
}

class MentionAutocompleteView extends AutocompleteView<MentionAutocompleteQuery, MentionAutocompleteResult, User> {
class MentionAutocompleteView extends AutocompleteView<MentionAutocompleteQuery, MentionAutocompleteResult> {
MentionAutocompleteView._({
required super.store,
required this.narrow,
Expand Down Expand Up @@ -589,7 +589,7 @@ class UserMentionAutocompleteResult extends MentionAutocompleteResult {

// TODO(#234): // class WildcardMentionAutocompleteResult extends MentionAutocompleteResult {

class TopicAutocompleteView extends AutocompleteView<TopicAutocompleteQuery, TopicAutocompleteResult, String> {
class TopicAutocompleteView extends AutocompleteView<TopicAutocompleteQuery, TopicAutocompleteResult> {
TopicAutocompleteView._({required super.store, required this.streamId});

factory TopicAutocompleteView.init({required PerAccountStore store, required int streamId}) {
Expand Down
21 changes: 10 additions & 11 deletions lib/widgets/autocomplete.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import 'package:flutter/material.dart';

import '../api/model/model.dart';
import 'content.dart';
import 'store.dart';
import '../model/autocomplete.dart';
import '../model/compose.dart';
import '../model/narrow.dart';
import 'compose_box.dart';

abstract class AutocompleteField<QueryT extends AutocompleteQuery, ResultT extends AutocompleteResult, CandidateT> extends StatefulWidget {
abstract class AutocompleteField<QueryT extends AutocompleteQuery, ResultT extends AutocompleteResult> extends StatefulWidget {
const AutocompleteField({
super.key,
required this.controller,
Expand All @@ -24,14 +23,14 @@ abstract class AutocompleteField<QueryT extends AutocompleteQuery, ResultT exten

Widget buildItem(BuildContext context, int index, ResultT option);

AutocompleteView<QueryT, ResultT, CandidateT> initViewModel(BuildContext context);
AutocompleteView<QueryT, ResultT> initViewModel(BuildContext context);

@override
State<AutocompleteField<QueryT, ResultT, CandidateT>> createState() => _AutocompleteFieldState<QueryT, ResultT, CandidateT>();
State<AutocompleteField<QueryT, ResultT>> createState() => _AutocompleteFieldState<QueryT, ResultT>();
}

class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends AutocompleteResult, CandidateT> extends State<AutocompleteField<QueryT, ResultT, CandidateT>> with PerAccountStoreAwareStateMixin<AutocompleteField<QueryT, ResultT, CandidateT>> {
AutocompleteView<QueryT, ResultT, CandidateT>? _viewModel;
class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends AutocompleteResult> extends State<AutocompleteField<QueryT, ResultT>> with PerAccountStoreAwareStateMixin<AutocompleteField<QueryT, ResultT>> {
AutocompleteView<QueryT, ResultT>? _viewModel;

void _initViewModel() {
_viewModel = widget.initViewModel(context)
Expand Down Expand Up @@ -71,7 +70,7 @@ class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends
}

@override
void didUpdateWidget(covariant AutocompleteField<QueryT, ResultT, CandidateT> oldWidget) {
void didUpdateWidget(covariant AutocompleteField<QueryT, ResultT> oldWidget) {
super.didUpdateWidget(oldWidget);
if (widget.controller != oldWidget.controller) {
oldWidget.controller.removeListener(_handleControllerChange);
Expand Down Expand Up @@ -106,8 +105,8 @@ class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends
optionsBuilder: (_) => _resultsToDisplay,
optionsViewOpenDirection: OptionsViewOpenDirection.up,
// RawAutocomplete passes these when it calls optionsViewBuilder:
// AutocompleteOnSelected<CandidateT> onSelected,
// Iterable<CandidateT> options,
// AutocompleteOnSelected<ResultT> onSelected,
// Iterable<ResultT> options,
//
// We ignore them:
// - `onSelected` would cause some behavior we don't want,
Expand Down Expand Up @@ -145,7 +144,7 @@ class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends
}
}

class ComposeAutocomplete extends AutocompleteField<MentionAutocompleteQuery, MentionAutocompleteResult, User> {
class ComposeAutocomplete extends AutocompleteField<MentionAutocompleteQuery, MentionAutocompleteResult> {
const ComposeAutocomplete({
super.key,
required this.narrow,
Expand Down Expand Up @@ -218,7 +217,7 @@ class ComposeAutocomplete extends AutocompleteField<MentionAutocompleteQuery, Me
}
}

class TopicAutocomplete extends AutocompleteField<TopicAutocompleteQuery, TopicAutocompleteResult, String> {
class TopicAutocomplete extends AutocompleteField<TopicAutocompleteQuery, TopicAutocompleteResult> {
const TopicAutocomplete({
super.key,
required this.streamId,
Expand Down