MrBlake/MrbWebLibre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

first bang implementation

Browse Source
This commit is contained in:
Fabian Freund
2024-06-10 03:08:23 +02:00
parent 9ae08409fe
commit 388eba93b7
47 changed files with 3809 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/features/search_browser/domain/providers.dart
+25
View File
@@ -2,6 +2,8 @@
import 'dart:async';
import 'package:bang_navigator/features/bangs/data/models/bang_data.dart';
import 'package:bang_navigator/features/bangs/domain/repositories/bang.dart';
import 'package:bang_navigator/features/search_browser/domain/entities/sheet.dart';
import 'package:bang_navigator/features/search_browser/domain/services/create_tab.dart';
import 'package:flutter/widgets.dart';
@@ -65,3 +67,26 @@ class BottomSheetExtend extends _$BottomSheetExtend {
.sampleTime(const Duration(milliseconds: 50));
}
}
@Riverpod(keepAlive: true)
class SelectedBangTrigger extends _$SelectedBangTrigger {
void setTrigger(String trigger) {
state = trigger;
}
void clearTrigger() {
state = null;
}
@override
String? build() {
return null;
}
}
@Riverpod()
Stream<BangData?> selectedBangData(SelectedBangDataRef ref) {
final repository = ref.watch(bangRepositoryProvider.notifier);
final selectedBangTrigger = ref.watch(selectedBangTriggerProvider);
return repository.watchBang(selectedBangTrigger);
}
app/lib/features/search_browser/domain/providers.g.dart
+32
View File
@@ -6,6 +6,21 @@ part of 'providers.dart';
// RiverpodGenerator
// **************************************************************************
String _$selectedBangDataHash() => r'6d99a08f4a02027cc007ee1df30e5ac7923ca5f5';
/// See also [selectedBangData].
@ProviderFor(selectedBangData)
final selectedBangDataProvider = AutoDisposeStreamProvider<BangData?>.internal(
selectedBangData,
name: r'selectedBangDataProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$selectedBangDataHash,
dependencies: null,
allTransitiveDependencies: null,
);
typedef SelectedBangDataRef = AutoDisposeStreamProviderRef<BangData?>;
String _$overlayDialogHash() => r'7a0376fff0ba12c70a257a47391e7c049dabd36d';
/// See also [OverlayDialog].
@@ -53,5 +68,22 @@ final bottomSheetExtendProvider =
);
typedef _$BottomSheetExtend = StreamNotifier<double>;
String _$selectedBangTriggerHash() =>
r'd110e4f8bd9d362e0cc54ee56a4f247d0870c760';
/// See also [SelectedBangTrigger].
@ProviderFor(SelectedBangTrigger)
final selectedBangTriggerProvider =
NotifierProvider<SelectedBangTrigger, String?>.internal(
SelectedBangTrigger.new,
name: r'selectedBangTriggerProvider',
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
? null
: _$selectedBangTriggerHash,
dependencies: null,
allTransitiveDependencies: null,
);
typedef _$SelectedBangTrigger = Notifier<String?>;
// ignore_for_file: type=lint
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
app/lib/features/search_browser/presentation/widgets/bang_chips.dart
+93
View File
@@ -0,0 +1,93 @@
import 'package:bang_navigator/core/routing/routes.dart';
import 'package:bang_navigator/features/bangs/data/models/bang_data.dart';
import 'package:bang_navigator/features/bangs/domain/providers.dart';
import 'package:bang_navigator/features/bangs/presentation/widgets/bang_icon.dart';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
class BangChips extends HookConsumerWidget {
static const _maxBangCount = 25;
final BangData? selectedBang;
final void Function(String trigger)? onSelected;
final void Function(String trigger)? onDeleted;
const BangChips({
this.selectedBang,
this.onSelected,
this.onDeleted,
super.key,
});
@override
Widget build(BuildContext context, WidgetRef ref) {
final frequentBangsAsync = ref.watch(frequentBangsProvider);
return frequentBangsAsync.when(
data: (bangs) {
bangs = bangs.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 SizedBox(
height: 48,
child: Row(
children: [
Expanded(
child: 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),
),
);
},
),
),
IconButton(
onPressed: () async {
await context.push(BangRoute().location);
},
icon: const Icon(Icons.chevron_right),
),
],
),
);
},
error: (error, stackTrace) => SizedBox.shrink(),
loading: () => SizedBox.shrink(),
);
}
}
app/lib/features/search_browser/presentation/widgets/tabs/search_tab.dart
+56 -19
View File
@@ -1,9 +1,11 @@
import 'package:bang_navigator/features/bangs/domain/providers.dart';
import 'package:bang_navigator/features/bangs/domain/repositories/bang.dart';
import 'package:bang_navigator/features/bangs/presentation/widgets/bang_icon.dart';
import 'package:bang_navigator/features/kagi/domain/repositories/autosuggest.dart';
import 'package:bang_navigator/features/search_browser/domain/providers.dart';
import 'package:bang_navigator/features/search_browser/presentation/widgets/bang_chips.dart';
import 'package:bang_navigator/features/search_browser/presentation/widgets/sheets/shared_content_sheet.dart';
import 'package:bang_navigator/features/search_browser/presentation/widgets/speech_to_text_button.dart';
import 'package:bang_navigator/features/search_browser/utils/url_builder.dart'
as uri_builder;
import 'package:bang_navigator/features/share_intent/domain/entities/shared_content.dart';
import 'package:bang_navigator/presentation/widgets/autocomplete.dart';
import 'package:flutter/material.dart';
@@ -105,8 +107,16 @@ class SearchTab extends HookConsumerWidget {
final formKey = useMemoized(() => GlobalKey<FormState>());
final focusNode = useFocusNode();
final selectedBangAsync = ref.watch(selectedBangDataProvider);
final defaultSearchBangAsync = ref.watch(kagiSearchBangProvider);
final activeBang =
selectedBangAsync.valueOrNull ?? defaultSearchBangAsync.valueOrNull;
final textController =
useTextEditingController(text: sharedContent?.toString());
final quickAnswer = useListenableSelector(
textController,
() => textController.text.endsWith('?'),
@@ -118,6 +128,28 @@ class SearchTab extends HookConsumerWidget {
mainAxisSize: MainAxisSize.min,
children: [
const SizedBox(height: 4),
selectedBangAsync.when(
skipLoadingOnReload: true,
data: (selectedBang) {
return BangChips(
selectedBang: selectedBang,
onSelected: (trigger) {
ref
.read(selectedBangTriggerProvider.notifier)
.setTrigger(trigger);
},
onDeleted: (trigger) {
if (ref.read(selectedBangTriggerProvider) == trigger) {
ref
.read(selectedBangTriggerProvider.notifier)
.clearTrigger();
}
},
);
},
error: (error, stackTrace) => SizedBox.shrink(),
loading: () => SizedBox.shrink(),
),
Consumer(
builder: (context, ref, child) {
final optionsStream = ref.watch(autosuggestRepositoryProvider);
@@ -169,7 +201,12 @@ class SearchTab extends HookConsumerWidget {
controller: textEditingController,
focusNode: focusNode,
decoration: InputDecoration(
// border: OutlineInputBorder(),
prefixIcon: (activeBang != null)
? Padding(
padding: const EdgeInsetsDirectional.all(12.0),
child: BangIcon(activeBang, iconSize: 24.0),
)
: null,
label: const Text('Query'),
hintText: 'Ask anything...',
floatingLabelBehavior: FloatingLabelBehavior.always,
@@ -190,16 +227,15 @@ class SearchTab extends HookConsumerWidget {
onTapOutside: (event) {
focusNode.unfocus();
},
onFieldSubmitted: (value) {
if (formKey.currentState?.validate() ?? false) {
onSubmit(
uri_builder.searchUri(
searchQuery: textController.text,
),
);
}
onFieldSubmitted: (_) async {
if (activeBang != null &&
(formKey.currentState?.validate() == true)) {
await ref
.read(bangRepositoryProvider.notifier)
.increaseFrequency(activeBang.trigger);
// onFieldSubmitted();
onSubmit(activeBang.getUrl(textController.text));
}
},
);
},
@@ -226,13 +262,14 @@ class SearchTab extends HookConsumerWidget {
SizedBox(
width: double.infinity,
child: FilledButton.icon(
onPressed: () {
if (formKey.currentState?.validate() ?? false) {
onSubmit(
uri_builder.searchUri(
searchQuery: textController.text,
),
);
onPressed: () async {
if (activeBang != null &&
(formKey.currentState?.validate() == true)) {
await ref
.read(bangRepositoryProvider.notifier)
.increaseFrequency(activeBang.trigger);
onSubmit(activeBang.getUrl(textController.text));
}
},
label: const Text('Search'),
app/lib/features/search_browser/utils/url_builder.dart
+1 -5
View File
@@ -36,6 +36,7 @@ Uri summarizerUri({
_baseUrl.replace(
pathSegments: [
'summarizer',
//TODO: check if really necessary
'index.html',
],
queryParameters: {
@@ -47,8 +48,3 @@ Uri summarizerUri({
_ => null,
},
);
Uri searchUri({required String searchQuery}) => _baseUrl.replace(
pathSegments: ['search'],
queryParameters: {'q': searchQuery},
);