From aa29d65d67a133414e63ee500d43177ac15287ef Mon Sep 17 00:00:00 2001
From: Martin Guillon <dev@akylas.fr>
Date: Sat, 24 Oct 2026 14:24:10 +0200
Subject: [PATCH 01/11] refactor(ui): migrate to the ui-native-components
 packages

Replace every ui-material-* plugin with the @nativescript-community/ui-* ones (button, switch,
slider, textfield, textview, dialogs, bottomsheet, snackbar, progress, activityindicator,
segmentedbar) so the app and the shared tools components use one set of plugins.

- rename `mdbutton` to `uibutton` (kept as an alias for the shared components) and update the
  css selectors to the new element types
- keep the sqlite 3 database wrapper in app/db: the shared one needs sqlite-core 4
- add the Mac Catalyst window helper, the @nativescript/ios runtime for Catalyst and the
  prepare/run catalyst scripts

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 app/android/camera_scan_activity.ts           |   2 +-
 app/app.android.scss                          |   2 +-
 app/app.common.scss                           |  12 +-
 app/app.ts                                    |  40 ++-
 app/components/ModalImportImages.svelte       |  12 +-
 app/components/OAuthWebViewModal.svelte       |   2 +-
 app/components/camera/Camera.svelte           |   8 +-
 app/components/common/CActionBar.svelte       |   2 +-
 app/components/common/ColorPicker.svelte      |   6 +-
 app/components/common/DocumentPicker.svelte   |   4 +-
 .../common/EditNameActionBar.svelte           |   4 +-
 app/components/common/FolderTextView.svelte   |   2 +-
 app/components/common/FolderView.svelte       |   4 +-
 app/components/common/LoadingIndicator.svelte |   2 +-
 .../common/RemoteFolderTextField.svelte       |   2 +-
 app/components/common/SelectionToolbar.svelte |   4 +-
 .../common/TransformPagesBottomSheet.svelte   |   6 +-
 app/components/edit/CropEditView.svelte       |   8 +-
 app/components/edit/DocumentEdit.svelte       |  22 +-
 app/components/list/CardListCell.svelte       |   2 +-
 app/components/ocr/OCRDataView.svelte         |   6 +-
 .../ocr/OCRSettingsBottomSheet.svelte         |  10 +-
 app/components/pdf/PDFPreview.svelte          |  12 +-
 app/components/qrcode/CreateBarcode.svelte    |   2 +-
 app/components/security/PasscodeWindow.svelte |   4 +-
 .../settings/FolderManagementView.svelte      |   4 +-
 app/components/settings/Settings.svelte       |  10 +-
 app/components/settings/StorageView.svelte    |   2 +-
 .../settings/sync/DataSyncSettings.svelte     |   2 +-
 .../settings/sync/ImageSyncSettings.svelte    |   4 +-
 .../settings/sync/OAuthSettingsView.svelte    |   4 +-
 .../settings/sync/PDFSyncSettings.svelte      |   6 +-
 .../sync/SyncFoldersSettingsView.svelte       |   2 +-
 .../settings/sync/SyncListSettings.svelte     |   2 +-
 .../sync/SyncSettingsCollectionView.svelte    |   6 +-
 .../paperless/PaperlessNgxSettingsView.svelte |   2 +-
 .../sync/webdav/WebdavSettingsView.svelte     |   4 +-
 app/components/view/CardView.svelte           |  28 +-
 app/components/view/DocumentView.svelte       |  14 +-
 app/components/widgets/Chip.svelte            |   2 +-
 app/components/widgets/CreateCard.svelte      |   2 +-
 .../widgets/ExtraFieldPicker.svelte           |   4 +-
 app/db/NSQLDatabase.ts                        |  78 +++++
 app/i18n/en.json                              |   3 +
 app/services/documents.ts                     |   2 +-
 app/utils/ui/index.android.ts                 |   4 +-
 app/utils/ui/index.common.ts                  |   4 +-
 nativescript.config.js                        |   4 +-
 package.json                                  |  33 +-
 tsconfig.json                                 |   2 +-
 typings/ios.d.ts                              |   3 +
 vitest.setup.ts                               |   2 +-
 yarn.lock                                     | 300 ++++++++++--------
 53 files changed, 425 insertions(+), 288 deletions(-)
 create mode 100644 app/db/NSQLDatabase.ts

diff --git a/app/android/camera_scan_activity.ts b/app/android/camera_scan_activity.ts
index 0e9388711..d0d76201d 100644
--- a/app/android/camera_scan_activity.ts
+++ b/app/android/camera_scan_activity.ts
@@ -1,5 +1,5 @@
 import { AppUtilsAndroid } from '@akylas/nativescript-app-utils';
-import { showBottomSheet } from '@nativescript-community/ui-material-bottomsheet/svelte';
+import { showBottomSheet } from '@nativescript-community/ui-bottomsheet/svelte';
 import {
     AndroidActivityBackPressedEventData,
     AndroidActivityCallbacks,
diff --git a/app/app.android.scss b/app/app.android.scss
index 3504ca9c7..b10ec4584 100644
--- a/app/app.android.scss
+++ b/app/app.android.scss
@@ -1,4 +1,4 @@
 @import './app.common';
 checkbox {
-    margin-right: -16;
+    margin-right: 0;
 }
diff --git a/app/app.common.scss b/app/app.common.scss
index 2c5bd2b0a..e1081fcc8 100644
--- a/app/app.common.scss
+++ b/app/app.common.scss
@@ -51,8 +51,8 @@
     font-family: $mdiFontFamily;
 }
 
-mdtextfield,
-mdtextview {
+textfield,
+textview {
     stroke-color: var(--colorOutline);
     placeholder-color: var(--colorOutline);
     color: var(--colorOnBackground);
@@ -64,8 +64,8 @@ checkbox {
     fill-color: var(--colorPrimary);
 }
 
-mdbutton[variant='flat'],
-mdbutton[variant='contained'] {
+button[variant='flat'],
+button[variant='contained'] {
     background-color: var(--colorPrimary);
     color: var(--colorOnPrimary);
 }
@@ -86,7 +86,7 @@ htmllabel {
     // white-space: normal;
 }
 
-// mdtextfield {
+// textfield {
 //     color: black;
 //     // background-color: white;
 //     // placeholder-color: black;
@@ -152,7 +152,7 @@ frame {
 label,
 canvaslabel,
 htmllabel,
-mdtextfield,
+textfield,
 .actionBarTitle,
 .actionBarSubtitle {
     &:black,
diff --git a/app/app.ts b/app/app.ts
index e8ecb742f..31f82c8bc 100644
--- a/app/app.ts
+++ b/app/app.ts
@@ -1,22 +1,23 @@
+import { startWindowHelper } from '@shared/utils/window';
 import { GestureRootView, install as installGestures } from '@nativescript-community/gesturehandler';
 import { installMixins as installUIMixins } from '@nativescript-community/systemui';
 import { overrideSpanAndFormattedString } from '@nativescript-community/text';
 import SwipeMenuElement from '@nativescript-community/ui-collectionview-swipemenu/svelte';
 import CollectionViewElement from '@nativescript-community/ui-collectionview/svelte';
-import SegmentedBarElement from '@nativescript-community/ui-material-segmentedbar/svelte/SegmentedBarElement';
+import { register as registerAppBar } from '@nativescript-community/ui-appbar/svelte';
 import DrawerElement from '@nativescript-community/ui-drawer/svelte';
 import { ImagePipeline, ImageViewTraceCategory, getImagePipeline, initialize } from '@nativescript-community/ui-image';
 import { installMixins as installColorFilters } from '@nativescript-community/ui-image-colorfilter';
 import { Label } from '@nativescript-community/ui-label';
-import { install as installBottomSheets } from '@nativescript-community/ui-material-bottomsheet';
-import { installMixins, themer } from '@nativescript-community/ui-material-core';
+import { install as installBottomSheets } from '@nativescript-community/ui-bottomsheet';
+import { installMixins, themer } from '@nativescript-community/ui-core';
 import { Pager } from '@nativescript-community/ui-pager';
 import PagerElement from '@nativescript-community/ui-pager/svelte';
 import { Application, ApplicationSettings, Frame, NavigatedData, Page, Trace } from '@nativescript/core';
 import { startSentry } from '@shared/utils/sentry';
 import { showError } from '@shared/utils/showError';
 import { CropView } from 'plugin-nativeprocessor/CropView';
-import { FrameElement, PageElement, createElement, navigate, registerElement, registerNativeViewElement } from '@nativescript-community/svelte-native/dom';
+import { FrameElement, NativeElementPropType, PageElement, createElement, navigate, registerElement, registerNativeViewElement } from '@nativescript-community/svelte-native/dom';
 import { NestedScrollView } from '@shared/components/NestedScrollView';
 import { getCurrentISO3Language, lc } from '~/helpers/locale';
 import { start as startThemeHelper } from '~/helpers/theme';
@@ -81,15 +82,19 @@ try {
     registerNativeViewElement('GridLayout', () => require('@nativescript/core').GridLayout);
     registerNativeViewElement('ScrollView', () => NestedScrollView as any);
     registerNativeViewElement('StackLayout', () => require('@nativescript/core').StackLayout);
-    registerNativeViewElement('Switch', () => require('@nativescript-community/ui-material-switch').Switch);
+    registerNativeViewElement('Switch', () => require('@nativescript-community/ui-switch').Switch);
     registerNativeViewElement('Span', () => require('@nativescript/core').Span);
 
-    registerNativeViewElement('slider', () => require('@nativescript-community/ui-material-slider').Slider, null, {}, { override: true });
-    registerNativeViewElement('textview', () => require('@nativescript-community/ui-material-textview').TextView, null, {}, { override: true });
-    registerNativeViewElement('textfield', () => require('@nativescript-community/ui-material-textfield').TextField, null, {}, { override: true });
-    registerNativeViewElement('mdbutton', () => require('@nativescript-community/ui-material-button').Button);
-    registerNativeViewElement('activityIndicator', () => require('@nativescript-community/ui-material-activityindicator').ActivityIndicator);
-    registerNativeViewElement('progress', () => require('@nativescript-community/ui-material-progress').Progress);
+    registerNativeViewElement('slider', () => require('@nativescript-community/ui-slider').Slider, null, {}, { override: true });
+    registerNativeViewElement('textview', () => require('@nativescript-community/ui-textview').TextView, null, {}, { override: true });
+    registerNativeViewElement('textfield', () => require('@nativescript-community/ui-textfield').TextField, null, {}, { override: true });
+    registerAppBar();
+    registerNativeViewElement('uibutton', () => require('@nativescript-community/ui-button').Button);
+    registerNativeViewElement('uifloatingactionbutton', () => require('@nativescript-community/ui-floatingactionbutton').FloatingActionButton);
+    // the shared components still use the mdbutton tag
+    registerNativeViewElement('mdbutton', () => require('@nativescript-community/ui-button').Button);
+    registerNativeViewElement('activityIndicator', () => require('@nativescript-community/ui-activityindicator').ActivityIndicator);
+    registerNativeViewElement('progress', () => require('@nativescript-community/ui-progress').Progress);
     registerNativeViewElement('label', () => Label);
     registerNativeViewElement('image', () => require('@nativescript-community/ui-image').Img);
     registerNativeViewElement('zoomimage', () => require('@nativescript-community/ui-zoomimage').ZoomImg);
@@ -103,13 +108,14 @@ try {
     registerNativeViewElement('gesturerootview', () => require('@nativescript-community/gesturehandler').GestureRootView);
     registerNativeViewElement('awebview', () => require('@nativescript-community/ui-webview').AWebView);
     registerNativeViewElement('lottie', () => require('@nativescript-community/ui-lottie').LottieView);
+    registerNativeViewElement('segmentedbar', () => require('@nativescript-community/ui-segmentedbar').SegmentedBar, null, { items: NativeElementPropType.Array }, { override: true });
+    registerNativeViewElement('segmentedbaritem', () => require('@nativescript-community/ui-segmentedbar').SegmentedBarItem, 'items', {}, { override: true });
     registerNativeViewElement('pagerindicator', () => require('@nativescript-community/ui-pager-indicator').PagerIndicator);
     registerNativeViewElement('svgview', () => require('@nativescript-community/ui-svg').SVGView);
     // registerNativeViewElement('blurview', () => require('@nativescript-community/ui-blurview').BlurView);
 
     PagerElement.register();
     CollectionViewElement.register();
-    SegmentedBarElement.register();
     SwipeMenuElement.register();
     DrawerElement.register();
     const shouldEnableSentry = ApplicationSettings.getBoolean(SETTINGS_ENABLE_CRASH_REPORT, PLAY_STORE_BUILD);
@@ -152,6 +158,16 @@ try {
     Application.on(Application.launchEvent, async () => {
         // DEV_LOG && console.log('launch');
         startThemeHelper();
+        startWindowHelper({
+            startWidth: 1300,
+            startHeight: 940,
+            minWidth: 480,
+            minHeight: 560,
+            commands: [
+                { id: 'search', title: lc('search'), input: 'f', menu: 'edit' },
+                { id: 'preferences', title: lc('preferences'), input: ',', menu: 'preferences' }
+            ]
+        });
         launched = true;
         start();
     });
diff --git a/app/components/ModalImportImages.svelte b/app/components/ModalImportImages.svelte
index 196c413b4..c14414dc9 100644
--- a/app/components/ModalImportImages.svelte
+++ b/app/components/ModalImportImages.svelte
@@ -107,7 +107,7 @@
             </Template>
         </pager>
         <PageIndicator colSpan={3} horizontalAlignment="right" margin="10 10 0 0" row={2} scale={$fontScale} text={`${currentIndex + 1}/${items.length}`} />
-        <mdbutton
+        <uibutton
             class="icon-btn"
             color={textColor}
             fontSize={46}
@@ -121,7 +121,7 @@
             on:tap={() => changePage(-1)}
         />
         <label col={1} color={textColor} fontSize={13} row={3} text={lc('crop_edit_doc')} textAlignment="center" textWrap={true} verticalAlignment="center" />
-        <mdbutton
+        <uibutton
             class="icon-btn"
             col={2}
             color={textColor}
@@ -135,8 +135,8 @@
             visibility={currentIndex < items.length - 1 ? 'visible' : 'hidden'}
             on:tap={() => changePage(1)}
         />
-        <mdbutton class="fab" colSpan={3} elevation={0} horizontalAlignment="center" row={4} text="mdi-check" variant="text" on:tap={onTapFinish} />
-        <mdbutton
+        <uibutton class="fab" colSpan={3} elevation={0} horizontalAlignment="center" row={4} text="mdi-check" variant="text" on:tap={onTapFinish} />
+        <uibutton
             class="icon-btn"
             colSpan={3}
             color={textColor}
@@ -149,8 +149,8 @@
             on:tap={resetCrop}
         />
         <CActionBar backgroundColor="transparent" buttonsDefaultVisualState={visualState} colSpan={3} modalWindow={true} {onGoBack} title={null}>
-            <mdbutton class="actionBarButton" defaultVisualState={visualState} isEnabled={currentItem?.undos.length > 0} text="mdi-undo" variant="text" on:tap={onUndo} />
-            <mdbutton class="actionBarButton" defaultVisualState={visualState} isEnabled={currentItem?.redos.length > 0} text="mdi-redo" variant="text" on:tap={onRedo} />
+            <uibutton class="actionBarButton" defaultVisualState={visualState} isEnabled={currentItem?.undos.length > 0} text="mdi-undo" variant="text" on:tap={onUndo} />
+            <uibutton class="actionBarButton" defaultVisualState={visualState} isEnabled={currentItem?.redos.length > 0} text="mdi-redo" variant="text" on:tap={onRedo} />
         </CActionBar>
     </gridlayout>
 </page>
diff --git a/app/components/OAuthWebViewModal.svelte b/app/components/OAuthWebViewModal.svelte
index f5144c37f..b863888bf 100644
--- a/app/components/OAuthWebViewModal.svelte
+++ b/app/components/OAuthWebViewModal.svelte
@@ -57,7 +57,7 @@
             <activityindicator busy={loading} visibility={loading ? 'visible' : 'collapse'} />
         </gridlayout>
         <CActionBar canGoBack={false} modalWindow={true} title={lc('authentication')}>
-            <mdbutton text={lc('cancel')} variant="text" verticalAlignment="middle" on:tap={onCancel} />
+            <uibutton text={lc('cancel')} variant="text" verticalAlignment="middle" on:tap={onCancel} />
         </CActionBar>
     </gridlayout>
 </page>
diff --git a/app/components/camera/Camera.svelte b/app/components/camera/Camera.svelte
index 092547cc4..4ce6a376b 100644
--- a/app/components/camera/Camera.svelte
+++ b/app/components/camera/Camera.svelte
@@ -3,9 +3,9 @@
     import { NativeViewElementNode } from '@nativescript-community/svelte-native/dom';
     import { CameraView } from '@nativescript-community/ui-cameraview';
     import { Canvas, CanvasView, Paint, Style } from '@nativescript-community/ui-canvas';
-    import { showBottomSheet } from '@nativescript-community/ui-material-bottomsheet/svelte';
-    import { confirm } from '@nativescript-community/ui-material-dialogs';
-    import { Slider } from '@nativescript-community/ui-material-slider/slider';
+    import { showBottomSheet } from '@nativescript-community/ui-bottomsheet/svelte';
+    import { confirm } from '@nativescript-community/ui-dialogs';
+    import { Slider } from '@nativescript-community/ui-slider';
     import { AbsoluteLayout, AndroidActivityBackPressedEventData, Application, ApplicationSettings, Page, Utils, knownFolders, path } from '@nativescript/core';
     import { ImageSource } from '@nativescript/core/image-source';
     import { debounce, wrapNativeException } from '@nativescript/core/utils';
@@ -851,7 +851,7 @@
                 <label color="white" fontSize={20} isUserInteractionEnabled={false} text={nbPages + ''} textAlignment="center" verticalAlignment="middle" visibility={nbPages ? 'visible' : 'hidden'} />
             </gridlayout>
 
-            <mdbutton
+            <uibutton
                 class="fab"
                 accessibilityLabel={lc('finish')}
                 col={4}
diff --git a/app/components/common/CActionBar.svelte b/app/components/common/CActionBar.svelte
index 85f8f9340..aeb98bb2b 100644
--- a/app/components/common/CActionBar.svelte
+++ b/app/components/common/CActionBar.svelte
@@ -66,7 +66,7 @@
     />
     <stacklayout col={0} orientation="horizontal">
         <slot name="left" />
-        <mdbutton class={'actionBarButton ' + clazz} defaultVisualState={buttonsDefaultVisualState} text={menuIcon} variant="text" visibility={menuIconVisibility} on:tap={onMenuIcon} />
+        <uibutton class={'actionBarButton ' + clazz} defaultVisualState={buttonsDefaultVisualState} text={menuIcon} variant="text" visibility={menuIconVisibility} on:tap={onMenuIcon} />
     </stacklayout>
     <stacklayout col={2} orientation="horizontal">
         <slot />
diff --git a/app/components/common/ColorPicker.svelte b/app/components/common/ColorPicker.svelte
index c52f504e8..f847476bd 100644
--- a/app/components/common/ColorPicker.svelte
+++ b/app/components/common/ColorPicker.svelte
@@ -15,7 +15,7 @@
     import { lc, lu } from '@nativescript-community/l';
     import { Template } from '@nativescript-community/svelte-native/components';
     import { NativeViewElementNode } from '@nativescript-community/svelte-native/dom';
-    import { closeBottomSheet } from '@nativescript-community/ui-material-bottomsheet/svelte';
+    import { closeBottomSheet } from '@nativescript-community/ui-bottomsheet/svelte';
     import { onMount } from 'svelte';
     import { colors, screenWidthDips } from '~/variables';
     const SLIDER_HEIGHT = 32;
@@ -732,7 +732,7 @@
 <!-- <page actionBarHidden={true}> -->
 <gesturerootview rows="auto,*" {...$$restProps}>
     <!-- <CActionBar title="Color Picker">
-        <mdbutton class="actionBarButton" text="mdi-eyedropper-variant" variant="text" on:tap={startScreenPicker} />
+        <uibutton class="actionBarButton" text="mdi-eyedropper-variant" variant="text" on:tap={startScreenPicker} />
     </CActionBar> -->
     <gridlayout padding={16} row={1} rows="auto,*, auto, auto, auto, auto">
         <!-- <gridlayout backgroundColor={hsvaToHex()} borderRadius="18" height="90" /> -->
@@ -813,7 +813,7 @@
                     }}
                 />
 
-                <mdbutton col={1} text={lc('select')} verticalAlignment="center" on:tap={(e) => closeBottomSheet(currentColor)} />
+                <uibutton col={1} text={lc('select')} verticalAlignment="center" on:tap={(e) => closeBottomSheet(currentColor)} />
             </gridlayout>
         </stacklayout>
     </gridlayout>
diff --git a/app/components/common/DocumentPicker.svelte b/app/components/common/DocumentPicker.svelte
index f1af15344..360781596 100644
--- a/app/components/common/DocumentPicker.svelte
+++ b/app/components/common/DocumentPicker.svelte
@@ -175,10 +175,10 @@
 
     <stacklayout slot="fab" class="fabHolder" marginBottom={Math.min(60, $windowInset.bottom)} orientation="horizontal" row={2}>
         {#if nbSelected > 0}
-            <mdbutton id="fab" class="fab" verticalAlignment="center" on:tap={throttle(() => importSelectedDocuments(), 500)}>
+            <uibutton id="fab" class="fab" verticalAlignment="center" on:tap={throttle(() => importSelectedDocuments(), 500)}>
                 <cspan fontFamily={$fonts.mdi} fontSize={24} text="mdi-check  " />
                 <cspan text={lc('import_documents')} />
-            </mdbutton>
+            </uibutton>
         {/if}
     </stacklayout>
     <stacklayout slot="abovecollectionview" horizontalAlignment="left" row={1}>
diff --git a/app/components/common/EditNameActionBar.svelte b/app/components/common/EditNameActionBar.svelte
index 469afa2c3..97d446b16 100644
--- a/app/components/common/EditNameActionBar.svelte
+++ b/app/components/common/EditNameActionBar.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { NativeViewElementNode } from '@nativescript-community/svelte-native/dom';
     import CActionBar from './CActionBar.svelte';
-    import { TextField } from '@nativescript-community/ui-material-textfield';
+    import { TextField } from '@nativescript-community/ui-textfield';
     import { DocFolder, OCRDocument } from '~/models/OCRDocument';
     import { shortcutService } from '~/services/shortcuts';
     import { showError } from '@shared/utils/showError';
@@ -76,7 +76,7 @@
             on:returnPress={saveDocumentTitle}
             on:layoutChanged={onTextFieldFocus}
         />
-        <mdbutton class="actionBarButton" col={1} defaultVisualState={buttonsDefaultVisualState} text="mdi-content-save" variant="text" on:tap={saveDocumentTitle} />
+        <uibutton class="actionBarButton" col={1} defaultVisualState={buttonsDefaultVisualState} text="mdi-content-save" variant="text" on:tap={saveDocumentTitle} />
     </gridlayout>
     <slot />
 </CActionBar>
diff --git a/app/components/common/FolderTextView.svelte b/app/components/common/FolderTextView.svelte
index 92796bb11..86366a071 100644
--- a/app/components/common/FolderTextView.svelte
+++ b/app/components/common/FolderTextView.svelte
@@ -41,5 +41,5 @@
         text={getDirectoryActualName(text)}
         {variant}
     />
-    <mdbutton class="icon-btn" color={colorOnSurfaceVariant} horizontalAlignment="right" text="mdi-folder-open" variant="text" verticalAlignment="middle" />
+    <uibutton class="icon-btn" color={colorOnSurfaceVariant} horizontalAlignment="right" text="mdi-folder-open" variant="text" verticalAlignment="middle" />
 </gridlayout>
diff --git a/app/components/common/FolderView.svelte b/app/components/common/FolderView.svelte
index 5a00a54f2..def6d1bb3 100644
--- a/app/components/common/FolderView.svelte
+++ b/app/components/common/FolderView.svelte
@@ -61,7 +61,7 @@
 </script>
 
 <gesturerootview {...$$restProps} {padding} rows="auto,auto,auto,auto" on:layoutChanged={(e) => (closeCallback = e.object['bindingContext']?.closeCallback)}>
-    <mdbutton height={30} horizontalAlignment="left" margin="2" text={topFolder} visibility={topFolder ? 'visible' : 'collapse'} />
+    <uibutton height={30} horizontalAlignment="left" margin="2" text={topFolder} visibility={topFolder ? 'visible' : 'collapse'} />
     <textfield
         autocapitalizationType="none"
         autocorrect={false}
@@ -78,7 +78,7 @@
         <label marginTop={15} row={2} text={lc('existing_folders')} />
         <wraplayout margin={5} row={3}>
             {#each foundFolders as group (group.id)}
-                <mdbutton height={30} margin="2" text={group.name} on:tap={() => onFolderTap(group)} />
+                <uibutton height={30} margin="2" text={group.name} on:tap={() => onFolderTap(group)} />
             {/each}
         </wraplayout>
     {/if}
diff --git a/app/components/common/LoadingIndicator.svelte b/app/components/common/LoadingIndicator.svelte
index 6ec74f713..043949cc8 100644
--- a/app/components/common/LoadingIndicator.svelte
+++ b/app/components/common/LoadingIndicator.svelte
@@ -17,6 +17,6 @@
         <activityindicator busy={true} row={1} visibility={progress === null ? 'visible' : 'collapse'} />
         <label col={1} fontSize={16 * $fontScale} padding={10} row={1} {text} textWrap={true} verticalAlignment="middle" />
         <progress colSpan={2} margin="10 10 0 10" maxValue={100} row={2} value={progress} visibility={progress !== null ? 'visible' : 'collapse'} />
-        <mdbutton colSpan={2} horizontalAlignment="right" row={3} text={lc('cancel')} variant="text" visibility={showButton ? 'visible' : 'collapse'} on:tap={onButtonTap} />
+        <uibutton colSpan={2} horizontalAlignment="right" row={3} text={lc('cancel')} variant="text" visibility={showButton ? 'visible' : 'collapse'} on:tap={onButtonTap} />
     </gesturerootview>
 </template>
diff --git a/app/components/common/RemoteFolderTextField.svelte b/app/components/common/RemoteFolderTextField.svelte
index 032d9b506..78d23833f 100644
--- a/app/components/common/RemoteFolderTextField.svelte
+++ b/app/components/common/RemoteFolderTextField.svelte
@@ -22,5 +22,5 @@
         on:returnPress
         on:textChange
     />
-    <mdbutton class="icon-btn" color={colorOnSurfaceVariant} horizontalAlignment="right" text="mdi-folder-open" variant="text" verticalAlignment="middle" />
+    <uibutton class="icon-btn" color={colorOnSurfaceVariant} horizontalAlignment="right" text="mdi-folder-open" variant="text" verticalAlignment="middle" />
 </gridlayout>
diff --git a/app/components/common/SelectionToolbar.svelte b/app/components/common/SelectionToolbar.svelte
index d491fef9c..b0190c59d 100644
--- a/app/components/common/SelectionToolbar.svelte
+++ b/app/components/common/SelectionToolbar.svelte
@@ -64,10 +64,10 @@
     <stacklayout col={hasOverflow ? 1 : 0} horizontalAlignment="center" orientation="horizontal">
         {#each visibleOptions as option, index}
             {@const color = typeof option.color === 'function' ? option['color'](options) : option.color}
-            <mdbutton class="selectionToolbarButton" color={color || colorOnSurface} text={option.icon} variant="text" on:tap={(event) => handleAction(event, option)} />
+            <uibutton class="selectionToolbarButton" color={color || colorOnSurface} text={option.icon} variant="text" on:tap={(event) => handleAction(event, option)} />
         {/each}
     </stacklayout>
     {#if hasOverflow}
-        <mdbutton class="selectionToolbarButton" col={2} color={colorOnSurface} text="mdi-dots-vertical" variant="text" on:tap={showMoreOptions} />
+        <uibutton class="selectionToolbarButton" col={2} color={colorOnSurface} text="mdi-dots-vertical" variant="text" on:tap={showMoreOptions} />
     {/if}
 </gridlayout>
diff --git a/app/components/common/TransformPagesBottomSheet.svelte b/app/components/common/TransformPagesBottomSheet.svelte
index cd5174d80..b0a35988c 100644
--- a/app/components/common/TransformPagesBottomSheet.svelte
+++ b/app/components/common/TransformPagesBottomSheet.svelte
@@ -5,7 +5,7 @@
     import { NativeViewElementNode } from '@nativescript-community/svelte-native/dom';
     import { CheckBox } from '@nativescript-community/ui-checkbox';
     import { CollectionView } from '@nativescript-community/ui-collectionview';
-    import { closeBottomSheet } from '@nativescript-community/ui-material-bottomsheet/svelte';
+    import { closeBottomSheet } from '@nativescript-community/ui-bottomsheet/svelte';
     import { VerticalPosition } from '@nativescript-community/ui-popover';
     import { View } from '@nativescript/core';
     import ListItemAutoSize from '@shared/components/ListItemAutoSize.svelte';
@@ -234,6 +234,6 @@
             </collectionview>
         </stacklayout>
     </scrollview>
-    <mdbutton row={1} text={lc('apply')} on:tap={startUpdate} />
-    <mdbutton col={1} margin="12 10 12 10" row={1} text={lc('reset')} variant="outline" on:tap={resetAll} />
+    <uibutton row={1} text={lc('apply')} on:tap={startUpdate} />
+    <uibutton col={1} margin="12 10 12 10" row={1} text={lc('reset')} variant="outline" on:tap={resetAll} />
 </gesturerootview>
diff --git a/app/components/edit/CropEditView.svelte b/app/components/edit/CropEditView.svelte
index 9c2b3bd65..6b551490c 100644
--- a/app/components/edit/CropEditView.svelte
+++ b/app/components/edit/CropEditView.svelte
@@ -60,11 +60,11 @@
     <gridlayout class="pageContent" backgroundColor={visualState} rows="auto,*,auto,auto" android:paddingBottom={$windowInset.bottom}>
         <CropView bind:this={cropView} {...cropItem ? cropItem : null} row={1} bind:quadChanged bind:quads on:undosChanged={onUndosChanged} />
         <label color={textColor} fontSize={13} padding={10} row={2} text={lc('crop_edit_doc')} textAlignment="center" textWrap={true} />
-        <mdbutton class="fab" elevation={0} horizontalAlignment="center" margin="0" row={3} text="mdi-check" variant="text" on:tap={() => onRecropTapFinish()} />
-        <mdbutton class="icon-btn" color={textColor} horizontalAlignment="right" marginRight={10} row={3} text="mdi-arrow-expand-all" variant="text" verticalAlignment="center" on:tap={resetCrop} />
+        <uibutton class="fab" elevation={0} horizontalAlignment="center" margin="0" row={3} text="mdi-check" variant="text" on:tap={() => onRecropTapFinish()} />
+        <uibutton class="icon-btn" color={textColor} horizontalAlignment="right" marginRight={10} row={3} text="mdi-arrow-expand-all" variant="text" verticalAlignment="center" on:tap={resetCrop} />
         <CActionBar backgroundColor="transparent" buttonsDefaultVisualState={visualState} modalWindow={true} title={null}>
-            <mdbutton class="actionBarButton" defaultVisualState={visualState} isEnabled={cropItem?.undos.length > 0} text="mdi-undo" variant="text" on:tap={onUndo} />
-            <mdbutton class="actionBarButton" defaultVisualState={visualState} isEnabled={cropItem?.redos.length > 0} text="mdi-redo" variant="text" on:tap={onRedo} />
+            <uibutton class="actionBarButton" defaultVisualState={visualState} isEnabled={cropItem?.undos.length > 0} text="mdi-undo" variant="text" on:tap={onUndo} />
+            <uibutton class="actionBarButton" defaultVisualState={visualState} isEnabled={cropItem?.redos.length > 0} text="mdi-redo" variant="text" on:tap={onRedo} />
         </CActionBar>
     </gridlayout>
 </page>
diff --git a/app/components/edit/DocumentEdit.svelte b/app/components/edit/DocumentEdit.svelte
index d5ffc587a..d4f34b716 100644
--- a/app/components/edit/DocumentEdit.svelte
+++ b/app/components/edit/DocumentEdit.svelte
@@ -3,8 +3,8 @@
     import { NativeViewElementNode } from '@nativescript-community/svelte-native/dom';
     import { CollectionView } from '@nativescript-community/ui-collectionview';
     import { Img } from '@nativescript-community/ui-image';
-    import { showBottomSheet } from '@nativescript-community/ui-material-bottomsheet/svelte';
-    import { confirm } from '@nativescript-community/ui-material-dialogs';
+    import { showBottomSheet } from '@nativescript-community/ui-bottomsheet/svelte';
+    import { confirm } from '@nativescript-community/ui-dialogs';
     import { Pager } from '@nativescript-community/ui-pager';
     import { HorizontalPosition, VerticalPosition } from '@nativescript-community/ui-popover';
     import { showPopover } from '@nativescript-community/ui-popover/svelte';
@@ -771,15 +771,15 @@
         </stacklayout>
 
         <stacklayout borderTopColor={colorOutline} borderTopWidth={1} orientation="horizontal" row={4}>
-            <mdbutton class="icon-btn" text="mdi-crop" variant="text" visibility={currentItem?.sourceImagePath ? 'visible' : 'collapse'} on:tap={() => cropEdit()} />
-            <mdbutton class="icon-btn" text="mdi-rotate-left" variant="text" on:tap={() => rotateImageLeft()} />
-            <mdbutton class="icon-btn" text="mdi-rotate-right" variant="text" on:tap={() => rotateImageRight()} />
-            <mdbutton class="icon-btn" text="mdi-auto-fix" variant="text" on:tap={showEnhancements} />
-            <mdbutton class="icon-btn" text="mdi-brightness-6" variant="text" on:tap={editBrightnessContrast} />
+            <uibutton class="icon-btn" text="mdi-crop" variant="text" visibility={currentItem?.sourceImagePath ? 'visible' : 'collapse'} on:tap={() => cropEdit()} />
+            <uibutton class="icon-btn" text="mdi-rotate-left" variant="text" on:tap={() => rotateImageLeft()} />
+            <uibutton class="icon-btn" text="mdi-rotate-right" variant="text" on:tap={() => rotateImageRight()} />
+            <uibutton class="icon-btn" text="mdi-auto-fix" variant="text" on:tap={showEnhancements} />
+            <uibutton class="icon-btn" text="mdi-brightness-6" variant="text" on:tap={editBrightnessContrast} />
             {#if CARD_APP}
-                <mdbutton class="actionBarButton" text="mdi-qrcode-scan" variant="text" on:tap={detectQRCode} />
+                <uibutton class="actionBarButton" text="mdi-qrcode-scan" variant="text" on:tap={detectQRCode} />
             {/if}
-            <mdbutton class="actionBarButton" text="mdi-text-recognition" variant="text" on:tap={showOCRSettings} />
+            <uibutton class="actionBarButton" text="mdi-text-recognition" variant="text" on:tap={showOCRSettings} />
         </stacklayout>
         <!-- <collectionview bind:this={collectionView} id="filters" colWidth={FILTER_COL_WIDTH} height={FILTER_ROW_HEIGHT} items={filters} orientation="horizontal" row={4}>
             <Template let:item>
@@ -809,8 +809,8 @@
             </Template>
         </collectionview> -->
         <CActionBar {onGoBack} onTitleTap={() => (editingTitle = true)} title={document.name} titleProps={{ autoFontSize: true, padding: 0 }}>
-            <mdbutton class="actionBarButton" text="mdi-file-pdf-box" variant="text" on:tap={showPDFPopover} />
-            <mdbutton class="actionBarButton" text="mdi-delete" variant="text" on:tap={deleteCurrentPage} />
+            <uibutton class="actionBarButton" text="mdi-file-pdf-box" variant="text" on:tap={showPDFPopover} />
+            <uibutton class="actionBarButton" text="mdi-delete" variant="text" on:tap={deleteCurrentPage} />
         </CActionBar>
         {#if editingTitle}
             <EditNameActionBar {document} bind:editingTitle />
diff --git a/app/components/list/CardListCell.svelte b/app/components/list/CardListCell.svelte
index cc73a6354..6b1b1d67f 100644
--- a/app/components/list/CardListCell.svelte
+++ b/app/components/list/CardListCell.svelte
@@ -286,6 +286,6 @@
         <FavoriteIndicator favorite={item.doc.favorite === 1} />
         <!-- </gridlayout> -->
     </gridlayout>
-    <!-- <mdbutton prop:rightDrawer class="mdi" fontSize={40} height={60} text="mdi-fullscreen" variant="text" verticalAlignment="center" width={60} on:tap={() => showImages(item)} />
+    <!-- <uibutton prop:rightDrawer class="mdi" fontSize={40} height={60} text="mdi-fullscreen" variant="text" verticalAlignment="center" width={60} on:tap={() => showImages(item)} />
 </swipemenu> -->
 </gridlayout>
diff --git a/app/components/ocr/OCRDataView.svelte b/app/components/ocr/OCRDataView.svelte
index b082bf1ef..a2192674e 100644
--- a/app/components/ocr/OCRDataView.svelte
+++ b/app/components/ocr/OCRDataView.svelte
@@ -340,9 +340,9 @@
             on:textChange={(e) => (text = e.value)}
         />
         <CActionBar backgroundColor="transparent" buttonsDefaultVisualState={visualState} modalWindow={true} title={null}>
-            <mdbutton class="actionBarButton" color={textColor} text="mdi-content-save" variant="text" visibility={showTextView ? 'visible' : 'hidden'} on:tap={saveEdit} />
-            <mdbutton class="actionBarButton" color={textColor} text="mdi-content-copy" variant="text" on:tap={copyText} />
-            <mdbutton class="actionBarButton" color={textColor} text="mdi-image-text" variant="text" on:tap={toggleShowTextView} />
+            <uibutton class="actionBarButton" color={textColor} text="mdi-content-save" variant="text" visibility={showTextView ? 'visible' : 'hidden'} on:tap={saveEdit} />
+            <uibutton class="actionBarButton" color={textColor} text="mdi-content-copy" variant="text" on:tap={copyText} />
+            <uibutton class="actionBarButton" color={textColor} text="mdi-image-text" variant="text" on:tap={toggleShowTextView} />
         </CActionBar>
     </gridlayout>
 </page>
diff --git a/app/components/ocr/OCRSettingsBottomSheet.svelte b/app/components/ocr/OCRSettingsBottomSheet.svelte
index c799b985b..fbbe9f0fa 100644
--- a/app/components/ocr/OCRSettingsBottomSheet.svelte
+++ b/app/components/ocr/OCRSettingsBottomSheet.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { CollectionView } from '@nativescript-community/ui-collectionview';
-    import { closeBottomSheet } from '@nativescript-community/ui-material-bottomsheet/svelte';
+    import { closeBottomSheet } from '@nativescript-community/ui-bottomsheet/svelte';
     import { HorizontalPosition, VerticalPosition } from '@nativescript-community/ui-popover';
     import { showPopover } from '@nativescript-community/ui-popover/svelte';
     import { View, verticalAlignmentProperty } from '@nativescript/core';
@@ -163,7 +163,7 @@
         {/if}
         {#if onlySettings}
             <ListItemAutoSize item={{ title: lc('languages'), titleProps: { verticalAlignment: 'top' } }} paddingRight={0}>
-                <mdbutton class="icon-btn" col={1} marginTop={6} text="mdi-plus" variant="text" verticalAlignment="top" on:tap={addLanguages} />
+                <uibutton class="icon-btn" col={1} marginTop={6} text="mdi-plus" variant="text" verticalAlignment="top" on:tap={addLanguages} />
                 <wraplayout marginTop={50} verticalAlignment="bottom">
                     {#each languages as language (language)}
                         <Chip rightIcon={downloaded.indexOf(language) !== -1 ? 'mdi-download' : null} text={localizedLanguage(language, OCRLanguages)} on:tap={() => removeLanguage(language)} />
@@ -173,7 +173,7 @@
         {:else}
             <gridlayout columns="*,auto" marginBottom={16} marginTop={15} rows="auto">
                 <label class="sectionBigHeader" text={lc('languages')} verticalAlignment="middle" />
-                <mdbutton class="icon-btn" col={1} padding={0} text="mdi-plus" variant="text" on:tap={addLanguages} />
+                <uibutton class="icon-btn" col={1} padding={0} text="mdi-plus" variant="text" on:tap={addLanguages} />
             </gridlayout>
 
             <wraplayout row={1}>
@@ -186,11 +186,11 @@
             <textfield hint={lc('languages')} placeholder={lc('languages')} returnKeyType="search" variant="none" verticalTextAlignment="center" />
         </gridlayout> -->
         {#if !onlySettings}
-            <mdbutton horizontalAlignment="right" padding="10 16 10 16" row={1} text={lc('start')} on:tap={startOrCloseOCR} />
+            <uibutton horizontalAlignment="right" padding="10 16 10 16" row={1} text={lc('start')} on:tap={startOrCloseOCR} />
         {/if}
 
         {#if showDownloadButton}
-            <mdbutton horizontalAlignment="right" padding="10 16 10 16" row={1} text={lc('download')} on:tap={downloadLanguages} />
+            <uibutton horizontalAlignment="right" padding="10 16 10 16" row={1} text={lc('download')} on:tap={downloadLanguages} />
         {/if}
     </stacklayout>
 </gesturerootview>
diff --git a/app/components/pdf/PDFPreview.svelte b/app/components/pdf/PDFPreview.svelte
index 5b78e7992..8010793e4 100644
--- a/app/components/pdf/PDFPreview.svelte
+++ b/app/components/pdf/PDFPreview.svelte
@@ -2,7 +2,7 @@
     import { Paint } from '@nativescript-community/ui-canvas';
     import { CheckBox } from '@nativescript-community/ui-checkbox';
     import DrawerElement from '@nativescript-community/ui-drawer/svelte';
-    import { prompt } from '@nativescript-community/ui-material-dialogs';
+    import { prompt } from '@nativescript-community/ui-dialogs';
     import { Pager } from '@nativescript-community/ui-pager';
     import { VerticalPosition } from '@nativescript-community/ui-popover';
     import { ApplicationSettings, ObservableArray, Utils, View, knownFolders } from '@nativescript/core';
@@ -354,10 +354,10 @@
 
                 <gridlayout columns="*,*" row={2}>
                     {#if saveFunction}
-                        <mdbutton text={lc('save')} on:tap={() => saveFunction(pdfCanvas.options)} />
+                        <uibutton text={lc('save')} on:tap={() => saveFunction(pdfCanvas.options)} />
                     {:else}
-                        <mdbutton text={lc('export')} on:tap={exportPDF} />
-                        <mdbutton col={1} text={lc('open')} on:tap={openPDF} />
+                        <uibutton text={lc('export')} on:tap={exportPDF} />
+                        <uibutton col={1} text={lc('open')} on:tap={openPDF} />
                     {/if}
                 </gridlayout>
             </gridlayout>
@@ -438,9 +438,9 @@
 
         <CActionBar modalWindow={true} title={lc('pdf_preview')}>
             {#if __ANDROID__}
-                <mdbutton class="actionBarButton" text="mdi-printer" variant="text" on:tap={onPrintPDF} />
+                <uibutton class="actionBarButton" text="mdi-printer" variant="text" on:tap={onPrintPDF} />
             {/if}
-            <mdbutton class="actionBarButton" text="mdi-cog" variant="text" on:tap={showPDFSettings} />
+            <uibutton class="actionBarButton" text="mdi-cog" variant="text" on:tap={showPDFSettings} />
         </CActionBar>
     </gridlayout>
 </page>
diff --git a/app/components/qrcode/CreateBarcode.svelte b/app/components/qrcode/CreateBarcode.svelte
index b86276f43..71b4d654a 100644
--- a/app/components/qrcode/CreateBarcode.svelte
+++ b/app/components/qrcode/CreateBarcode.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { CollectionView } from '@nativescript-community/ui-collectionview';
-    import { TextField } from '@nativescript-community/ui-material-textfield';
+    import { TextField } from '@nativescript-community/ui-textfield';
     import { ObservableArray } from '@nativescript/core';
     import { closeModal } from '@shared/utils/svelte/ui';
     import { Template } from '@nativescript-community/svelte-native/components';
diff --git a/app/components/security/PasscodeWindow.svelte b/app/components/security/PasscodeWindow.svelte
index f4522ebef..dadf5bbb1 100644
--- a/app/components/security/PasscodeWindow.svelte
+++ b/app/components/security/PasscodeWindow.svelte
@@ -263,7 +263,7 @@
                 <label colSpan={4} color="white" fontSize={16} fontWeight="bold" paddingBottom={30} text={message} textAlignment="center" verticalAlignment="bottom" />
             </gridlayout>
             {#each { length: 10 } as _, j (j)}
-                <mdbutton
+                <uibutton
                     backgroundColor="transparent"
                     borderRadius={30}
                     col={j === 1 ? 1 : (j - 2) % 3}
@@ -278,7 +278,7 @@
                     on:tap={() => onButtonTap(j - 1 + '')}
                 />
             {/each}
-            <mdbutton class="mdi" backgroundColor="transparent" borderRadius={30} col={2} fontSize={30} height={60} row={4} text="mdi-close" variant="flat" width="60" on:tap={() => clear()} />
+            <uibutton class="mdi" backgroundColor="transparent" borderRadius={30} col={2} fontSize={30} height={60} row={4} text="mdi-close" variant="flat" width="60" on:tap={() => clear()} />
         </gridlayout>
     {:else}
         <gridlayout on:layoutChanged={onLayoutChanged}>
diff --git a/app/components/settings/FolderManagementView.svelte b/app/components/settings/FolderManagementView.svelte
index 06e1d7c71..127e50357 100644
--- a/app/components/settings/FolderManagementView.svelte
+++ b/app/components/settings/FolderManagementView.svelte
@@ -2,7 +2,7 @@
     import { Template } from '@nativescript-community/svelte-native/components';
     import { NativeViewElementNode } from '@nativescript-community/svelte-native/dom';
     import { CollectionView } from '@nativescript-community/ui-collectionview';
-    import { confirm } from '@nativescript-community/ui-material-dialogs';
+    import { confirm } from '@nativescript-community/ui-dialogs';
     import { VerticalPosition } from '@nativescript-community/ui-popover';
     import { ApplicationSettings, ObservableArray } from '@nativescript/core';
     import ListItemAutoSize from '@shared/components/ListItemAutoSize.svelte';
@@ -223,7 +223,7 @@
             <SelectionToolbar onAction={handleSelectionAction} options={getSelectionToolbarOptions()} row={1} />
         {/if}
         <CActionBar canGoBack onGoBack={nbSelected ? unselectAll : null} title={nbSelected ? lcp('selected', nbSelected) : lc('manage_folders')}>
-            <mdbutton class="actionBarButton" text="mdi-dots-vertical" variant="text" on:tap={showOptions} />
+            <uibutton class="actionBarButton" text="mdi-dots-vertical" variant="text" on:tap={showOptions} />
         </CActionBar>
     </gridlayout>
 </page>
diff --git a/app/components/settings/Settings.svelte b/app/components/settings/Settings.svelte
index 93c9b78f6..8ece784f6 100644
--- a/app/components/settings/Settings.svelte
+++ b/app/components/settings/Settings.svelte
@@ -4,10 +4,10 @@
     import { NativeViewElementNode } from '@nativescript-community/svelte-native/dom';
     import { CheckBox } from '@nativescript-community/ui-checkbox';
     import { openFilePicker, pickFolder, saveFile } from '@nativescript-community/ui-document-picker';
-    import { showBottomSheet } from '@nativescript-community/ui-material-bottomsheet/svelte';
-    import { alert, confirm } from '@nativescript-community/ui-material-dialogs';
-    import { TextField, TextFieldProperties } from '@nativescript-community/ui-material-textfield';
-    import { TextView } from '@nativescript-community/ui-material-textview';
+    import { showBottomSheet } from '@nativescript-community/ui-bottomsheet/svelte';
+    import { alert, confirm } from '@nativescript-community/ui-dialogs';
+    import { TextField, TextFieldProperties } from '@nativescript-community/ui-textfield';
+    import { TextView } from '@nativescript-community/ui-textview';
     import { ApplicationSettings, File, ObservableArray, Page, ScrollView, StackLayout, knownFolders, path } from '@nativescript/core';
     import { presentInAppSponsorBottomsheet } from '@shared/utils/inapp-purchase';
     import { Sentry, startSentry, stopSentry } from '@shared/utils/sentry';
@@ -1412,7 +1412,7 @@
     bind:refresh>
     <svelte:fragment slot="actionBarButtons">
         {#each actionBarButtons as button (button.id)}
-            <mdbutton class="actionBarButton" text={button.icon} variant="text" on:tap={(event) => onTap({ id: button.id }, event)} />
+            <uibutton class="actionBarButton" text={button.icon} variant="text" on:tap={(event) => onTap({ id: button.id }, event)} />
         {/each}
     </svelte:fragment>
 
diff --git a/app/components/settings/StorageView.svelte b/app/components/settings/StorageView.svelte
index 9195066dd..3a2b15d03 100644
--- a/app/components/settings/StorageView.svelte
+++ b/app/components/settings/StorageView.svelte
@@ -235,7 +235,7 @@
             <SelectionToolbar onAction={handleSelectionAction} options={getSelectionToolbarOptions()} row={2} />
         {/if}
         <CActionBar canGoBack onGoBack={nbSelected ? unselectAll : null} title={nbSelected ? lcp('selected', nbSelected) : lc('documents_storage')}>
-            <mdbutton class="actionBarButton" text="mdi-dots-vertical" variant="text" on:tap={showOptions} />
+            <uibutton class="actionBarButton" text="mdi-dots-vertical" variant="text" on:tap={showOptions} />
         </CActionBar>
     </gridlayout>
 </page>
diff --git a/app/components/settings/sync/DataSyncSettings.svelte b/app/components/settings/sync/DataSyncSettings.svelte
index 8a98e3564..060627c5a 100644
--- a/app/components/settings/sync/DataSyncSettings.svelte
+++ b/app/components/settings/sync/DataSyncSettings.svelte
@@ -93,7 +93,7 @@
         </SyncSettingsCollectionView>
 
         <CActionBar canGoBack modalWindow={true} title={lc('data_sync_settings')}>
-            <mdbutton text={lc('save')} variant="text" verticalAlignment="middle" on:tap={save} />
+            <uibutton text={lc('save')} variant="text" verticalAlignment="middle" on:tap={save} />
         </CActionBar>
     </gridlayout>
 </page>
diff --git a/app/components/settings/sync/ImageSyncSettings.svelte b/app/components/settings/sync/ImageSyncSettings.svelte
index 4c920f5a9..ccccd3255 100644
--- a/app/components/settings/sync/ImageSyncSettings.svelte
+++ b/app/components/settings/sync/ImageSyncSettings.svelte
@@ -1,7 +1,7 @@
 <script context="module" lang="ts">
     import { NativeViewElementNode } from '@nativescript-community/svelte-native/dom';
     import { Template } from '@nativescript-community/svelte-native/components';
-    import { TextFieldProperties } from '@nativescript-community/ui-material-textfield';
+    import { TextFieldProperties } from '@nativescript-community/ui-textfield';
     import { ApplicationSettings, Color, ObservableArray, Page } from '@nativescript/core';
     import { closeModal } from '@shared/utils/svelte/ui';
     import { Writable, get, writable } from 'svelte/store';
@@ -150,7 +150,7 @@
         </SyncSettingsCollectionView>
 
         <CActionBar canGoBack modalWindow={true} title={lc('image_sync_settings')}>
-            <mdbutton text={lc('save')} variant="text" verticalAlignment="middle" on:tap={save} />
+            <uibutton text={lc('save')} variant="text" verticalAlignment="middle" on:tap={save} />
         </CActionBar>
     </gridlayout>
 </page>
diff --git a/app/components/settings/sync/OAuthSettingsView.svelte b/app/components/settings/sync/OAuthSettingsView.svelte
index b72be8a44..210a4a5fe 100644
--- a/app/components/settings/sync/OAuthSettingsView.svelte
+++ b/app/components/settings/sync/OAuthSettingsView.svelte
@@ -85,7 +85,7 @@
 <stacklayout>
     <gridlayout columns="*,auto" rows="auto">
         <label color={colorOnSurfaceVariant} fontSize={13} padding="0 16 0 16" text={isAuthenticated ? lc('authenticated') : lc('not_authenticated')} textWrap={true} verticalAlignment="center" />
-        <mdbutton
+        <uibutton
             col={1}
             margin="0 16 0 0"
             text={isAuthenticated ? lc('re_authenticate') : lc('authenticate')}
@@ -106,7 +106,7 @@
             verticalAlignment="center"
             visibility={testConnectionSuccess !== 0 ? 'visible' : 'collapse'}
         />
-        <mdbutton col={2} horizontalAlignment="right" text={lc('test_connection')} variant="outline" on:tap={testConnectionAction} />
+        <uibutton col={2} horizontalAlignment="right" text={lc('test_connection')} variant="outline" on:tap={testConnectionAction} />
     </gridlayout>
     <RemoteFolderTextField hint={lc('remote_folder')} margin="20 4 10 4" text={$store.remoteFolder} {variant} on:textChange={(e) => ($store.remoteFolder = e['value'])} />
 </stacklayout>
diff --git a/app/components/settings/sync/PDFSyncSettings.svelte b/app/components/settings/sync/PDFSyncSettings.svelte
index 6dc443f40..ca00caf38 100644
--- a/app/components/settings/sync/PDFSyncSettings.svelte
+++ b/app/components/settings/sync/PDFSyncSettings.svelte
@@ -1,7 +1,7 @@
 <script context="module" lang="ts">
     import { Template } from '@nativescript-community/svelte-native/components';
     import { NativeViewElementNode } from '@nativescript-community/svelte-native/dom';
-    import { TextFieldProperties } from '@nativescript-community/ui-material-textfield';
+    import { TextFieldProperties } from '@nativescript-community/ui-textfield';
     import { ApplicationSettings, Color, ObservableArray, Page } from '@nativescript/core';
     import { closeModal } from '@shared/utils/svelte/ui';
     import { Writable, get, writable } from 'svelte/store';
@@ -178,8 +178,8 @@
         </SyncSettingsCollectionView>
 
         <CActionBar canGoBack modalWindow={true} title={lc('pdf_sync_settings')}>
-            <mdbutton text={lc('save')} variant="text" verticalAlignment="middle" on:tap={save} />
-            <!-- <mdbutton class="actionBarButton" text={lc('save')} variant="text" on:tap={save} /> -->
+            <uibutton text={lc('save')} variant="text" verticalAlignment="middle" on:tap={save} />
+            <!-- <uibutton class="actionBarButton" text={lc('save')} variant="text" on:tap={save} /> -->
         </CActionBar>
     </gridlayout>
 </page>
diff --git a/app/components/settings/sync/SyncFoldersSettingsView.svelte b/app/components/settings/sync/SyncFoldersSettingsView.svelte
index 33387a6ac..17ac670b4 100644
--- a/app/components/settings/sync/SyncFoldersSettingsView.svelte
+++ b/app/components/settings/sync/SyncFoldersSettingsView.svelte
@@ -62,7 +62,7 @@
 </script>
 
 <ListItemAutoSize item={{ title: lc('sync_folders'), subtitle: lc('sync_folders_desc'), titleProps: { verticalAlignment: 'top' } }} paddingRight={0} rows="auto,auto">
-    <mdbutton
+    <uibutton
         class="icon-btn"
         col={1}
         marginTop={6}
diff --git a/app/components/settings/sync/SyncListSettings.svelte b/app/components/settings/sync/SyncListSettings.svelte
index 4d14acd6f..21d4045dc 100644
--- a/app/components/settings/sync/SyncListSettings.svelte
+++ b/app/components/settings/sync/SyncListSettings.svelte
@@ -502,7 +502,7 @@
         </collectionview>
         <CActionBar canGoBack {title}>
             {#each actionBarButtons as button (button.id)}
-                <mdbutton class="actionBarButton" text={button.icon} variant="text" on:tap={(event) => onTap({ id: button.id }, event)} />
+                <uibutton class="actionBarButton" text={button.icon} variant="text" on:tap={(event) => onTap({ id: button.id }, event)} />
             {/each}
         </CActionBar>
     </gridlayout>
diff --git a/app/components/settings/sync/SyncSettingsCollectionView.svelte b/app/components/settings/sync/SyncSettingsCollectionView.svelte
index 1e93195bf..b4ff53d67 100644
--- a/app/components/settings/sync/SyncSettingsCollectionView.svelte
+++ b/app/components/settings/sync/SyncSettingsCollectionView.svelte
@@ -4,8 +4,8 @@
     import { CheckBox } from '@nativescript-community/ui-checkbox';
     import { CollectionView } from '@nativescript-community/ui-collectionview';
     import { Label } from '@nativescript-community/ui-label';
-    import { prompt } from '@nativescript-community/ui-material-dialogs';
-    import { TextField } from '@nativescript-community/ui-material-textfield';
+    import { prompt } from '@nativescript-community/ui-dialogs';
+    import { TextField } from '@nativescript-community/ui-textfield';
     import { ObservableArray, View } from '@nativescript/core';
     import { showError } from '@shared/utils/showError';
     import { Writable } from 'svelte/store';
@@ -222,7 +222,7 @@
     <Template key="textfield" let:item>
         <gridlayout columns="*" margin={5} row={3} rows="auto" on:tap={(e) => item.onTap(item, e)}>
             <textfield isUserInteractionEnabled={false} text={item.text} {variant} {...item.textFieldProperties} on:loaded={onTextChange} />
-            <mdbutton
+            <uibutton
                 class="icon-btn"
                 color={colorOnSurfaceVariant}
                 horizontalAlignment="right"
diff --git a/app/components/settings/sync/paperless/PaperlessNgxSettingsView.svelte b/app/components/settings/sync/paperless/PaperlessNgxSettingsView.svelte
index 1beac89a2..11cd24537 100644
--- a/app/components/settings/sync/paperless/PaperlessNgxSettingsView.svelte
+++ b/app/components/settings/sync/paperless/PaperlessNgxSettingsView.svelte
@@ -128,7 +128,7 @@
 
     <gridlayout columns="*,*" margin="5 0 0 0" rows="auto">
         <gridlayout col={1} columns="auto" horizontalAlignment="right" rows="auto" verticalAlignment="middle">
-            <mdbutton
+            <uibutton
                 backgroundColor={testConnectionSuccess < 0 ? colorError : testConnectionSuccess > 0 ? 'lightgreen' : colorSecondary}
                 color={colorOnError}
                 text={testConnectionSuccess < 0 ? lc('failed') : testConnectionSuccess > 0 ? lc('successful') : lc('test')}
diff --git a/app/components/settings/sync/webdav/WebdavSettingsView.svelte b/app/components/settings/sync/webdav/WebdavSettingsView.svelte
index 07cf4caff..88d516bc6 100644
--- a/app/components/settings/sync/webdav/WebdavSettingsView.svelte
+++ b/app/components/settings/sync/webdav/WebdavSettingsView.svelte
@@ -147,9 +147,9 @@
     />
     <RemoteFolderTextField columns="*" row={3} text={$store.remoteFolder} on:returnPress={testConnection} on:textChange={(e) => ($store.remoteFolder = e['value'])} />
     <gridlayout columns="*,*" row={4} rows="auto">
-        <!-- <mdbutton text={lc('save')} verticalAlignment="middle" on:tap={save} /> -->
+        <!-- <uibutton text={lc('save')} verticalAlignment="middle" on:tap={save} /> -->
         <gridlayout col={1} columns="auto" horizontalAlignment="right" rows="auto" verticalAlignment="middle">
-            <mdbutton
+            <uibutton
                 backgroundColor={testConnectionSuccess < 0 ? colorError : testConnectionSuccess > 0 ? 'lightgreen' : colorSecondary}
                 color={colorOnError}
                 text={testConnectionSuccess < 0 ? lc('failed') : testConnectionSuccess > 0 ? lc('successful') : lc('test')}
diff --git a/app/components/view/CardView.svelte b/app/components/view/CardView.svelte
index 1260bf27d..c24a12a4b 100644
--- a/app/components/view/CardView.svelte
+++ b/app/components/view/CardView.svelte
@@ -4,8 +4,8 @@
     import { CollectionView } from '@nativescript-community/ui-collectionview';
     import { Img } from '@nativescript-community/ui-image';
     import { SVGView } from '@nativescript-community/ui-svg';
-    import { showBottomSheet } from '@nativescript-community/ui-material-bottomsheet/svelte';
-    import { confirm } from '@nativescript-community/ui-material-dialogs';
+    import { showBottomSheet } from '@nativescript-community/ui-bottomsheet/svelte';
+    import { confirm } from '@nativescript-community/ui-dialogs';
     import { Pager } from '@nativescript-community/ui-pager';
     import { VerticalPosition } from '@nativescript-community/ui-popover';
     import {
@@ -98,7 +98,7 @@
 
 <script lang="ts">
     import SliderPopover from '../common/SliderPopover.svelte';
-    import { TextField } from '@nativescript-community/ui-material-textfield';
+    import { TextField } from '@nativescript-community/ui-textfield';
     import { Label } from '@nativescript-community/ui-label';
     import { EXTRA_PAPERLESS_ID_KEY } from '~/services/sync/paperless/PaperlessNgxPDFSyncService';
 
@@ -1440,9 +1440,9 @@
             <!-- <gridlayout backgroundColor={colorBackground} borderRadius="10 10 0 0" col={$isLandscape ? 1 : 0} row={$isLandscape ? 1 : 2} rows="auto,auto,*"> -->
             <!-- <stacklayout bind:this={fabHolder} horizontalAlignment="right" orientation="horizontal" rowSpan={3} verticalAlignment="bottom" android:marginBottom={$windowInset.bottom}> -->
             <!-- {#if __IOS__}
-                        <mdbutton class="small-fab" text="mdi-image-plus-outline" verticalAlignment="center" on:tap={throttle(() => importDocument(false), 500)} />
+                        <uibutton class="small-fab" text="mdi-image-plus-outline" verticalAlignment="center" on:tap={throttle(() => importDocument(false), 500)} />
                     {/if}
-                    <mdbutton class="small-fab" horizontalAlignment="center" text="mdi-file-document-plus-outline" on:tap={throttle(() => importDocument(), 500)} /> -->
+                    <uibutton class="small-fab" horizontalAlignment="center" text="mdi-file-document-plus-outline" on:tap={throttle(() => importDocument(), 500)} /> -->
             <!-- </stacklayout> -->
             <gridlayout class="cardViewHolder" col={$isLandscape ? 1 : 0} row={$isLandscape ? 1 : 2}>
                 <collectionview bind:this={collectionViewExtras} itemTemplateSelector={selectTemplate} items={extraItems} paddingBottom={Math.max($windowInset.bottom + FAB_BUTTON_OFFSET)}>
@@ -1546,13 +1546,13 @@
                         </gridlayout>
                     </Template>
                     <Template key="button" let:item>
-                        <mdbutton margin={10} text={item.text} on:tap={(event) => onExtraItemTap(item, event)} />
+                        <uibutton margin={10} text={item.text} on:tap={(event) => onExtraItemTap(item, event)} />
                     </Template>
                 </collectionview>
             </gridlayout>
 
             <!-- </gridlayout> -->
-            <mdbutton
+            <uibutton
                 col={1}
                 margin={10}
                 marginBottom={Math.min(60, $windowInset.bottom + 16)}
@@ -1572,8 +1572,8 @@
             row={2}
             visibility={editing ? 'collapsed' : 'visible'}
         >
-            <mdbutton class="small-fab" text="mdi-pencil" verticalAlignment="center" visibility={isPKPassDocument ? 'collapsed' : 'visible'} on:tap={startEdit} />
-            <mdbutton
+            <uibutton class="small-fab" text="mdi-pencil" verticalAlignment="center" visibility={isPKPassDocument ? 'collapsed' : 'visible'} on:tap={startEdit} />
+            <uibutton
                 class="small-fab"
                 text="mdi-fullscreen"
                 verticalAlignment="center"
@@ -1581,7 +1581,7 @@
                 on:tap={throttle(() => showFullscreen(), 500)}
             />
 
-            <mdbutton
+            <uibutton
                 bind:this={fabHolder}
                 id="fab"
                 class="fab"
@@ -1602,10 +1602,10 @@
             titleProps={{ padding: 0, color: statusBarStyle === 'dark' ? 'white' : 'black' }}
         >
             <!-- {#if editing}
-                <mdbutton class="actionBarButton" defaultVisualState={statusBarStyle} text="mdi-close" variant="text" on:tap={cancelEdit} />
-                <mdbutton class="actionBarButton" defaultVisualState={statusBarStyle} text="mdi-content-save" variant="text" on:tap={saveEdit} />
+                <uibutton class="actionBarButton" defaultVisualState={statusBarStyle} text="mdi-close" variant="text" on:tap={cancelEdit} />
+                <uibutton class="actionBarButton" defaultVisualState={statusBarStyle} text="mdi-content-save" variant="text" on:tap={saveEdit} />
             {:else} -->
-            <mdbutton
+            <uibutton
                 class="actionBarButton"
                 defaultVisualState={statusBarStyle}
                 text="mdi-file-pdf-box"
@@ -1613,7 +1613,7 @@
                 visibility={canBeExportedToPDF ? 'visible' : 'collapse'}
                 on:tap={showPDFPopover}
             />
-            <mdbutton class="actionBarButton" defaultVisualState={statusBarStyle} text="mdi-dots-vertical" variant="text" on:tap={showOptions} />
+            <uibutton class="actionBarButton" defaultVisualState={statusBarStyle} text="mdi-dots-vertical" variant="text" on:tap={showOptions} />
             <!-- {/if} -->
         </CActionBar>
         {#if editingTitle}
diff --git a/app/components/view/DocumentView.svelte b/app/components/view/DocumentView.svelte
index d1dfc8b5b..8f09e95a9 100644
--- a/app/components/view/DocumentView.svelte
+++ b/app/components/view/DocumentView.svelte
@@ -1,7 +1,7 @@
 <script context="module" lang="ts">
     import { CollectionView } from '@nativescript-community/ui-collectionview';
     import { Img, getImagePipeline } from '@nativescript-community/ui-image';
-    import { confirm } from '@nativescript-community/ui-material-dialogs';
+    import { confirm } from '@nativescript-community/ui-dialogs';
     import { VerticalPosition } from '@nativescript-community/ui-popover';
     import { AnimationDefinition, Application, ApplicationSettings, ContentView, EventData, ObservableArray, Page, PageTransition, SharedTransition, StackLayout } from '@nativescript/core';
     import { AndroidActivityBackPressedEventData } from '@nativescript/core/application';
@@ -60,7 +60,7 @@
     import EditNameActionBar from '../common/EditNameActionBar.svelte';
     import { prefs } from '@shared/services/preferences';
     import { ROOT_GESTURE_HANDLER_TAG } from '@nativescript-community/gesturehandler/gesturehandler.common';
-    import { showBottomSheet } from '@nativescript-community/ui-material-bottomsheet/svelte';
+    import { showBottomSheet } from '@nativescript-community/ui-bottomsheet/svelte';
     const rowMargin = 8;
     interface Item {
         page: OCRPage;
@@ -815,16 +815,16 @@
 
         <stacklayout bind:this={fabHolder} class="fabHolder" marginBottom={Math.min(60, $windowInset.bottom)} orientation="horizontal" row={1}>
             {#if __IOS__}
-                <mdbutton
+                <uibutton
                     class="small-fab"
                     text="mdi-image-plus-outline"
                     verticalAlignment="center"
                     on:tap={throttle(() => importAndScanImage({ document, importPDFs: false, canGoToView: false, forceGalleryPick: true }), 500)}
                 />
             {/if}
-            <mdbutton class={$hasCamera ? 'small-fab' : 'fab'} text="mdi-file-document-plus-outline" verticalAlignment="center" on:tap={throttle(() => onAddButton(), 500)} />
+            <uibutton class={$hasCamera ? 'small-fab' : 'fab'} text="mdi-file-document-plus-outline" verticalAlignment="center" on:tap={throttle(() => onAddButton(), 500)} />
             {#if $hasCamera}
-                <mdbutton class="fab" text="mdi-camera" verticalAlignment="center" on:tap={throttle(() => addPages(), 500)} on:longPress={() => addPages(true)} />
+                <uibutton class="fab" text="mdi-camera" verticalAlignment="center" on:tap={throttle(() => addPages(), 500)} on:longPress={() => addPages(true)} />
             {/if}
         </stacklayout>
         <CActionBar
@@ -835,8 +835,8 @@
             titleProps={{ padding: 0 }}
         >
             {#if !nbSelected}
-                <mdbutton class="actionBarButton" text="mdi-file-pdf-box" variant="text" on:tap={showPDFPopover} />
-                <mdbutton class="actionBarButton" text="mdi-dots-vertical" variant="text" on:tap={showOptions} />
+                <uibutton class="actionBarButton" text="mdi-file-pdf-box" variant="text" on:tap={showPDFPopover} />
+                <uibutton class="actionBarButton" text="mdi-dots-vertical" variant="text" on:tap={showOptions} />
             {/if}
         </CActionBar>
 
diff --git a/app/components/widgets/Chip.svelte b/app/components/widgets/Chip.svelte
index f477d0e42..bf9afc69f 100644
--- a/app/components/widgets/Chip.svelte
+++ b/app/components/widgets/Chip.svelte
@@ -12,5 +12,5 @@
     <label color={colorOnSurface} fontFamily={$fonts.mdi} fontSize={16} marginRight={4} text={rightIcon} verticalAlignment="middle" visibility={rightIcon ? 'visible' : 'collapse'} />
 
     <label col={1} fontSize={14} paddingBottom={2} {text} verticalAlignment="middle" />
-    <mdbutton col={2} color={colorOnSurface} fontFamily={$fonts.mdi} fontSize={16} marginLeft={4} padding={0} text="mdi-close" variant="text" verticalAlignment="middle" width={20} on:tap />
+    <uibutton col={2} color={colorOnSurface} fontFamily={$fonts.mdi} fontSize={16} marginLeft={4} padding={0} text="mdi-close" variant="text" verticalAlignment="middle" width={20} on:tap />
 </gridlayout>
diff --git a/app/components/widgets/CreateCard.svelte b/app/components/widgets/CreateCard.svelte
index f2694a1a9..52b96c6bc 100644
--- a/app/components/widgets/CreateCard.svelte
+++ b/app/components/widgets/CreateCard.svelte
@@ -101,5 +101,5 @@
         visibility={code?.length && !validCode ? 'visible' : 'collapse'}
     />
 
-    <mdbutton colSpan={2} horizontalAlignment="right" isEnabled={name?.length > 0} row={5} text={lc('add')} variant="text" on:tap={add} />
+    <uibutton colSpan={2} horizontalAlignment="right" isEnabled={name?.length > 0} row={5} text={lc('add')} variant="text" on:tap={add} />
 </gesturerootview>
diff --git a/app/components/widgets/ExtraFieldPicker.svelte b/app/components/widgets/ExtraFieldPicker.svelte
index b72275fc1..5a5a77021 100644
--- a/app/components/widgets/ExtraFieldPicker.svelte
+++ b/app/components/widgets/ExtraFieldPicker.svelte
@@ -127,7 +127,7 @@
     <label color={colorOnBackground} fontSize={20} fontWeight="bold" marginBottom={16} text={editing ? lc('edit_extra_field') : lc('add_extra_field')} />
     <gridlayout row={1}>
         <textfield hint={lc('name')} margin={tMargin} paddingLeft={60} row={2} text={currentName} variant="outline" on:textChange={(e) => (currentName = e.value)} />
-        <mdbutton class="icon-btn" color={colorOnSurfaceVariant} horizontalAlignment="left" text="mdi-menu-down" variant="text" verticalAlignment="middle" on:tap={selecteTemplateName} />
+        <uibutton class="icon-btn" color={colorOnSurfaceVariant} horizontalAlignment="left" text="mdi-menu-down" variant="text" verticalAlignment="middle" on:tap={selecteTemplateName} />
     </gridlayout>
     <textfield editable={false} hint={lc('type')} margin={tMargin} row={2} text={lc(currentType)} textTransform="uppercase" variant="outline" on:tap={(e) => selectType(e)} />
 
@@ -143,5 +143,5 @@
         on:tap={(e) => selectDate(e)}
     />
 
-    <mdbutton horizontalAlignment="right" row={4} text={editing ? lc('edit') : lc('add')} variant="text" on:tap={add} />
+    <uibutton horizontalAlignment="right" row={4} text={editing ? lc('edit') : lc('add')} variant="text" on:tap={add} />
 </gesturerootview>
diff --git a/app/db/NSQLDatabase.ts b/app/db/NSQLDatabase.ts
new file mode 100644
index 000000000..30504581f
--- /dev/null
+++ b/app/db/NSQLDatabase.ts
@@ -0,0 +1,78 @@
+import SqlQuery from 'kiss-orm/dist/Queries/SqlQuery';
+import DatabaseInterface from 'kiss-orm/dist/Databases/DatabaseInterface';
+import migrate from 'kiss-orm/dist/Databases/Common/migrate';
+import { SQLiteDatabase, openOrCreate, wrapDb } from '@nativescript-community/sqlite';
+import { NoSpaceLeftError } from '@akylas/nativescript-app-utils/error';
+import { DatabaseOptions } from '@nativescript-community/sqlite/sqlite.common';
+
+function formatIdentifier(i: string): string {
+    return i;
+}
+
+export default class NSQLDatabase implements DatabaseInterface {
+    db: SQLiteDatabase;
+    constructor(filePathOrDb: any, options?: DatabaseOptions) {
+        if (typeof filePathOrDb === 'string') {
+            this.db = openOrCreate(filePathOrDb, options);
+        } else {
+            this.db = wrapDb(filePathOrDb, options);
+        }
+    }
+
+    async disconnect(): Promise<void> {
+        return this.db.close();
+    }
+    isOpen(): boolean {
+        return this.db.isOpen;
+    }
+
+    indexToPlaceholder(i: number): string {
+        return '?';
+    }
+
+    wrapAndThrowError(error) {
+        if (/SQLITE_IOERR_FSYNC|ENOSPC/.test(error)) {
+            throw new NoSpaceLeftError(error);
+        } else {
+            throw error;
+        }
+    }
+
+    async query(query: SqlQuery): Promise<any[]> {
+        const compiledQuery = query.compile(this.indexToPlaceholder, formatIdentifier);
+        const sqlQuery = compiledQuery.sql.trim();
+        try {
+            const result = await this.db.select(sqlQuery, compiledQuery.params);
+            return result as any[];
+        } catch (error) {
+            this.wrapAndThrowError(error);
+        }
+    }
+    async sequence<T>(sequence: (sequenceDb: NSQLDatabase) => Promise<T>): Promise<T> {
+        return sequence(this);
+    }
+
+    async migrate(migrations: { [key: string]: SqlQuery }) {
+        await migrate(this, migrations);
+    }
+
+    async insertAndGet(standardInsertQuery: SqlQuery): Promise<number[] | string[] | any[]> {
+        const compiledQuery = standardInsertQuery.compile(this.indexToPlaceholder, formatIdentifier);
+        const sqlQuery = compiledQuery.sql.trim();
+        try {
+            let result = await this.db.execute(sqlQuery, compiledQuery.params);
+            // console.info('insertAndGet', sqlQuery, compiledQuery.params, result);
+            if (!result) {
+                // create await an array result.
+                result = [undefined];
+            }
+            return result as any[];
+        } catch (error) {
+            this.wrapAndThrowError(error);
+        }
+    }
+
+    async updateAndGet(standardUpdateQuery: SqlQuery): Promise<null | any[]> {
+        return this.insertAndGet(standardUpdateQuery);
+    }
+}
diff --git a/app/i18n/en.json b/app/i18n/en.json
index 2171b0898..8ea8702ce 100644
--- a/app/i18n/en.json
+++ b/app/i18n/en.json
@@ -86,6 +86,7 @@
     "camera_settings": "camera settings",
     "camera_view_size": "view size",
     "cancel": "cancel",
+    "more_options": "more options",
     "capturing": "capturing",
     "cardholder": "card holder",
     "cards": "cards",
@@ -94,6 +95,7 @@
     "choose": "choose",
     "color": "color",
     "color_desc": "improve colors and reduce unwanted color shades",
+    "color_grid": "grid",
     "color_hex_hint": "hex color #",
     "color_theme": {
         "default": "default",
@@ -284,6 +286,7 @@
     },
     "internal_storage": "internal storage",
     "invalid": "invalid",
+    "invalid_color": "invalid color",
     "ios": {
         "info": {
             "plist": {
diff --git a/app/services/documents.ts b/app/services/documents.ts
index 07c793967..9ddd04f8e 100644
--- a/app/services/documents.ts
+++ b/app/services/documents.ts
@@ -1,7 +1,7 @@
 import { isObject, isString, wrapNativeException } from '@nativescript/core/utils';
 import { Optional } from '@nativescript/core/utils/typescript-utils';
 import { ApplicationSettings, EventData, File, Folder, Observable, knownFolders, path } from '@nativescript/core';
-import NSQLDatabase from '@shared/db/NSQLDatabase';
+import NSQLDatabase from '~/db/NSQLDatabase';
 import { doInBatch } from '@shared/utils/batch';
 import SqlQuery from 'kiss-orm/dist/Queries/SqlQuery';
 import CrudRepository from 'kiss-orm/dist/Repositories/CrudRepository';
diff --git a/app/utils/ui/index.android.ts b/app/utils/ui/index.android.ts
index 7ba76ca23..b8208ec5d 100644
--- a/app/utils/ui/index.android.ts
+++ b/app/utils/ui/index.android.ts
@@ -7,7 +7,7 @@ import { documentsService } from '~/services/documents';
 import { ocrService } from '~/services/ocr';
 import { securityService } from '~/services/security';
 import { copyOCRToClipboard, getOCRFromCamera, goToDocumentView, importAndScanImageOrPdfFromUris, importPKPassFromUris, onStartCam, requestStoragePermission } from './index.common';
-import { showBottomSheet } from '@nativescript-community/ui-material-bottomsheet/svelte';
+import { showBottomSheet } from '@nativescript-community/ui-bottomsheet/svelte';
 import { screenHeightDips } from '@shared/variables';
 
 export * from './index.common';
@@ -161,7 +161,7 @@ export const onAndroidNewItent = throttle(async function onAndroidNewItent(event
 
 // TODO: move to a plugin
 export async function pickColor(color: Color | string, options: { alpha?: boolean; anchor?: View } = {}) {
-    const view = (await import('~/components/common/ColorPicker.svelte')).default;
+    const view = (await import('@shared/components/ColorPicker.svelte')).default;
     return showBottomSheet({
         view,
         // backgroundOpacity: 1,
diff --git a/app/utils/ui/index.common.ts b/app/utils/ui/index.common.ts
index 29f5722e3..2be668c8b 100644
--- a/app/utils/ui/index.common.ts
+++ b/app/utils/ui/index.common.ts
@@ -6,8 +6,8 @@ import { openFilePicker, pickFolder } from '@nativescript-community/ui-document-
 import { GestureRootView } from '@nativescript-community/gesturehandler';
 import { CheckBox } from '@nativescript-community/ui-checkbox';
 import { Label } from '@nativescript-community/ui-label';
-import { showBottomSheet } from '@nativescript-community/ui-material-bottomsheet/svelte';
-import { MDCAlertControlerOptions, alert, confirm, prompt } from '@nativescript-community/ui-material-dialogs';
+import { showBottomSheet } from '@nativescript-community/ui-bottomsheet/svelte';
+import { MDCAlertControlerOptions, alert, confirm, prompt } from '@nativescript-community/ui-dialogs';
 import { HorizontalPosition, PopoverOptions, VerticalPosition } from '@nativescript-community/ui-popover';
 import { closePopover, showPopover } from '@nativescript-community/ui-popover/svelte';
 import {
diff --git a/nativescript.config.js b/nativescript.config.js
index c4f625d06..495ca68c6 100644
--- a/nativescript.config.js
+++ b/nativescript.config.js
@@ -5,6 +5,8 @@ const playstoreBuild = !!process.env['PLAY_STORE_BUILD'];
 
 const id = process.env['APP_ID'];
 const CARD_APP = id === 'com.akylas.cardwallet';
+// the akylas runtime lacks the Mac Catalyst fixes of @nativescript/ios 9.1
+const catalystBuild = process.argv.includes('catalyst');
 module.exports = {
     ignoredNativeDependencies: [].concat(sentryEnabled ? [] : ['@nativescript-community/sentry']).concat(playstoreBuild ? [] : ['@akylas/nativescript-inapp-purchase']),
     id: id || 'com.akylas.documentscanner',
@@ -21,7 +23,7 @@ module.exports = {
         defaultLanguage: 'en'
     },
     ios: {
-        runtimePackageName: '@akylas/nativescript-ios-runtime'
+        runtimePackageName: catalystBuild ? '@nativescript/ios' : '@akylas/nativescript-ios-runtime'
     },
     android: {
         ignoredNativeDependencies: ['@akylas/nativescript-inapp-purchase'],
diff --git a/package.json b/package.json
index 27c706b8b..42e3d9a15 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,9 @@
         "prepare": "ts-patch install -s",
         "prepare.ios": "PLAY_STORE_BUILD=1 ns prepare ios --release --env.adhoc",
         "prepare.ios.sentry": "NS_SENTRY=1 PLAY_STORE_BUILD=1 ns prepare ios --release --env.adhoc_sentry",
+        "prepare.catalyst": "PLAY_STORE_BUILD=1 ns prepare catalyst --release --env.adhoc",
+        "prepare.catalyst.sentry": "NS_SENTRY=1 PLAY_STORE_BUILD=1 ns prepare catalyst --release --env.adhoc_sentry",
+        "run.catalyst": "ns run catalyst --no-hmr",
         "run.ios.production": "NS_LOGGING=1 PLAY_STORE_BUILD=1 ns run ios --release --env.production --env.adhoc",
         "run.ios.production.sentry": "NS_SENTRY=1 PLAY_STORE_BUILD=1 ns run ios --release --env.production --env.adhoc_sentry",
         "sentry-set-commits": "sentry-cli releases set-commits --auto --ignore-missing",
@@ -60,34 +63,37 @@
         "@nativescript-community/svelte-native": "1.0.32",
         "@nativescript-community/systemui": "1.1.25",
         "@nativescript-community/text": "1.6.25",
+        "@nativescript-community/ui-activityindicator": "1.1.0",
+        "@nativescript-community/ui-appbar": "1.1.0",
+        "@nativescript-community/ui-bottomsheet": "1.1.0",
+        "@nativescript-community/ui-button": "1.1.0",
         "@nativescript-community/ui-cameraview": "0.7.0",
         "@nativescript-community/ui-canvas": "4.6.52",
         "@nativescript-community/ui-canvaslabel": "1.2.55",
-        "@nativescript-community/ui-checkbox": "2.0.18",
+        "@nativescript-community/ui-checkbox": "1.1.0",
         "@nativescript-community/ui-collectionview": "6.0.27",
         "@nativescript-community/ui-collectionview-swipemenu": "6.0.27",
+        "@nativescript-community/ui-core": "1.1.0",
+        "@nativescript-community/ui-dialogs": "1.1.0",
         "@nativescript-community/ui-document-picker": "1.1.29",
+        "@nativescript-community/ui-floatingactionbutton": "1.1.0",
         "@nativescript-community/ui-image": "4.6.20",
         "@nativescript-community/ui-image-colorfilter": "4.6.20",
         "@nativescript-community/ui-label": "2.0.4",
         "@nativescript-community/ui-lottie": "~5.0.11",
-        "@nativescript-community/ui-material-activityindicator": "7.3.2",
-        "@nativescript-community/ui-material-bottomsheet": "7.3.2",
-        "@nativescript-community/ui-material-button": "7.3.2",
-        "@nativescript-community/ui-material-dialogs": "7.3.2",
-        "@nativescript-community/ui-material-progress": "7.3.2",
-        "@nativescript-community/ui-material-segmentedbar": "7.3.2",
-        "@nativescript-community/ui-material-slider": "7.3.2",
-        "@nativescript-community/ui-material-snackbar": "7.3.2",
-        "@nativescript-community/ui-material-switch": "7.3.2",
-        "@nativescript-community/ui-material-tabs": "7.3.2",
-        "@nativescript-community/ui-material-textfield": "7.3.2",
-        "@nativescript-community/ui-material-textview": "7.3.2",
+        "@nativescript-community/ui-menu": "1.1.0",
         "@nativescript-community/ui-pager": "14.1.42",
         "@nativescript-community/ui-pager-indicator": "14.1.42",
         "@nativescript-community/ui-popover": "0.1.22",
+        "@nativescript-community/ui-progress": "1.1.0",
+        "@nativescript-community/ui-segmentedbar": "1.1.0",
         "@nativescript-community/ui-share-file": "1.3.3",
+        "@nativescript-community/ui-slider": "1.1.0",
+        "@nativescript-community/ui-snackbar": "1.1.0",
         "@nativescript-community/ui-svg": "0.2.24",
+        "@nativescript-community/ui-switch": "1.1.0",
+        "@nativescript-community/ui-textfield": "1.1.0",
+        "@nativescript-community/ui-textview": "1.1.0",
         "@nativescript-community/ui-webview": "1.6.2",
         "@nativescript-community/ui-zoomimage": "4.6.20",
         "@nativescript/biometrics": "patch:@nativescript/biometrics@npm%3A1.3.1#~/.yarn/patches/@nativescript-biometrics-npm-1.3.1-b5d39a8970.patch",
@@ -113,6 +119,7 @@
         "@nativescript/android": "9.1.1",
         "@nativescript/android-quickjs-ng": "9.0.0-alpha.5",
         "@nativescript/core": "9.0.20",
+        "@nativescript/ios": "9.1.0",
         "merge-properties-files": "1.1.6",
         "mini-css-extract-plugin": "2.10.0",
         "svelte-loader": "3.2.4",
diff --git a/tsconfig.json b/tsconfig.json
index 499ce9f0b..6e3aa0e35 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -26,5 +26,5 @@
         "plugin-shared/*.ts",
         "plugin-shared/typings"
     ],
-    "exclude": ["app/**/*.test.ts"]
+    "exclude": ["app/**/*.test.ts", "tools/app/db/**/*"]
 }
diff --git a/typings/ios.d.ts b/typings/ios.d.ts
index e69de29bb..250b001ce 100644
--- a/typings/ios.d.ts
+++ b/typings/ios.d.ts
@@ -0,0 +1,3 @@
+declare function CGSizeMake(width: number, height: number): CGSize;
+
+declare function CGRectMake(x: number, y: number, width: number, height: number): CGRect;
diff --git a/vitest.setup.ts b/vitest.setup.ts
index f0e092259..cebdb3dcd 100644
--- a/vitest.setup.ts
+++ b/vitest.setup.ts
@@ -221,7 +221,7 @@ vi.mock('@nativescript-community/ui-svg/canvas', () => ({
     SVGView: class SVGView {}
 }));
 
-vi.mock('@nativescript-community/ui-material-dialogs', () => ({
+vi.mock('@nativescript-community/ui-dialogs', () => ({
     alert: vi.fn(),
     confirm: vi.fn(),
     prompt: vi.fn(),
diff --git a/yarn.lock b/yarn.lock
index 25def702e..51d257804 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -20,7 +20,7 @@ __metadata:
 
 "@akylas/nativescript-app-tools@file:tools::locator=root-workspace-0b6124%40workspace%3A.":
   version: 1.0.0
-  resolution: "@akylas/nativescript-app-tools@file:tools#tools::hash=5f9fe8&locator=root-workspace-0b6124%40workspace%3A."
+  resolution: "@akylas/nativescript-app-tools@file:tools#tools::hash=60f9d5&locator=root-workspace-0b6124%40workspace%3A."
   dependencies:
     "@dotenvx/dotenvx": "npm:1.51.4"
     "@nativescript-community/fontmin": "npm:0.9.11"
@@ -74,7 +74,7 @@ __metadata:
     typescript: "npm:5.9.3"
     typescript-eslint: "npm:8.53.0"
     webpack-bundle-analyzer: "npm:4.10.2"
-  checksum: 10/30d1754f73fe8af03a96fde42c1e35bf7fbcf4a33dc77c6b01589fc45ef18bf4f10282291837a75d3ca4bc8c55c4c0f8ce062c05600baff4851caedbeff6e584
+  checksum: 10/73786370870e556e27d062c71c4ace6bd44f38eb427b0fd29412de948c51b977f340ba2cdbeec5d2ac8f0d5f89e630e69e7ba7ede0fb7190d795c68a9ca6e89f
   languageName: node
   linkType: hard
 
@@ -1568,6 +1568,44 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nativescript-community/ui-activityindicator@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@nativescript-community/ui-activityindicator@npm:1.1.0"
+  dependencies:
+    "@nativescript-community/ui-core": "npm:^1.1.0"
+  checksum: 10/44ffd03f633170dbc7a66c6b4086ae07c407c9d838a1ce838c1e8c735f9ba3f8d482628312f452d73412f493edffa035552333c66c86d9956497939dc51483ff
+  languageName: node
+  linkType: hard
+
+"@nativescript-community/ui-appbar@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@nativescript-community/ui-appbar@npm:1.1.0"
+  dependencies:
+    "@nativescript-community/ui-core": "npm:^1.1.0"
+    "@nativescript-community/ui-menu": "npm:^1.1.0"
+  checksum: 10/dad3be5994c42d768bade72777eada23ff56cd745352c6f6af0442149aad0efede8600b18c344c8e066697dec82e28ad4de85bd67d3f0c1e3f2bb1f15af37430
+  languageName: node
+  linkType: hard
+
+"@nativescript-community/ui-bottomsheet@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@nativescript-community/ui-bottomsheet@npm:1.1.0"
+  dependencies:
+    "@nativescript-community/ui-core": "npm:^1.1.0"
+  checksum: 10/0d00cedaed34e0315294387352a1fd462957e0cd897cceb1728ce41243e6240dea183a4936acd867406dc3e13ca69a4f153269299a0390567335b33c2d3ecd92
+  languageName: node
+  linkType: hard
+
+"@nativescript-community/ui-button@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@nativescript-community/ui-button@npm:1.1.0"
+  dependencies:
+    "@nativescript-community/text": "npm:^1.5.2"
+    "@nativescript-community/ui-core": "npm:^1.1.0"
+  checksum: 10/d9344f4d1710a76bd586fb87a3b0b1ff2ea8a8b6cfab329b931517c9255a82955960d70fbff816c187b3090b2ef21cafd8558c04251eacc4a388f16dc05b7a96
+  languageName: node
+  linkType: hard
+
 "@nativescript-community/ui-cameraview@npm:*":
   version: 0.6.6
   resolution: "@nativescript-community/ui-cameraview@npm:0.6.6"
@@ -1601,10 +1639,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nativescript-community/ui-checkbox@npm:2.0.18":
-  version: 2.0.18
-  resolution: "@nativescript-community/ui-checkbox@npm:2.0.18"
-  checksum: 10/9e92740a672dc14d8a2cfc8ff02f6651faf390d1e07b05319fb86a56eeb46fd045aaf31ac8d9e674b8611898e793fd4bbe1ea4dda862d2d129294b8c0f5331f7
+"@nativescript-community/ui-checkbox@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@nativescript-community/ui-checkbox@npm:1.1.0"
+  dependencies:
+    "@nativescript-community/ui-core": "npm:^1.1.0"
+  checksum: 10/735939f1015dd08b74a3107bb87f0689e65ee3db7357ab81168e6e46effd007a052906d576a869204092e4d937e5041dca3cc8ebcd072514112cd79e6a5d84a1
   languageName: node
   linkType: hard
 
@@ -1628,6 +1668,30 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nativescript-community/ui-core@npm:1.1.0, @nativescript-community/ui-core@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@nativescript-community/ui-core@npm:1.1.0"
+  dependencies:
+    "@nativescript-community/text": "npm:^1.6.25"
+  peerDependencies:
+    "@nativescript-community/text": "*"
+  peerDependenciesMeta:
+    "@nativescript-community/text":
+      optional: true
+  checksum: 10/ed6fd06f3fb05037e098f5f47ae02a1cfe5438ab399695d8f87ff8a70a687a1aea7b548f4b33506d9ed941fbbaf9552906be5acf1daf41bc99c838fbcdca5721
+  languageName: node
+  linkType: hard
+
+"@nativescript-community/ui-dialogs@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@nativescript-community/ui-dialogs@npm:1.1.0"
+  dependencies:
+    "@nativescript-community/ui-core": "npm:^1.1.0"
+    "@nativescript-community/ui-textfield": "npm:^1.1.0"
+  checksum: 10/e856acbfa8ad7c7e9d095e0fb546bfb01bfc66d5916e9c9420a70b68c1060c8252a7b74015f858cbe815a4d13930701d2716309b1f949bfdabd27cb2cd14b2e3
+  languageName: node
+  linkType: hard
+
 "@nativescript-community/ui-document-picker@npm:1.1.29":
   version: 1.1.29
   resolution: "@nativescript-community/ui-document-picker@npm:1.1.29"
@@ -1646,6 +1710,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nativescript-community/ui-floatingactionbutton@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@nativescript-community/ui-floatingactionbutton@npm:1.1.0"
+  dependencies:
+    "@nativescript-community/ui-core": "npm:^1.1.0"
+  checksum: 10/e40d287377dc67c990a51dc87fb08a8d23820351475d3b819f002bac2205302f219d68472546325e4a02516abc9e436f1ec69a74488e6a27ae874dbfd980effe
+  languageName: node
+  linkType: hard
+
 "@nativescript-community/ui-image-colorfilter@npm:4.6.20":
   version: 4.6.20
   resolution: "@nativescript-community/ui-image-colorfilter@npm:4.6.20"
@@ -1678,170 +1751,114 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nativescript-community/ui-material-activityindicator@npm:7.3.2":
-  version: 7.3.2
-  resolution: "@nativescript-community/ui-material-activityindicator@npm:7.3.2"
-  dependencies:
-    "@nativescript-community/ui-material-core": "npm:^7.3.2"
-  checksum: 10/877abfcb6e1dce910caeadc38621a9c4bd4f29a277172e8819f07c607589b428511aae2d8df285f7f0816bd858bd1a79003a3150e2072f8157ee6a56e65bcc29
-  languageName: node
-  linkType: hard
-
-"@nativescript-community/ui-material-bottomsheet@npm:7.3.2":
-  version: 7.3.2
-  resolution: "@nativescript-community/ui-material-bottomsheet@npm:7.3.2"
+"@nativescript-community/ui-menu@npm:1.1.0, @nativescript-community/ui-menu@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@nativescript-community/ui-menu@npm:1.1.0"
   dependencies:
-    "@nativescript-community/ui-material-core": "npm:^7.3.2"
-  checksum: 10/99697f7c75e37c555276c73fb6cf21bc15b00a955d65b35f1ddec8ab470dc41a9eba105cb954a49face19de6abc1026cf85e4b49e6cf45d1f2069234f949991b
+    "@nativescript-community/ui-core": "npm:^1.1.0"
+  checksum: 10/3cc1d7fb3329d26a4bdedbc4c2ab4cc4e9f538696c3f4627c79ff2a24281197da2ec642d186c667b67f30fe6f23ea238f1c73f03e0a50522dc48b65bb88ebf38
   languageName: node
   linkType: hard
 
-"@nativescript-community/ui-material-button@npm:7.3.2, @nativescript-community/ui-material-button@npm:^7.3.2":
-  version: 7.3.2
-  resolution: "@nativescript-community/ui-material-button@npm:7.3.2"
-  dependencies:
-    "@nativescript-community/text": "npm:^1.5.2"
-    "@nativescript-community/ui-material-core": "npm:^7.3.2"
-  checksum: 10/aaa75f19d590000b1f19e4331a36845dfc4acb4c349d4d89f75979d706feca6fecfddac47412355c0a0360b41495547709ee18ff800d3954fbc45e0dc717d1fe
+"@nativescript-community/ui-pager-indicator@npm:14.1.42":
+  version: 14.1.42
+  resolution: "@nativescript-community/ui-pager-indicator@npm:14.1.42"
+  checksum: 10/f83ea473631428ad7dea7e4fbf3138b8939860192ae1cee98bc0cee67ed0d6c2e0f7b2a7a5cfd06bc2c828290b85e216b313677d3fb6cb925a6e51fd90fc9010
   languageName: node
   linkType: hard
 
-"@nativescript-community/ui-material-core-tabs@npm:^7.3.2":
-  version: 7.3.2
-  resolution: "@nativescript-community/ui-material-core-tabs@npm:7.3.2"
-  dependencies:
-    "@nativescript-community/ui-material-core": "npm:^7.3.2"
-  checksum: 10/9e563cfb3e7b254dcc8f972922572d8b913295d88bab35831661409273289e9c4d3faea66f6577729b274d84454dc33301230b27ad2ee990ee55b5d9e51fcd5f
+"@nativescript-community/ui-pager@npm:14.1.42":
+  version: 14.1.42
+  resolution: "@nativescript-community/ui-pager@npm:14.1.42"
+  checksum: 10/0c88d84dd4298ce24f353925476a33c46a5ad9cb4f92567367641972e4d0165b31dffcb4639489efa2aa0e5c63a51792b6b2afb2b9749362356b94168b9ab43e
   languageName: node
   linkType: hard
 
-"@nativescript-community/ui-material-core@npm:^7.3.2":
-  version: 7.3.2
-  resolution: "@nativescript-community/ui-material-core@npm:7.3.2"
-  checksum: 10/83b734b779054599a92489aad89fa29a4dbb7954e3119e1995829237a4696d7316eb86d6d958be8583e2c91bb07bef005cee69b228d92b7e05af3ea7a5aa60b9
+"@nativescript-community/ui-popover@npm:0.1.22":
+  version: 0.1.22
+  resolution: "@nativescript-community/ui-popover@npm:0.1.22"
+  checksum: 10/9e80c03656ca129784ac7eee8f133885cd62735f31ec4defda59610652d85a5663e6a45e19d35a40922bd05b74c00a85643ea2d804840bf0f059b47a618e26f2
   languageName: node
   linkType: hard
 
-"@nativescript-community/ui-material-dialogs@npm:7.3.2":
-  version: 7.3.2
-  resolution: "@nativescript-community/ui-material-dialogs@npm:7.3.2"
+"@nativescript-community/ui-progress@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@nativescript-community/ui-progress@npm:1.1.0"
   dependencies:
-    "@nativescript-community/ui-material-core": "npm:^7.3.2"
-    "@nativescript-community/ui-material-textfield": "npm:^7.3.2"
-  checksum: 10/f7674b3ec3ed35ef289ebb2ca2905ccbd69142aa1376dd2ea13730dfa4004d5b2ff1f8ca2d1fd128bc74393913e5338ae31277fd1d7ce6ebac9d11f2399d1621
+    "@nativescript-community/ui-core": "npm:^1.1.0"
+  checksum: 10/b95fe2435eba9759f1a9dd9e89d260b0b467bfc8f54397978c87abe61bf05f956ef4598355b56f9f5fa6aa558c12a9cfdf26b69219566f38241b22d26a465e24
   languageName: node
   linkType: hard
 
-"@nativescript-community/ui-material-progress@npm:7.3.2":
-  version: 7.3.2
-  resolution: "@nativescript-community/ui-material-progress@npm:7.3.2"
+"@nativescript-community/ui-segmentedbar@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@nativescript-community/ui-segmentedbar@npm:1.1.0"
   dependencies:
-    "@nativescript-community/ui-material-core": "npm:^7.3.2"
-  checksum: 10/d5fcdd0b8e7d92707ba57fd8971c8466f8b3fd4947d34d90a09b484587a1f8ec960d0483e64f0de0433b74efff1e3bc392169d1064698fc9d192dac08180b4aa
+    "@nativescript-community/ui-core": "npm:^1.1.0"
+  checksum: 10/e1c9674016870852a850a80f6d95c6c3f132ab1eec6a3ad9c3cbb870e5d2364252e026a5fbed763137338d290b184dd446d1e47f4bc4ef69af35422d82ce6a59
   languageName: node
   linkType: hard
 
-"@nativescript-community/ui-material-segmentedbar@npm:7.3.2":
-  version: 7.3.2
-  resolution: "@nativescript-community/ui-material-segmentedbar@npm:7.3.2"
-  dependencies:
-    "@nativescript-community/ui-material-button": "npm:^7.3.2"
-    "@nativescript-community/ui-material-core": "npm:^7.3.2"
-  checksum: 10/44b6678ba7cb7aae54950f15e7624b840c5dc26389aaf656b02b85a537d2b71455ae007777274d11fcab9ae468b52b98605fabab4d0bab6717cfd4f2f307135d
+"@nativescript-community/ui-share-file@npm:1.3.3, @nativescript-community/ui-share-file@npm:^1.3.3":
+  version: 1.3.3
+  resolution: "@nativescript-community/ui-share-file@npm:1.3.3"
+  checksum: 10/b4e512f5a9e8681dc35dfd683aa76e66cae8298c037468c06ce3697ee5ab64e1adb181659e8798bb4b12870631fbabc09958f1bf959c714dcaebe739da9bb3aa
   languageName: node
   linkType: hard
 
-"@nativescript-community/ui-material-slider@npm:7.3.2":
-  version: 7.3.2
-  resolution: "@nativescript-community/ui-material-slider@npm:7.3.2"
+"@nativescript-community/ui-slider@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@nativescript-community/ui-slider@npm:1.1.0"
   dependencies:
-    "@nativescript-community/ui-material-core": "npm:^7.3.2"
-  checksum: 10/1b9fdcc99597c6733deb8ccaed0aff8fd96e752dcdc013514cdddeb535fca48ec33963d10f66f8d7d77f913699906024e30d32948330458a6ebca237b4ac15c2
+    "@nativescript-community/ui-core": "npm:^1.1.0"
+  checksum: 10/49286a3a9b049f5409907f6fe7b637b33be49e7b8ed59cb05077f2bf2651a3e2dd09880587bdf3d1d6799a733fd65dd540777bb52d5799ce35e5782d189e6cbc
   languageName: node
   linkType: hard
 
-"@nativescript-community/ui-material-snackbar@npm:7.3.2":
-  version: 7.3.2
-  resolution: "@nativescript-community/ui-material-snackbar@npm:7.3.2"
+"@nativescript-community/ui-snackbar@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@nativescript-community/ui-snackbar@npm:1.1.0"
   dependencies:
-    "@nativescript-community/ui-material-core": "npm:^7.3.2"
-  checksum: 10/ec3cd04e4f466783412b5c3305a20798fbb99fffff335d90dbe7a21e9381135d007c940d1b13d6fccd4e5c19b399b56b7f06b07fe8702d997bb78b29f8b46b0c
+    "@nativescript-community/ui-core": "npm:^1.1.0"
+  checksum: 10/3b1864e6fd652d2e3d30ba067d16d1624394b929c60d2f6ba6ce3622066a6a17690fae666ec224be56ee1db3cb347a1184f9a7d535e0f26583cbee79e641a11b
   languageName: node
   linkType: hard
 
-"@nativescript-community/ui-material-switch@npm:7.3.2":
-  version: 7.3.2
-  resolution: "@nativescript-community/ui-material-switch@npm:7.3.2"
+"@nativescript-community/ui-svg@npm:0.2.24":
+  version: 0.2.24
+  resolution: "@nativescript-community/ui-svg@npm:0.2.24"
   dependencies:
-    "@nativescript-community/ui-material-core": "npm:^7.3.2"
-  checksum: 10/a41516c653a8fe27fdce1f4d867c713eda578b99422caf5827e6e6f42e925b960cc13a361c60772ae9812405e6ffe61906a090b9edf0d209c3e122b3fd36d5fa
+    "@nativescript-community/ui-canvas": "npm:^4.6.52"
+  checksum: 10/f722be22c8aeba52a1864c43559d7e4f88602b838d56a12fd1201b45411f0b1d80af29324cae228a48e99f222dd4d238fe0d91974338cdaf262078e089d43d58
   languageName: node
   linkType: hard
 
-"@nativescript-community/ui-material-tabs@npm:7.3.2":
-  version: 7.3.2
-  resolution: "@nativescript-community/ui-material-tabs@npm:7.3.2"
+"@nativescript-community/ui-switch@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@nativescript-community/ui-switch@npm:1.1.0"
   dependencies:
-    "@nativescript-community/ui-material-core": "npm:^7.3.2"
-    "@nativescript-community/ui-material-core-tabs": "npm:^7.3.2"
-  checksum: 10/6e3f3fbca5a71b8c01f71ea46979e42204702cff0e05a146d3040662c0e5872d733c6eb6e9a0500a298503612f14b2b717723aed378ec38e1071b01fa1cae457
+    "@nativescript-community/ui-core": "npm:^1.1.0"
+  checksum: 10/2ef27145098e62eede8988f4cefef4e618a7b170402598717e28a773aee2b6517b6dfd6e5bd0a2b5c2a37c321a69b9ee4caafa61d612a24e65acfe9340021c2d
   languageName: node
   linkType: hard
 
-"@nativescript-community/ui-material-textfield@npm:7.3.2, @nativescript-community/ui-material-textfield@npm:^7.3.2":
-  version: 7.3.2
-  resolution: "@nativescript-community/ui-material-textfield@npm:7.3.2"
+"@nativescript-community/ui-textfield@npm:1.1.0, @nativescript-community/ui-textfield@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@nativescript-community/ui-textfield@npm:1.1.0"
   dependencies:
     "@nativescript-community/text": "npm:^1.5.33"
-    "@nativescript-community/ui-material-core": "npm:^7.3.2"
-  checksum: 10/f72e177dc24aef39689d439e42cb62e662abe511180498ffb00870a2f9c88a77e8753fa5b2aafc29b85b53b290594f2d0ef675dc655c48914828c0683e73e21f
+    "@nativescript-community/ui-core": "npm:^1.1.0"
+  checksum: 10/47d964fbd5108edf21f88c7e53568ae7790aff8c156b19499e24f3717046e15e11de198a044e512b4d23ce5304c7da025d78ae786f0ed79df15335a7298a2943
   languageName: node
   linkType: hard
 
-"@nativescript-community/ui-material-textview@npm:7.3.2":
-  version: 7.3.2
-  resolution: "@nativescript-community/ui-material-textview@npm:7.3.2"
+"@nativescript-community/ui-textview@npm:1.1.0":
+  version: 1.1.0
+  resolution: "@nativescript-community/ui-textview@npm:1.1.0"
   dependencies:
     "@nativescript-community/text": "npm:^1.5.33"
-    "@nativescript-community/ui-material-core": "npm:^7.3.2"
-  checksum: 10/f83c9d06ead2fb6e9af95e225ce8a2cda6ba0000fb12d38038daebcf12f862e833de1a8aea5694f0b13e1a68462819a928cd5ccf7933bc178f198a77434d3ef0
-  languageName: node
-  linkType: hard
-
-"@nativescript-community/ui-pager-indicator@npm:14.1.42":
-  version: 14.1.42
-  resolution: "@nativescript-community/ui-pager-indicator@npm:14.1.42"
-  checksum: 10/f83ea473631428ad7dea7e4fbf3138b8939860192ae1cee98bc0cee67ed0d6c2e0f7b2a7a5cfd06bc2c828290b85e216b313677d3fb6cb925a6e51fd90fc9010
-  languageName: node
-  linkType: hard
-
-"@nativescript-community/ui-pager@npm:14.1.42":
-  version: 14.1.42
-  resolution: "@nativescript-community/ui-pager@npm:14.1.42"
-  checksum: 10/0c88d84dd4298ce24f353925476a33c46a5ad9cb4f92567367641972e4d0165b31dffcb4639489efa2aa0e5c63a51792b6b2afb2b9749362356b94168b9ab43e
-  languageName: node
-  linkType: hard
-
-"@nativescript-community/ui-popover@npm:0.1.22":
-  version: 0.1.22
-  resolution: "@nativescript-community/ui-popover@npm:0.1.22"
-  checksum: 10/9e80c03656ca129784ac7eee8f133885cd62735f31ec4defda59610652d85a5663e6a45e19d35a40922bd05b74c00a85643ea2d804840bf0f059b47a618e26f2
-  languageName: node
-  linkType: hard
-
-"@nativescript-community/ui-share-file@npm:1.3.3, @nativescript-community/ui-share-file@npm:^1.3.3":
-  version: 1.3.3
-  resolution: "@nativescript-community/ui-share-file@npm:1.3.3"
-  checksum: 10/b4e512f5a9e8681dc35dfd683aa76e66cae8298c037468c06ce3697ee5ab64e1adb181659e8798bb4b12870631fbabc09958f1bf959c714dcaebe739da9bb3aa
-  languageName: node
-  linkType: hard
-
-"@nativescript-community/ui-svg@npm:0.2.24":
-  version: 0.2.24
-  resolution: "@nativescript-community/ui-svg@npm:0.2.24"
-  dependencies:
-    "@nativescript-community/ui-canvas": "npm:^4.6.52"
-  checksum: 10/f722be22c8aeba52a1864c43559d7e4f88602b838d56a12fd1201b45411f0b1d80af29324cae228a48e99f222dd4d238fe0d91974338cdaf262078e089d43d58
+    "@nativescript-community/ui-core": "npm:^1.1.0"
+  checksum: 10/12467efcc84c4d5d678d27defcaf3af5d5d4fb06aa01965a5a0b7bffd205753a4066b9afc8bd7c14efe878de72eef257e593c751717ef7c3b23052093479b54d
   languageName: node
   linkType: hard
 
@@ -1944,6 +1961,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nativescript/ios@npm:9.1.0":
+  version: 9.1.0
+  resolution: "@nativescript/ios@npm:9.1.0"
+  checksum: 10/85f69eb0c1a72ec68db1bff7a493d1383b6450e25f1d7bdaa9a9999a8a9b38aeb26b7fe4b888899595d62566983b5b325aee9db40924b3599fe15e466f59b1c6
+  languageName: node
+  linkType: hard
+
 "@nativescript/types-android@npm:8.9.0":
   version: 8.9.0
   resolution: "@nativescript/types-android@npm:8.9.0"
@@ -11141,34 +11165,37 @@ __metadata:
     "@nativescript-community/svelte-native": "npm:1.0.32"
     "@nativescript-community/systemui": "npm:1.1.25"
     "@nativescript-community/text": "npm:1.6.25"
+    "@nativescript-community/ui-activityindicator": "npm:1.1.0"
+    "@nativescript-community/ui-appbar": "npm:1.1.0"
+    "@nativescript-community/ui-bottomsheet": "npm:1.1.0"
+    "@nativescript-community/ui-button": "npm:1.1.0"
     "@nativescript-community/ui-cameraview": "npm:0.7.0"
     "@nativescript-community/ui-canvas": "npm:4.6.52"
     "@nativescript-community/ui-canvaslabel": "npm:1.2.55"
-    "@nativescript-community/ui-checkbox": "npm:2.0.18"
+    "@nativescript-community/ui-checkbox": "npm:1.1.0"
     "@nativescript-community/ui-collectionview": "npm:6.0.27"
     "@nativescript-community/ui-collectionview-swipemenu": "npm:6.0.27"
+    "@nativescript-community/ui-core": "npm:1.1.0"
+    "@nativescript-community/ui-dialogs": "npm:1.1.0"
     "@nativescript-community/ui-document-picker": "npm:1.1.29"
+    "@nativescript-community/ui-floatingactionbutton": "npm:1.1.0"
     "@nativescript-community/ui-image": "npm:4.6.20"
     "@nativescript-community/ui-image-colorfilter": "npm:4.6.20"
     "@nativescript-community/ui-label": "npm:2.0.4"
     "@nativescript-community/ui-lottie": "npm:~5.0.11"
-    "@nativescript-community/ui-material-activityindicator": "npm:7.3.2"
-    "@nativescript-community/ui-material-bottomsheet": "npm:7.3.2"
-    "@nativescript-community/ui-material-button": "npm:7.3.2"
-    "@nativescript-community/ui-material-dialogs": "npm:7.3.2"
-    "@nativescript-community/ui-material-progress": "npm:7.3.2"
-    "@nativescript-community/ui-material-segmentedbar": "npm:7.3.2"
-    "@nativescript-community/ui-material-slider": "npm:7.3.2"
-    "@nativescript-community/ui-material-snackbar": "npm:7.3.2"
-    "@nativescript-community/ui-material-switch": "npm:7.3.2"
-    "@nativescript-community/ui-material-tabs": "npm:7.3.2"
-    "@nativescript-community/ui-material-textfield": "npm:7.3.2"
-    "@nativescript-community/ui-material-textview": "npm:7.3.2"
+    "@nativescript-community/ui-menu": "npm:1.1.0"
     "@nativescript-community/ui-pager": "npm:14.1.42"
     "@nativescript-community/ui-pager-indicator": "npm:14.1.42"
     "@nativescript-community/ui-popover": "npm:0.1.22"
+    "@nativescript-community/ui-progress": "npm:1.1.0"
+    "@nativescript-community/ui-segmentedbar": "npm:1.1.0"
     "@nativescript-community/ui-share-file": "npm:1.3.3"
+    "@nativescript-community/ui-slider": "npm:1.1.0"
+    "@nativescript-community/ui-snackbar": "npm:1.1.0"
     "@nativescript-community/ui-svg": "npm:0.2.24"
+    "@nativescript-community/ui-switch": "npm:1.1.0"
+    "@nativescript-community/ui-textfield": "npm:1.1.0"
+    "@nativescript-community/ui-textview": "npm:1.1.0"
     "@nativescript-community/ui-webview": "npm:1.6.2"
     "@nativescript-community/ui-zoomimage": "npm:4.6.20"
     "@nativescript/android": "npm:9.1.1"
@@ -11177,6 +11204,7 @@ __metadata:
     "@nativescript/core": "npm:9.0.20"
     "@nativescript/datetimepicker": "npm:3.0.2"
     "@nativescript/imagepicker": "npm:5.0.0"
+    "@nativescript/ios": "npm:9.1.0"
     buffer: "npm:^6.0.3"
     dayjs: "npm:1.11.19"
     fast-xml-parser: "npm:5.8.0"

From d610a4e0b62006b5717c6d4ddaa1e24d5e642c55 Mon Sep 17 00:00:00 2001
From: Martin Guillon <dev@akylas.fr>
Date: Sat, 24 Oct 2026 14:24:10 +0200
Subject: [PATCH 02/11] feat(list): use the native app bar, inline search and
 selection toolbar

Replace the custom action bar of the document and card lists with ui-appbar:

- M3 search bar hosting the actions on Android, large-less inline title, glass bar items and
  bottom search on iOS; search filters the current list in place
- primary and import actions come from one `actions` list: FABs on Android, "+" menu and bottom
  toolbar button on iOS
- selection actions use the bottom toolbar (floating toolbar on Android, UIToolbar on iOS)
- Catalyst only: right click context menus and Cmd+F / Cmd+, shortcuts

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 app/components/list/CardsList.svelte     |   7 +-
 app/components/list/DocumentsList.svelte |  13 +-
 app/components/list/MainList.svelte      | 462 +++++++++++++----------
 app/utils/appIcons.ts                    |  80 ++++
 4 files changed, 351 insertions(+), 211 deletions(-)
 create mode 100644 app/utils/appIcons.ts

diff --git a/app/components/list/CardsList.svelte b/app/components/list/CardsList.svelte
index ba2ad740d..8f1ef6cb2 100644
--- a/app/components/list/CardsList.svelte
+++ b/app/components/list/CardsList.svelte
@@ -4,7 +4,7 @@
     import { NativeViewElementNode } from '@nativescript-community/svelte-native/dom';
     import { Paint } from '@nativescript-community/ui-canvas';
     import { CollectionViewWithSwipeMenu } from '@nativescript-community/ui-collectionview-swipemenu';
-    import { showBottomSheet } from '@nativescript-community/ui-material-bottomsheet/svelte';
+    import { showBottomSheet } from '@nativescript-community/ui-bottomsheet/svelte';
     import { ApplicationSettings, ObservableArray, StackLayout } from '@nativescript/core';
     import { throttle } from '@nativescript/core/utils';
     import { prefs } from '@shared/services/preferences';
@@ -277,6 +277,7 @@
 </script>
 
 <MainList
+    actions={[{ text: lc('add'), icon: 'add', onTap: () => onAddButton() }]}
     collectionViewOptions={{
         // spanSize: (item) => itemTemplateSpanSize(viewStyle, item),
         swipeMenuId: 'swipeMenu',
@@ -458,8 +459,8 @@
         />
     </Template>
 
-    <stacklayout bind:this={fabHolder} slot="fab" class="fabHolder" marginBottom={Math.min(60, $windowInset.bottom)} orientation="horizontal" row={2}>
-        <mdbutton bind:this={fabHolder} class="fab" text="mdi-plus" on:tap={throttle(() => onAddButton(), 500)} />
+    <stacklayout bind:this={fabHolder} slot="fab" class="fabHolder" marginBottom={Math.min(60, $windowInset.bottom)} orientation="horizontal">
+        <uibutton bind:this={fabHolder} class="fab" text="mdi-plus" on:tap={throttle(() => onAddButton(), 500)} />
     </stacklayout>
 
     <!-- <canvasview bind:this={canvastest} slot="test" row={2} on:draw={onDrawCanvasTest} on:tap={() => (canvastest.nativeView.visibility = 'hidden')}> </canvasview> -->
diff --git a/app/components/list/DocumentsList.svelte b/app/components/list/DocumentsList.svelte
index 9cbd3fbf6..3b298a3e7 100644
--- a/app/components/list/DocumentsList.svelte
+++ b/app/components/list/DocumentsList.svelte
@@ -99,6 +99,11 @@
 </script>
 
 <MainList
+    actions={[
+        { text: lc('import_from_image'), icon: 'import_image', onTap: () => importImages() },
+        { text: lc('import_from_file'), icon: 'import_file', onTap: () => importDocument() },
+        { text: lc('camera'), icon: 'camera', primary: true, onTap: () => onStartCam() }
+    ]}
     folderViewStyles={{
         horizontal: { name: lc('horizontal') },
         vertical: { name: lc('vertical') }
@@ -152,9 +157,9 @@
         </canvasview>
     </Template>
 
-    <stacklayout bind:this={fabHolder} slot="fab" class="fabHolder" marginBottom={Math.min(60, $windowInset.bottom)} orientation="horizontal" row={2}>
-        <mdbutton class="small-fab" horizontalAlignment="center" text="mdi-image-plus-outline" verticalAlignment="center" on:tap={throttle(() => importImages(), 500)} />
-        <mdbutton
+    <stacklayout bind:this={fabHolder} slot="fab" class="fabHolder" marginBottom={Math.min(60, $windowInset.bottom)} orientation="horizontal">
+        <uibutton class="small-fab" horizontalAlignment="center" text="mdi-image-plus-outline" verticalAlignment="center" on:tap={throttle(() => importImages(), 500)} />
+        <uibutton
             class={$hasCamera ? 'small-fab' : 'fab'}
             horizontalAlignment="center"
             text="mdi-file-document-plus-outline"
@@ -162,7 +167,7 @@
             on:tap={throttle(() => importDocument(), 500)}
         />
         {#if $hasCamera}
-            <mdbutton id="fab" class="fab" text="mdi-camera" verticalAlignment="center" on:tap={throttle(() => onStartCam(), 500)} on:longPress={() => onStartCam(true)} />
+            <uibutton id="fab" class="fab" text="mdi-camera" verticalAlignment="center" on:tap={throttle(() => onStartCam(), 500)} on:longPress={() => onStartCam(true)} />
         {/if}
     </stacklayout>
 </MainList>
diff --git a/app/components/list/MainList.svelte b/app/components/list/MainList.svelte
index ffcf47127..e2c50b840 100644
--- a/app/components/list/MainList.svelte
+++ b/app/components/list/MainList.svelte
@@ -5,12 +5,13 @@
     import { CollectionView } from '@nativescript-community/ui-collectionview';
     import { Img } from '@nativescript-community/ui-image';
     import { createNativeAttributedString } from '@nativescript-community/ui-label';
-    import { confirm, prompt } from '@nativescript-community/ui-material-dialogs';
+    import { confirm, prompt } from '@nativescript-community/ui-dialogs';
     import { VerticalPosition } from '@nativescript-community/ui-popover';
-    import { AnimationDefinition, Application, ApplicationSettings, Color, EventData, Frame, NavigatedData, ObservableArray, Page, Screen, StackLayout } from '@nativescript/core';
+    import { isCatalyst, windowCommandEvent } from '@shared/utils/window';
+    import { setContextMenu } from '@nativescript-community/ui-menu';
+    import { AnimationDefinition, Application, ApplicationSettings, Color, EventData, Frame, NavigatedData, ObservableArray, Page, ProxyViewContainer, Screen, StackLayout, View } from '@nativescript/core';
     import { AndroidActivityBackPressedEventData } from '@nativescript/core/application/application-interfaces';
     import { debounce, throttle } from '@nativescript/core/utils';
-    import ActionBarSearch from '@shared/components/ActionBarSearch.svelte';
     import ListItemAutoSize from '@shared/components/ListItemAutoSize.svelte';
     import { OptionType } from '@shared/components/OptionSelect.svelte';
     import { prefs } from '@shared/services/preferences';
@@ -18,10 +19,11 @@
     import { closeModal, fade, goBack, navigate } from '@shared/utils/svelte/ui';
     import { onDestroy, onMount } from 'svelte';
     import { writable } from 'svelte/store';
-    import CActionBar from '~/components/common/CActionBar.svelte';
+    import type { AppBar } from '@nativescript-community/ui-appbar';
+    import type { MenuItem } from '@nativescript-community/ui-menu';
+    import { appIcon } from '~/utils/appIcons';
     import EditNameActionBar from '~/components/common/EditNameActionBar.svelte';
     import SelectedIndicator from '~/components/common/SelectedIndicator.svelte';
-    import SelectionToolbar from '~/components/common/SelectionToolbar.svelte';
     import { l, lc, lcp, lp } from '~/helpers/locale';
     import { getRealTheme, isEInk, onThemeChanged } from '~/helpers/theme';
     import { DocFolder, OCRDocument, OCRPage } from '~/models/OCRDocument';
@@ -138,11 +140,14 @@
     let foldersCollectionView: NativeViewElementNode<CollectionView>;
     // let lottieView: NativeViewElementNode<LottieView>;
     export let fabHolder: NativeViewElementNode<StackLayout> = null;
-    let search: ActionBarSearch;
+    let searchTimer: ReturnType<typeof setTimeout>;
+    let appBar: NativeViewElementNode<AppBar>;
 
     export let folder: DocFolder = null;
     export let title: string;
     export let modal: boolean = false;
+    // iOS has no FAB: `primary` goes to the bottom toolbar, the others to the "+" menu of the bar
+    export let actions: { text: string; icon: string; primary?: boolean; onTap: () => void }[] = [];
     export let itemTemplateSelector = (viewStyle, item?: Item) => item?.type || 'default';
     export let viewStyles: { [k: string]: { name: string; icon?: string; type?: string; boxType?: string } };
     export let folderViewStyles: { [k: string]: { name: string; icon?: string; type?: string; boxType?: string } } = {};
@@ -179,7 +184,9 @@
     $: updateTitle(folder);
 
     export let updateTitle = (folder) => {
-        if (folder) {
+        if (folder && __IOS__) {
+            title = folder.name;
+        } else if (folder) {
             // DEV_LOG && console.log('updateTitle', $fontScale, folder);
             title = createNativeAttributedString(
                 {
@@ -227,8 +234,6 @@
     prefs.on(`key:${SETTINGS_NB_COLUMNS}`, () => updateColumns($isLandscape));
     prefs.on(`key:${SETTINGS_NB_COLUMNS_LANDSCAPE}`, () => updateColumns($isLandscape));
 
-    $: if (nbSelected > 0) search.unfocusSearch();
-
     // Animate FAB visibility when selection changes
     $: if (fabHolder?.nativeView) {
         fabHolder.nativeView.animate({
@@ -514,8 +519,22 @@
         }
     }
 
+    function onWindowCommand(event: EventData & { commandId: string }) {
+        if (Frame.topmost()?.currentPage !== page?.nativeView) {
+            return;
+        }
+        if (event.commandId === 'search') {
+            appBar?.nativeView?.focusSearch();
+        } else if (event.commandId === 'preferences') {
+            openPreferences();
+        }
+    }
+
     onMount(() => {
         mounted = true;
+        if (__IOS__) {
+            Application.on(windowCommandEvent, onWindowCommand);
+        }
         // DEV_LOG && console.log('MainList', 'onMount', documentsService.id, viewStyle);
         updateColumns($isLandscape);
         Application.on('snackMessageAnimation', onSnackMessageAnimation);
@@ -547,6 +566,9 @@
     });
     onDestroy(() => {
         DEV_LOG && console.log('MainList', 'onDestroy');
+        if (__IOS__) {
+            Application.off(windowCommandEvent, onWindowCommand);
+        }
         Application.off('snackMessageAnimation', onSnackMessageAnimation);
         if (__ANDROID__) {
             Application.android.off(Application.android.activityBackPressedEvent, onAndroidBackButton);
@@ -606,7 +628,6 @@
     }
     function onNavigatingFrom() {
         // shown = false;
-        search.unfocusSearch();
     }
     function selectItem(item: Item) {
         if (!item.selected) {
@@ -769,17 +790,14 @@
                 data.cancel = true;
             }
             editingTitle = false;
-        } else if (showSearch) {
+        } else if (appBar?.nativeView?.closeSearch()) {
             if (data) {
                 data.cancel = true;
             }
-            search.hideSearch();
         }
     }
     function actionBarOnGoBack() {
-        if (showSearch) {
-            search.hideSearch();
-        } else if (modal) {
+        if (modal) {
             closeModal();
         } else if (Frame.topmost().canGoBack()) {
             goBack();
@@ -962,102 +980,61 @@
         }
     }
 
-    async function showViewOptions(event) {
-        try {
-            const options = new ObservableArray(
-                ([{ type: 'header', title: lc('view_style') }] as any)
-                    .concat(
-                        Object.keys(viewStyles).map((k) => ({
-                            id: k,
-                            ...viewStyles[k],
-                            boxType: 'circle',
-                            type: 'checkbox',
-                            value: viewStyle === k,
-                            group: 'viewStyle',
-                            color: (item) => (item.value ? colorPrimary : undefined)
-                        }))
-                    )
-                    .concat(
-                        Object.keys(folderViewStyles).length > 1
-                            ? [
-                                  { type: 'header', title: lc('folder_view_style') },
-                                  ...Object.keys(folderViewStyles).map((k) => ({
-                                      id: k,
-                                      ...folderViewStyles[k],
-                                      boxType: 'circle',
-                                      type: 'checkbox',
-                                      value: folderViewStyle === k,
-                                      group: 'folderViewStyle',
-                                      color: (item) => (item.value ? colorPrimary : undefined)
-                                  }))
-                              ]
-                            : []
-                    )
-                    .concat([{ type: 'header', title: lc('sort') }])
-                    .concat(
-                        Object.keys(sortKeys).map((k) => ({
-                            id: k,
-                            ...sortKeys[k],
-                            boxType: 'circle',
-                            type: 'checkbox',
-                            value: sortOrder.includes(k),
-                            group: 'sort'
-                            // color: (item) => (!!item.value ? colorPrimary : undefined)
-                        }))
-                    )
-                    .concat([{ type: 'checkbox', title: lc('ascending'), id: 'ascending', value: sortOrder.indexOf('ASC') !== -1 }])
-            );
-            // const options = Object.keys(OPTIONS[option]).map((k) => ({ ...OPTIONS[option][k], id: k }));
-            await showPopoverMenu({
-                anchor: event.object,
-                options,
-                vertPos: VerticalPosition.BELOW,
-                props: {
-                    width: 200 * $fontScale,
-                    autoSizeListItem: true,
-                    onCheckBox: (item, value) => {
-                        if (item.group === 'viewStyle') {
-                            const changed = viewStyleChanged(item.id, viewStyle);
-
-                            viewStyle = item.id;
-                            ApplicationSettings.setString(SETTINGS_VIEW_STYLE, viewStyle);
-                            updateColumns($isLandscape);
-                            if (changed) {
-                                collectionView?.nativeView.refresh();
-                            }
-                        } else if (item.group === 'folderViewStyle') {
-                            const changed = folderViewStyleChanged(item.id, folderViewStyle);
-
-                            folderViewStyle = item.id;
-                            ApplicationSettings.setString(SETTINGS_FOLDER_VIEW_STYLE, folderViewStyle);
-                            if (changed) {
-                                refresh();
-                            }
-                        } else if (item.group === 'sort') {
-                            if (item.id === 'useCount') {
-                                // Most-used is always descending (most used first)
-                                sortOrder = 'useCount DESC';
-                            } else {
-                                const currentAscending = sortOrder.indexOf('ASC') !== -1;
-                                sortOrder = `${item.id} ${currentAscending ? 'ASC' : 'DESC'}`;
-                            }
-                            ApplicationSettings.setString(SETTINGS_SORT_ORDER, sortOrder);
-                            refreshThrottle();
-                        } else if (item.id === 'ascending') {
-                            const currentKey = sortOrder.split(' ')[0];
-                            if (currentKey !== 'useCount') {
-                                sortOrder = `${currentKey} ${value ? 'ASC' : 'DESC'}`;
-                                ApplicationSettings.setString(SETTINGS_SORT_ORDER, sortOrder);
-                                refreshThrottle();
-                            }
-                        }
-                    }
-                }
-            });
-        } catch (error) {
-            showError(error);
+    function selectViewStyle(id: string) {
+        const changed = viewStyleChanged(id, viewStyle);
+        viewStyle = id;
+        ApplicationSettings.setString(SETTINGS_VIEW_STYLE, viewStyle);
+        updateColumns($isLandscape);
+        if (changed) {
+            collectionView?.nativeView.refresh();
+        }
+    }
+    function selectFolderViewStyle(id: string) {
+        const changed = folderViewStyleChanged(id, folderViewStyle);
+        folderViewStyle = id;
+        ApplicationSettings.setString(SETTINGS_FOLDER_VIEW_STYLE, folderViewStyle);
+        if (changed) {
+            refresh();
         }
     }
+    function selectSortKey(id: string) {
+        if (id === 'useCount') {
+            // Most-used is always descending (most used first)
+            sortOrder = 'useCount DESC';
+        } else {
+            const currentAscending = sortOrder.indexOf('ASC') !== -1;
+            sortOrder = `${id} ${currentAscending ? 'ASC' : 'DESC'}`;
+        }
+        ApplicationSettings.setString(SETTINGS_SORT_ORDER, sortOrder);
+        refreshThrottle();
+    }
+    function toggleAscending() {
+        const currentKey = sortOrder.split(' ')[0];
+        if (currentKey !== 'useCount') {
+            sortOrder = `${currentKey} ${sortOrder.indexOf('ASC') !== -1 ? 'DESC' : 'ASC'}`;
+            ApplicationSettings.setString(SETTINGS_SORT_ORDER, sortOrder);
+            refreshThrottle();
+        }
+    }
+    function getViewOptionsMenu(currentViewStyle: string, currentFolderViewStyle: string, currentSortOrder: string): MenuItem[] {
+        const folderViewStyleKeys = Object.keys(folderViewStyles);
+        return [
+            { title: lc('view_style'), disabled: true },
+            ...Object.keys(viewStyles).map((key) => ({ title: viewStyles[key].name, checked: currentViewStyle === key, onSelect: () => selectViewStyle(key) })),
+            ...(folderViewStyleKeys.length > 1
+                ? [
+                      { separator: true },
+                      { title: lc('folder_view_style'), disabled: true },
+                      ...folderViewStyleKeys.map((key) => ({ title: folderViewStyles[key].name, checked: currentFolderViewStyle === key, onSelect: () => selectFolderViewStyle(key) }))
+                  ]
+                : []),
+            { separator: true },
+            { title: lc('sort'), disabled: true },
+            ...Object.keys(sortKeys).map((key) => ({ title: sortKeys[key].name, checked: currentSortOrder.includes(key), onSelect: () => selectSortKey(key) })),
+            { title: lc('ascending'), checked: currentSortOrder.indexOf('ASC') !== -1, onSelect: toggleAscending }
+        ];
+    }
+    $: viewOptionsMenu = getViewOptionsMenu(viewStyle, folderViewStyle, sortOrder);
 
     async function syncDocuments() {
         try {
@@ -1140,6 +1117,62 @@
         return showImagePopoverMenu(selection[0], event.object, { vertPos: VerticalPosition.ABOVE });
     }
 
+    const contextMenuItems = new WeakMap<View, Item>();
+
+    function findCurrentItem(item: Item) {
+        const items = item.folder && folderViewStyle === 'horizontal' ? folderItems : documents;
+        return items?.slice().find((current) => (item.folder ? current.folder === item.folder : current.doc === item.doc)) ?? item;
+    }
+
+    async function handleContextMenuAction(view: View, item: Item, optionId: string) {
+        if (optionId === 'open') {
+            return onItemTap(item);
+        }
+        if (optionId === 'select') {
+            return onItemLongPress(item);
+        }
+        if (!item.selected) {
+            unselectAll();
+            selectItem(findCurrentItem(item));
+        }
+        return handleSelectionAction({ object: view }, { id: optionId, name: optionId });
+    }
+
+    function getContextMenuItems(view: View) {
+        const item = contextMenuItems.get(view);
+        if (!item?.doc && !item?.folder) {
+            return [];
+        }
+        const options = getSelectionToolbarOptions().filter((option) => option.id !== 'select_all' && option.id !== 'rename');
+        if (!isTrash && (nbSelected === 0 || (nbSelected === 1 && item.selected))) {
+            options.splice(options.findIndex((option) => option.id === 'delete') + 1, 0, { icon: 'mdi-rename', id: 'rename', name: lc('rename') });
+        }
+        return [
+            ...(isTrash ? [] : [{ id: 'open', title: lc('open'), icon: appIcon('open') }]),
+            { id: 'select', title: lc('select'), icon: appIcon('select') },
+            { separator: true },
+            ...options.map((option) => ({ id: option.id, title: option.name, icon: appIcon(option.id), destructive: option.id.startsWith('delete') }))
+        ];
+    }
+
+    // right click on Mac Catalyst, long press keeps selecting on the other platforms
+    function onCollectionViewItemLoading(event: { view: View; bindingContext: Item }) {
+        if (!isCatalyst || !event.bindingContext) {
+            return;
+        }
+        const view = event.view instanceof ProxyViewContainer ? event.view.getChildAt(0) : event.view;
+        if (!view) {
+            return;
+        }
+        if (!contextMenuItems.has(view)) {
+            setContextMenu(view, {
+                items: () => getContextMenuItems(view),
+                onSelect: (menuItem) => handleContextMenuAction(view, contextMenuItems.get(view), menuItem.id as string)
+            });
+        }
+        contextMenuItems.set(view, event.bindingContext);
+    }
+
     function getSelectionToolbarOptions() {
         if (isTrash) {
             return [
@@ -1287,61 +1320,64 @@
         })
     );
 
-    async function showOptions(event) {
-        try {
-            const options = (
-                !isTrash && trashEnabled
-                    ? [
-                          {
-                              icon: 'mdi-trash-can-outline',
-                              id: 'open_trash',
-                              name: lc('open_trash')
-                          }
-                      ]
-                    : []
-            ).concat([
+    const openPreferences = tryCatchFunction(async () => {
+        const Settings = (await import('~/components/settings/Settings.svelte')).default;
+        navigate({ page: Settings });
+    });
+    const openTrash = tryCatchFunction(async () => {
+        const TrashList = (await import('~/components/list/TrashList.svelte')).default;
+        navigate({ page: TrashList });
+    });
+    $: primaryAction = actions.find((action) => action.primary);
+    $: secondaryActions = actions.filter((action) => !action.primary);
+    $: plusMenu = secondaryActions.map((action) => ({ title: action.text, icon: appIcon(action.icon), onSelect: action.onTap }));
+    function getSelectionBottomItems(options: OptionType[]) {
+        const toolbarIds = isTrash ? options.map((option) => option.id) : ['pdf', 'share', 'delete'];
+        const toolbarOptions = options.filter((option) => toolbarIds.includes(option.id));
+        const menuOptions = options.filter((option) => !toolbarIds.includes(option.id));
+        const onAction = (option: OptionType) => handleSelectionAction({ object: collectionView?.nativeView }, option);
+        const items: any[] = toolbarOptions.flatMap((option) => [{ spacer: true }, { text: option.name, icon: appIcon(option.id), onTap: () => onAction(option) }]);
+        if (menuOptions.length) {
+            items.push(
+                { spacer: true },
                 {
-                    icon: 'mdi-cogs',
-                    id: 'preferences',
-                    name: lc('preferences')
+                    text: lc('more_options'),
+                    icon: appIcon('more'),
+                    menu: menuOptions.map((option) => ({ title: option.name, icon: appIcon(option.id), onSelect: () => onAction(option) }))
                 }
-            ]);
-
-            await showPopoverMenu({
-                options,
-                anchor: event.object,
-                vertPos: VerticalPosition.BELOW,
-                props: {
-                    width: 220 * $fontScale,
-                    maxHeight: Screen.mainScreen.heightDIPs - $actionBarHeight
-                    // autoSizeListItem: true
-                },
-
-                onClose: async (item) => {
-                    try {
-                        if (item) {
-                            switch (item.id) {
-                                case 'preferences':
-                                    const Settings = (await import('~/components/settings/Settings.svelte')).default;
-                                    navigate({ page: Settings });
-                                    break;
-                                case 'open_trash':
-                                    const TrashList = (await import('~/components/list/TrashList.svelte')).default;
-                                    navigate({ page: TrashList });
-                                    break;
-                            }
-                        }
-                    } catch (error) {
-                        showError(error);
-                    } finally {
-                        hideLoading();
-                    }
-                }
-            });
-        } catch (error) {
-            showError(error);
+            );
         }
+        return items.concat({ spacer: true });
+    }
+    $: bottomItems =
+        nbSelected > 0
+            ? getSelectionBottomItems(getSelectionToolbarOptions())
+            : __IOS__ && primaryAction
+              ? [{ search: true }, { text: primaryAction.text, icon: appIcon(primaryAction.icon), onTap: primaryAction.onTap }]
+              : [];
+    let iosMenu: MenuItem[];
+    $: iosMenu = [
+        { title: lc('view_style'), icon: appIcon('view_style'), items: viewOptionsMenu },
+        ...(!isTrash && trashEnabled ? [{ title: lc('open_trash'), icon: appIcon('trash'), onSelect: openTrash }] : [])
+    ];
+    let optionsMenu: MenuItem[];
+    $: optionsMenu = [...(!isTrash && trashEnabled ? [{ title: lc('open_trash'), icon: appIcon('trash'), onSelect: openTrash }] : []), { title: lc('preferences'), icon: appIcon('settings'), onSelect: openPreferences }];
+
+    function onSearchChange(event: { text: string }) {
+        const query = event.text?.toLowerCase();
+        showSearch = !!query;
+        clearTimeout(searchTimer);
+        searchTimer = setTimeout(() => refresh(false, query?.length > 1 ? query : undefined), 500);
     }
+    function onSearchCancel() {
+        clearTimeout(searchTimer);
+        showSearch = false;
+        refresh(false, undefined);
+    }
+    let canGoBack = false;
+    onMount(() => {
+        canGoBack = !!folder || isTrash || !!Frame.topmost()?.canGoBack();
+    });
 
     const emptyTrash = tryCatchFunction(async () => {
         const confirmed = await confirm({
@@ -1357,12 +1393,63 @@
     });
 </script>
 
-<page bind:this={page} id="documentList" actionBarHidden={true} on:navigatedTo={onNavigatedTo} on:navigatingFrom={onNavigatingFrom}>
+<appPage bind:this={page} id="documentList" on:navigatedTo={onNavigatedTo} on:navigatingFrom={onNavigatingFrom}>
+    <appBar
+        bind:this={appBar}
+        scrollBehavior="lift"
+        searchable={!isTrash && !onlyForImport && nbSelected === 0}
+        scrollTarget={__IOS__ ? collectionView?.nativeView : undefined}
+        searchHint={lc('search')}
+        searchMode="inline"
+        searchPlacement="integrated"
+        {bottomItems}
+        size="small"
+        titleAlignment="leading"
+        class="listAppBar"
+        title={nbSelected > 0 ? lp('selected', nbSelected) : __IOS__ || isTrash ? title : folder?.name}
+        on:searchChange={onSearchChange}
+        on:searchCancel={onSearchCancel}
+    >
+        {#if (__ANDROID__ && nbSelected > 0) || modal || (__ANDROID__ && canGoBack)}
+            <navigationButton {...{ 'android.systemIcon': nbSelected > 0 ? 'ic_menu_close_clear_cancel' : 'ic_menu_back' }} on:tap={nbSelected > 0 ? unselectAll : actionBarOnGoBack} />
+        {/if}
+        {#if nbSelected === 0}
+            {#if isTrash}
+                <appBarItem icon={appIcon('empty_trash')} ios.position="right" text={lc('empty_trash')} on:tap={emptyTrash} />
+            {:else if !onlyForImport}
+                {#if folder}
+                    {#if __IOS__ && plusMenu.length > 1}
+                        <appBarItem icon={appIcon('add')} ios.position="right" menu={plusMenu} text={lc('add')} />
+                    {/if}
+                    <appBarItem icon={appIcon('color')} ios.position="right" text={lc('color')} on:tap={setFolderColor} />
+                {:else}
+                    {#if syncEnabled}
+                        <appBarItem icon={appIcon('sync')} ios.position="right" text={lc('sync')} on:tap={syncDocuments} />
+                    {/if}
+                    {#if __IOS__}
+                        {#if plusMenu.length > 1}
+                            <appBarItem icon={appIcon('add')} ios.position="right" menu={plusMenu} text={lc('add')} />
+                        {:else if plusMenu.length === 1}
+                            <appBarItem icon={appIcon('add')} ios.position="right" text={lc('add')} on:tap={secondaryActions[0].onTap} />
+                        {/if}
+                        <appBarItem icon={appIcon('settings')} ios.position="right" text={lc('preferences')} on:tap={openPreferences} />
+                        <appBarItem icon={appIcon('more')} ios.position="right" menu={iosMenu} />
+                    {:else}
+                        <appBarItem icon={appIcon('view_style')} ios.position="right" menu={viewOptionsMenu} text={lc('view_style')} />
+                        <appBarItem icon={appIcon('more')} ios.position="right" menu={optionsMenu} />
+                    {/if}
+                {/if}
+            {/if}
+        {:else if __IOS__}
+            <appBarItem ios.position="right" prominent={true} text={lc('cancel')} on:tap={unselectAll} />
+        {/if}
+    </appBar>
     <gridlayout class="pageContent" rows="auto,auto,*">
         <slot name="abovecollectionview" />
         <collectionView
             bind:this={collectionView}
             {colWidth}
+            on:itemLoading={onCollectionViewItemLoading}
             ios:autoReloadItemOnLayout={true}
             itemTemplateSelector={(item) => itemTemplateSelector(viewStyle, item)}
             items={documents}
@@ -1379,7 +1466,7 @@
                     fontWeight="600"
                     item={{ ...item, title: folder ? item.folder.name.replace(folder.name + '/', '') : item.folder.name, subtitle: lcp('documents_count', item.folder.count) }}
                     mainCol={1}
-                    margin="4 8 4 8"
+                    margin={__IOS__ ? '4 16' : '4 8 4 8'}
                     padding="0 10 0 10"
                     subtitleFontSize={12}
                     useExtraPadding={false}
@@ -1401,6 +1488,7 @@
             <Template key="folders" let:item>
                 <collectionView
                     bind:this={foldersCollectionView}
+                    on:itemLoading={onCollectionViewItemLoading}
                     colWidth={150}
                     height={70}
                     items={folderItems}
@@ -1413,8 +1501,8 @@
                             backgroundColor={($folderBackgroundColor && item.folder.color) || isEInk ? 'transparent' : colorSurfaceContainerLow}
                             borderColor={colorOutline}
                             borderRadius={12}
-                            borderWidth={1}
-                            margin="4 8 0 8"
+                            borderWidth={__IOS__ ? 0 : 1}
+                            margin={__IOS__ ? '4 16 0 16' : '4 8 0 8'}
                             rippleColor={colorSurface}
                             on:tap={() => onItemTap(item)}
                             on:longPress={(e) => onItemLongPress(item, e)}
@@ -1466,47 +1554,13 @@
                 />
             </flexlayout>
         {/if}
-        {#if showActionButton}
-            <slot name="fab" />
-        {/if}
-
-        <CActionBar modalWindow={modal || showSearch} onGoBack={actionBarOnGoBack} onTitleTap={folder ? () => (editingTitle = true) : null} {title}>
-            {#if isTrash}
-                <mdbutton class="actionBarButton" text="mdi-delete-empty" variant="text" on:tap={emptyTrash} />
-            {:else}
-                {#if !onlyForImport}
-                    <mdbutton
-                        class="actionBarButton"
-                        class:infinite-rotate={syncRunning}
-                        isEnabled={!syncRunning}
-                        text="mdi-autorenew"
-                        variant="text"
-                        visibility={!folder && syncEnabled ? 'visible' : 'collapse'}
-                        on:tap={syncDocuments}
-                        on:longPress={openSyncSettings}
-                    />
-                {/if}
-                <mdbutton class="actionBarButton" text="mdi-magnify" variant="text" on:tap={() => search.showSearch()} />
-                {#if !onlyForImport}
-                    {#if folder}
-                        <mdbutton class="actionBarButton" testID="settingsBtn" text="mdi-palette" variant="text" on:tap={setFolderColor} />
-                    {:else}
-                        <mdbutton class="actionBarButton" text="mdi-view-dashboard" variant="text" on:tap={showViewOptions} />
-                        <mdbutton class="actionBarButton" testID="settingsBtn" text="mdi-dots-vertical" variant="text" on:tap={showOptions} />
-                    {/if}
-                {/if}
-            {/if}
-
-            <ActionBarSearch bind:this={search} slot="center" {refresh} bind:visible={showSearch} />
-        </CActionBar>
-        {#if nbSelected > 0}
-            <CActionBar forceCanGoBack={true} onGoBack={unselectAll} title={lp('selected', nbSelected)} titleProps={{ autoFontSize: true, maxLines: 1 }} />
-        {/if}
-        {#if !onlyForImport && nbSelected > 0}
-            <SelectionToolbar onAction={handleSelectionAction} options={getSelectionToolbarOptions()} row={2} />
-        {/if}
         {#if !onlyForImport && editingTitle}
             <EditNameActionBar {folder} onRenameSuccessful={() => (folder = folder)} bind:editingTitle />
         {/if}
     </gridlayout>
-</page>
+    <appPageOverlay>
+        {#if showActionButton && !__IOS__}
+            <slot name="fab" />
+        {/if}
+    </appPageOverlay>
+</appPage>
diff --git a/app/utils/appIcons.ts b/app/utils/appIcons.ts
new file mode 100644
index 000000000..9b6f3f8c7
--- /dev/null
+++ b/app/utils/appIcons.ts
@@ -0,0 +1,80 @@
+import { Color, Font, ImageSource } from '@nativescript/core';
+import { get } from 'svelte/store';
+import { colors, fonts } from '~/variables';
+
+const ICON_SIZE = 24;
+
+// app icon id -> SF Symbol on iOS, MDI glyph on Android (the other platform's names are not bundled)
+const ICONS: Record<string, string> = __IOS__
+    ? {
+          add: 'plus',
+          arrow_back: 'chevron.backward',
+          camera: 'camera',
+          color: 'paintbrush',
+          delete: 'trash',
+          delete_originals: 'photo.badge.minus',
+          delete_permanently: 'trash.slash',
+          empty_trash: 'trash.slash',
+          favorite: 'star',
+          fullscreen: 'arrow.up.left.and.arrow.down.right',
+          import_file: 'doc.badge.plus',
+          import_image: 'photo.badge.plus',
+          more: 'ellipsis',
+          move_folder: 'folder',
+          ocr: 'text.viewfinder',
+          open: 'arrow.up.forward.square',
+          pdf: 'doc.richtext',
+          rename: 'pencil',
+          restore: 'arrow.uturn.backward',
+          select: 'checkmark.circle',
+          select_all: 'checkmark.circle',
+          settings: 'gearshape',
+          share: 'square.and.arrow.up',
+          sync: 'arrow.triangle.2.circlepath',
+          transform: 'wand.and.stars',
+          trash: 'trash',
+          view_style: 'square.grid.2x2'
+      }
+    : {
+          add: 'mdi-plus',
+          arrow_back: 'mdi-arrow-left',
+          camera: 'mdi-camera',
+          color: 'mdi-palette',
+          delete: 'mdi-delete',
+          delete_originals: 'mdi-image-remove',
+          delete_permanently: 'mdi-delete-forever',
+          empty_trash: 'mdi-delete-empty',
+          favorite: 'mdi-star',
+          fullscreen: 'mdi-fullscreen',
+          import_file: 'mdi-file-document-plus-outline',
+          import_image: 'mdi-image-plus-outline',
+          more: 'mdi-dots-vertical',
+          move_folder: 'mdi-folder-swap',
+          ocr: 'mdi-text-recognition',
+          open: 'mdi-open-in-new',
+          pdf: 'mdi-file-pdf-box',
+          rename: 'mdi-rename',
+          restore: 'mdi-restore',
+          select: 'mdi-check-circle-outline',
+          select_all: 'mdi-select-all',
+          settings: 'mdi-cog',
+          share: 'mdi-share-variant',
+          sync: 'mdi-autorenew',
+          transform: 'mdi-auto-fix',
+          trash: 'mdi-trash-can-outline',
+          view_style: 'mdi-view-dashboard'
+      };
+
+export type AppIconId = keyof typeof ICONS;
+
+/** the icon of an app id for the app bar and the menus: `sys://` symbol on iOS, ImageSource rendered from the MDI font on Android */
+export function appIcon(id: string) {
+    const name = ICONS[id];
+    if (!name) {
+        return undefined;
+    }
+    if (__IOS__) {
+        return `sys://${name}`;
+    }
+    return ImageSource.fromFontIconCodeSync(name, new Font(get(fonts).mdi, ICON_SIZE), new Color(get(colors).colorOnSurface));
+}

From a5fabb2f29936dd4d2234a044801ede0eca72924 Mon Sep 17 00:00:00 2001
From: Martin Guillon <dev@akylas.fr>
Date: Sat, 24 Oct 2026 14:24:10 +0200
Subject: [PATCH 03/11] feat(ios): follow system colors with the app color as
 tint

Resolve the grouped background, label and separator colors from the system on iOS, use the app
primary color as the window tint and restyle the list rows as inset cards.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 app/app.ios.scss             | 33 +++++++++++++++++++++++----------
 app/utils/iosSystemColors.ts | 28 ++++++++++++++++++++++++++++
 app/variables.ts             |  7 ++++++-
 3 files changed, 57 insertions(+), 11 deletions(-)
 create mode 100644 app/utils/iosSystemColors.ts

diff --git a/app/app.ios.scss b/app/app.ios.scss
index 3bc80a277..c1ca6c25e 100644
--- a/app/app.ios.scss
+++ b/app/app.ios.scss
@@ -1,10 +1,10 @@
 @import './app.common';
 
-mdbutton {
+button {
     // material3 basic design
     shape: round;
 }
-mdbutton[variant='outline'] {
+button[variant='outline'] {
     ripple-color: var(--colorPrimary);
     color: var(--colorPrimary);
 }
@@ -19,10 +19,8 @@ htmllabel,
 label,
 button,
 textfield,
-mdtextfield,
-mdtextview,
-checkbox,
-mdbutton {
+textview,
+checkbox {
     ios-a11y-adjusts-font-size: true;
 }
 
@@ -33,14 +31,14 @@ checkbox {
     on-tint-color: var(--colorPrimary);
 }
 
-mdswitch {
+switch {
     on-background-color: var(--colorPrimary);
 }
 
-// mdbutton[variant=flat],mdbutton[variant=contained] {
+// button[variant=flat],button[variant=contained] {
 //     color: var(--colorOnPrimary);
 // }
-mdcardview {
+card {
     // material3 basic design
     shape: medium;
 }
@@ -58,6 +56,21 @@ mdcardview {
     // height: calc(40 * var(--fontScale));
 }
 
-mdtextfield[variant='none'] {
+textfield[variant='none'] {
     padding: 0;
 }
+
+.pageContent,
+.pageContent > collectionview {
+    ios-overflow-safe-area: true;
+}
+
+.card {
+    margin: 4 16;
+    border-radius: 12;
+}
+
+.listAppBar {
+    font-size: 30;
+    font-weight: 700;
+}
diff --git a/app/utils/iosSystemColors.ts b/app/utils/iosSystemColors.ts
new file mode 100644
index 000000000..7dc14ee2a
--- /dev/null
+++ b/app/utils/iosSystemColors.ts
@@ -0,0 +1,28 @@
+import { Color } from '@nativescript/core';
+
+function resolve(color: UIColor, style: UIUserInterfaceStyle) {
+    return Color.fromIosColor(color.resolvedColorWithTraitCollection(UITraitCollection.traitCollectionWithUserInterfaceStyle(style))).hex;
+}
+
+/** iOS: the surfaces and the texts of the theme are the system colors (light / dark only, no custom palette) */
+export function withSystemColors<T extends { light: Record<string, string>; dark: Record<string, string> }>(theme: T): T {
+    const pick = (style: UIUserInterfaceStyle) => ({
+        colorBackground: resolve(UIColor.systemGroupedBackgroundColor, style),
+        colorSurface: resolve(UIColor.secondarySystemGroupedBackgroundColor, style),
+        colorSurfaceContainerLowest: resolve(UIColor.systemGroupedBackgroundColor, style),
+        colorSurfaceContainerLow: resolve(UIColor.secondarySystemGroupedBackgroundColor, style),
+        colorSurfaceContainer: resolve(UIColor.secondarySystemGroupedBackgroundColor, style),
+        colorSurfaceContainerHigh: resolve(UIColor.secondarySystemGroupedBackgroundColor, style),
+        colorSurfaceContainerHighest: resolve(UIColor.tertiarySystemGroupedBackgroundColor, style),
+        colorOnBackground: resolve(UIColor.labelColor, style),
+        colorOnSurface: resolve(UIColor.labelColor, style),
+        colorOnSurfaceVariant: resolve(UIColor.secondaryLabelColor, style),
+        colorOutline: resolve(UIColor.tertiaryLabelColor, style),
+        colorOutlineVariant: resolve(UIColor.separatorColor, style)
+    });
+    return {
+        ...theme,
+        light: { ...theme.light, ...pick(UIUserInterfaceStyle.Light) },
+        dark: { ...theme.dark, ...pick(UIUserInterfaceStyle.Dark) }
+    };
+}
diff --git a/app/variables.ts b/app/variables.ts
index 2e6cf4c83..3b8488293 100644
--- a/app/variables.ts
+++ b/app/variables.ts
@@ -8,12 +8,17 @@ export * from '@shared/variables';
 
 import { deviceHasCamera } from '@nativescript-community/ui-cameraview';
 import { initVariables } from '@shared/variables';
+import { withSystemColors } from '~/utils/iosSystemColors';
 
 initVariables({
     onInitRootView: () => {
         hasCamera.set(deviceHasCamera());
     },
-    getTheme: (colorTheme) => require(`~/themes/${__APP_ID__}/${colorTheme}.json`)
+    keepSurfaceContainerHigh: __IOS__,
+    getTheme: (colorTheme) => {
+        const theme = require(`~/themes/${__APP_ID__}/${colorTheme}.json`);
+        return __IOS__ ? withSystemColors(theme) : theme;
+    }
 });
 
 export const startOnCam = ApplicationSettings.getBoolean(SETTINGS_START_ON_CAM, START_ON_CAM);

From 6ccac8c818f4972dc959b3c7af7a5d515f3bb8b5 Mon Sep 17 00:00:00 2001
From: Martin Guillon <dev@akylas.fr>
Date: Sat, 24 Oct 2026 14:24:21 +0200
Subject: [PATCH 04/11] build(ios): target iOS 17, adopt the scene manifest and
 allow resizable windows

- raise the deployment target to 17 (liquid toasts of ui-snackbar, Xcode 27 minimum)
- add UIApplicationSceneManifest: apps built with the iOS 27 SDK refuse to launch without scenes
- set UIRequiresFullScreen to false for the resizable Mac Catalyst window
- build simulator pods for arm64 only

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 App_Resources/cardwallet/iOS/Info.plist       |  2 +-
 App_Resources/documentscanner/iOS/Info.plist  | 21 ++++++++++++++++++-
 App_Resources/documentscanner/iOS/Podfile     |  7 ++++---
 .../documentscanner/iOS/build.xcconfig        |  3 ++-
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/App_Resources/cardwallet/iOS/Info.plist b/App_Resources/cardwallet/iOS/Info.plist
index 1ba12a231..7da5307ce 100644
--- a/App_Resources/cardwallet/iOS/Info.plist
+++ b/App_Resources/cardwallet/iOS/Info.plist
@@ -25,7 +25,7 @@
     <key>UILaunchStoryboardName</key>
     <string>LaunchScreen</string>
     <key>UIRequiresFullScreen</key>
-    <true/>
+    <false/>
     <key>UIRequiredDeviceCapabilities</key>
     <array>
       <string>location-services</string>
diff --git a/App_Resources/documentscanner/iOS/Info.plist b/App_Resources/documentscanner/iOS/Info.plist
index 7e5744a7e..e95de1a1d 100644
--- a/App_Resources/documentscanner/iOS/Info.plist
+++ b/App_Resources/documentscanner/iOS/Info.plist
@@ -25,7 +25,7 @@
     <key>UILaunchStoryboardName</key>
     <string>LaunchScreen</string>
     <key>UIRequiresFullScreen</key>
-    <true/>
+    <false/>
     <key>UIRequiredDeviceCapabilities</key>
     <array>
       <string>location-services</string>
@@ -63,5 +63,24 @@
     <string>12.0</string>
     <key>UIViewControllerBasedStatusBarAppearance</key>
     <false/>
+    <key>UIApplicationSceneManifest</key>
+    <dict>
+      <key>UIApplicationPreferredDefaultSceneSessionRole</key>
+      <string>UIWindowSceneSessionRoleApplication</string>
+      <key>UIApplicationSupportsMultipleScenes</key>
+      <false/>
+      <key>UISceneConfigurations</key>
+      <dict>
+        <key>UIWindowSceneSessionRoleApplication</key>
+        <array>
+          <dict>
+            <key>UISceneConfigurationName</key>
+            <string>Default Configuration</string>
+            <key>UISceneDelegateClassName</key>
+            <string>SceneDelegate</string>
+          </dict>
+        </array>
+      </dict>
+    </dict>
   </dict>
 </plist>
\ No newline at end of file
diff --git a/App_Resources/documentscanner/iOS/Podfile b/App_Resources/documentscanner/iOS/Podfile
index 4bfbc26f9..50114dceb 100644
--- a/App_Resources/documentscanner/iOS/Podfile
+++ b/App_Resources/documentscanner/iOS/Podfile
@@ -1,13 +1,14 @@
 plugin 'cocoapods-acknowledgements'
 # pod "MSColorPicker"
-platform :ios, '14.0'
+platform :ios, '17.0'
 pod 'SSZipArchive'
 post_install do |installer|
     installer.pods_project.targets.each do |target|
         target.build_configurations.each do |config|
-            config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
             config.build_settings["ONLY_ACTIVE_ARCH"] = "YES"
-            config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '14.0'
+            config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "x86_64"
+            config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '17.0'
+            config.build_settings['CODE_SIGN_IDENTITY[sdk=macosx*]'] = '-'
             config.build_settings['SWIFT_VERSION'] = '5.1'
             config.build_settings['DEVELOPMENT_TEAM'] = '3UUB5NM43K'
             config.build_settings['GCC_WARN_INHIBIT_ALL_WARNINGS'] = 'YES'
diff --git a/App_Resources/documentscanner/iOS/build.xcconfig b/App_Resources/documentscanner/iOS/build.xcconfig
index 7dabfee49..c19ac2354 100644
--- a/App_Resources/documentscanner/iOS/build.xcconfig
+++ b/App_Resources/documentscanner/iOS/build.xcconfig
@@ -7,4 +7,5 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 DEVELOPMENT_TEAM = 3UUB5NM43K
 EMBEDDED_CONTENT_CONTAINS_SWIFT = YES
 SWIFT_VERSION=5.1
-IPHONEOS_DEPLOYMENT_TARGET = 14.0
\ No newline at end of file
+IPHONEOS_DEPLOYMENT_TARGET = 17.0
+EXCLUDED_ARCHS[sdk=iphonesimulator*] = x86_64

From 39ed20e235e19b76aaec2429d70739d390351a4f Mon Sep 17 00:00:00 2001
From: Martin Guillon <dev@akylas.fr>
Date: Sat, 24 Oct 2026 14:24:21 +0200
Subject: [PATCH 05/11] build(android): use Material 1.14 and stop hiding the
 app bar classes from the metadata

Material 1.14 provides the floating toolbar and search bar styles of ui-appbar. Remove the app bar,
floating action button and SearchView classes from the plugin-shared metadata blacklist.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 App_Resources/cardwallet/Android/before-plugins.gradle |  2 +-
 .../documentscanner/Android/before-plugins.gradle      |  2 +-
 plugin-shared/platforms/android/native-api-usage.json  | 10 ----------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/App_Resources/cardwallet/Android/before-plugins.gradle b/App_Resources/cardwallet/Android/before-plugins.gradle
index d0f2f1fc4..fde25a135 100644
--- a/App_Resources/cardwallet/Android/before-plugins.gradle
+++ b/App_Resources/cardwallet/Android/before-plugins.gradle
@@ -14,7 +14,7 @@ ext {
     androidXRecyclerViewVersion = "1.4.0"
     androidxViewPager2Version = "1.1.0"
     androidXSwipeRefreshLayoutViewVersion = "1.2.0"
-    androidXMaterial = "1.13.0"
+    androidXMaterial = "1.14.0"
     androidXBrowser = "1.10.0"
     androidXPreferenceVersion = "1.2.1"
     androidXSplashscreenVersion = "1.2.0"
diff --git a/App_Resources/documentscanner/Android/before-plugins.gradle b/App_Resources/documentscanner/Android/before-plugins.gradle
index d0f2f1fc4..fde25a135 100644
--- a/App_Resources/documentscanner/Android/before-plugins.gradle
+++ b/App_Resources/documentscanner/Android/before-plugins.gradle
@@ -14,7 +14,7 @@ ext {
     androidXRecyclerViewVersion = "1.4.0"
     androidxViewPager2Version = "1.1.0"
     androidXSwipeRefreshLayoutViewVersion = "1.2.0"
-    androidXMaterial = "1.13.0"
+    androidXMaterial = "1.14.0"
     androidXBrowser = "1.10.0"
     androidXPreferenceVersion = "1.2.1"
     androidXSplashscreenVersion = "1.2.0"
diff --git a/plugin-shared/platforms/android/native-api-usage.json b/plugin-shared/platforms/android/native-api-usage.json
index aa7e1756a..9852643b6 100644
--- a/plugin-shared/platforms/android/native-api-usage.json
+++ b/plugin-shared/platforms/android/native-api-usage.json
@@ -47,10 +47,6 @@
         "android.widget:TabWidget",
         "android.widget:TimePicker",
         "android.widget:TimePicker.OnTimeChangedListener",
-        "androidx.appcompat.widget:SearchView",
-        "androidx.appcompat.widget:SearchView.OnCloseListener",
-        "androidx.appcompat.widget:SearchView.OnQueryTextListener",
-        "androidx.appcompat.widget:Toolbar.OnMenuItemClickListener",
         "androidx.appcompat.widget:AppCompatTextView",
         "org.ow2.asmdex*:*",
         "org.nativescript.widgets:TabItemSpec*",
@@ -60,9 +56,6 @@
         "org.nativescript.widgets:TabLayout*",
         "org.nativescript.widgets:BottomNavigationBar*",
         "com.google.android.material.chip*:*",
-        "com.google.android.material.appbar*:*",
-        "com.google.android.material.floatingactionbutton*:*",
-        "com.google.android.material.bottomappbar*:*",
         "com.google.android.material.internal*:*",
         "com.google.android.material.transformation*:*",
         "com.google.android.material.theme*:*",
@@ -79,9 +72,6 @@
         "org.nativescript.widgets:TabLayout*",
         "org.nativescript.widgets:BottomNavigationBar*",
         "com.google.android.material.chip*:*",
-        "com.google.android.material.appbar*:*",
-        "com.google.android.material.floatingactionbutton*:*",
-        "com.google.android.material.bottomappbar*:*",
         "com.google.android.material.internal*:*",
         "com.google.android.material.transformation*:*",
         "com.google.android.material.theme*:*"

From 3c1863f3f9745ca67646c0a4e2b7ca14ecad5ab2 Mon Sep 17 00:00:00 2001
From: Martin Guillon <dev@akylas.fr>
Date: Sat, 24 Oct 2026 14:24:21 +0200
Subject: [PATCH 06/11] feat(catalyst): add Mac Catalyst build configuration

Add the Catalyst entitlements and build settings (sandbox, JIT, camera, photos, user selected
files) and link the Catalyst tesseract, leptonica and png libraries in plugin-nativeprocessor.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 .../documentscanner/Catalyst/app.entitlements  | 18 ++++++++++++++++++
 .../documentscanner/Catalyst/build.xcconfig    |  2 ++
 .../platforms/ios/build.xcconfig               |  1 +
 3 files changed, 21 insertions(+)
 create mode 100644 App_Resources/documentscanner/Catalyst/app.entitlements
 create mode 100644 App_Resources/documentscanner/Catalyst/build.xcconfig

diff --git a/App_Resources/documentscanner/Catalyst/app.entitlements b/App_Resources/documentscanner/Catalyst/app.entitlements
new file mode 100644
index 000000000..912d75f3f
--- /dev/null
+++ b/App_Resources/documentscanner/Catalyst/app.entitlements
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.app-sandbox</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.network.client</key>
+    <true/>
+    <key>com.apple.security.device.camera</key>
+    <true/>
+    <key>com.apple.security.personal-information.photos-library</key>
+    <true/>
+    <key>com.apple.security.files.user-selected.read-write</key>
+    <true/>
+</dict>
+</plist>
diff --git a/App_Resources/documentscanner/Catalyst/build.xcconfig b/App_Resources/documentscanner/Catalyst/build.xcconfig
new file mode 100644
index 000000000..bcb244da3
--- /dev/null
+++ b/App_Resources/documentscanner/Catalyst/build.xcconfig
@@ -0,0 +1,2 @@
+// Overrides App_Resources/documentscanner/iOS/build.xcconfig for Mac Catalyst builds
+IPHONEOS_DEPLOYMENT_TARGET = 16.0
diff --git a/plugin-nativeprocessor/platforms/ios/build.xcconfig b/plugin-nativeprocessor/platforms/ios/build.xcconfig
index 163f6f900..734871580 100644
--- a/plugin-nativeprocessor/platforms/ios/build.xcconfig
+++ b/plugin-nativeprocessor/platforms/ios/build.xcconfig
@@ -3,5 +3,6 @@ HEADER_SEARCH_PATHS = $(ROOT)/tesseract/ios/include/** $(ROOT)/tesseract/ios/inc
 LIBRARY_SEARCH_PATHS = $(inherited)  $(ROOT)/tesseract/ios/lib/**
 OTHER_LDFLAGS[sdk=iphoneos*] = $(inherited)  -lc++ -lleptonica-ios -lpng16-ios -ltesseract-ios
 OTHER_LDFLAGS[sdk=iphonesimulator*] = $(inherited)  -lc++ -ltesseract-sim -lpng16-sim -lleptonica-sim
+OTHER_LDFLAGS[sdk=macosx*] = $(inherited)  -lc++ -ltesseract-catalyst -lpng16-catalyst -lleptonica-catalyst
 CLANG_CXX_LANGUAGE_STANDARD = gnu++20
 CLANG_CXX_LIBRARY = libc++
\ No newline at end of file

From 7d85bfb0c42bf07b258246eebcaf7851754f2eee Mon Sep 17 00:00:00 2001
From: Martin Guillon <dev@akylas.fr>
Date: Sat, 24 Oct 2026 14:24:21 +0200
Subject: [PATCH 07/11] build(native-libs): add a workflow to build tesseract
 and OpenCV by version

Build tesseract (with leptonica, libpng and libjpeg) and fetch OpenCV for Android, iOS and Mac
Catalyst from pinned versions, in release and debug variants, and publish them as release assets.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 .github/workflows/build-native-libs.yml | 213 +++++++++++++++
 Readme.md                               |   3 +-
 scripts/native-libs/README.md           | 128 +++++++++
 scripts/native-libs/build-opencv.sh     | 199 ++++++++++++++
 scripts/native-libs/build-tesseract.sh  | 347 ++++++++++++++++++++++++
 scripts/native-libs/build.sh            |  47 ++++
 scripts/native-libs/fetch.sh            |  76 ++++++
 scripts/native-libs/lib/common.sh       |  89 ++++++
 scripts/native-libs/package.sh          |  37 +++
 scripts/native-libs/versions.env        |  49 ++++
 10 files changed, 1187 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/build-native-libs.yml
 create mode 100644 scripts/native-libs/README.md
 create mode 100755 scripts/native-libs/build-opencv.sh
 create mode 100755 scripts/native-libs/build-tesseract.sh
 create mode 100755 scripts/native-libs/build.sh
 create mode 100755 scripts/native-libs/fetch.sh
 create mode 100644 scripts/native-libs/lib/common.sh
 create mode 100755 scripts/native-libs/package.sh
 create mode 100644 scripts/native-libs/versions.env

diff --git a/.github/workflows/build-native-libs.yml b/.github/workflows/build-native-libs.yml
new file mode 100644
index 000000000..d76ebada4
--- /dev/null
+++ b/.github/workflows/build-native-libs.yml
@@ -0,0 +1,213 @@
+name: 'build-native-libs'
+
+# Builds the C++ libraries the app links (OpenCV, tesseract + leptonica + libpng [+ libjpeg-turbo])
+# for Android, iOS (device + simulator) and Mac Catalyst, selected by version number.
+# See scripts/native-libs/README.md. Download the result with scripts/native-libs/fetch.sh.
+
+on:
+    workflow_dispatch:
+        inputs:
+            opencv_version:
+                description: 'OpenCV version (must have an OPENCV_MOBILE_TAG_<ver> pin in scripts/native-libs/versions.env, or exist as an opencv-mobile release)'
+                required: true
+                default: '4.13.0'
+                type: string
+            tesseract_version:
+                description: 'Tesseract version (needs TESSERACT_<ver>_* dependency pins in scripts/native-libs/versions.env)'
+                required: true
+                default: '5.5.1'
+                type: string
+            platforms:
+                description: 'Platforms to build'
+                required: true
+                default: all
+                type: choice
+                options:
+                    - all
+                    - android
+                    - ios
+                    - catalyst
+            variant:
+                description: 'Tesseract variant: release (optimized, stripped), debug (-O1 -g, not stripped, same file names) or both. OpenCV has no debug variant.'
+                required: true
+                default: release
+                type: choice
+                options:
+                    - release
+                    - debug
+                    - both
+            opencv_from_source:
+                description: 'Rebuild OpenCV from the opencv-mobile sources instead of repackaging the prebuilt opencv-mobile binaries'
+                required: true
+                default: false
+                type: boolean
+            release:
+                description: 'Attach the archives to the GitHub release native-libs-<opencv>-<tesseract>'
+                required: true
+                default: false
+                type: boolean
+
+permissions:
+    contents: read
+
+concurrency:
+    group: build-native-libs-${{ inputs.opencv_version }}-${{ inputs.tesseract_version }}
+    cancel-in-progress: false
+
+env:
+    OPENCV_VERSION: ${{ inputs.opencv_version }}
+    TESSERACT_VERSION: ${{ inputs.tesseract_version }}
+    ARTIFACT_SUFFIX: opencv${{ inputs.opencv_version }}-tesseract${{ inputs.tesseract_version }}
+    OPENCV_FROM_SOURCE: ${{ inputs.opencv_from_source && '1' || '0' }}
+
+jobs:
+    android:
+        name: Android
+        if: inputs.platforms == 'all' || inputs.platforms == 'android'
+        runs-on: ubuntu-latest
+        strategy:
+            fail-fast: false
+            matrix:
+                variant: ${{ fromJSON(inputs.variant == 'both' && '["release","debug"]' || format('["{0}"]', inputs.variant)) }}
+        timeout-minutes: 120
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Install pinned Android NDK
+              run: |
+                  source scripts/native-libs/versions.env
+                  yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --install "ndk;$NATIVE_LIBS_NDK_VERSION" >/dev/null
+                  echo "ANDROID_NDK_HOME=$ANDROID_HOME/ndk/$NATIVE_LIBS_NDK_VERSION" >> "$GITHUB_ENV"
+
+            - name: Cache build output
+              id: cache
+              uses: actions/cache@v4
+              with:
+                  path: build/native-libs/out/android${{ matrix.variant == 'debug' && '-debug' || '' }}
+                  key: native-libs-android${{ matrix.variant == 'debug' && '-debug' || '' }}-${{ env.ARTIFACT_SUFFIX }}-src${{ inputs.opencv_from_source }}-${{ hashFiles('scripts/native-libs/**') }}
+
+            - name: Cache downloads
+              uses: actions/cache@v4
+              with:
+                  path: build/native-libs/downloads
+                  key: native-libs-downloads-${{ env.ARTIFACT_SUFFIX }}-${{ hashFiles('scripts/native-libs/versions.env') }}
+
+            - name: Build
+              if: steps.cache.outputs.cache-hit != 'true'
+              run: scripts/native-libs/build.sh "$OPENCV_VERSION" "$TESSERACT_VERSION" android --variant ${{ matrix.variant }}
+
+            - name: Package (cache hit)
+              if: steps.cache.outputs.cache-hit == 'true'
+              run: scripts/native-libs/package.sh "$OPENCV_VERSION" "$TESSERACT_VERSION" android --variant ${{ matrix.variant }}
+
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: native-libs-android-${{ env.ARTIFACT_SUFFIX }}${{ matrix.variant == 'debug' && '-debug' || '' }}
+                  path: build/native-libs/out/native-libs-android-*.tar.gz*
+                  if-no-files-found: error
+
+    ios:
+        name: iOS (device + simulator) + OpenCV xcframework
+        if: inputs.platforms == 'all' || inputs.platforms == 'ios'
+        runs-on: macos-15
+        strategy:
+            fail-fast: false
+            matrix:
+                variant: ${{ fromJSON(inputs.variant == 'both' && '["release","debug"]' || format('["{0}"]', inputs.variant)) }}
+        timeout-minutes: 180
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Cache build output
+              id: cache
+              uses: actions/cache@v4
+              with:
+                  path: build/native-libs/out/ios${{ matrix.variant == 'debug' && '-debug' || '' }}
+                  key: native-libs-ios${{ matrix.variant == 'debug' && '-debug' || '' }}-${{ env.ARTIFACT_SUFFIX }}-src${{ inputs.opencv_from_source }}-${{ hashFiles('scripts/native-libs/**') }}
+
+            - name: Cache downloads
+              uses: actions/cache@v4
+              with:
+                  path: build/native-libs/downloads
+                  key: native-libs-downloads-${{ env.ARTIFACT_SUFFIX }}-${{ hashFiles('scripts/native-libs/versions.env') }}
+
+            - name: Build
+              if: steps.cache.outputs.cache-hit != 'true'
+              run: scripts/native-libs/build.sh "$OPENCV_VERSION" "$TESSERACT_VERSION" ios --variant ${{ matrix.variant }}
+
+            - name: Package (cache hit)
+              if: steps.cache.outputs.cache-hit == 'true'
+              run: scripts/native-libs/package.sh "$OPENCV_VERSION" "$TESSERACT_VERSION" ios --variant ${{ matrix.variant }}
+
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: native-libs-ios-${{ env.ARTIFACT_SUFFIX }}${{ matrix.variant == 'debug' && '-debug' || '' }}
+                  path: build/native-libs/out/native-libs-ios-*.tar.gz*
+                  if-no-files-found: error
+
+    catalyst:
+        name: Mac Catalyst
+        if: inputs.platforms == 'all' || inputs.platforms == 'catalyst'
+        runs-on: macos-15
+        strategy:
+            fail-fast: false
+            matrix:
+                variant: ${{ fromJSON(inputs.variant == 'both' && '["release","debug"]' || format('["{0}"]', inputs.variant)) }}
+        timeout-minutes: 120
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Cache build output
+              id: cache
+              uses: actions/cache@v4
+              with:
+                  path: build/native-libs/out/catalyst${{ matrix.variant == 'debug' && '-debug' || '' }}
+                  key: native-libs-catalyst${{ matrix.variant == 'debug' && '-debug' || '' }}-${{ env.ARTIFACT_SUFFIX }}-${{ hashFiles('scripts/native-libs/**') }}
+
+            - name: Cache downloads
+              uses: actions/cache@v4
+              with:
+                  path: build/native-libs/downloads
+                  key: native-libs-downloads-${{ env.ARTIFACT_SUFFIX }}-${{ hashFiles('scripts/native-libs/versions.env') }}
+
+            - name: Build
+              if: steps.cache.outputs.cache-hit != 'true'
+              run: scripts/native-libs/build.sh "$OPENCV_VERSION" "$TESSERACT_VERSION" catalyst --variant ${{ matrix.variant }}
+
+            - name: Package (cache hit)
+              if: steps.cache.outputs.cache-hit == 'true'
+              run: scripts/native-libs/package.sh "$OPENCV_VERSION" "$TESSERACT_VERSION" catalyst --variant ${{ matrix.variant }}
+
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: native-libs-catalyst-${{ env.ARTIFACT_SUFFIX }}${{ matrix.variant == 'debug' && '-debug' || '' }}
+                  path: build/native-libs/out/native-libs-catalyst-*.tar.gz*
+                  if-no-files-found: error
+
+    release:
+        name: Attach to GitHub release
+        if: ${{ !cancelled() && !failure() && inputs.release }}
+        needs: [android, ios, catalyst]
+        runs-on: ubuntu-latest
+        permissions:
+            contents: write
+        steps:
+            - uses: actions/download-artifact@v4
+              with:
+                  pattern: native-libs-*-${{ env.ARTIFACT_SUFFIX }}*
+                  path: assets
+                  merge-multiple: true
+
+            - name: Create or update the release
+              env:
+                  GH_TOKEN: ${{ github.token }}
+              run: |
+                  tag="native-libs-${OPENCV_VERSION}-${TESSERACT_VERSION}"
+                  ls -la assets
+                  if ! gh release view "$tag" --repo "$GITHUB_REPOSITORY" >/dev/null 2>&1; then
+                      gh release create "$tag" --repo "$GITHUB_REPOSITORY" --target "$GITHUB_SHA" \
+                          --title "Native libs: OpenCV ${OPENCV_VERSION} + Tesseract ${TESSERACT_VERSION}" \
+                          --notes "Prebuilt OpenCV ${OPENCV_VERSION} and Tesseract ${TESSERACT_VERSION} static libraries (Android, iOS, Mac Catalyst); *-debug archives hold tesseract with symbols (extract over the release one). Install with scripts/native-libs/fetch.sh ${OPENCV_VERSION} ${TESSERACT_VERSION} all [--variant both]. Built by the build-native-libs workflow, run ${GITHUB_RUN_ID}." \
+                          --prerelease
+                  fi
+                  gh release upload "$tag" assets/* --repo "$GITHUB_REPOSITORY" --clobber
diff --git a/Readme.md b/Readme.md
index b32670636..5567ae98e 100644
--- a/Readme.md
+++ b/Readme.md
@@ -127,8 +127,9 @@ I use dotenv plugin for zsh which automatically loads the `.env` file
 ### 3rd parties
 
 This app also uses opencv and tesseract. I did not include the libraries in git because there are huge and would make the github repo too big.
-There are 2 ways to install them:
+There are 3 ways to install them:
 
+- reproducible, selected by version (Android, iOS and Mac Catalyst): `scripts/native-libs/fetch.sh <opencv_version> <tesseract_version> all` downloads a build of the `build-native-libs` workflow, or build locally with `scripts/native-libs/build.sh`. See [scripts/native-libs/README.md](scripts/native-libs/README.md)
 - download from [here](https://github.com/ossappscollective/OSS-DocumentScanner/releases/tag/dev_resources) and uncompress them at the root
 - build them yourself:
 
diff --git a/scripts/native-libs/README.md b/scripts/native-libs/README.md
new file mode 100644
index 000000000..9de1cf72d
--- /dev/null
+++ b/scripts/native-libs/README.md
@@ -0,0 +1,128 @@
+# Native libraries (OpenCV, Tesseract)
+
+Reproducible build of the C++ libraries `plugin-nativeprocessor` links, for **Android**, **iOS (device + simulator)** and **Mac Catalyst**.
+The result is installed in `opencv/` and `tesseract/` at the repo root (both gitignored), exactly where the Android CMake and the iOS `build.xcconfig` look for it.
+
+## What is built
+
+| Library                                | Source                                                               | Used for              |
+| -------------------------------------- | -------------------------------------------------------------------- | --------------------- |
+| OpenCV (core, imgproc, photo, features2d, video, highgui) | [nihui/opencv-mobile](https://github.com/nihui/opencv-mobile) (stripped OpenCV, same flavour as the libs the app always used) | document detection / image processing |
+| Tesseract                              | `tesseract-ocr/tesseract` tag                                        | OCR                   |
+| Leptonica, libpng                      | pinned per tesseract version in `versions.env`                       | tesseract dependencies |
+| libjpeg-turbo (Android only)           | pinned per tesseract version                                         | linked by `CMakeLists.txt` (`jpeg`), not used by leptonica |
+
+OpenCV on Android and iOS/Catalyst comes from **opencv-mobile** because that is what the app ships today (`opencv/ios/opencv2.xcframework` is the opencv-mobile "apple" package, `opencv/android` its `sdk/native`).
+Default mode repackages the prebuilt opencv-mobile release assets (checksum pinned). `--from-source` / `OPENCV_FROM_SOURCE=1` rebuilds them from the opencv-mobile source zip with the same cmake options as their CI.
+
+## Versions
+
+Everything is selected by version number, pins live in [`versions.env`](versions.env):
+
+- `OPENCV_MOBILE_TAG_<opencv ver>`: opencv-mobile release carrying that OpenCV (4.13.0 -> `v35`). Unpinned versions are looked up through `gh` (and a warning tells you what to pin).
+- `TESSERACT_<tesseract ver>_{LEPTONICA,LIBPNG,LIBJPEG_TURBO}`: dependency set of a tesseract version (5.5.1 -> leptonica 1.85.0, libpng 1.6.48, libjpeg-turbo 3.1.4.1; these match the libs currently in `tesseract/ios`).
+- `SHA256_*`: optional archive checksums, verified when present (the script prints the checksum of unpinned downloads).
+- Android: NDK `NATIVE_LIBS_NDK_VERSION`, API 24 (plugin `minSdkVersion`), ABIs `arm64-v8a armeabi-v7a x86_64` (override with `NATIVE_LIBS_ANDROID_ABIS="arm64-v8a armeabi-v7a x86 x86_64"`).
+- Apple: iOS/Catalyst deployment target 16.0 (`NATIVE_LIBS_IOS_MIN`, `NATIVE_LIBS_CATALYST_MIN`).
+
+To add a version: add the pins to `versions.env`, nothing else.
+
+## Getting the libs
+
+**Download a published build** (needs a release `native-libs-<opencv>-<tesseract>`, see below):
+
+```sh
+scripts/native-libs/fetch.sh 4.13.0 5.5.1 all        # or android | ios | catalyst
+scripts/native-libs/fetch.sh 4.13.0 5.5.1 all --variant both   # + debug tesseract on top (release | debug | both)
+```
+
+It extracts into the repo root (`opencv/...`, `tesseract/...`), overwriting `opencv/ios/opencv2.xcframework` and the libs of the selected platforms. Use `--dest <dir>` to extract elsewhere, `--dry-run` to only print the URLs.
+
+**Build locally**:
+
+```sh
+export ANDROID_NDK_HOME=~/Library/Android/sdk/ndk/27.3.13750724   # android only
+scripts/native-libs/build.sh 4.13.0 5.5.1 ios catalyst            # android | ios | catalyst | all
+scripts/native-libs/build.sh 4.13.0 5.5.1 catalyst --variant debug # release (default) | debug | both
+```
+
+Needs `cmake`, `curl`, `unzip`, Xcode for ios/catalyst. Output goes to `build/native-libs/out/<platform>/{opencv,tesseract}` and to `build/native-libs/out/native-libs-<platform>-opencv<ov>-tesseract<tv>.tar.gz`, it never touches `opencv/` or `tesseract/`.
+Copy it over with `tar -xzf build/native-libs/out/native-libs-ios-*.tar.gz -C .`.
+Each step is also available alone: `build-opencv.sh <ver> <android|ios> [--from-source]`, `build-tesseract.sh <ver> <android|ios|catalyst> [--variant release|debug]`, `package.sh ... [--variant ...]`.
+`NATIVE_LIBS_OUT`, `NATIVE_LIBS_WORK`, `NATIVE_LIBS_DL` relocate the output / work / download dirs.
+
+**CI**: run the `build-native-libs` workflow (Actions tab, `workflow_dispatch`) with `opencv_version`, `tesseract_version`, `platforms` (`all|android|ios|catalyst`), `variant` (`release|debug|both`), `opencv_from_source` and `release`.
+Jobs run on `ubuntu-latest` (Android) and `macos-15` (iOS, Catalyst), results are cached by version + script hash and uploaded as artifacts `native-libs-<platform>-opencv<ver>-tesseract<ver>`.
+With `release` on, the archives (and `.sha256`) are attached to the pre-release tag `native-libs-<opencv>-<tesseract>`, which is what `fetch.sh` downloads.
+
+## Layout produced
+
+```
+opencv/android/{include,jni,staticlibs/<abi>,3rdparty/libs/<abi>}      # opencv-mobile sdk/native
+opencv/ios/opencv2.xcframework                                          # ios-arm64, ios-arm64_x86_64-simulator, ios-arm64_x86_64-maccatalyst
+tesseract/android/include/{tesseract,leptonica,png*.h}
+tesseract/android/staticlibs/<abi>/{libtesseract,libleptonica,libpngx,libjpeg}.a
+tesseract/ios/include/{tesseract,leptonica,libpng16,png*.h,module.modulemap}
+tesseract/ios/lib/lib{tesseract,leptonica,png16}-{ios,sim,catalyst}.a   # + libpng-<x>.a symlinks
+```
+
+Release assets are split per platform; paths inside are relative to the repo root:
+
+- `native-libs-android-...tar.gz`: opencv/android + tesseract/android
+- `native-libs-ios-...tar.gz`: **the whole opencv2.xcframework (ios + simulator + maccatalyst)**, tesseract `-ios` and `-sim` libs, headers
+- `native-libs-catalyst-...tar.gz`: tesseract `-catalyst` libs only (and the same headers)
+- `native-libs-<platform>-...-debug.tar.gz`: the debug variant, see below (tesseract only, no OpenCV)
+
+So a Mac Catalyst build needs both the `ios` and `catalyst` archives (`fetch.sh <ov> <tv> all`).
+
+## Release and debug variants
+
+Tesseract, leptonica, libpng and libjpeg are built in two variants (OpenCV has none, it comes from opencv-mobile):
+
+| | release (default) | debug |
+| --- | --- | --- |
+| flags | `-O3 -DNDEBUG`, stripped | `-O1 -g -fno-omit-frame-pointer -UNDEBUG`, **not stripped** |
+| output stage | `build/native-libs/out/<platform>/` | `build/native-libs/out/<platform>-debug/` |
+| archive | `native-libs-<platform>-opencv<ov>-tesseract<tv>.tar.gz` | `native-libs-<platform>-opencv<ov>-tesseract<tv>-debug.tar.gz` (+ `.sha256`) |
+| size (tesseract lib only) | Catalyst 11MB (2 arches), Android arm64 8MB | Catalyst 245MB, Android arm64 100MB (archives 65MB / 71MB) |
+
+Why `-O1` and not `-O0`: tesseract's LSTM engine is unusably slow unoptimised (pages take minutes). `-O1 -g` keeps functions steppable with locals mostly visible (lldb shows `[opt]`, some variables are optimised out) while OCR stays usable. `-fno-omit-frame-pointer` gives reliable backtraces and `ndk-stack`/Instruments sampling, `-UNDEBUG` keeps `assert()` live. For a particular file you can still drop to `-O0` by hand.
+
+The debug archive has **exactly the same file names and layout** as the release one (only `tesseract/...`, no `opencv/...`), so it is extracted over it, no build file change needed:
+
+```sh
+scripts/native-libs/fetch.sh 4.13.0 5.5.1 all --variant both   # or --variant debug on top of an installed release
+```
+
+and to go back, extract the release archive again (`fetch.sh ... all`). Then rebuild the app.
+
+- **iOS / Catalyst**: DWARF stays inside the static library objects (no dSYM for a `.a`); the app binary's debug map points to the `.a`, so lldb finds it as long as `tesseract/ios/lib/*.a` stays where it is. Breakpoints like `b tesseract::TessBaseAPI::Version` resolve to `baseapi.cpp:191` (verified on Catalyst arm64).
+- **Android**: the `.a` carry the DWARF into the unstripped `libdocument_detector.so` of the CMake build tree (`build/intermediates/cxx/.../obj/<abi>/`), which is what Android Studio's native debugger and `ndk-stack -sym` want. The APK copy is stripped by Gradle unless you add `packaging { jniLibs { keepDebugSymbols += "**/libdocument_detector.so" } }`.
+- Source paths in the DWARF are those of the machine that built it (`<repo>/build/native-libs/work/src/tesseract-<ver>/...` locally, the runner's workspace for CI archives). Point the debugger at the sources with `settings set target.source-map <old> <new>` (lldb) or the path mapping of Android Studio; local debug builds need nothing.
+- Wiring in the app: none required (same names, extract over). If a permanent switch is wanted later, the smallest change would be a `tesseract/<platform>/lib-debug` directory chosen in `build.xcconfig` with `LIBRARY_SEARCH_PATHS[config=Debug]` (iOS) and a `-DTESSERACT_VARIANT=debug` CMake option selecting `staticlibs-debug` (Android); it is not implemented, so as not to touch the plugin files for something extract-over already does.
+
+## How Catalyst consumes it
+
+- **OpenCV**: `plugin-nativeprocessor/platforms/ios/opencv2.xcframework` is a symlink to `opencv/ios/opencv2.xcframework`; Xcode picks the `ios-arm64_x86_64-maccatalyst` slice by itself.
+- **Tesseract**: `plugin-nativeprocessor/platforms/ios/build.xcconfig` selects the libs by SDK, the Catalyst build uses the `macosx` SDK:
+
+  ```
+  OTHER_LDFLAGS[sdk=iphoneos*]        = -lleptonica-ios -lpng16-ios -ltesseract-ios
+  OTHER_LDFLAGS[sdk=iphonesimulator*] = -ltesseract-sim -lpng16-sim -lleptonica-sim
+  OTHER_LDFLAGS[sdk=macosx*]          = -ltesseract-catalyst -lpng16-catalyst -lleptonica-catalyst
+  ```
+
+  `build-tesseract.sh catalyst` builds the three libs for real with `-target <arm64|x86_64>-apple-ios16.0-macabi` against the macOS SDK and `lipo`s them into one fat `lib*-catalyst.a`. The script checks with `vtool` that every object is tagged `MACCATALYST` (this replaces the old workaround that retagged macOS objects with `vtool`/`ld -r`, which only produced arm64 and no x86_64).
+- `libtesseract-macos.a` & co. (plain macOS) are not produced, nothing links them.
+
+## Tesseract build notes
+
+- Built with upstream CMake: static, `Release`, no TIFF/libarchive/curl, no training tools, `GRAPHICS_DISABLED`, `FAST_FLOAT`, leptonica with PNG + zlib only.
+- Android: tesseract is built with OpenMP (like the previous `Tesseract4Android` libs; the app links `-fopenmp -static-openmp`). tesseract needs the NDK `cpu-features`: it is compiled from the NDK sources and folded into `libtesseract.a`, so the app still links just `tesseract leptonica pngx jpeg`. libpng is installed as `libpngx.a` (name expected by `CMakeLists.txt`). Debug info is stripped.
+- x86/x86_64 Android: libjpeg-turbo is built without SIMD (it would need nasm/yasm).
+- Apple: `strip -S` on every slice; tesseract has no OpenMP on Apple (no libomp in the SDK).
+- tesseract's `try_run` for leptonica TIFF support cannot run when cross compiling, it is answered with `LEPT_TIFF_RESULT=1` (no TIFF).
+
+## Licenses
+
+OpenCV (Apache 2.0), Tesseract (Apache 2.0), Leptonica (BSD-2), libpng (libpng license), libjpeg-turbo (BSD/IJG/zlib) and the NDK `cpu-features` (Apache 2.0) all allow redistributing binaries, keep their notices in the app's third party licenses.
diff --git a/scripts/native-libs/build-opencv.sh b/scripts/native-libs/build-opencv.sh
new file mode 100755
index 000000000..2c97a2b83
--- /dev/null
+++ b/scripts/native-libs/build-opencv.sh
@@ -0,0 +1,199 @@
+#!/usr/bin/env bash
+# Provide OpenCV (opencv-mobile flavour: core, imgproc, photo, features2d, video, highgui) for the app.
+#
+# usage: build-opencv.sh <opencv_version> <android|ios|catalyst> [--from-source]
+#   android : static libs for NATIVE_LIBS_ANDROID_ABIS     -> <out>/android/opencv/android/{include,jni,staticlibs,3rdparty}
+#   ios     : opencv2.xcframework with the ios, ios-simulator and mac-catalyst slices
+#   catalyst: alias of ios, the xcframework always carries the maccatalyst slice
+#             (-> <out>/ios/opencv/ios/opencv2.xcframework)
+#
+# Default mode downloads the prebuilt nihui/opencv-mobile release assets (what the app has always
+# used). --from-source (or OPENCV_FROM_SOURCE=1) instead downloads the opencv-mobile *source* zip
+# of the same release and rebuilds it with the same cmake options as opencv-mobile's CI, so the
+# result no longer depends on binaries somebody else uploaded.
+set -euo pipefail
+# shellcheck source=lib/common.sh
+source "$(dirname "${BASH_SOURCE[0]}")/lib/common.sh"
+
+FROM_SOURCE="${OPENCV_FROM_SOURCE:-0}"
+POSITIONAL=()
+for arg in "$@"; do
+    case "$arg" in
+        --from-source) FROM_SOURCE=1 ;;
+        *) POSITIONAL+=("$arg") ;;
+    esac
+done
+[[ ${#POSITIONAL[@]} -eq 2 ]] || die "usage: $0 <opencv_version> <android|ios|catalyst> [--from-source]"
+OPENCV_VERSION="${POSITIONAL[0]}"
+PLATFORM="${POSITIONAL[1]}"
+case "$PLATFORM" in android) ;; ios | catalyst) PLATFORM=ios ;; *) die "unknown platform '$PLATFORM'" ;; esac
+
+TAG="$(pin_get OPENCV_MOBILE_TAG "$OPENCV_VERSION")"
+if [[ -z "$TAG" ]]; then
+    require_cmd gh
+    log "no OPENCV_MOBILE_TAG pin for $OPENCV_VERSION, looking it up on github (newest release carrying it)"
+    TAG="$(gh api repos/nihui/opencv-mobile/releases --paginate \
+        --jq ".[] | select(any(.assets[]; .name == \"opencv-mobile-$OPENCV_VERSION.zip\")) | .tag_name" | head -n1)"
+    [[ -n "$TAG" ]] || die "no opencv-mobile release contains OpenCV $OPENCV_VERSION"
+    warn "resolved $OPENCV_VERSION -> opencv-mobile $TAG, pin OPENCV_MOBILE_TAG_$(version_key "$OPENCV_VERSION")=$TAG in versions.env"
+fi
+BASE_URL="https://github.com/nihui/opencv-mobile/releases/download/$TAG"
+WORK="$NATIVE_LIBS_WORK/opencv-$OPENCV_VERSION"
+STAGE="$(stage_dir "$PLATFORM")"
+log "opencv $OPENCV_VERSION (opencv-mobile $TAG, $([[ $FROM_SOURCE == 1 ]] && echo from source || echo prebuilt)) for $PLATFORM"
+
+# fetch_zip <asset suffix: android|ios|ios-simulator|mac-catalyst, or empty for the source zip> <dest dir>
+fetch_zip() {
+    local suffix="$1" dest="$2" name="opencv-mobile-$OPENCV_VERSION${1:+-$1}" sha_var
+    sha_var="SHA256_opencv_mobile_$(version_key "$OPENCV_VERSION")${suffix:+_$(version_key "$suffix")}"
+    download "$BASE_URL/$name.zip" "$NATIVE_LIBS_DL/$name.zip" "${!sha_var:-}"
+    rm -rf "$dest"
+    mkdir -p "$dest"
+    unzip -q "$NATIVE_LIBS_DL/$name.zip" -d "$dest"
+}
+
+# ------------------------------------------------------------------------------------------
+# Android
+# ------------------------------------------------------------------------------------------
+build_android_from_source() { # -> $WORK/android-sdk/<abi>/ install trees
+    require_android_ndk
+    require_cmd cmake
+    fetch_zip "" "$WORK/source"
+    local src="$WORK/source/opencv-mobile-$OPENCV_VERSION" abi opts
+    read -r -a opts < <(tr '\n' ' ' <"$src/options.txt"; echo)
+    for abi in $(android_abis); do
+        local bld="$src/build-$abi" extra=()
+        log "[$abi] opencv-mobile $OPENCV_VERSION"
+        if [[ "$abi" == armeabi-v7a ]]; then extra+=(-DANDROID_ARM_NEON=ON); fi
+        if [[ "$abi" == arm64-v8a ]]; then extra+=(-DOPENCV_EXTRA_FLAGS=-mno-outline-atomics); fi
+        cmake -S "$src" -B "$bld" \
+            -DCMAKE_POLICY_DEFAULT_CMP0057=NEW -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+            -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake" \
+            -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=False -DANDROID_ABI="$abi" \
+            -DANDROID_PLATFORM="android-$NATIVE_LIBS_ANDROID_API" -DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON \
+            -DANDROID_CPP_FEATURES="no-rtti no-exceptions" -DCMAKE_INSTALL_PREFIX="$bld/install" -DCMAKE_BUILD_TYPE=Release \
+            "${opts[@]}" -DBUILD_opencv_world=OFF -DOPENCV_DISABLE_FILESYSTEM_SUPPORT=ON "${extra[@]}" >"$bld.configure.log" 2>&1 \
+            || { tail -n 40 "$bld.configure.log" >&2; die "opencv configure failed for $abi"; }
+        cmake --build "$bld" --parallel "$JOBS" >"$bld.build.log" 2>&1 || { tail -n 60 "$bld.build.log" >&2; die "opencv build failed for $abi"; }
+        cmake --build "$bld" --target install >/dev/null
+        mkdir -p "$WORK/android-sdk"
+        cp -R "$bld/install/." "$WORK/android-sdk/"
+    done
+}
+
+build_android() {
+    local native out="$STAGE/opencv/android" abi
+    if [[ "$FROM_SOURCE" == 1 ]]; then
+        build_android_from_source
+        native="$WORK/android-sdk/sdk/native"
+    else
+        fetch_zip android "$WORK/android"
+        native="$WORK/android/opencv-mobile-$OPENCV_VERSION-android/sdk/native"
+    fi
+    [[ -d "$native/staticlibs" ]] || die "unexpected android package layout in $native"
+    rm -rf "$out"
+    mkdir -p "$out/staticlibs" "$out/3rdparty/libs" "$out/jni"
+    cp -R "$native/jni/." "$out/jni/"
+    cp -R "$native/jni/include" "$out/include"
+    for abi in $(android_abis); do
+        [[ -d "$native/staticlibs/$abi" ]] || die "ABI $abi missing from the opencv package"
+        cp -R "$native/staticlibs/$abi" "$out/staticlibs/$abi"
+        if [[ -d "$native/3rdparty/libs/$abi" ]]; then cp -R "$native/3rdparty/libs/$abi" "$out/3rdparty/libs/$abi"; fi
+    done
+    # drop the cmake config of the ABIs we do not ship
+    for dir in "$out"/jni/abi-*; do
+        abi="${dir##*/abi-}"
+        if [[ " $(android_abis) " != *" $abi "* ]]; then rm -rf "$dir"; fi
+    done
+}
+
+# ------------------------------------------------------------------------------------------
+# Apple: opencv2.xcframework = ios + ios-simulator + mac-catalyst frameworks
+# ------------------------------------------------------------------------------------------
+# build_apple_framework <ios|simulator|catalyst> <dest dir>: builds <dest>/opencv2.framework from source
+build_apple_framework() {
+    local kind="$1" dest="$2" src="$WORK/source/opencv-mobile-$OPENCV_VERSION"
+    local platform deploy archs arch extra=()
+    case "$kind" in
+        ios) platform=OS deploy="$OPENCV_IOS_MIN" archs="arm64" extra=(-DOPENCV_DISABLE_FILESYSTEM_SUPPORT=ON) ;;
+        simulator) platform=SIMULATOR deploy="$OPENCV_IOS_MIN" archs="x86_64 arm64" extra=(-DOPENCV_DISABLE_FILESYSTEM_SUPPORT=ON) ;;
+        catalyst) platform=MAC_CATALYST deploy="$OPENCV_CATALYST_MIN" archs="x86_64 arm64" ;;
+    esac
+    local opts libs=()
+    read -r -a opts < <(tr '\n' ' ' <"$src/options.txt"; echo)
+    for arch in $archs; do
+        local bld="$src/build-$kind-$arch"
+        log "[$kind/$arch] opencv-mobile $OPENCV_VERSION"
+        cmake -S "$src" -B "$bld" \
+            -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_TOOLCHAIN_FILE="$src/toolchains/ios.toolchain.cmake" \
+            -DPLATFORM="$platform" -DDEPLOYMENT_TARGET="$deploy" -DENABLE_BITCODE=OFF -DENABLE_ARC=OFF -DENABLE_VISIBILITY=OFF \
+            -DCMAKE_C_FLAGS="-fno-rtti -fno-exceptions" -DCMAKE_CXX_FLAGS="-fno-rtti -fno-exceptions" \
+            -DCMAKE_INSTALL_PREFIX="$bld/install" -DCMAKE_BUILD_TYPE=Release -DARCHS="$arch" \
+            "${opts[@]}" -DBUILD_opencv_world=ON "${extra[@]}" >"$bld.configure.log" 2>&1 \
+            || { tail -n 40 "$bld.configure.log" >&2; die "opencv configure failed for $kind/$arch"; }
+        # `ar @list` breaks on some macOS toolchains: fall back to archiving the object list by hand (as opencv-mobile's CI does)
+        cmake --build "$bld" --parallel "$JOBS" >"$bld.build.log" 2>&1 || {
+            # shellcheck disable=SC2046
+            (cd "$bld/modules/world" && "$(xcrun -f ar)" qc ../../lib/libopencv_world.a $(cat world_objects.rsp) CMakeFiles/opencv_world.dir/src/world_init.cpp.o)
+        }
+        cmake --build "$bld" --target install >/dev/null
+        local kleidi
+        kleidi="$(find "$bld/install/lib" -name libkleidicv.a -print -quit)"
+        if [[ -n "$kleidi" ]]; then # KleidiCV (arm64, opencv >= 4.14) is a separate 3rdparty archive: fold it in
+            libtool -static "$bld/install/lib/libopencv_world.a" "$(dirname "$kleidi")"/libkleidicv*.a -o "$bld/install/lib/world_combined.a"
+            mv "$bld/install/lib/world_combined.a" "$bld/install/lib/libopencv_world.a"
+        fi
+        libs+=("$bld/install/lib/libopencv_world.a")
+    done
+    local fw="$dest/opencv2.framework" headers_from
+    rm -rf "$fw"
+    mkdir -p "$fw/Versions/A/Headers" "$fw/Versions/A/Resources"
+    ln -s A "$fw/Versions/Current"
+    ln -s Versions/Current/Headers "$fw/Headers"
+    ln -s Versions/Current/Resources "$fw/Resources"
+    ln -s Versions/Current/opencv2 "$fw/opencv2"
+    lipo -create "${libs[@]}" -o "$fw/Versions/A/opencv2"
+    headers_from="$(dirname "$(dirname "${libs[0]}")")/include"
+    for inc in "$headers_from/opencv5/opencv2" "$headers_from/opencv4/opencv2" "$headers_from/opencv2"; do
+        if [[ -d "$inc" ]]; then cp -R "$inc/." "$fw/Versions/A/Headers/"; fi
+    done
+    cp "$src/Info.plist" "$fw/Versions/A/Resources/"
+}
+
+build_apple() {
+    require_macos_tools
+    require_cmd lipo
+    local frameworks="$WORK/frameworks" out="$STAGE/opencv/ios"
+    rm -rf "$frameworks"
+    mkdir -p "$frameworks"
+    if [[ "$FROM_SOURCE" == 1 ]]; then
+        require_cmd cmake
+        fetch_zip "" "$WORK/source"
+        build_apple_framework ios "$frameworks/ios"
+        build_apple_framework simulator "$frameworks/ios-simulator"
+        build_apple_framework catalyst "$frameworks/mac-catalyst"
+    else
+        local kind
+        for kind in ios ios-simulator mac-catalyst; do
+            fetch_zip "$kind" "$frameworks/$kind"
+        done
+    fi
+    rm -rf "$out/opencv2.xcframework"
+    mkdir -p "$out"
+    xcodebuild -create-xcframework \
+        -framework "$frameworks/ios/opencv2.framework" \
+        -framework "$frameworks/ios-simulator/opencv2.framework" \
+        -framework "$frameworks/mac-catalyst/opencv2.framework" \
+        -output "$out/opencv2.xcframework" >/dev/null
+    local slices
+    slices="$(find "$out/opencv2.xcframework" -maxdepth 1 -type d -name '*-*' -exec basename {} \; | sort | tr '\n' ' ')"
+    log "opencv2.xcframework slices: $slices"
+    [[ "$slices" == *maccatalyst* && "$slices" == *simulator* ]] || die "xcframework misses the simulator or maccatalyst slice"
+}
+
+case "$PLATFORM" in
+    android) build_android ;;
+    ios) build_apple ;;
+esac
+printf 'opencv=%s\nopencv-mobile=%s\nsource=%s\nplatform=%s\n' "$OPENCV_VERSION" "$TAG" "$([[ $FROM_SOURCE == 1 ]] && echo source || echo prebuilt)" "$PLATFORM" >"$STAGE/opencv/VERSION.$PLATFORM"
+log "done: $STAGE/opencv"
diff --git a/scripts/native-libs/build-tesseract.sh b/scripts/native-libs/build-tesseract.sh
new file mode 100755
index 000000000..bdbca0fb2
--- /dev/null
+++ b/scripts/native-libs/build-tesseract.sh
@@ -0,0 +1,347 @@
+#!/usr/bin/env bash
+# Build tesseract + leptonica + libpng (+ libjpeg-turbo on Android) as static libraries.
+#
+# usage: build-tesseract.sh <tesseract_version> <android|ios|catalyst> [--variant release|debug]
+#   android  : arm64-v8a armeabi-v7a x86_64 (NATIVE_LIBS_ANDROID_ABIS), needs ANDROID_NDK_HOME
+#   ios      : iphoneos arm64 + iphonesimulator arm64/x86_64 -> libX-ios.a, libX-sim.a
+#   catalyst : Mac Catalyst (macabi) arm64 + x86_64          -> libX-catalyst.a
+#
+#   --variant release (default): -O3, stripped, small.
+#   --variant debug            : -O1 -g -fno-omit-frame-pointer, asserts on, NOT stripped, same file names
+#                                (output in <platform>-debug/, extract it over the release one to debug into tesseract).
+#                                Not -O0: tesseract's LSTM engine becomes unusably slow without optimisation.
+#
+# Result is written to $NATIVE_LIBS_OUT/<platform>/tesseract/{android,ios}/ (default build/native-libs/out),
+# with the same layout the app already uses (see scripts/native-libs/README.md). The dependency
+# versions (leptonica, libpng, libjpeg-turbo) come from the TESSERACT_<ver>_* pins in versions.env.
+set -euo pipefail
+# shellcheck source=lib/common.sh
+source "$(dirname "${BASH_SOURCE[0]}")/lib/common.sh"
+
+VARIANT="${NATIVE_LIBS_VARIANT:-release}"
+args=()
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --variant) VARIANT="${2:-}"; shift 2 ;;
+        -*) die "unknown option $1" ;;
+        *) args+=("$1"); shift ;;
+    esac
+done
+[[ ${#args[@]} -eq 2 ]] || die "usage: $0 <tesseract_version> <android|ios|catalyst> [--variant release|debug]"
+TESS_VERSION="${args[0]}"
+PLATFORM="${args[1]}"
+variant_suffix "$VARIANT" >/dev/null
+case "$PLATFORM" in android | ios | catalyst) ;; *) die "unknown platform '$PLATFORM'" ;; esac
+require_cmd cmake
+require_cmd curl
+
+LEPT_VERSION="$(pin_get TESSERACT "$TESS_VERSION" LEPTONICA)"
+PNG_VERSION="$(pin_get TESSERACT "$TESS_VERSION" LIBPNG)"
+JPEG_VERSION="$(pin_get TESSERACT "$TESS_VERSION" LIBJPEG_TURBO)"
+[[ -n "$LEPT_VERSION" && -n "$PNG_VERSION" && -n "$JPEG_VERSION" ]] \
+    || die "tesseract $TESS_VERSION has no dependency pins in versions.env (TESSERACT_$(version_key "$TESS_VERSION")_{LEPTONICA,LIBPNG,LIBJPEG_TURBO})"
+log "tesseract $TESS_VERSION (leptonica $LEPT_VERSION, libpng $PNG_VERSION, libjpeg-turbo $JPEG_VERSION) for $PLATFORM, $VARIANT"
+
+SRC="$NATIVE_LIBS_WORK/src"
+WORK="$NATIVE_LIBS_WORK/tesseract-$TESS_VERSION/$PLATFORM$(variant_suffix "$VARIANT")"
+STAGE="$(stage_dir "$PLATFORM" "$VARIANT")"
+
+fetch_source() { # fetch_source <name> <url> <version> <sha-key>
+    local archive="$NATIVE_LIBS_DL/$1-$3.tar.gz" sha_var="SHA256_$4"
+    download "$2" "$archive" "${!sha_var:-}"
+    extract_tarball "$archive" "$SRC/$1-$3"
+}
+fetch_source tesseract "https://github.com/tesseract-ocr/tesseract/archive/refs/tags/$TESS_VERSION.tar.gz" "$TESS_VERSION" "tesseract_$(version_key "$TESS_VERSION")"
+fetch_source leptonica "https://github.com/DanBloomberg/leptonica/archive/refs/tags/$LEPT_VERSION.tar.gz" "$LEPT_VERSION" "leptonica_$(version_key "$LEPT_VERSION")"
+fetch_source libpng "https://github.com/pnggroup/libpng/archive/refs/tags/v$PNG_VERSION.tar.gz" "$PNG_VERSION" "libpng_$(version_key "$PNG_VERSION")"
+if [[ "$PLATFORM" == android ]]; then
+    fetch_source libjpeg-turbo "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/$JPEG_VERSION.tar.gz" "$JPEG_VERSION" "libjpeg_turbo_$(version_key "$JPEG_VERSION")"
+fi
+TESS_SRC="$SRC/tesseract-$TESS_VERSION"
+LEPT_SRC="$SRC/leptonica-$LEPT_VERSION"
+PNG_SRC="$SRC/libpng-$PNG_VERSION"
+JPEG_SRC="$SRC/libjpeg-turbo-$JPEG_VERSION"
+
+# --- cmake helpers ---------------------------------------------------------------------------
+# The debug variant keeps CMAKE_BUILD_TYPE=Release (same install names/targets) and only swaps the
+# Release flags: -O1 keeps the code steppable but fast enough for OCR, -UNDEBUG so assert() stays live (the NDK toolchain adds -DNDEBUG on its own).
+VARIANT_FLAGS=()
+if [[ "$VARIANT" == debug ]]; then
+    VARIANT_FLAGS=("-DCMAKE_C_FLAGS_RELEASE=-O1 -g -fno-omit-frame-pointer -UNDEBUG" "-DCMAKE_CXX_FLAGS_RELEASE=-O1 -g -fno-omit-frame-pointer -UNDEBUG")
+fi
+# TOOLCHAIN_ARGS is filled per target (android abi / apple sdk+arch) before calling build_stack
+TOOLCHAIN_ARGS=()
+
+# cmake_build <src> <build dir> <prefix> [cmake args...] ; libs are installed into <prefix>
+cmake_build() {
+    local src="$1" bld="$2" prefix="$3"
+    shift 3
+    cmake -S "$src" -B "$bld" \
+        -DCMAKE_BUILD_TYPE=Release ${VARIANT_FLAGS[@]+"${VARIANT_FLAGS[@]}"} \
+        -DBUILD_SHARED_LIBS=OFF \
+        -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+        -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+        -DCMAKE_INSTALL_PREFIX="$prefix" \
+        "${TOOLCHAIN_ARGS[@]}" "$@" >"$bld.configure.log" 2>&1 \
+        || { tail -n 40 "$bld.configure.log" >&2; die "cmake configure failed for $src (log: $bld.configure.log)"; }
+    cmake --build "$bld" --parallel "$JOBS" ${BUILD_TARGET:+--target "$BUILD_TARGET"} >"$bld.build.log" 2>&1 \
+        || { tail -n 60 "$bld.build.log" >&2; die "cmake build failed for $src (log: $bld.build.log)"; }
+}
+cmake_install() { cmake --install "$1" >/dev/null; }
+
+# build_stack <label> <ABI-or-arch used for CMAKE_SYSTEM_PROCESSOR hint, may be empty>
+# Builds libpng, [libjpeg-turbo], leptonica and tesseract into $WORK/<label>/prefix
+build_stack() {
+    local label="$1" root="$WORK/$1"
+    local prefix="$root/prefix"
+    rm -rf "$root"
+    mkdir -p "$root" "$prefix"
+    log "[$label] libpng $PNG_VERSION"
+    cmake_build "$PNG_SRC" "$root/png" "$prefix" \
+        -DPNG_SHARED=OFF -DPNG_STATIC=ON -DPNG_TESTS=OFF -DPNG_TOOLS=OFF -DPNG_FRAMEWORK=OFF
+    cmake_install "$root/png"
+
+    if [[ "$PLATFORM" == android ]]; then
+        log "[$label] libjpeg-turbo $JPEG_VERSION"
+        # x86 SIMD needs nasm/yasm (the NDK's yasm is an x86 binary, unusable on Apple Silicon); leptonica
+        # is built without jpeg anyway, libjpeg is only shipped because the app links it
+        local jpeg_simd=()
+        if [[ "$label" == x86* ]]; then jpeg_simd=(-DWITH_SIMD=OFF); fi
+        cmake_build "$JPEG_SRC" "$root/jpeg" "$prefix" \
+            -DENABLE_SHARED=OFF -DENABLE_STATIC=ON -DWITH_TURBOJPEG=OFF -DWITH_JAVA=OFF "${jpeg_simd[@]}"
+        cmake_install "$root/jpeg"
+    fi
+
+    log "[$label] leptonica $LEPT_VERSION"
+    cmake_build "$LEPT_SRC" "$root/lept" "$prefix" \
+        -DSW_BUILD=OFF -DBUILD_PROG=OFF \
+        -DENABLE_ZLIB=ON -DENABLE_PNG=ON \
+        -DENABLE_GIF=OFF -DENABLE_JPEG=OFF -DENABLE_TIFF=OFF -DENABLE_WEBP=OFF -DENABLE_OPENJPEG=OFF \
+        -DPNG_LIBRARY="$prefix/lib/libpng16.a" -DPNG_PNG_INCLUDE_DIR="$prefix/include"
+    cmake_install "$root/lept"
+
+    log "[$label] tesseract $TESS_VERSION"
+    # LEPT_TIFF_RESULT: answer of a try_run() that cannot run when cross-compiling (1 = no TIFF in leptonica)
+    local extra=(-DOPENMP_BUILD=OFF)
+    if [[ "$PLATFORM" == android ]]; then
+        extra=(-DOPENMP_BUILD=ON -DCpuFeaturesNdkCompat_DIR="$WORK/cpufeatures-$1/lib/cmake/CpuFeaturesNdkCompat")
+    fi
+    BUILD_TARGET=libtesseract cmake_build "$TESS_SRC" "$root/tess" "$prefix" \
+        -DSW_BUILD=OFF -DBUILD_TRAINING_TOOLS=OFF -DBUILD_TESTS=OFF -DINSTALL_CONFIGS=OFF \
+        -DDISABLE_TIFF=ON -DDISABLE_ARCHIVE=ON -DDISABLE_CURL=ON \
+        -DLEPT_TIFF_RESULT=1 \
+        -DGRAPHICS_DISABLED=ON -DFAST_FLOAT=ON \
+        -DLeptonica_DIR="$prefix/lib/cmake/leptonica" "${extra[@]}"
+    cp "$root/tess/libtesseract.a" "$prefix/lib/libtesseract.a"
+    mkdir -p "$prefix/include/tesseract"
+    cp "$TESS_SRC"/include/tesseract/*.h "$root/tess/include/tesseract/version.h" "$prefix/include/tesseract/"
+}
+
+copy_headers() { # copy_headers <prefix> <dest include dir>
+    local prefix="$1" dest="$2"
+    rm -rf "$dest"
+    mkdir -p "$dest/libpng16"
+    cp -R "$prefix/include/tesseract" "$prefix/include/leptonica" "$dest/"
+    cp "$prefix"/include/png.h "$prefix"/include/pngconf.h "$prefix"/include/pnglibconf.h "$dest/"
+    cp "$prefix"/include/libpng16/*.h "$dest/libpng16/" 2>/dev/null || cp "$dest"/png*.h "$dest/libpng16/"
+}
+
+# --- android ---------------------------------------------------------------------------------
+build_android() {
+    require_android_ndk
+    local ndk="$ANDROID_NDK_HOME" abi out="$STAGE/tesseract/android"
+    local host_tag strip_bin
+    host_tag="$(ls "$ndk/toolchains/llvm/prebuilt")"
+    strip_bin="$ndk/toolchains/llvm/prebuilt/$host_tag/bin/llvm-strip"
+    rm -rf "$out"
+    mkdir -p "$out/staticlibs"
+    for abi in $(android_abis); do
+        TOOLCHAIN_ARGS=(
+            -DCMAKE_TOOLCHAIN_FILE="$ndk/build/cmake/android.toolchain.cmake"
+            -DANDROID_ABI="$abi" -DANDROID_PLATFORM="android-$NATIVE_LIBS_ANDROID_API"
+            -DANDROID_STL=c++_shared -DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON
+            -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=BOTH -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=BOTH -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=BOTH
+        )
+        if [[ "$abi" == armeabi-v7a ]]; then TOOLCHAIN_ARGS+=(-DANDROID_ARM_NEON=ON); fi
+        make_cpufeatures_shim "$abi" "$WORK/cpufeatures-$abi"
+        build_stack "$abi"
+        local prefix="$WORK/$abi/prefix" lib="$out/staticlibs/$abi"
+        mkdir -p "$lib"
+        cp "$prefix/lib/libleptonica.a" "$prefix/lib/libjpeg.a" "$lib/"
+        cp "$prefix/lib/libpng16.a" "$lib/libpngx.a"
+        # tesseract needs the NDK cpu-features helpers: fold them into libtesseract.a so the app
+        # keeps linking `tesseract leptonica pngx jpeg` only
+        merge_archives "$ndk/toolchains/llvm/prebuilt/$host_tag/bin/llvm-ar" "$lib/libtesseract.a" \
+            "$prefix/lib/libtesseract.a" "$WORK/cpufeatures-$abi/lib/libndk_compat.a"
+        if [[ "$VARIANT" == release ]]; then "$strip_bin" --strip-debug "$lib"/*.a; fi
+        if [[ ! -d "$out/include" ]]; then copy_headers "$prefix" "$out/include"; fi
+    done
+}
+
+# NDK ships cpu-features.c; tesseract's CMake wants it through find_package(CpuFeaturesNdkCompat)
+make_cpufeatures_shim() { # make_cpufeatures_shim <abi> <dir>
+    local abi="$1" dir="$2" ndk="$ANDROID_NDK_HOME" cpuf
+    cpuf="$ndk/sources/android/cpufeatures"
+    [[ -f "$cpuf/cpu-features.c" ]] || die "NDK cpu-features.c not found in $cpuf"
+    rm -rf "$dir"
+    mkdir -p "$dir/lib/cmake/CpuFeaturesNdkCompat" "$dir/include/ndk_compat" "$dir/build"
+    cp "$cpuf/cpu-features.h" "$dir/include/ndk_compat/"
+    cat >"$dir/build/CMakeLists.txt" <<CMAKE
+cmake_minimum_required(VERSION 3.14)
+project(ndk_compat C)
+add_library(ndk_compat STATIC $cpuf/cpu-features.c)
+target_compile_definitions(ndk_compat PRIVATE _GNU_SOURCE)
+target_link_libraries(ndk_compat PUBLIC dl)
+CMAKE
+    cmake -S "$dir/build" -B "$dir/build/b" -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_TOOLCHAIN_FILE="$ndk/build/cmake/android.toolchain.cmake" -DANDROID_ABI="$abi" \
+        -DANDROID_PLATFORM="android-$NATIVE_LIBS_ANDROID_API" -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY="$dir/lib" \
+        >"$dir/build/configure.log" 2>&1 && cmake --build "$dir/build/b" >"$dir/build/build.log" 2>&1 \
+        || die "cpu-features shim failed for $abi (see $dir/build)"
+    cat >"$dir/lib/cmake/CpuFeaturesNdkCompat/CpuFeaturesNdkCompatConfig.cmake" <<CMAKE
+if(NOT TARGET CpuFeatures::ndk_compat)
+  add_library(CpuFeatures::ndk_compat STATIC IMPORTED)
+  set_target_properties(CpuFeatures::ndk_compat PROPERTIES
+    IMPORTED_LOCATION "\${CMAKE_CURRENT_LIST_DIR}/../../libndk_compat.a")
+endif()
+CMAKE
+}
+
+merge_archives() { # merge_archives <llvm-ar> <out.a> <in.a>...
+    local ar_bin="$1" out="$2" mri
+    shift 2
+    mri="$(mktemp)"
+    { echo "CREATE $out"; for a in "$@"; do echo "ADDLIB $a"; done; echo "SAVE"; echo "END"; } >"$mri"
+    "$ar_bin" -M <"$mri"
+    rm -f "$mri"
+}
+
+# --- apple -----------------------------------------------------------------------------------
+# apple_toolchain <ios|sim|catalyst> <arch>
+apple_toolchain() {
+    local kind="$1" arch="$2" sdk
+    TOOLCHAIN_ARGS=(-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY -DCMAKE_SYSTEM_PROCESSOR="$arch")
+    case "$kind" in
+        ios)
+            TOOLCHAIN_ARGS+=(-DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphoneos -DCMAKE_OSX_ARCHITECTURES="$arch"
+                -DCMAKE_OSX_DEPLOYMENT_TARGET="$NATIVE_LIBS_IOS_MIN")
+            ;;
+        sim)
+            TOOLCHAIN_ARGS+=(-DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_SYSROOT=iphonesimulator -DCMAKE_OSX_ARCHITECTURES="$arch"
+                -DCMAKE_OSX_DEPLOYMENT_TARGET="$NATIVE_LIBS_IOS_MIN")
+            ;;
+        catalyst)
+            # Mac Catalyst is "macOS SDK + ios-macabi target": CMake has no native mode for it, so the
+            # target triple does the job. CMAKE_OSX_ARCHITECTURES must match it (otherwise CMake adds
+            # the host arch with -arch), CMAKE_OSX_DEPLOYMENT_TARGET stays unset (-mmacosx-version-min
+            # would fight with -target).
+            sdk="$(xcrun --sdk macosx --show-sdk-path)"
+            local triple="$arch-apple-ios$NATIVE_LIBS_CATALYST_MIN-macabi"
+            # CMAKE_SYSTEM_NAME=Darwin forces cross-compiling mode, which keeps the CMAKE_SYSTEM_PROCESSOR
+            # given above (else it is reset to the host cpu and tesseract picks NEON for x86_64).
+            TOOLCHAIN_ARGS+=(-DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_OSX_SYSROOT="$sdk" -DCMAKE_OSX_ARCHITECTURES="$arch"
+                "-DCMAKE_C_FLAGS=-target $triple" "-DCMAKE_CXX_FLAGS=-target $triple" "-DCMAKE_ASM_FLAGS=-target $triple"
+                "-DCMAKE_EXE_LINKER_FLAGS=-target $triple" "-DCMAKE_MODULE_LINKER_FLAGS=-target $triple")
+            ;;
+    esac
+}
+
+# thin_libs <prefix> <dest dir> <suffix-tag> <label>: copy + strip the three libs of one slice
+collect_slice() {
+    local prefix="$1" dest="$2" label="$3"
+    mkdir -p "$dest"
+    for lib in tesseract leptonica png16; do
+        cp "$prefix/lib/lib$lib.a" "$dest/lib$lib-$label.a"
+        if [[ "$VARIANT" == release ]]; then strip -S "$dest/lib$lib-$label.a" 2>/dev/null || true; fi
+    done
+}
+
+# fat_libs <out dir> <label> <thin dir>...  : lipo the per-arch dirs into libX-<label>.a
+fat_libs() {
+    local out="$1" label="$2"
+    shift 2
+    mkdir -p "$out"
+    for lib in tesseract leptonica png16; do
+        local inputs=()
+        for dir in "$@"; do inputs+=("$dir/lib$lib-$label.a"); done
+        if [[ ${#inputs[@]} -eq 1 ]]; then cp "${inputs[0]}" "$out/lib$lib-$label.a"; else lipo -create "${inputs[@]}" -output "$out/lib$lib-$label.a"; fi
+    done
+    ln -sf "libpng16-$label.a" "$out/libpng-$label.a"
+}
+
+# verify_slices <lib.a> <expected archs, space separated> <expected vtool platform or empty>
+verify_slices() {
+    local lib="$1" archs="$2" platform="${3:-}" got arch tmp
+    got="$(lipo -archs "$lib")"
+    [[ " $(printf '%s\n' $got | sort | tr '\n' ' ')" == " $(printf '%s\n' $archs | sort | tr '\n' ' ')" ]] \
+        || die "$lib has archs '$got', expected '$archs'"
+    [[ -z "$platform" ]] && return 0
+    tmp="$(mktemp -d)"
+    for arch in $archs; do
+        if [[ "$(lipo -archs "$lib" | wc -w)" -eq 1 ]]; then cp "$lib" "$tmp/thin.a"; else lipo "$lib" -thin "$arch" -output "$tmp/thin.a"; fi
+        (cd "$tmp" && rm -f ./*.o && ar x thin.a && vtool -show-build "$(ls ./*.o | head -n1)" | grep -q "platform $platform") \
+            || { rm -rf "$tmp"; die "$lib ($arch) is not built for platform $platform"; }
+    done
+    rm -rf "$tmp"
+}
+
+write_modulemap() {
+    cat >"$1/module.modulemap" <<'MAP'
+module libtesseract {
+    header "tesseract/capi.h"
+    export *
+}
+
+module libleptonica {
+    header "leptonica/allheaders.h"
+    export *
+}
+MAP
+}
+
+build_apple() {
+    require_macos_tools
+    require_cmd lipo
+    local out="$STAGE/tesseract/ios" thin="$WORK/thin"
+    rm -rf "$out" "$thin"
+    mkdir -p "$out/lib"
+    if [[ "$PLATFORM" == ios ]]; then
+        apple_toolchain ios arm64
+        build_stack ios-arm64
+        collect_slice "$WORK/ios-arm64/prefix" "$thin/ios-arm64" ios
+        fat_libs "$out/lib" ios "$thin/ios-arm64"
+        copy_headers "$WORK/ios-arm64/prefix" "$out/include"
+        write_modulemap "$out/include"
+        local sim_dirs=()
+        for arch in arm64 x86_64; do
+            apple_toolchain sim "$arch"
+            build_stack "sim-$arch"
+            collect_slice "$WORK/sim-$arch/prefix" "$thin/sim-$arch" sim
+            sim_dirs+=("$thin/sim-$arch")
+        done
+        fat_libs "$out/lib" sim "${sim_dirs[@]}"
+        verify_slices "$out/lib/libtesseract-ios.a" "arm64" IOS
+        verify_slices "$out/lib/libtesseract-sim.a" "arm64 x86_64" IOSSIMULATOR
+    else
+        local cat_dirs=()
+        for arch in arm64 x86_64; do
+            apple_toolchain catalyst "$arch"
+            build_stack "catalyst-$arch"
+            collect_slice "$WORK/catalyst-$arch/prefix" "$thin/catalyst-$arch" catalyst
+            cat_dirs+=("$thin/catalyst-$arch")
+        done
+        fat_libs "$out/lib" catalyst "${cat_dirs[@]}"
+        for lib in tesseract leptonica png16; do verify_slices "$out/lib/lib$lib-catalyst.a" "arm64 x86_64" MACCATALYST; done
+        copy_headers "$WORK/catalyst-arm64/prefix" "$out/include"
+        write_modulemap "$out/include"
+    fi
+}
+
+case "$PLATFORM" in
+    android) build_android ;;
+    ios | catalyst) build_apple ;;
+esac
+
+printf 'tesseract=%s\nleptonica=%s\nlibpng=%s\nlibjpeg-turbo=%s\nplatform=%s\nvariant=%s\n' \
+    "$TESS_VERSION" "$LEPT_VERSION" "$PNG_VERSION" "$JPEG_VERSION" "$PLATFORM" "$VARIANT" >"$STAGE/tesseract/VERSION.$PLATFORM"
+log "done: $STAGE/tesseract"
diff --git a/scripts/native-libs/build.sh b/scripts/native-libs/build.sh
new file mode 100755
index 000000000..b7a44a910
--- /dev/null
+++ b/scripts/native-libs/build.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+# Build + package everything for one or more platforms. This is what the workflow runs.
+#
+# usage: build.sh <opencv_version> <tesseract_version> <android|ios|catalyst|all>... [--opencv-from-source] [--variant release|debug|both]
+#   --variant debug builds only tesseract/leptonica/libpng/libjpeg with symbols (OpenCV has no debug variant);
+#   its archive has the same layout/names as the release one and can be extracted over it.
+#   (--opencv-from-source is the same as OPENCV_FROM_SOURCE=1)
+#   ios      : opencv2.xcframework (ios + simulator + maccatalyst slices) + tesseract -ios/-sim libs
+#   catalyst : tesseract -catalyst libs only (the maccatalyst opencv slice ships with `ios`)
+#   all      : android ios catalyst
+set -euo pipefail
+# shellcheck source=lib/common.sh
+source "$(dirname "${BASH_SOURCE[0]}")/lib/common.sh"
+
+opencv_args=()
+args=()
+variant="${NATIVE_LIBS_VARIANT:-release}"
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --opencv-from-source) opencv_args+=(--from-source); shift ;;
+        --variant) variant="${2:-}"; shift 2 ;;
+        *) args+=("$1"); shift ;;
+    esac
+done
+case "$variant" in release | debug | both) ;; *) die "unknown variant '$variant' (release|debug|both)" ;; esac
+[[ ${#args[@]} -ge 3 ]] || die "usage: $0 <opencv_version> <tesseract_version> <android|ios|catalyst|all>... [--opencv-from-source]"
+OPENCV_VERSION="${args[0]}"
+TESS_VERSION="${args[1]}"
+platforms=("${args[@]:2}")
+if [[ " ${platforms[*]} " == *" all "* ]]; then platforms=(android ios catalyst); fi
+
+variants=("$variant")
+if [[ "$variant" == both ]]; then variants=(release debug); fi
+
+for platform in "${platforms[@]}"; do
+    for v in "${variants[@]}"; do
+        case "$platform" in
+            android | ios)
+                if [[ "$v" == release ]]; then "$NL_DIR/build-opencv.sh" "$OPENCV_VERSION" "$platform" ${opencv_args[@]+"${opencv_args[@]}"}; fi
+                "$NL_DIR/build-tesseract.sh" "$TESS_VERSION" "$platform" --variant "$v"
+                ;;
+            catalyst) "$NL_DIR/build-tesseract.sh" "$TESS_VERSION" catalyst --variant "$v" ;;
+            *) die "unknown platform '$platform'" ;;
+        esac
+        "$NL_DIR/package.sh" "$OPENCV_VERSION" "$TESS_VERSION" "$platform" --variant "$v"
+    done
+done
diff --git a/scripts/native-libs/fetch.sh b/scripts/native-libs/fetch.sh
new file mode 100755
index 000000000..a25cf93f0
--- /dev/null
+++ b/scripts/native-libs/fetch.sh
@@ -0,0 +1,76 @@
+#!/usr/bin/env bash
+# Download the prebuilt native libs of a `build-native-libs` release into opencv/ and tesseract/.
+#
+# usage: fetch.sh <opencv_version> <tesseract_version> <android|ios|catalyst|all> [--variant release|debug|both] [--dest <dir>] [--repo <owner/name>] [--dry-run]
+#   release tag : native-libs-<opencv_version>-<tesseract_version>
+#   asset       : native-libs-<platform>-opencv<ov>-tesseract<tv>[-debug].tar.gz
+#   --variant   : release (default), debug (tesseract with symbols, same file names: extracted over the release libs,
+#                 so fetch release first or use `both`) or both (release, then debug on top)
+#   --dest      : repo root to extract into (default: this repo's root)
+#   --repo      : GitHub repository holding the release (default: $NATIVE_LIBS_REPO or ossappscollective/OSS-DocumentScanner)
+#   --dry-run   : only print what would be downloaded
+# Uses `gh release download` when gh is installed and authenticated, plain curl otherwise.
+# Note: this overwrites opencv/ios/opencv2.xcframework and the matching libs of the selected platforms.
+set -euo pipefail
+# shellcheck source=lib/common.sh
+source "$(dirname "${BASH_SOURCE[0]}")/lib/common.sh"
+
+DEST="$REPO_ROOT"
+REPO="${NATIVE_LIBS_REPO:-ossappscollective/OSS-DocumentScanner}"
+DRY_RUN=0
+VARIANT="${NATIVE_LIBS_VARIANT:-release}"
+args=()
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --dest) DEST="$2"; shift 2 ;;
+        --repo) REPO="$2"; shift 2 ;;
+        --dry-run) DRY_RUN=1; shift ;;
+        --variant) VARIANT="${2:-}"; shift 2 ;;
+        -*) die "unknown option $1" ;;
+        *) args+=("$1"); shift ;;
+    esac
+done
+[[ ${#args[@]} -eq 3 ]] || die "usage: $0 <opencv_version> <tesseract_version> <android|ios|catalyst|all> [--dest dir] [--repo owner/name] [--dry-run]"
+OPENCV_VERSION="${args[0]}"
+TESS_VERSION="${args[1]}"
+case "${args[2]}" in
+    all) platforms=(android ios catalyst) ;;
+    android | ios | catalyst) platforms=("${args[2]}") ;;
+    *) die "unknown platform '${args[2]}'" ;;
+esac
+case "$VARIANT" in
+    release) variants=(release) ;;
+    debug) variants=(debug) ;;
+    both) variants=(release debug) ;;
+    *) die "unknown variant '$VARIANT' (release|debug|both)" ;;
+esac
+TAG="native-libs-$OPENCV_VERSION-$TESS_VERSION"
+mkdir -p "$NATIVE_LIBS_DL/release-$TAG"
+
+for platform in "${platforms[@]}"; do
+    for variant in "${variants[@]}"; do
+        asset="native-libs-$platform-opencv$OPENCV_VERSION-tesseract$TESS_VERSION$(variant_suffix "$variant").tar.gz"
+        url="https://github.com/$REPO/releases/download/$TAG/$asset"
+        if [[ "$DRY_RUN" == 1 ]]; then
+            log "would download $url and extract it into $DEST"
+            continue
+        fi
+        file="$NATIVE_LIBS_DL/release-$TAG/$asset"
+        if [[ ! -s "$file" ]]; then
+            if command -v gh >/dev/null 2>&1 && gh auth status >/dev/null 2>&1; then
+                gh release download "$TAG" --repo "$REPO" --pattern "$asset" --dir "$NATIVE_LIBS_DL/release-$TAG" --clobber \
+                    || die "release $TAG / asset $asset not found in $REPO (run the build-native-libs workflow first)"
+            else
+                log "download $url"
+                curl -fL --retry 3 -sS -o "$file.part" "$url" || die "cannot download $url (run the build-native-libs workflow first)"
+                mv "$file.part" "$file"
+            fi
+        fi
+        # verify against the published checksum when there is one
+        if curl -fsSL "$url.sha256" -o "$file.sha256" 2>/dev/null; then
+            [[ "$(cut -d' ' -f1 "$file.sha256")" == "$(sha256_of "$file")" ]] || { rm -f "$file"; die "checksum mismatch for $asset"; }
+        fi
+        log "extract $asset into $DEST"
+        tar -xzf "$file" -C "$DEST"
+    done
+done
diff --git a/scripts/native-libs/lib/common.sh b/scripts/native-libs/lib/common.sh
new file mode 100644
index 000000000..0ce0f6d53
--- /dev/null
+++ b/scripts/native-libs/lib/common.sh
@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+# Shared helpers for scripts/native-libs. Source it, do not execute it.
+set -euo pipefail
+
+NL_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+REPO_ROOT="$(cd "$NL_DIR/../.." && pwd)"
+# shellcheck source=../versions.env
+source "$NL_DIR/versions.env"
+
+# Everything lives under build/ (gitignored). Nothing is ever written into opencv/ or tesseract/
+# by the build scripts: results go to $NATIVE_LIBS_OUT/<stage>/{opencv,tesseract}/...
+NATIVE_LIBS_OUT="${NATIVE_LIBS_OUT:-$REPO_ROOT/build/native-libs/out}"
+NATIVE_LIBS_WORK="${NATIVE_LIBS_WORK:-$REPO_ROOT/build/native-libs/work}"
+NATIVE_LIBS_DL="${NATIVE_LIBS_DL:-$REPO_ROOT/build/native-libs/downloads}"
+JOBS="${JOBS:-$(getconf _NPROCESSORS_ONLN 2>/dev/null || echo 4)}"
+
+log() { printf '\033[1;34m[native-libs]\033[0m %s\n' "$*" >&2; }
+warn() { printf '\033[1;33m[native-libs] warning:\033[0m %s\n' "$*" >&2; }
+die() { printf '\033[1;31m[native-libs] error:\033[0m %s\n' "$*" >&2; exit 1; }
+
+# "4.13.0" -> "4_13_0"
+version_key() { printf '%s' "$1" | tr -c 'A-Za-z0-9' '_'; }
+
+# pin_get <PREFIX> <version> [SUFFIX] -> value of PREFIX_<version>[_SUFFIX], empty if unset
+pin_get() {
+    local key name
+    key="$(version_key "$2")"
+    name="$1_${key}${3:+_$3}"
+    printf '%s' "${!name:-}"
+}
+
+sha256_of() {
+    if command -v sha256sum >/dev/null 2>&1; then sha256sum "$1" | cut -d' ' -f1; else shasum -a 256 "$1" | cut -d' ' -f1; fi
+}
+
+# download <url> <dest> [expected_sha256]
+download() {
+    local url="$1" dest="$2" expected="${3:-}"
+    mkdir -p "$(dirname "$dest")"
+    if [[ ! -s "$dest" ]]; then
+        log "download $url"
+        curl -fL --retry 3 --retry-delay 2 -sS -o "$dest.part" "$url"
+        mv "$dest.part" "$dest"
+    fi
+    local actual
+    actual="$(sha256_of "$dest")"
+    if [[ -n "$expected" ]]; then
+        [[ "$actual" == "$expected" ]] || { rm -f "$dest"; die "sha256 mismatch for $url (expected $expected, got $actual)"; }
+    else
+        warn "no pinned sha256 for $(basename "$dest"), got $actual (add it to versions.env)"
+    fi
+}
+
+# extract_tarball <archive> <dest_dir>  (strips the top level directory)
+extract_tarball() {
+    local archive="$1" dest="$2"
+    if [[ -d "$dest" ]]; then return 0; fi
+    mkdir -p "$dest.tmp"
+    tar -xzf "$archive" -C "$dest.tmp" --strip-components=1
+    mv "$dest.tmp" "$dest"
+}
+
+# stage_dir <android|ios|catalyst> [release|debug] -> where the packaged tree of a platform is assembled
+stage_dir() { printf '%s/%s%s' "$NATIVE_LIBS_OUT" "$1" "$(variant_suffix "${2:-release}")"; }
+
+# variant_suffix <release|debug> -> "" or "-debug" (suffix of stage dirs and archive names)
+variant_suffix() {
+    case "$1" in
+        release) ;;
+        debug) printf -- '-debug' ;;
+        *) die "unknown variant '$1' (release|debug)" ;;
+    esac
+}
+
+android_abis() { printf '%s' "${NATIVE_LIBS_ANDROID_ABIS:-$NATIVE_LIBS_ANDROID_ABIS_DEFAULT}"; }
+
+require_android_ndk() {
+    ANDROID_NDK_HOME="${ANDROID_NDK_HOME:-${ANDROID_NDK_ROOT:-${ANDROID_NDK_LATEST_HOME:-}}}"
+    [[ -n "$ANDROID_NDK_HOME" && -f "$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake" ]] \
+        || die "ANDROID_NDK_HOME must point to an Android NDK (got '${ANDROID_NDK_HOME:-}')"
+    export ANDROID_NDK_HOME
+}
+
+require_macos_tools() {
+    [[ "$(uname -s)" == "Darwin" ]] || die "Apple builds need macOS with Xcode"
+    command -v xcrun >/dev/null || die "xcrun not found, install Xcode"
+}
+
+require_cmd() { command -v "$1" >/dev/null 2>&1 || die "missing required command: $1"; }
diff --git a/scripts/native-libs/package.sh b/scripts/native-libs/package.sh
new file mode 100755
index 000000000..7d3fc5a21
--- /dev/null
+++ b/scripts/native-libs/package.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+# Pack the output of build-opencv.sh / build-tesseract.sh of one platform into a release asset.
+#
+# usage: package.sh <opencv_version> <tesseract_version> <android|ios|catalyst> [dest dir] [--variant release|debug]
+# -> native-libs-<platform>-opencv<ov>-tesseract<tv>[-debug].tar.gz (+ .sha256), paths relative to the repo root
+#    (opencv/..., tesseract/...), so `tar -xzf <asset> -C <repo root>` installs it.
+set -euo pipefail
+# shellcheck source=lib/common.sh
+source "$(dirname "${BASH_SOURCE[0]}")/lib/common.sh"
+
+VARIANT="${NATIVE_LIBS_VARIANT:-release}"
+args=()
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --variant) VARIANT="${2:-}"; shift 2 ;;
+        -*) die "unknown option $1" ;;
+        *) args+=("$1"); shift ;;
+    esac
+done
+[[ ${#args[@]} -ge 3 ]] || die "usage: $0 <opencv_version> <tesseract_version> <android|ios|catalyst> [dest dir] [--variant release|debug]"
+OPENCV_VERSION="${args[0]}"
+TESS_VERSION="${args[1]}"
+PLATFORM="${args[2]}"
+DEST="${args[3]:-$NATIVE_LIBS_OUT}"
+STAGE="$(stage_dir "$PLATFORM" "$VARIANT")"
+[[ -d "$STAGE" ]] || die "nothing built for $PLATFORM in $STAGE"
+
+NAME="native-libs-$PLATFORM-opencv$OPENCV_VERSION-tesseract$TESS_VERSION$(variant_suffix "$VARIANT")"
+mkdir -p "$DEST"
+members=()
+for dir in opencv tesseract; do
+    if [[ -d "$STAGE/$dir" ]]; then members+=("$dir"); fi
+done
+[[ ${#members[@]} -gt 0 ]] || die "$STAGE has neither opencv/ nor tesseract/"
+tar -C "$STAGE" -czf "$DEST/$NAME.tar.gz" "${members[@]}"
+(cd "$DEST" && { sha256sum "$NAME.tar.gz" 2>/dev/null || shasum -a 256 "$NAME.tar.gz"; } >"$NAME.tar.gz.sha256")
+log "packaged $DEST/$NAME.tar.gz ($(du -h "$DEST/$NAME.tar.gz" | cut -f1))"
diff --git a/scripts/native-libs/versions.env b/scripts/native-libs/versions.env
new file mode 100644
index 000000000..ecb126050
--- /dev/null
+++ b/scripts/native-libs/versions.env
@@ -0,0 +1,49 @@
+# Pinned upstream versions for scripts/native-libs. Sourced by bash, keep it plain KEY=VALUE.
+#
+# Version scheme
+#   OpenCV      : upstream OpenCV version (4.13.0). The sources are the stripped "opencv-mobile"
+#                 flavour (github.com/nihui/opencv-mobile), the same one the app already ships.
+#   Tesseract   : upstream tesseract-ocr/tesseract tag (5.5.1).
+#   Dependencies: leptonica / libpng / libjpeg-turbo versions are pinned *per tesseract version*
+#                 with TESSERACT_<ver>_<DEP> (dots become underscores), so one tesseract version
+#                 always builds against the same dependency set.
+#   SHA256_*    : optional source archive checksums. When present the download is verified,
+#                 when absent the script warns and prints the checksum to pin.
+
+OPENCV_DEFAULT_VERSION=4.13.0
+TESSERACT_DEFAULT_VERSION=5.5.1
+
+# Android NDK installed by the workflow (ANDROID_NDK_HOME must point to it for local builds)
+NATIVE_LIBS_NDK_VERSION=27.3.13750724
+# Android ABIs built by default (override with NATIVE_LIBS_ANDROID_ABIS="arm64-v8a armeabi-v7a x86 x86_64")
+NATIVE_LIBS_ANDROID_ABIS_DEFAULT="arm64-v8a armeabi-v7a x86_64"
+# Android API level the static libs are compiled for (minSdkVersion of plugin-nativeprocessor)
+NATIVE_LIBS_ANDROID_API=24
+# Apple deployment targets (App_Resources/documentscanner/iOS/build.xcconfig: IPHONEOS_DEPLOYMENT_TARGET = 16.0)
+NATIVE_LIBS_IOS_MIN=16.0
+NATIVE_LIBS_CATALYST_MIN=16.0
+
+# Deployment targets used when OpenCV is built from source (same values as opencv-mobile's own CI)
+OPENCV_IOS_MIN=13.0
+OPENCV_CATALYST_MIN=13.1
+
+# ---- OpenCV (opencv-mobile release tag that carries OpenCV <version>) ----
+OPENCV_MOBILE_TAG_4_12_0=v34
+OPENCV_MOBILE_TAG_4_13_0=v35
+OPENCV_MOBILE_TAG_4_14_0=v37
+
+SHA256_opencv_mobile_4_13_0=9304482980b3e4ff1050a8527cdb5777fadf8c5dd9c1a8620170d23e252fb150
+SHA256_opencv_mobile_4_13_0_android=f0e1a22fa9df0056ac89231e4e3604c01f2e40e69e0a0c244571c56d2bc85bfb
+SHA256_opencv_mobile_4_13_0_ios=b16cf8ec2f3de04dcd24f426c85cea6ae120c91b36f961a45984fe7ccdb05ee1
+SHA256_opencv_mobile_4_13_0_ios_simulator=cceaed5a83cfff8d4dbe5952d99ec4e0586af6e092c8fadf7d6c9b1d9fff003f
+SHA256_opencv_mobile_4_13_0_mac_catalyst=71d851abaf61bc765063fb9883a997ee9fbe26aedf9287dfed584464703f4d34
+
+# ---- Tesseract 5.5.1 and its dependency set ----
+TESSERACT_5_5_1_LEPTONICA=1.85.0
+TESSERACT_5_5_1_LIBPNG=1.6.48
+TESSERACT_5_5_1_LIBJPEG_TURBO=3.1.4.1
+
+SHA256_tesseract_5_5_1=a7a3f2a7420cb6a6a94d80c24163e183cf1d2f1bed2df3bbc397c81808a57237
+SHA256_leptonica_1_85_0=c01376bce0379d4ea4bc2ec5d5cbddaa49e2f06f88242619ab8c059e21adf233
+SHA256_libpng_1_6_48=b17e99026055727e8cba99160c3a9a7f9af788e9f786daeadded5a42243f1dd0
+SHA256_libjpeg_turbo_3_1_4_1=a7da42b640377c2a9a9665e2c4b0ea60cd5599afb48c2521e6df0c9dc9d15a25

From d3a1d86552be952e6f6465c19781bc8a1170ca04 Mon Sep 17 00:00:00 2001
From: Martin Guillon <dev@akylas.fr>
Date: Sat, 24 Oct 2026 16:06:00 +0200
Subject: [PATCH 08/11] feat(list): give the app bar its scroll target and a
 text field search on Android

Pass the collection view id as `scrollTargetId` so the bar follows it without walking the view
tree, and host a ui-textfield in the Android inline search.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 app/components/list/MainList.svelte | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/components/list/MainList.svelte b/app/components/list/MainList.svelte
index e2c50b840..3868c8314 100644
--- a/app/components/list/MainList.svelte
+++ b/app/components/list/MainList.svelte
@@ -1398,7 +1398,7 @@
         bind:this={appBar}
         scrollBehavior="lift"
         searchable={!isTrash && !onlyForImport && nbSelected === 0}
-        scrollTarget={__IOS__ ? collectionView?.nativeView : undefined}
+        scrollTargetId="documentsCollectionView"
         searchHint={lc('search')}
         searchMode="inline"
         searchPlacement="integrated"
@@ -1410,6 +1410,9 @@
         on:searchChange={onSearchChange}
         on:searchCancel={onSearchCancel}
     >
+        {#if __ANDROID__}
+            <appBarSearchField><textfield backgroundColor="transparent" floating={false} fontSize={16} hint={lc('search')} returnKeyType="search" variant="none" /></appBarSearchField>
+        {/if}
         {#if (__ANDROID__ && nbSelected > 0) || modal || (__ANDROID__ && canGoBack)}
             <navigationButton {...{ 'android.systemIcon': nbSelected > 0 ? 'ic_menu_close_clear_cancel' : 'ic_menu_back' }} on:tap={nbSelected > 0 ? unselectAll : actionBarOnGoBack} />
         {/if}
@@ -1447,6 +1450,7 @@
     <gridlayout class="pageContent" rows="auto,auto,*">
         <slot name="abovecollectionview" />
         <collectionView
+            id="documentsCollectionView"
             bind:this={collectionView}
             {colWidth}
             on:itemLoading={onCollectionViewItemLoading}

From cc86607410c1c22825573fe2bf4afcce32fc1689 Mon Sep 17 00:00:00 2001
From: Martin Guillon <dev@akylas.fr>
Date: Sat, 24 Oct 2026 18:46:51 +0200
Subject: [PATCH 09/11] build(tools): update the shared tools to the
 ui-native-components version

Points to the app-tools branch with the ui-native-components packages, the Mac Catalyst window helper
and the additions used by the app (window menu commands, window tint, Android status bar refresh).

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 tools | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools b/tools
index 01fb95497..147362ef5 160000
--- a/tools
+++ b/tools
@@ -1 +1 @@
-Subproject commit 01fb9549753f821d203e4b011ae13e046ed3140e
+Subproject commit 147362ef516246a23786e0e19393ab92e8eef7ed

From 0f516f4155b482f5213ea908f560cc8c80aeb5a0 Mon Sep 17 00:00:00 2001
From: Martin Guillon <dev@akylas.fr>
Date: Sat, 24 Oct 2026 18:58:53 +0200
Subject: [PATCH 10/11] build(deps): update systemui to apply status bar style
 changes live

systemui 1.1.26 owns the page status bar style, so a live dark / light switch updates the status
bar icons without the Android workaround; point tools to the branch without that workaround.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 package.json |  2 +-
 tools        |  2 +-
 yarn.lock    | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 42e3d9a15..a7145ccee 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
         "@nativescript-community/sentry": "4.6.49",
         "@nativescript-community/sqlite": "3.5.9",
         "@nativescript-community/svelte-native": "1.0.32",
-        "@nativescript-community/systemui": "1.1.25",
+        "@nativescript-community/systemui": "1.1.26",
         "@nativescript-community/text": "1.6.25",
         "@nativescript-community/ui-activityindicator": "1.1.0",
         "@nativescript-community/ui-appbar": "1.1.0",
diff --git a/tools b/tools
index 147362ef5..f33e0c9ff 160000
--- a/tools
+++ b/tools
@@ -1 +1 @@
-Subproject commit 147362ef516246a23786e0e19393ab92e8eef7ed
+Subproject commit f33e0c9ffce9be3cd2092025cbb155dec0389316
diff --git a/yarn.lock b/yarn.lock
index 51d257804..d03b1369b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1554,10 +1554,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nativescript-community/systemui@npm:1.1.25":
-  version: 1.1.25
-  resolution: "@nativescript-community/systemui@npm:1.1.25"
-  checksum: 10/42fd950e7d6de803f8f88144a6acd79a75a1f03517a1798441970e307b6461c985c32eb65af006700e40be51534f0f897c93e49edde016520bedc0390230a343
+"@nativescript-community/systemui@npm:1.1.26":
+  version: 1.1.26
+  resolution: "@nativescript-community/systemui@npm:1.1.26"
+  checksum: 10/52af4c822672b3cb1a026d18ebf31480f8930b9cd4e1bcf29d73aacb7fbf69d2182982ff7c8b332107fe08e71683e8916846688fb8e541e3ccbf7864801fbd55
   languageName: node
   linkType: hard
 
@@ -11163,7 +11163,7 @@ __metadata:
     "@nativescript-community/sentry": "npm:4.6.49"
     "@nativescript-community/sqlite": "npm:3.5.9"
     "@nativescript-community/svelte-native": "npm:1.0.32"
-    "@nativescript-community/systemui": "npm:1.1.25"
+    "@nativescript-community/systemui": "npm:1.1.26"
     "@nativescript-community/text": "npm:1.6.25"
     "@nativescript-community/ui-activityindicator": "npm:1.1.0"
     "@nativescript-community/ui-appbar": "npm:1.1.0"

From ce73683fdea5fd9a0b2a35f89123fc24c5d395f7 Mon Sep 17 00:00:00 2001
From: Martin Guillon <dev@akylas.fr>
Date: Sat, 24 Oct 2026 19:11:15 +0200
Subject: [PATCH 11/11] build(tools): opt in to the iOS window tint

The shared tools now only tint the window when asked: enable it for this app.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
---
 app/variables.ts | 1 +
 tools            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/variables.ts b/app/variables.ts
index 3b8488293..39ccd4af7 100644
--- a/app/variables.ts
+++ b/app/variables.ts
@@ -15,6 +15,7 @@ initVariables({
         hasCamera.set(deviceHasCamera());
     },
     keepSurfaceContainerHigh: __IOS__,
+    tintWindow: __IOS__,
     getTheme: (colorTheme) => {
         const theme = require(`~/themes/${__APP_ID__}/${colorTheme}.json`);
         return __IOS__ ? withSystemColors(theme) : theme;
diff --git a/tools b/tools
index f33e0c9ff..a9078bc9b 160000
--- a/tools
+++ b/tools
@@ -1 +1 @@
-Subproject commit f33e0c9ffce9be3cd2092025cbb155dec0389316
+Subproject commit a9078bc9bbed03d912417d1cf6f2f2b18d62496d