refactored selectable chips
This commit is contained in:
@@ -1,69 +0,0 @@
|
|||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:lensai/features/bangs/data/models/bang_data.dart';
|
|
||||||
import 'package:lensai/features/bangs/presentation/widgets/bang_icon.dart';
|
|
||||||
|
|
||||||
class BangChips extends StatelessWidget {
|
|
||||||
final List<BangData> availableBangs;
|
|
||||||
final BangData? selectedBang;
|
|
||||||
final int maxBangCount;
|
|
||||||
|
|
||||||
final void Function(String trigger)? onSelected;
|
|
||||||
final void Function(String trigger)? onDeleted;
|
|
||||||
|
|
||||||
const BangChips({
|
|
||||||
required this.availableBangs,
|
|
||||||
this.selectedBang,
|
|
||||||
this.maxBangCount = 25,
|
|
||||||
this.onSelected,
|
|
||||||
this.onDeleted,
|
|
||||||
super.key,
|
|
||||||
});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
var bangs = availableBangs.take(maxBangCount).toList();
|
|
||||||
if (selectedBang != null) {
|
|
||||||
final selectedIndex =
|
|
||||||
bangs.indexWhere((bang) => bang.trigger == selectedBang?.trigger);
|
|
||||||
if (selectedIndex < 0) {
|
|
||||||
bangs = [
|
|
||||||
selectedBang!,
|
|
||||||
...bangs,
|
|
||||||
];
|
|
||||||
} else {
|
|
||||||
bangs = [
|
|
||||||
bangs.removeAt(selectedIndex),
|
|
||||||
...bangs,
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return ListView.builder(
|
|
||||||
scrollDirection: Axis.horizontal,
|
|
||||||
shrinkWrap: true,
|
|
||||||
itemCount: bangs.length,
|
|
||||||
itemBuilder: (context, index) {
|
|
||||||
final bang = bangs[index];
|
|
||||||
return Padding(
|
|
||||||
padding: const EdgeInsets.only(right: 8.0),
|
|
||||||
child: FilterChip(
|
|
||||||
selected: bang.trigger == selectedBang?.trigger,
|
|
||||||
showCheckmark: false,
|
|
||||||
onSelected: (value) {
|
|
||||||
if (value) {
|
|
||||||
onSelected?.call(bang.trigger);
|
|
||||||
} else {
|
|
||||||
onDeleted?.call(bang.trigger);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
onDeleted: () {
|
|
||||||
onDeleted?.call(bang.trigger);
|
|
||||||
},
|
|
||||||
avatar: BangIcon(bang, iconSize: 20),
|
|
||||||
label: Text(bang.websiteName),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -4,10 +4,11 @@ import 'package:flutter_material_design_icons/flutter_material_design_icons.dart
|
|||||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||||
import 'package:lensai/features/bangs/data/models/bang_data.dart';
|
import 'package:lensai/features/bangs/data/models/bang_data.dart';
|
||||||
import 'package:lensai/features/bangs/domain/repositories/data.dart';
|
import 'package:lensai/features/bangs/domain/repositories/data.dart';
|
||||||
import 'package:lensai/features/bangs/presentation/widgets/bang_chips.dart';
|
import 'package:lensai/features/bangs/presentation/widgets/bang_icon.dart';
|
||||||
import 'package:lensai/features/bangs/presentation/widgets/search_field.dart';
|
import 'package:lensai/features/bangs/presentation/widgets/search_field.dart';
|
||||||
import 'package:lensai/features/search_browser/domain/providers.dart';
|
import 'package:lensai/features/search_browser/domain/providers.dart';
|
||||||
import 'package:lensai/features/web_view/presentation/controllers/switch_new_tab.dart';
|
import 'package:lensai/features/web_view/presentation/controllers/switch_new_tab.dart';
|
||||||
|
import 'package:lensai/presentation/widgets/selectable_chips.dart';
|
||||||
|
|
||||||
class SiteSearch extends HookConsumerWidget {
|
class SiteSearch extends HookConsumerWidget {
|
||||||
final String domain;
|
final String domain;
|
||||||
@@ -54,21 +55,24 @@ class SiteSearch extends HookConsumerWidget {
|
|||||||
SizedBox(
|
SizedBox(
|
||||||
height: 48,
|
height: 48,
|
||||||
width: double.maxFinite,
|
width: double.maxFinite,
|
||||||
child: BangChips(
|
child: SelectableChips(
|
||||||
availableBangs: availableBangs,
|
itemId: (bang) => bang.trigger,
|
||||||
selectedBang: selectedBang,
|
itemAvatar: (bang) => BangIcon(bang, iconSize: 20),
|
||||||
onSelected: (trigger) {
|
itemLabel: (bang) => Text(bang.websiteName),
|
||||||
|
available: availableBangs,
|
||||||
|
selected: selectedBang,
|
||||||
|
onSelected: (bang) {
|
||||||
ref
|
ref
|
||||||
.read(
|
.read(
|
||||||
selectedBangTriggerProvider(domain: domain).notifier,
|
selectedBangTriggerProvider(domain: domain).notifier,
|
||||||
)
|
)
|
||||||
.setTrigger(trigger);
|
.setTrigger(bang.trigger);
|
||||||
},
|
},
|
||||||
onDeleted: (trigger) {
|
onDeleted: (bang) {
|
||||||
if (ref.read(
|
if (ref.read(
|
||||||
selectedBangTriggerProvider(domain: domain),
|
selectedBangTriggerProvider(domain: domain),
|
||||||
) ==
|
) ==
|
||||||
trigger) {
|
bang.trigger) {
|
||||||
ref
|
ref
|
||||||
.read(
|
.read(
|
||||||
selectedBangTriggerProvider(domain: domain).notifier,
|
selectedBangTriggerProvider(domain: domain).notifier,
|
||||||
|
|||||||
@@ -6,11 +6,12 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
|
|||||||
import 'package:lensai/core/routing/routes.dart';
|
import 'package:lensai/core/routing/routes.dart';
|
||||||
import 'package:lensai/features/bangs/domain/providers.dart';
|
import 'package:lensai/features/bangs/domain/providers.dart';
|
||||||
import 'package:lensai/features/bangs/domain/repositories/data.dart';
|
import 'package:lensai/features/bangs/domain/repositories/data.dart';
|
||||||
import 'package:lensai/features/bangs/presentation/widgets/bang_chips.dart';
|
import 'package:lensai/features/bangs/presentation/widgets/bang_icon.dart';
|
||||||
import 'package:lensai/features/bangs/presentation/widgets/search_field.dart';
|
import 'package:lensai/features/bangs/presentation/widgets/search_field.dart';
|
||||||
import 'package:lensai/features/search_browser/domain/providers.dart';
|
import 'package:lensai/features/search_browser/domain/providers.dart';
|
||||||
import 'package:lensai/features/search_browser/presentation/widgets/sheets/shared_content_sheet.dart';
|
import 'package:lensai/features/search_browser/presentation/widgets/sheets/shared_content_sheet.dart';
|
||||||
import 'package:lensai/features/share_intent/domain/entities/shared_content.dart';
|
import 'package:lensai/features/share_intent/domain/entities/shared_content.dart';
|
||||||
|
import 'package:lensai/presentation/widgets/selectable_chips.dart';
|
||||||
|
|
||||||
class SearchTab extends HookConsumerWidget {
|
class SearchTab extends HookConsumerWidget {
|
||||||
final SharedContent? sharedContent;
|
final SharedContent? sharedContent;
|
||||||
@@ -66,17 +67,20 @@ class SearchTab extends HookConsumerWidget {
|
|||||||
children: [
|
children: [
|
||||||
if (selectedBang != null || availableBangs.isNotEmpty)
|
if (selectedBang != null || availableBangs.isNotEmpty)
|
||||||
Expanded(
|
Expanded(
|
||||||
child: BangChips(
|
child: SelectableChips(
|
||||||
availableBangs: availableBangs,
|
itemId: (bang) => bang.trigger,
|
||||||
selectedBang: selectedBang,
|
itemAvatar: (bang) => BangIcon(bang, iconSize: 20),
|
||||||
onSelected: (trigger) {
|
itemLabel: (bang) => Text(bang.websiteName),
|
||||||
|
available: availableBangs,
|
||||||
|
selected: selectedBang,
|
||||||
|
onSelected: (bang) {
|
||||||
ref
|
ref
|
||||||
.read(selectedBangTriggerProvider().notifier)
|
.read(selectedBangTriggerProvider().notifier)
|
||||||
.setTrigger(trigger);
|
.setTrigger(bang.trigger);
|
||||||
},
|
},
|
||||||
onDeleted: (trigger) async {
|
onDeleted: (bang) async {
|
||||||
if (ref.read(selectedBangTriggerProvider()) ==
|
if (ref.read(selectedBangTriggerProvider()) ==
|
||||||
trigger) {
|
bang.trigger) {
|
||||||
ref
|
ref
|
||||||
.read(
|
.read(
|
||||||
selectedBangTriggerProvider().notifier,
|
selectedBangTriggerProvider().notifier,
|
||||||
@@ -87,7 +91,7 @@ class SearchTab extends HookConsumerWidget {
|
|||||||
context: context,
|
context: context,
|
||||||
builder: (context) => AlertDialog(
|
builder: (context) => AlertDialog(
|
||||||
title: Text(
|
title: Text(
|
||||||
'Reset usage frequency of !$trigger?',
|
'Reset usage frequency of !${bang.trigger}?',
|
||||||
),
|
),
|
||||||
content: const Text(
|
content: const Text(
|
||||||
'This will remove the Bang from quick select.',
|
'This will remove the Bang from quick select.',
|
||||||
@@ -110,7 +114,7 @@ class SearchTab extends HookConsumerWidget {
|
|||||||
if (dialogResult == true) {
|
if (dialogResult == true) {
|
||||||
await ref
|
await ref
|
||||||
.read(bangDataRepositoryProvider.notifier)
|
.read(bangDataRepositoryProvider.notifier)
|
||||||
.resetFrequency(trigger);
|
.resetFrequency(bang.trigger);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
class SelectableChips<T, K> extends StatelessWidget {
|
||||||
|
final List<T> available;
|
||||||
|
final T? selected;
|
||||||
|
final int maxCount;
|
||||||
|
|
||||||
|
final K Function(T item) itemId;
|
||||||
|
final Widget Function(T item) itemLabel;
|
||||||
|
final Widget Function(T item)? itemAvatar;
|
||||||
|
|
||||||
|
final void Function(T item)? onSelected;
|
||||||
|
final void Function(T item)? onDeleted;
|
||||||
|
|
||||||
|
const SelectableChips({
|
||||||
|
required this.itemId,
|
||||||
|
required this.itemLabel,
|
||||||
|
this.itemAvatar,
|
||||||
|
required this.available,
|
||||||
|
this.selected,
|
||||||
|
this.maxCount = 25,
|
||||||
|
this.onSelected,
|
||||||
|
this.onDeleted,
|
||||||
|
super.key,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
var items = available.take(maxCount).toList();
|
||||||
|
if (selected != null) {
|
||||||
|
final selectedIndex = items.indexWhere(
|
||||||
|
(item) => selected != null && itemId(item) == itemId(selected!));
|
||||||
|
if (selectedIndex < 0) {
|
||||||
|
items = [
|
||||||
|
selected!,
|
||||||
|
...items,
|
||||||
|
];
|
||||||
|
} else {
|
||||||
|
items = [
|
||||||
|
items.removeAt(selectedIndex),
|
||||||
|
...items,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return ListView.builder(
|
||||||
|
scrollDirection: Axis.horizontal,
|
||||||
|
shrinkWrap: true,
|
||||||
|
itemCount: items.length,
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
final item = items[index];
|
||||||
|
return Padding(
|
||||||
|
padding: const EdgeInsets.only(right: 8.0),
|
||||||
|
child: FilterChip(
|
||||||
|
selected: selected != null && itemId(item) == itemId(selected!),
|
||||||
|
showCheckmark: false,
|
||||||
|
onSelected: (value) {
|
||||||
|
if (value) {
|
||||||
|
onSelected?.call(item);
|
||||||
|
} else {
|
||||||
|
onDeleted?.call(item);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
onDeleted: () {
|
||||||
|
onDeleted?.call(item);
|
||||||
|
},
|
||||||
|
label: itemLabel.call(item),
|
||||||
|
avatar: itemAvatar?.call(item),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user