chore: testing

Author: farfromrefug

app/components/bottomsheet/BottomSheetInner.svelte

@@ -32,7 +32,7 @@
     import { computeDistanceBetween } from '~/utils/geo';
     import { share } from '@akylas/nativescript-app-utils/share';
     import { navigate } from '@shared/utils/svelte/ui';
-    import { hideLoading, openLink, showLoading, showPopoverMenu, showSlidersPopover } from '~/utils/ui/index.common';
+    import { hideLoading, openURL, showLoading, showPopoverMenu, showSlidersPopover } from '~/utils/ui/index.common';
     import { actionBarButtonHeight, colors } from '~/variables';
     import ElevationChart from '../chart/ElevationChart.svelte';
     import IconButton from '../common/IconButton.svelte';
@@ -149,15 +149,6 @@
             console.error(error, error.stack);
         }
     }
-    function openURL(url) {
-        const useInAppBrowser = ApplicationSettings. getBoolean("url_use_inapp_browser", true);
-        if (useInAppBrowser) {
-            openLink(url);
-        } else {
-            Utils.openUrl(url);
-        }
-        
-    }
     
     function openWikipedia() {
         try {

app/components/items/ItemInfo.svelte

@@ -14,7 +14,7 @@
     import { networkService } from '~/services/NetworkService';
     import { showError } from '@shared/utils/showError';
     import { share } from '@akylas/nativescript-app-utils/share';
-    import { openLink } from '~/utils/ui/index.common';
+    import { openURL } from '~/utils/ui/index.common';
     import { actionBarButtonHeight, actionBarHeight, colors, fonts } from '~/variables';
     import IconButton from '../common/IconButton.svelte';
     import JsonViewer from './JSONViewer.svelte';
@@ -335,7 +335,7 @@
         try {
             switch (listItem.id) {
                 case 'website':
-                    await openLink(listItem.subtitle);
+                    await openURL(listItem.subtitle);
                     break;
                 case 'phone':
                     openUrl('tel:' + listItem.subtitle);
@@ -346,13 +346,13 @@
                     });
                     break;
                 case 'wikipedia':
-                    await openLink(`https://en.wikipedia.org/wiki/${listItem.subtitle}`);
+                    await openURL(`https://en.wikipedia.org/wiki/${listItem.subtitle}`);
                     break;
                 case 'wikidata':
-                    await openLink(`https://www.wikidata.org/wiki/${listItem.subtitle}`);
+                    await openURL(`https://www.wikidata.org/wiki/${listItem.subtitle}`);
                     break;
                 case 'mapillary':
-                    await openLink(`https://www.mapillary.com/app/?pKey=${listItem.subtitle}&focus=photo`);
+                    await openURL(`https://www.mapillary.com/app/?pKey=${listItem.subtitle}&focus=photo`);
                     break;
                 default:
                     if (listItem.expandable) {
@@ -402,7 +402,7 @@
                 case 'operator':
                 case 'wikidata':
                     if (listItem.wikidata) {
-                        await openLink(`https://www.wikidata.org/wiki/${listItem.wikidata}`);
+                        await openURL(`https://www.wikidata.org/wiki/${listItem.wikidata}`);
                     }
                     break;
                 case 'phone':

app/components/settings/Settings.svelte

@@ -185,7 +185,7 @@
                         
                         type: 'switch',
                         key: 'url_use_inapp_browser',
-                        value: ApplicationSettings.getBoolean('url_use_inapp_browser', false),
+                        value: ApplicationSettings.getBoolean('url_use_inapp_browser', true),
                         title: lc('url_use_inapp_browser')
                     }
                 ].concat(__ANDROID__ ? [{

app/utils/ui/index.common.ts

@@ -3,12 +3,12 @@ import { lc } from '@nativescript-community/l';
 import { MDCAlertControlerOptions, alert, confirm } from '@nativescript-community/ui-material-dialogs';
 import { HorizontalPosition, PopoverOptions, VerticalPosition } from '@nativescript-community/ui-popover';
 import { closePopover, showPopover } from '@nativescript-community/ui-popover/svelte';
-import { AlertOptions, Application, GridLayout, View } from '@nativescript/core';
+import { AlertOptions, Application, GridLayout, Utils, View } from '@nativescript/core';
 import { SDK_VERSION, copyToClipboard, debounce } from '@nativescript/core/utils';
 import { tryCatchFunction } from '@shared/utils/ui';
 import { showError } from '@shared/utils/showError';
 import { navigate } from '@shared/utils/svelte/ui';
-import { hideLoading, showSnack, showToast } from '@shared/utils/ui';
+import { hideLoading, openLink, showSnack, showToast } from '@shared/utils/ui';
 import { ComponentProps } from 'svelte';
 import { ComponentInstanceInfo, resolveComponentElement } from 'svelte-native/dom';
 import { get } from 'svelte/store';
@@ -18,6 +18,15 @@ import { colors, fontScale, screenWidthDips } from '~/variables';
 
 export * from '@shared/utils/ui';
 
+export async function openURL(url) {
+    const useInAppBrowser = ApplicationSettings. getBoolean("url_use_inapp_browser", true);
+    if (useInAppBrowser) {
+       return openLink(url);
+    } else {
+        Utils.openUrl(url);
+    }     
+}
+
 export async function promptForGroup(defaultGroup: string, groups?: Group[]): Promise<string> {
     const TagView = (await import('~/components/common/TagView.svelte')).default;
     const componentInstanceInfo = resolveComponentElement(TagView, { groups, defaultGroup });