Merge Release 1.46.3

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "app.vger.voyager"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 223
-        versionName "1.46.2"
+        versionCode 224
+        versionName "1.46.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

android/app/src/main/java/app/vger/voyager/MainActivity.java

@@ -1,8 +1,12 @@
 package app.vger.voyager;
 
+import android.app.AlertDialog;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
+import android.webkit.URLUtil;
 
 import com.getcapacitor.BridgeActivity;
 
@@ -35,4 +39,29 @@ protected void onCreate(Bundle savedInstanceState) {
             getWindow().setNavigationBarColor(0);
         }
     }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+
+        if (intent.getAction() == Intent.ACTION_SEND) {
+            var newIntent = new Intent(Intent.ACTION_VIEW);
+            var potentialUrl = intent.getStringExtra(Intent.EXTRA_TEXT);
+
+            if (!URLUtil.isValidUrl(potentialUrl) || !potentialUrl.startsWith("https://")) {
+                new AlertDialog.Builder(bridge.getContext())
+                        .setTitle("Unknown share data received")
+                        .setMessage("Voyager only accepts URLs to Lemmy content so that you can browse in-app.")
+                        .setCancelable(true)
+                        .setPositiveButton("OK", null)
+                        .show();
+
+                return;
+            }
+
+            newIntent.setData(Uri.parse(potentialUrl));
+
+            bridge.onNewIntent(newIntent);
+        }
+    }
 }

android/app/src/main/res/values/strings.xml

@@ -4,4 +4,5 @@
     <string name="title_activity_main">Voyager</string>
     <string name="package_name">app.vger.voyager</string>
     <string name="custom_url_scheme">app.vger.voyager</string>
+    <string name="lemmy_link">Lemmy link</string>
 </resources>

ios/App/App.xcodeproj/project.pbxproj

@@ -660,7 +660,7 @@
 				INFOPLIST_FILE = VoyagerActionExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Open in Voyager";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MARKETING_VERSION = 1.0;
@@ -695,7 +695,7 @@
 				INFOPLIST_FILE = VoyagerActionExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Open in Voyager";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 17.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
 				MARKETING_VERSION = 1.0;

ios/App/App/Info.plist

@@ -17,7 +17,7 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.46.2</string>
+    <string>1.46.3</string>
     <key>CFBundleURLTypes</key>
     <array>
       <dict>
@@ -32,7 +32,7 @@
       </dict>
     </array>
     <key>CFBundleVersion</key>
-    <string>223</string>
+    <string>224</string>
     <key>ITSAppUsesNonExemptEncryption</key>
     <false/>
     <key>LSRequiresIPhoneOS</key>

ios/App/VoyagerActionExtension/ActionRequestHandler.swift

@@ -46,18 +46,18 @@ final class ActionRequestHandler: NSObject, NSExtensionRequestHandling, Sendable
 }
 
 extension URL {
-  var isPotentialLemmyInstance: Bool {
-    get async {
-      do {
-          guard host() != nil else {
-          throw ActionRequestHandler.Error.noHost
+    var isPotentialLemmyInstance: Bool {
+        get async {
+            do {
+                guard let host = self.host else {
+                    throw ActionRequestHandler.Error.noHost
+                }
+                return true
+            } catch {
+                return false
+            }
         }
-        return true
-      } catch {
-        return false
-      }
     }
-  }
 
   var iceCubesAppDeepLink: URL {
     var components = URLComponents(url: self, resolvingAgainstBaseURL: false)!

package.json

@@ -2,7 +2,7 @@
   "name": "voyager",
   "description": "A progressive webapp Lemmy client",
   "private": true,
-  "version": "1.46.2",
+  "version": "1.46.3",
   "type": "module",
   "packageManager": "pnpm@8.15.4+sha256.cea6d0bdf2de3a0549582da3983c70c92ffc577ff4410cbf190817ddc35137c2",
   "scripts": {

src/features/comment/compose/edit/CommentEdit.tsx

@@ -1,4 +1,10 @@
-import { IonButtons, IonButton, IonToolbar, IonTitle } from "@ionic/react";
+import {
+  IonButtons,
+  IonButton,
+  IonToolbar,
+  IonTitle,
+  IonIcon,
+} from "@ionic/react";
 import { Comment } from "lemmy-js-client";
 import { useEffect, useState } from "react";
 import { useAppDispatch } from "../../../../store";
@@ -9,6 +15,8 @@ import CommentEditorContent from "../CommentEditorContent";
 import useAppToast from "../../../../helpers/useAppToast";
 import AppHeader from "../../../shared/AppHeader";
 import { clearRecoveredText } from "../../../../helpers/useTextRecovery";
+import { isIosTheme } from "../../../../helpers/device";
+import { arrowBackSharp, send } from "ionicons/icons";
 
 type CommentEditingProps = DismissableProps & {
   item: Comment;
@@ -67,7 +75,13 @@ export default function CommentEdit({
       <AppHeader>
         <IonToolbar>
           <IonButtons slot="start">
-            <IonButton onClick={() => dismiss()}>Cancel</IonButton>
+            <IonButton onClick={() => dismiss()}>
+              {isIosTheme() ? (
+                "Cancel"
+              ) : (
+                <IonIcon icon={arrowBackSharp} slot="icon-only" />
+              )}
+            </IonButton>
           </IonButtons>
           <IonTitle>
             <Centered>
@@ -83,7 +97,7 @@ export default function CommentEdit({
               color={isSubmitDisabled ? "medium" : undefined}
               onClick={submit}
             >
-              Save
+              {isIosTheme() ? "Save" : <IonIcon icon={send} slot="icon-only" />}
             </IonButton>
           </IonButtons>
         </IonToolbar>

src/features/comment/compose/reply/CommentReply.tsx

@@ -32,7 +32,8 @@ import { isLemmyError } from "../../../../helpers/lemmy";
 import AccountSwitcher from "../../../auth/AccountSwitcher";
 import { getClient } from "../../../../services/lemmy";
 import AppHeader from "../../../shared/AppHeader";
-import { arrowBackSharp } from "ionicons/icons";
+import { arrowBackSharp, send } from "ionicons/icons";
+import { isIosTheme } from "../../../../helpers/device";
 
 export const UsernameIonText = styled(IonText)`
   font-size: 0.7em;
@@ -239,7 +240,7 @@ export default function CommentReply({
         <IonToolbar>
           <IonButtons slot="start">
             <IonButton onClick={() => dismiss()}>
-              {document.documentElement.classList.contains("ios") ? (
+              {isIosTheme() ? (
                 "Cancel"
               ) : (
                 <IonIcon icon={arrowBackSharp} slot="icon-only" />
@@ -280,7 +281,7 @@ export default function CommentReply({
               color={isSubmitDisabled ? "medium" : undefined}
               onClick={submit}
             >
-              Post
+              {isIosTheme() ? "Post" : <IonIcon icon={send} slot="icon-only" />}
             </IonButton>
           </IonButtons>
         </IonToolbar>

src/features/community/titleSearch/TitleSearch.tsx

@@ -1,8 +1,9 @@
 import { IonButton, IonButtons, IonIcon, IonTitle } from "@ionic/react";
-import { chevronDown } from "ionicons/icons";
+import { chevronDown, close } from "ionicons/icons";
 import React, { useContext, useEffect, useRef } from "react";
 import { TitleSearchContext } from "./TitleSearchProvider";
 import { styled } from "@linaria/react";
+import { isIosTheme } from "../../../helpers/device";
 
 const TitleContents = styled.span`
   display: inline-flex;
@@ -82,7 +83,13 @@ export default function TitleSearch({ name, children }: TitleSearchProps) {
         </IonTitle>
 
         <IonButtons slot="end">
-          <IonButton onClick={() => setSearching(false)}>Cancel</IonButton>
+          <IonButton onClick={() => setSearching(false)}>
+            {isIosTheme() ? (
+              "Cancel"
+            ) : (
+              <IonIcon icon={close} slot="icon-only" />
+            )}
+          </IonButton>
         </IonButtons>
       </>
     );

src/features/post/new/NewPostText.tsx

@@ -2,6 +2,7 @@ import {
   IonBackButton,
   IonButton,
   IonButtons,
+  IonIcon,
   IonText,
   IonTitle,
   IonToolbar,
@@ -12,6 +13,8 @@ import { clearRecoveredText } from "../../../helpers/useTextRecovery";
 import AppHeader from "../../shared/AppHeader";
 import Editor from "../../shared/markdown/editing/Editor";
 import { MarkdownEditorIonContent } from "../../shared/markdown/editing/MarkdownToolbar";
+import { isIosTheme } from "../../../helpers/device";
+import { send } from "ionicons/icons";
 
 interface NewPostTextProps {
   value: string;
@@ -70,7 +73,7 @@ export default function NewPostText({
               onClick={submit}
               disabled={isSubmitDisabled}
             >
-              Post
+              {isIosTheme() ? "Post" : <IonIcon icon={send} slot="icon-only" />}
             </IonButton>
           </IonButtons>
         </IonToolbar>

src/features/shared/HeaderEllipsisIcon.tsx

@@ -1,22 +1,16 @@
 import { IonIcon } from "@ionic/react";
-import { css, cx } from "@linaria/core";
-import { ellipsisHorizontal } from "ionicons/icons";
+import { ellipsisHorizontal, ellipsisVertical } from "ionicons/icons";
 import { ComponentProps } from "react";
-
-const rotateCss = css`
-  &.md {
-    transform: rotate(90deg);
-  }
-`;
+import { isIosTheme } from "../../helpers/device";
 
 export default function HeaderEllipsisIcon(
   props: ComponentProps<typeof IonIcon>,
 ) {
   return (
     <IonIcon
       {...props}
-      icon={ellipsisHorizontal}
-      className={cx(rotateCss, props.className)}
+      icon={isIosTheme() ? ellipsisHorizontal : ellipsisVertical}
+      className={props.className}
     />
   );
 }

src/features/shared/markdown/editing/PreviewModal.tsx

@@ -2,6 +2,7 @@ import {
   IonButton,
   IonButtons,
   IonContent,
+  IonIcon,
   IonPage,
   IonTitle,
   IonToolbar,
@@ -10,6 +11,8 @@ import Markdown from "../Markdown";
 import CommentMarkdown from "../../../comment/CommentMarkdown";
 import AppHeader from "../../AppHeader";
 import { useId } from "react";
+import { isIosTheme } from "../../../../helpers/device";
+import { arrowBackSharp } from "ionicons/icons";
 
 interface PreviewModalProps {
   text: string;
@@ -49,11 +52,19 @@ export default function PreviewModal({
     <IonPage>
       <AppHeader>
         <IonToolbar>
-          <IonButtons slot="end">
-            <IonButton color="primary" strong onClick={() => onDismiss()}>
-              Done
-            </IonButton>
-          </IonButtons>
+          {isIosTheme() ? (
+            <IonButtons slot="primary">
+              <IonButton strong onClick={() => onDismiss()}>
+                Done
+              </IonButton>
+            </IonButtons>
+          ) : (
+            <IonButtons slot="start">
+              <IonButton onClick={() => onDismiss()}>
+                <IonIcon icon={arrowBackSharp} slot="icon-only" />
+              </IonButton>
+            </IonButtons>
+          )}
           <IonTitle>Preview</IonTitle>
         </IonToolbar>
       </AppHeader>

src/helpers/device.ts

@@ -1,6 +1,7 @@
 import UAParser from "ua-parser-js";
 import { Capacitor } from "@capacitor/core";
 import { NavMode, NavModes } from "capacitor-android-nav-mode";
+import { memoize } from "lodash";
 
 export function isNative() {
   return Capacitor.isNativePlatform();
@@ -62,3 +63,7 @@ export function getAndroidNavMode() {
   androidNavMode = promise;
   return promise;
 }
+
+export const isIosTheme = memoize(() =>
+  document.documentElement.classList.contains("ios"),
+);

src/helpers/toastMessages.ts

@@ -251,7 +251,8 @@ export const cacheClearFailed: AppToastOptions = {
 };
 
 export const deepLinkFailed: AppToastOptions = {
-  message: "Failed to find requested link on your instance",
+  message:
+    "Unknown URL. Voyager only accepts URLs to Lemmy content to browse in-app.",
   color: "warning",
   position: "top",
   duration: 7000,

src/routes/pages/profile/ProfilePage.tsx

@@ -1,6 +1,7 @@
 import {
   IonButton,
   IonButtons,
+  IonIcon,
   IonPage,
   IonTitle,
   IonToolbar,
@@ -19,6 +20,8 @@ import FeedContent from "../shared/FeedContent";
 import ProfilePageActions from "../../../features/user/ProfilePageActions";
 import { useSetActivePage } from "../../../features/auth/AppContext";
 import AppHeader from "../../../features/shared/AppHeader";
+import { swapHorizontalSharp } from "ionicons/icons";
+import { isIosTheme } from "../../../helpers/device";
 
 export default function ProfilePage() {
   const pageRef = useRef<HTMLElement>(null);
@@ -39,9 +42,13 @@ export default function ProfilePage() {
       <AppHeader>
         <IonToolbar>
           {!accountsListEmpty && (
-            <IonButtons slot="start">
+            <IonButtons slot="secondary">
               <IonButton onClick={() => presentAccountSwitcher()}>
-                Accounts
+                {isIosTheme() ? (
+                  "Accounts"
+                ) : (
+                  <IonIcon icon={swapHorizontalSharp} slot="icon-only" />
+                )}
               </IonButton>
             </IonButtons>
           )}