Merge remote-tracking branch 'origin/main'

Author: farfromrefug

app/components/list/CardListCell.svelte

@@ -267,7 +267,7 @@
     on:close={(e) => onFullCardItemTouch(item, { action: 'up' })}> -->
 <gridlayout {height} width="100%" {...$$restProps}>
     <gridlayout id="cardItemTemplate" class="cardItemTemplate" prop:mainContent {...getItemHolderParams(layout, item, $nbColumns)} on:tap on:longPress>
-        {#if pkPassCell}
+        {#if CARD_APP && pkPassCell}
             <PKPassCardCell {item} {itemWidth} {layout} pkpass={item.doc.pages[0]?.pkpass} />
         {:else}
             <RotableImageView {...getItemRotableImageParams(item)} />

app/components/pkpass/PKPassCardCell.svelte

@@ -1,9 +1,10 @@
 <script lang="ts">
     import { lang } from '~/helpers/locale';
-    import { PKPass, PKPassData, PKPassField, PKPassStructure, PKPassTransitType } from '~/models/PKPass';
+    import { PKPass, PKPassData, PKPassField, PKPassStructure, PKPassStyle, PKPassTransitType, PKPassType } from '~/models/PKPass';
     import { getFieldTextAlignment, getTransitIcon } from '~/utils/pkpass';
     import { colors } from '~/variables';
     import { Item } from '~/components/list/MainList.svelte';
+    import { Color } from '@nativescript/core';
 
     const FIELD_LINE_HEIGHT = 15;
 
@@ -43,9 +44,9 @@
 
     function updatePkPass(pkpass: PKPass) {
         passData = pkpass?.passData;
-        foregroundColor = passData?.foregroundColor || colorOnBackground;
-        labelColor = passData.labelColor || colorOnBackground;
         backgroundColor = passData?.backgroundColor || colorSurface;
+        foregroundColor = passData?.foregroundColor || (new Color(backgroundColor).getBrightness() < 145 ? 'white' : 'black');
+        labelColor = passData.labelColor || (new Color(backgroundColor).getBrightness() < 145 ? 'white' : 'black');
         // Apple PKPass image specifications - prefer @2x for quality
         logoImage = pkpass?.images?.logo2x || pkpass?.images?.logo; // Max 160x50 points
         iconImage = pkpass?.images?.icon2x || pkpass?.images?.icon; // 29x29 points
@@ -79,8 +80,7 @@
     // Get formatted field label
     function getFieldLabel(field: any): string {
         if (!field) return null;
-        const label = field.label || field.key;
-        return pkpass.getLocalizedValue(label, lang).toUpperCase() + '\n';
+        return pkpass.getLocalizedFieldLabel(field, lang).toUpperCase() + '\n';
     }
 
     function getLocalizedText(text: string): string {
@@ -90,11 +90,16 @@
 
 <!-- Credit card sized layout with scalable content -->
 <gridlayout {backgroundColor} borderRadius={12 * scaleFactor} {...$$restProps}>
+    {#if stripImage && pkpass?.passType === PKPassType.ESpass}
+        <image noRatioEnforce={true} opacity={0.3} rowSpan={4} src={stripImage} stretch="aspectFill" width="100%" />
+    {/if}
     <!-- Strip or thumbnail banner at top if available -->
-    <image colSpan={3} height={60 * scaleFactor} row={0} src={stripImage || thumbnailImage} stretch="aspectFill" visibility={stripImage || thumbnailImage ? 'visible' : 'collapse'} />
+    {#if pkpass?.passType === PKPassType.PKPass}
+        <image colSpan={3} height={60 * scaleFactor} row={0} src={stripImage || thumbnailImage} stretch="aspectFill" visibility={stripImage || thumbnailImage ? 'visible' : 'collapse'} />
+    {/if}
 
     <!-- Content container with proper padding -->
-    <gridlayout padding={12 * scaleFactor} rows="auto,*,auto,auto">
+    <gridlayout padding={12 * scaleFactor} rows={`auto,${pkpass?.getPassStyle() === PKPassStyle.BoardingPass ? '*' : 'auto'},auto,auto`}>
         <!-- Top row: Logo/Icon + Name (limited width) + Important right-side data -->
         <gridlayout columns="auto,*,auto" marginBottom={5 * scaleFactor} row={0}>
             <!-- Left: Logo (max 80px scaled) or Icon (20px scaled) + Name -->

app/components/pkpass/PKPassView.svelte

@@ -300,6 +300,13 @@
     function onSelectedIndex(event) {
         currentQRCodeIndex = event.object.selectedIndex;
     }
+    function geAllPages() {
+        const selected: { page: OCRPage; document: OCRDocument }[] = [];
+        items.forEach((d, index) => {
+            selected.push({ page: d.page, document });
+        });
+        return selected;
+    }
     function getSelectedPages() {
         const selected: { page: OCRPage; document: OCRDocument }[] = [];
         items.forEach((d, index) => {
@@ -770,6 +777,7 @@
                 onClose: async (item) => {
                     try {
                         let result;
+                        DEV_LOG && console.log('item.id', item.id);
                         switch (item.id) {
                             case 'share':
                                 result = await showImageExportPopover(event);
@@ -823,26 +831,26 @@
         } else {
             // Filter options based on PKPass document
 
-            const allOptions = [
-                { id: 'rename', name: lc('rename'), icon: 'mdi-rename' },
-                { id: 'select_all', name: lc('select_all'), icon: 'mdi-select-all' },
-                { id: 'reorder', name: lc('reorder_pages'), icon: 'mdi-reorder-horizontal' }
-            ] as any[];
+            const allOptions = [{ id: 'rename', name: lc('rename'), icon: 'mdi-rename' }] as any[];
 
             if (!isPKPassDocument) {
                 if (hasImages) {
                     allOptions.push(
                         ...[
+                            { id: 'select_all', name: lc('select_all'), icon: 'mdi-select-all' },
+                            { id: 'reorder', name: lc('reorder_pages'), icon: 'mdi-reorder-horizontal' },
                             { id: 'transform', name: lc('transform_images'), icon: 'mdi-auto-fix' },
                             { id: 'ocr', name: lc('ocr_document'), icon: 'mdi-text-recognition' }
                         ]
                     );
                 }
+            } else {
+                allOptions.push({ id: 'share', name: lc('share_images'), icon: 'mdi-share-variant' });
             }
             allOptions.push(...[{ id: 'delete', name: lc('delete'), icon: 'mdi-delete', color: colorError }]);
 
             // For PKPass documents, only allow delete (of the whole document)
-            const options = new ObservableArray(isPKPassDocument ? allOptions.filter((opt) => opt.id === 'delete') : allOptions);
+            const options = new ObservableArray(allOptions);
             return showPopoverMenu({
                 options,
                 anchor: event.object,
@@ -853,6 +861,9 @@
                         case 'rename':
                             editingTitle = true;
                             break;
+                        case 'share':
+                            await showImagePopoverMenu(geAllPages(), event.object);
+                            break;
                         case 'select_all':
                             selectAll();
                             break;
@@ -1344,7 +1355,7 @@
 
 <page bind:this={page} id="cardview" actionBarHidden={true} statusBarColor={topBackgroundColor} {statusBarStyle}>
     <gridlayout class="pageContent" backgroundColor={topBackgroundColor} columns={$isLandscape ? 'auto,*' : '*'} rows={$isLandscape ? 'auto,*' : 'auto,auto,*'}>
-        {#if isPKPassDocument}
+        {#if CARD_APP && isPKPassDocument}
             <pager bind:this={pager} items={document.pages} row={2} transformers="zoomOut" on:selectedIndexChange={onSelectedIndex}>
                 <Template let:item>
                     <stacklayout padding="0">

app/components/view/CardView.svelte

@@ -159,6 +159,8 @@
   "expanded": "expanded",
   "export": "export",
   "export_folder": "export folder",
+  "export_as_espass": "Export as ESpass",
+  "export_as_pkpass": "Export as PKPass",
   "export_passbooks": "export Passbooks",
   "export_settings": "export settings",
   "export_settings_desc": "export all application settings so that you can import them later",
@@ -395,6 +397,8 @@
   "share": "share",
   "share_application": "share application",
   "share_images": "share images",
+  "share_as_espass": "Share as ESpass",
+  "share_as_pkpass": "Share as PKPass",
   "share_passbooks": "share Passbooks",
   "show_fullscreen_images": "fullscreen",
   "show_love": "If you like the project please share some love or even contribute",

app/i18n/en.json

@@ -3,10 +3,15 @@ import { formatCurrency } from '@shared/helpers/format';
 import dayjs from 'dayjs';
 
 /**
- * PKPass model representing an Apple Wallet Pass
- * Based on Apple's PassKit specification
+ * PKPass model representing a wallet pass (Apple PKPass or ESpass)
+ * Based on Apple's PassKit specification and ESpass open standard
  */
 
+export enum PKPassType {
+    PKPass = 'pkpass',
+    ESpass = 'espass'
+}
+
 export enum PKPassStyle {
     BoardingPass = 'boardingPass',
     Coupon = 'coupon',
@@ -135,6 +140,9 @@ export class PKPass extends Observable {
     id: string;
     page_id: string; // Changed from document_id to page_id
 
+    // Pass type identifier (pkpass or espass)
+    passType: PKPassType = PKPassType.PKPass;
+
     // PKPass data
     passData: PKPassData;
     images: PKPassImages;
@@ -147,10 +155,11 @@ export class PKPass extends Observable {
     createdDate: number;
     modifiedDate?: number;
 
-    constructor(id: string, pageId: string) {
+    constructor(id: string, pageId: string, passType: PKPassType = PKPassType.PKPass) {
         super();
         this.id = id;
         this.page_id = pageId;
+        this.passType = passType;
         this.createdDate = Date.now();
     }
 
@@ -207,6 +216,11 @@ export class PKPass extends Observable {
         return this.passData.voided === true;
     }
 
+    getLocalizedFieldLabel(field: any, currentLang: string): string {
+        if (!field) return null;
+        const label = field.label || field.key;
+        return this.getLocalizedValue(label, currentLang);
+    }
     /**
      * Get localized value for a given key based on current app language
      * @param key The key to localize
@@ -323,7 +337,7 @@ export class PKPass extends Observable {
     }
 
     static fromJSON(jsonObj: any): PKPass {
-        const pass = new PKPass(jsonObj.id, jsonObj.page_id || jsonObj.document_id); // Support both old and new schema
+        const pass = new PKPass(jsonObj.id, jsonObj.page_id || jsonObj.document_id, jsonObj.passType || PKPassType.PKPass); // Support both old and new schema
         Object.assign(pass, {
             passData: typeof jsonObj.passData === 'string' ? JSON.parse(jsonObj.passData) : jsonObj.passData,
             images: typeof jsonObj.images === 'string' ? JSON.parse(jsonObj.images) : jsonObj.images,
@@ -339,6 +353,7 @@ export class PKPass extends Observable {
         return {
             id: this.id,
             page_id: this.page_id,
+            passType: this.passType,
             passData: this.passData,
             images: this.images,
             // passJsonPath: this.passJsonPath,

app/models/PKPass.ts

@@ -6,7 +6,7 @@ import { doInBatch } from '@shared/utils/batch';
 import SqlQuery from 'kiss-orm/dist/Queries/SqlQuery';
 import CrudRepository from 'kiss-orm/dist/Repositories/CrudRepository';
 import { DocFolder, Document, IDocFolder, OCRDocument, OCRPage, Page, Tag } from '~/models/OCRDocument';
-import { PKPass } from '~/models/PKPass';
+import { PKPass, PKPassType } from '~/models/PKPass';
 import { EVENT_DOCUMENT_DELETED, SETTINGS_ROOT_DATA_FOLDER } from '~/utils/constants';
 import { groupByArray } from '@shared/utils';
 import DatabaseInterface from 'kiss-orm/dist/Databases/DatabaseInterface';
@@ -203,6 +203,10 @@ export class PKPassRepository extends BaseRepository<PKPass, PKPass> {
         });
     }
 
+    migrations = {
+        addPassType: sql`ALTER TABLE PKPass ADD COLUMN passType TEXT NOT NULL DEFAULT 'pkpass'`
+    };
+
     async createTables() {
         return this.database.query(sql`
         CREATE TABLE IF NOT EXISTS "PKPass" (
@@ -225,6 +229,7 @@ export class PKPassRepository extends BaseRepository<PKPass, PKPass> {
             cleanUndefined({
                 id: pkpass.id,
                 page_id: pkpass.page_id,
+                passType: pkpass.passType || PKPassType.PKPass,
                 passData: JSON.stringify(pkpass.passData),
                 images: JSON.stringify(pkpass.images),
                 // passJsonPath: pkpass.passJsonPath,
@@ -261,7 +266,7 @@ export class PKPassRepository extends BaseRepository<PKPass, PKPass> {
 
     async createModelFromAttributes(attributes: any): Promise<PKPass> {
         const { images, passData, ...other } = attributes;
-        const model = new PKPass(attributes.id, attributes.page_id || attributes.document_id); // Support both for migration
+        const model = new PKPass(attributes.id, attributes.page_id || attributes.document_id, attributes.passType || PKPassType.PKPass); // Support both for migration
         Object.assign(model, {
             ...other,
             passData: typeof passData === 'string' ? JSON.parse(passData) : passData,

app/services/documents.ts

@@ -53,6 +53,7 @@ export const SEPARATOR = '/';
 export const IMG_FORMAT = 'jpg';
 export const PDF_EXT = '.pdf';
 export const PKPASS_EXT = '.pkpass';
+export const ESPASS_EXT = '.espass';
 export const CARD_RATIO = 0.629;
 export const IMAGE_DECODE_HEIGHT = Math.max(Screen.mainScreen.widthPixels, Screen.mainScreen.heightPixels);