fix show site search when no bangs avalilable
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
import 'package:bang_navigator/features/bangs/domain/providers.dart';
|
import 'package:bang_navigator/features/bangs/data/models/bang_data.dart';
|
||||||
import 'package:bang_navigator/features/bangs/domain/repositories/data.dart';
|
import 'package:bang_navigator/features/bangs/domain/repositories/data.dart';
|
||||||
import 'package:bang_navigator/features/bangs/presentation/widgets/bang_chips.dart';
|
import 'package:bang_navigator/features/bangs/presentation/widgets/bang_chips.dart';
|
||||||
import 'package:bang_navigator/features/bangs/presentation/widgets/search_field.dart';
|
import 'package:bang_navigator/features/bangs/presentation/widgets/search_field.dart';
|
||||||
@@ -11,32 +11,24 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
|
|||||||
|
|
||||||
class SiteSearch extends HookConsumerWidget {
|
class SiteSearch extends HookConsumerWidget {
|
||||||
final String domain;
|
final String domain;
|
||||||
|
final List<BangData> availableBangs;
|
||||||
|
|
||||||
const SiteSearch({required this.domain, super.key});
|
const SiteSearch({
|
||||||
|
required this.domain,
|
||||||
|
required this.availableBangs,
|
||||||
|
super.key,
|
||||||
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
final formKey = useMemoized(() => GlobalKey<FormState>());
|
final formKey = useMemoized(() => GlobalKey<FormState>());
|
||||||
|
|
||||||
final availableBangsAsync = ref.watch(
|
|
||||||
bangDataListProvider(
|
|
||||||
filter: (
|
|
||||||
domain: domain,
|
|
||||||
groups: null,
|
|
||||||
categoryFilter: null,
|
|
||||||
orderMostFrequentFirst: true,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
final availableBangCount = availableBangsAsync.valueOrNull?.length ?? 0;
|
|
||||||
|
|
||||||
final selectedBang = ref.watch(
|
final selectedBang = ref.watch(
|
||||||
selectedBangDataProvider(domain: domain)
|
selectedBangDataProvider(domain: domain)
|
||||||
.select((value) => value.valueOrNull),
|
.select((value) => value.valueOrNull),
|
||||||
);
|
);
|
||||||
|
|
||||||
final activeBang =
|
final activeBang = selectedBang ?? availableBangs.firstOrNull;
|
||||||
selectedBang ?? availableBangsAsync.valueOrNull?.firstOrNull;
|
|
||||||
|
|
||||||
final textController = useTextEditingController();
|
final textController = useTextEditingController();
|
||||||
|
|
||||||
@@ -54,67 +46,58 @@ class SiteSearch extends HookConsumerWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return availableBangsAsync.when(
|
return Form(
|
||||||
data: (availableBangs) {
|
key: formKey,
|
||||||
return Form(
|
child: Column(
|
||||||
key: formKey,
|
mainAxisSize: MainAxisSize.min,
|
||||||
child: Column(
|
children: [
|
||||||
mainAxisSize: MainAxisSize.min,
|
SizedBox(
|
||||||
children: [
|
height: 48,
|
||||||
if (availableBangCount > 1)
|
width: double.maxFinite,
|
||||||
SizedBox(
|
child: BangChips(
|
||||||
height: 48,
|
availableBangs: availableBangs,
|
||||||
width: double.maxFinite,
|
selectedBang: selectedBang,
|
||||||
child: BangChips(
|
onSelected: (trigger) {
|
||||||
availableBangs: availableBangs,
|
ref
|
||||||
selectedBang: selectedBang,
|
.read(
|
||||||
onSelected: (trigger) {
|
selectedBangTriggerProvider(domain: domain).notifier,
|
||||||
ref
|
)
|
||||||
.read(
|
.setTrigger(trigger);
|
||||||
selectedBangTriggerProvider(domain: domain)
|
},
|
||||||
.notifier,
|
onDeleted: (trigger) {
|
||||||
)
|
if (ref.read(
|
||||||
.setTrigger(trigger);
|
selectedBangTriggerProvider(domain: domain),
|
||||||
},
|
) ==
|
||||||
onDeleted: (trigger) {
|
trigger) {
|
||||||
if (ref.read(
|
ref
|
||||||
selectedBangTriggerProvider(domain: domain),
|
.read(
|
||||||
) ==
|
selectedBangTriggerProvider(domain: domain).notifier,
|
||||||
trigger) {
|
)
|
||||||
ref
|
.clearTrigger();
|
||||||
.read(
|
}
|
||||||
selectedBangTriggerProvider(domain: domain)
|
},
|
||||||
.notifier,
|
),
|
||||||
)
|
|
||||||
.clearTrigger();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
),
|
|
||||||
),
|
|
||||||
SearchField(
|
|
||||||
textController: textController,
|
|
||||||
activeBang: activeBang,
|
|
||||||
onFieldSubmitted: (_) async {
|
|
||||||
await submitSearch();
|
|
||||||
},
|
|
||||||
),
|
|
||||||
const SizedBox(
|
|
||||||
height: 12,
|
|
||||||
),
|
|
||||||
SizedBox(
|
|
||||||
width: double.infinity,
|
|
||||||
child: FilledButton.icon(
|
|
||||||
onPressed: submitSearch,
|
|
||||||
label: const Text('Search on Site'),
|
|
||||||
icon: const Icon(MdiIcons.cloudSearch),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
);
|
SearchField(
|
||||||
},
|
textController: textController,
|
||||||
error: (error, stackTrace) => const SizedBox.shrink(),
|
activeBang: activeBang,
|
||||||
loading: () => const SizedBox(height: 48),
|
onFieldSubmitted: (_) async {
|
||||||
|
await submitSearch();
|
||||||
|
},
|
||||||
|
),
|
||||||
|
const SizedBox(
|
||||||
|
height: 12,
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
width: double.infinity,
|
||||||
|
child: FilledButton.icon(
|
||||||
|
onPressed: submitSearch,
|
||||||
|
label: const Text('Search on Site'),
|
||||||
|
icon: const Icon(MdiIcons.cloudSearch),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
import 'package:bang_navigator/domain/entities/web_page_info.dart';
|
import 'package:bang_navigator/domain/entities/web_page_info.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/site_search.dart';
|
import 'package:bang_navigator/features/bangs/presentation/widgets/site_search.dart';
|
||||||
import 'package:bang_navigator/features/search_browser/domain/entities/modes.dart';
|
import 'package:bang_navigator/features/search_browser/domain/entities/modes.dart';
|
||||||
import 'package:bang_navigator/features/search_browser/utils/url_builder.dart'
|
import 'package:bang_navigator/features/search_browser/utils/url_builder.dart'
|
||||||
@@ -8,6 +10,7 @@ import 'package:bang_navigator/features/share_intent/domain/entities/shared_cont
|
|||||||
import 'package:bang_navigator/features/web_view/presentation/controllers/switch_new_tab.dart';
|
import 'package:bang_navigator/features/web_view/presentation/controllers/switch_new_tab.dart';
|
||||||
import 'package:bang_navigator/features/web_view/presentation/widgets/favicon.dart';
|
import 'package:bang_navigator/features/web_view/presentation/widgets/favicon.dart';
|
||||||
import 'package:bang_navigator/presentation/controllers/website_title.dart';
|
import 'package:bang_navigator/presentation/controllers/website_title.dart';
|
||||||
|
import 'package:bang_navigator/presentation/widgets/failure_widget.dart';
|
||||||
import 'package:bang_navigator/utils/ui_helper.dart' as ui_helper;
|
import 'package:bang_navigator/utils/ui_helper.dart' as ui_helper;
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
@@ -16,7 +19,6 @@ import 'package:flutter_inappwebview/flutter_inappwebview.dart';
|
|||||||
import 'package:flutter_material_design_icons/flutter_material_design_icons.dart';
|
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:share_plus/share_plus.dart';
|
import 'package:share_plus/share_plus.dart';
|
||||||
import 'package:skeletonizer/skeletonizer.dart';
|
|
||||||
|
|
||||||
class LoadingWebPageDialog extends HookConsumerWidget {
|
class LoadingWebPageDialog extends HookConsumerWidget {
|
||||||
final Uri url;
|
final Uri url;
|
||||||
@@ -29,11 +31,14 @@ class LoadingWebPageDialog extends HookConsumerWidget {
|
|||||||
Widget build(BuildContext context, WidgetRef ref) {
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
final pageInfoAsync = ref.watch(pageInfoProvider(url));
|
final pageInfoAsync = ref.watch(pageInfoProvider(url));
|
||||||
|
|
||||||
return Skeletonizer(
|
return pageInfoAsync.when(
|
||||||
enabled: pageInfoAsync.isLoading,
|
data: (pageInfo) => WebPageDialog(
|
||||||
child: WebPageDialog(
|
page: pageInfo,
|
||||||
page: pageInfoAsync.valueOrNull ??
|
onDismiss: onDismiss,
|
||||||
WebPageInfo(url: url, favicon: null, title: ''),
|
),
|
||||||
|
error: (error, stackTrace) => SizedBox.shrink(),
|
||||||
|
loading: () => ModalBarrier(
|
||||||
|
color: Theme.of(context).dialogTheme.barrierColor ?? Colors.black54,
|
||||||
onDismiss: onDismiss,
|
onDismiss: onDismiss,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
@@ -60,6 +65,18 @@ class WebPageDialog extends HookConsumerWidget {
|
|||||||
.select((value) => value.valueOrNull?.incognitoMode ?? false),
|
.select((value) => value.valueOrNull?.incognitoMode ?? false),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
final availableBangsAsync = ref.watch(
|
||||||
|
bangDataListProvider(
|
||||||
|
filter: (
|
||||||
|
domain: page.url.host,
|
||||||
|
groups: null,
|
||||||
|
categoryFilter: null,
|
||||||
|
orderMostFrequentFirst: true,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
final availableBangCount = availableBangsAsync.valueOrNull?.length;
|
||||||
|
|
||||||
final formKey = useMemoized(() => GlobalKey<FormState>());
|
final formKey = useMemoized(() => GlobalKey<FormState>());
|
||||||
final urlTextController =
|
final urlTextController =
|
||||||
useTextEditingController(text: page.url.toString());
|
useTextEditingController(text: page.url.toString());
|
||||||
@@ -98,6 +115,7 @@ class WebPageDialog extends HookConsumerWidget {
|
|||||||
controller: urlTextController,
|
controller: urlTextController,
|
||||||
enableIMEPersonalizedLearning: !incognitoEnabled,
|
enableIMEPersonalizedLearning: !incognitoEnabled,
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
|
labelText: 'URL',
|
||||||
suffixIcon: (webViewController != null)
|
suffixIcon: (webViewController != null)
|
||||||
? IconButton(
|
? IconButton(
|
||||||
onPressed: () async {
|
onPressed: () async {
|
||||||
@@ -137,11 +155,38 @@ class WebPageDialog extends HookConsumerWidget {
|
|||||||
const Divider(),
|
const Divider(),
|
||||||
Padding(
|
Padding(
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16.0),
|
padding: const EdgeInsets.symmetric(horizontal: 16.0),
|
||||||
child: SiteSearch(
|
child: availableBangsAsync.when(
|
||||||
domain: page.url.host,
|
data: (availableBangs) {
|
||||||
|
if (availableBangs.isEmpty) {
|
||||||
|
return const SizedBox.shrink();
|
||||||
|
}
|
||||||
|
|
||||||
|
return SiteSearch(
|
||||||
|
domain: page.url.host,
|
||||||
|
availableBangs: availableBangs,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
error: (error, stackTrace) => FailureWidget(
|
||||||
|
title: 'Could not load bangs',
|
||||||
|
exception: error,
|
||||||
|
),
|
||||||
|
loading: () => SiteSearch(
|
||||||
|
domain: page.url.host,
|
||||||
|
availableBangs: [
|
||||||
|
BangData(
|
||||||
|
websiteName: 'websiteName',
|
||||||
|
domain: 'domain',
|
||||||
|
trigger: 'trigger',
|
||||||
|
urlTemplate: 'urlTemplate',
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
const Divider(),
|
if (availableBangsAsync.isLoading ||
|
||||||
|
availableBangCount == null ||
|
||||||
|
availableBangCount > 0)
|
||||||
|
const Divider(),
|
||||||
ListTile(
|
ListTile(
|
||||||
leading: const Icon(MdiIcons.contentCopy),
|
leading: const Icon(MdiIcons.contentCopy),
|
||||||
title: const Text('Copy address'),
|
title: const Text('Copy address'),
|
||||||
|
|||||||
Reference in New Issue
Block a user