use dedicated call for default bang url

FaFre · FaFre · commit 3dfd02de79dc · 2025-11-21T05:25:40.000+01:00
diff --git a/app/lib/features/bangs/data/models/bang.dart b/app/lib/features/bangs/data/models/bang.dart
@@ -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)
diff --git a/app/lib/features/bangs/presentation/widgets/bang_details.dart b/app/lib/features/bangs/presentation/widgets/bang_details.dart
@@ -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)
diff --git a/app/lib/features/bangs/presentation/widgets/site_search.dart b/app/lib/features/bangs/presentation/widgets/site_search.dart
@@ -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,
diff --git a/app/lib/features/geckoview/features/search/presentation/widgets/bang_chips.dart b/app/lib/features/geckoview/features/search/presentation/widgets/bang_chips.dart
@@ -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,
diff --git a/app/lib/features/geckoview/features/search/presentation/widgets/search_field.dart b/app/lib/features/geckoview/features/search/presentation/widgets/search_field.dart
@@ -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'),
diff --git a/app/lib/features/onboarding/presentation/pages/default_search.dart b/app/lib/features/onboarding/presentation/pages/default_search.dart
@@ -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) {
diff --git a/app/lib/features/settings/presentation/widgets/bang_icon.dart b/app/lib/features/settings/presentation/widgets/bang_icon.dart
@@ -36,7 +36,7 @@ class BangIcon extends ConsumerWidget {
     );
 
     return UrlIcon([
-      if (bang != null) bang.getTemplateUrl(''),
+      if (bang != null) bang.getDefaultUrl(),
     ], iconSize: iconSize);
   }
 }
diff --git a/app/lib/features/settings/presentation/widgets/default_search_selector.dart b/app/lib/features/settings/presentation/widgets/default_search_selector.dart
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,9 @@ class Bang with FastEquatable implements Insertable<Bang> {`
`92`	`92`	`: Uri.encodeComponent(input)`
`93`	`93`	`: input;`
`94`	`94`	`}`
	`95`	`+ Uri getDefaultUrl() {`
	`96`	`+ return getTemplateUrl('');`
	`97`	`+ }`
`95`	`98`
`96`	`99`	`Uri getTemplateUrl(String? query) {`
`97`	`100`	`final url = (query != null)`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class BangIcon extends ConsumerWidget {`
`36`	`36`	`);`
`37`	`37`
`38`	`38`	`return UrlIcon([`
`39`		`- if (bang != null) bang.getTemplateUrl(''),`
	`39`	`+ if (bang != null) bang.getDefaultUrl(),`
`40`	`40`	`], iconSize: iconSize);`
`41`	`41`	`}`
`42`	`42`	`}`