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

use dedicated call for default bang url

Browse Source
This commit is contained in:
Fabian Freund
2025-11-21 05:25:40 +01:00
parent 8f612f5181
commit 3dfd02de79
8 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/features/bangs/data/models/bang.dart
+3
View File
@@ -92,6 +92,9 @@ class Bang with FastEquatable implements Insertable<Bang> {
: Uri.encodeComponent(input)
: input;
}
Uri getDefaultUrl() {
return getTemplateUrl('');
}
Uri getTemplateUrl(String? query) {
final url = (query != null)
app/lib/features/bangs/presentation/widgets/bang_details.dart
+2 -2
View File
@@ -58,7 +58,7 @@ class BangDetails extends HookConsumerWidget {
children: [
Row(
children: [
UrlIcon([bangData.getTemplateUrl('')], iconSize: 34.0),
UrlIcon([bangData.getDefaultUrl()], iconSize: 34.0),
const SizedBox(width: 12.0),
Expanded(
child: Column(
@@ -87,7 +87,7 @@ class BangDetails extends HookConsumerWidget {
visualDensity: VisualDensity.compact,
),
onPressed: () async {
final url = Uri.parse(bangData.getTemplateUrl('').origin);
final url = Uri.parse(bangData.getDefaultUrl().origin);
final isPrivate =
ref
.read(generalSettingsWithDefaultsProvider)
app/lib/features/bangs/presentation/widgets/site_search.dart
+1 -1
View File
@@ -128,7 +128,7 @@ class SiteSearch extends HookConsumerWidget {
child: SelectableChips(
itemId: (bang) => bang.trigger,
itemAvatar: (bang) =>
UrlIcon([bang.getTemplateUrl('')], iconSize: 20),
UrlIcon([bang.getDefaultUrl()], iconSize: 20),
itemLabel: (bang) => Text(bang.websiteName),
itemTooltip: (bang) => bang.trigger,
availableItems: availableBangs,
app/lib/features/geckoview/features/search/presentation/widgets/bang_chips.dart
+1 -1
View File
@@ -92,7 +92,7 @@ class BangChips extends HookConsumerWidget {
child: SelectableChips(
itemId: (bang) => bang.trigger,
itemAvatar: (bang) =>
UrlIcon([bang.getTemplateUrl('')], iconSize: 20),
UrlIcon([bang.getDefaultUrl()], iconSize: 20),
itemLabel: (bang) => Text(bang.websiteName),
itemTooltip: (bang) => bang.trigger,
availableItems: availableBangs,
app/lib/features/geckoview/features/search/presentation/widgets/search_field.dart
+1 -3
View File
@@ -110,9 +110,7 @@ class SearchField extends HookConsumerWidget {
prefixIcon: (showBangIcon && activeBang != null)
? Padding(
padding: const EdgeInsetsDirectional.all(12.0),
child: UrlIcon([
activeBang!.getTemplateUrl(''),
], iconSize: 24.0),
child: UrlIcon([activeBang!.getDefaultUrl()], iconSize: 24.0),
)
: null,
label: label ?? const Text('Search'),
app/lib/features/onboarding/presentation/pages/default_search.dart
+2 -4
View File
@@ -83,9 +83,7 @@ class DefaultSearchPage extends HookConsumerWidget {
child: FilterChip(
showCheckmark: false,
label: Text(activeBang.websiteName),
avatar: UrlIcon([
activeBang.getTemplateUrl(''),
], iconSize: 20),
avatar: UrlIcon([activeBang.getDefaultUrl()], iconSize: 20),
selected: true,
onSelected: (value) {},
),
@@ -98,7 +96,7 @@ class DefaultSearchPage extends HookConsumerWidget {
(bang) => FilterChip(
showCheckmark: false,
label: Text(bang.websiteName),
avatar: UrlIcon([bang.getTemplateUrl('')], iconSize: 20),
avatar: UrlIcon([bang.getDefaultUrl()], iconSize: 20),
selected: activeBang?.trigger == bang.trigger,
onSelected: (selected) async {
if (selected) {
app/lib/features/settings/presentation/widgets/bang_icon.dart
+1 -1
View File
@@ -36,7 +36,7 @@ class BangIcon extends ConsumerWidget {
);
return UrlIcon([
if (bang != null) bang.getTemplateUrl(''),
if (bang != null) bang.getDefaultUrl(),
], iconSize: iconSize);
}
}
app/lib/features/settings/presentation/widgets/default_search_selector.dart
+1 -1
View File
@@ -57,7 +57,7 @@ class DefaultSearchSelector extends HookConsumerWidget {
child: SelectableChips(
itemId: (bang) => bang.trigger,
itemAvatar: (bang) =>
UrlIcon([bang.getTemplateUrl('')], iconSize: 20),
UrlIcon([bang.getDefaultUrl()], iconSize: 20),
itemLabel: (bang) => Text(bang.websiteName),
itemTooltip: (bang) => bang.trigger,
availableItems: availableBangs,