Skip to content

A self-hostable bookmark-everything app (links, notes and images) with AI-based automatic tagging and full text search

feat(mobile): add external browser default bookmark view (#2516) (#2548)

冰水泡枸杞ba6a6f97baa0
diff --git a/apps/mobile/app/dashboard/(tabs)/(settings)/index.tsx b/apps/mobile/app/dashboard/(tabs)/(settings)/index.tsx
index 53b0e604..9474c5e8 100644
--- a/apps/mobile/app/dashboard/(tabs)/(settings)/index.tsx
+++ b/apps/mobile/app/dashboard/(tabs)/(settings)/index.tsx
@@ -155,9 +155,13 @@ export default function Settings() {
<ActivityIndicator size="small" />
) : (
<Text className="mr-1 text-muted-foreground" numberOfLines={1}>
- {settings.defaultBookmarkView === "reader"
- ? "Reader"
- : "Browser"}
+ {
+ {
+ reader: "Reader",
+ browser: "Browser",
+ externalBrowser: "External Browser",
+ }[settings.defaultBookmarkView]
+ }
</Text>
)}
<ChevronRight />
diff --git a/apps/mobile/app/dashboard/bookmarks/[slug]/index.tsx b/apps/mobile/app/dashboard/bookmarks/[slug]/index.tsx
index 40390af9..7ca853c3 100644
--- a/apps/mobile/app/dashboard/bookmarks/[slug]/index.tsx
+++ b/apps/mobile/app/dashboard/bookmarks/[slug]/index.tsx
@@ -29,7 +29,9 @@ export default function BookmarkView() {
const api = useTRPC();
const [bookmarkLinkType, setBookmarkLinkType] = useState<BookmarkLinkType>(
- settings.defaultBookmarkView,
+ settings.defaultBookmarkView === "externalBrowser"
+ ? "browser"
+ : settings.defaultBookmarkView,
);
if (typeof slug !== "string") {
diff --git a/apps/mobile/app/dashboard/settings/bookmark-default-view.tsx b/apps/mobile/app/dashboard/settings/bookmark-default-view.tsx
index ae2576cf..00920349 100644
--- a/apps/mobile/app/dashboard/settings/bookmark-default-view.tsx
+++ b/apps/mobile/app/dashboard/settings/bookmark-default-view.tsx
@@ -11,7 +11,9 @@ export default function BookmarkDefaultViewSettings() {
const { toast } = useToast();
const { settings, setSettings } = useAppSettings();
- const handleUpdate = async (mode: "reader" | "browser") => {
+ const handleUpdate = async (
+ mode: "reader" | "browser" | "externalBrowser",
+ ) => {
try {
await setSettings({
...settings,
@@ -31,7 +33,7 @@ export default function BookmarkDefaultViewSettings() {
}
};
- const options = (["reader", "browser"] as const)
+ const options = (["reader", "browser", "externalBrowser"] as const)
.map((mode) => {
const currentMode = settings.defaultBookmarkView;
const isChecked = currentMode === mode;
@@ -42,7 +44,13 @@ export default function BookmarkDefaultViewSettings() {
key={mode}
>
<Text className="mr-2 flex-1" numberOfLines={1}>
- {{ browser: "Browser", reader: "Reader" }[mode]}
+ {
+ {
+ browser: "Browser",
+ reader: "Reader",
+ externalBrowser: "External Browser",
+ }[mode]
+ }
</Text>
{isChecked && <Check color="rgb(0, 122, 255)" />}
</Pressable>,
diff --git a/apps/mobile/components/bookmarks/BookmarkCard.tsx b/apps/mobile/components/bookmarks/BookmarkCard.tsx
index ed479ef8..e2dab31a 100644
--- a/apps/mobile/components/bookmarks/BookmarkCard.tsx
+++ b/apps/mobile/components/bookmarks/BookmarkCard.tsx
@@ -1,6 +1,7 @@
import {
ActivityIndicator,
Alert,
+ Linking,
Platform,
Pressable,
ScrollView,
@@ -543,6 +544,28 @@ export default function BookmarkCard({
);
const router = useRouter();
+ const { settings } = useAppSettings();
+ const { toast } = useToast();
+
+ const onOpenBookmark = (bookmark: ZBookmark) => {
+ if (
+ bookmark.content.type === BookmarkTypes.LINK &&
+ settings.defaultBookmarkView === "externalBrowser"
+ ) {
+ void Linking.openURL(bookmark.content.url).catch(() => {
+ toast({
+ message: "Failed to open link",
+ variant: "destructive",
+ showProgress: false,
+ });
+
+ router.push(`/dashboard/bookmarks/${bookmark.id}`);
+ });
+ return;
+ }
+
+ router.push(`/dashboard/bookmarks/${bookmark.id}`);
+ };
let comp;
switch (bookmark.content.type) {
@@ -550,9 +573,7 @@ export default function BookmarkCard({
comp = (
<LinkCard
bookmark={bookmark}
- onOpenBookmark={() =>
- router.push(`/dashboard/bookmarks/${bookmark.id}`)
- }
+ onOpenBookmark={() => onOpenBookmark(bookmark)}
/>
);
break;
@@ -560,9 +581,7 @@ export default function BookmarkCard({
comp = (
<TextCard
bookmark={bookmark}
- onOpenBookmark={() =>
- router.push(`/dashboard/bookmarks/${bookmark.id}`)
- }
+ onOpenBookmark={() => onOpenBookmark(bookmark)}
/>
);
break;
@@ -570,9 +589,7 @@ export default function BookmarkCard({
comp = (
<AssetCard
bookmark={bookmark}
- onOpenBookmark={() =>
- router.push(`/dashboard/bookmarks/${bookmark.id}`)
- }
+ onOpenBookmark={() => onOpenBookmark(bookmark)}
/>
);
break;
diff --git a/apps/mobile/components/bookmarks/BottomActions.tsx b/apps/mobile/components/bookmarks/BottomActions.tsx
index 64653779..2dcb90d1 100644
--- a/apps/mobile/components/bookmarks/BottomActions.tsx
+++ b/apps/mobile/components/bookmarks/BottomActions.tsx
@@ -112,9 +112,21 @@ export default function BottomActions({ bookmark }: BottomActionsProps) {
/>
),
shouldRender: bookmark.content.type == BookmarkTypes.LINK,
- onClick: () =>
- bookmark.content.type == BookmarkTypes.LINK &&
- Linking.openURL(bookmark.content.url),
+ onClick: async () => {
+ if (bookmark.content.type !== BookmarkTypes.LINK) {
+ return;
+ }
+
+ try {
+ await Linking.openURL(bookmark.content.url);
+ } catch {
+ toast({
+ message: "Failed to open link",
+ variant: "destructive",
+ showProgress: false,
+ });
+ }
+ },
disabled: false,
},
];
diff --git a/apps/mobile/lib/settings.ts b/apps/mobile/lib/settings.ts
index 8da1d33d..74070bf5 100644
--- a/apps/mobile/lib/settings.ts
+++ b/apps/mobile/lib/settings.ts
@@ -14,7 +14,7 @@ const zSettingsSchema = z.object({
imageQuality: z.number().optional().default(0.2),
theme: z.enum(["light", "dark", "system"]).optional().default("system"),
defaultBookmarkView: z
- .enum(["reader", "browser"])
+ .enum(["reader", "browser", "externalBrowser"])
.optional()
.default("reader"),
showNotes: z.boolean().optional().default(false),