From b9d4078d354d93cc52b501efee8ef8c1ab3187c1 Mon Sep 17 00:00:00 2001
From: Chris <chris.m.clarke@live.co.uk>
Date: Sun, 23 Jul 2023 17:09:41 +0100
Subject: [PATCH 1/4] chore: bump version

---
 apps/picsa-apps/extension-app-native/android/.idea/misc.xml   | 1 -
 apps/picsa-apps/extension-app-native/android/app/build.gradle | 4 ++--
 libs/environments/src/version.ts                              | 2 +-
 package.json                                                  | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/picsa-apps/extension-app-native/android/.idea/misc.xml b/apps/picsa-apps/extension-app-native/android/.idea/misc.xml
index 3533ef77a..b6ffb79c9 100644
--- a/apps/picsa-apps/extension-app-native/android/.idea/misc.xml
+++ b/apps/picsa-apps/extension-app-native/android/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
diff --git a/apps/picsa-apps/extension-app-native/android/app/build.gradle b/apps/picsa-apps/extension-app-native/android/app/build.gradle
index fe597d0bb..5b510deea 100644
--- a/apps/picsa-apps/extension-app-native/android/app/build.gradle
+++ b/apps/picsa-apps/extension-app-native/android/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "io.picsa.extension"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 3031000
-        versionName "3.31.0"
+        versionCode 3031001
+        versionName "3.31.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
diff --git a/libs/environments/src/version.ts b/libs/environments/src/version.ts
index a9baf57b9..025ef31a7 100644
--- a/libs/environments/src/version.ts
+++ b/libs/environments/src/version.ts
@@ -4,5 +4,5 @@ import packageJson from '../../../package.json';
 
 export const APP_VERSION = {
   number: packageJson.version,
-  date: '2023-07-22',
+  date: '2023-07-23',
 };
diff --git a/package.json b/package.json
index 16ebc1781..c5ae3b6ca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "picsa-apps",
-  "version": "3.31.0",
+  "version": "3.31.1",
   "license": "See LICENSE",
   "scripts": {
     "ng": "nx",

From 7eee919d66b3b6d490af7a3b4a6b5d1d71eb13f8 Mon Sep 17 00:00:00 2001
From: Chris <chris.m.clarke@live.co.uk>
Date: Sun, 23 Jul 2023 17:10:03 +0100
Subject: [PATCH 2/4] chore: update translations

---
 libs/i18n/assets/mw_ny.json | 2 +-
 libs/i18n/assets/zm_ny.json | 2 +-
 libs/i18n/source/mw_ny.json | 3 ++-
 libs/i18n/source/zm_ny.json | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/libs/i18n/assets/mw_ny.json b/libs/i18n/assets/mw_ny.json
index 72701e250..96d7a4dcc 100644
--- a/libs/i18n/assets/mw_ny.json
+++ b/libs/i18n/assets/mw_ny.json
@@ -191,7 +191,7 @@
   "paw-paw": "papaya",
   "Performance": "•Performance•",
   "Performance in high, mid and low RF (rainfall)": "•Performance in high, mid and low RF (rainfall)•",
-  "PICSA": "•PICSA•",
+  "PICSA": "PICSA",
   "Pigeon Peas": "•Pigeon Peas•",
   "pigeon peas": "nandolo",
   "pigs": "nkhumba",
diff --git a/libs/i18n/assets/zm_ny.json b/libs/i18n/assets/zm_ny.json
index 78eacef59..440899627 100644
--- a/libs/i18n/assets/zm_ny.json
+++ b/libs/i18n/assets/zm_ny.json
@@ -191,7 +191,7 @@
   "paw-paw": "paw-paw",
   "Performance": "•Performance•",
   "Performance in high, mid and low RF (rainfall)": "•Performance in high, mid and low RF (rainfall)•",
-  "PICSA": "•PICSA•",
+  "PICSA": "PICSA",
   "Pigeon Peas": "•Pigeon Peas•",
   "pigeon peas": "nyamdolo",
   "pigs": "nkhumba",
diff --git a/libs/i18n/source/mw_ny.json b/libs/i18n/source/mw_ny.json
index 2126c6980..202b4eeb7 100644
--- a/libs/i18n/source/mw_ny.json
+++ b/libs/i18n/source/mw_ny.json
@@ -250,5 +250,6 @@
   "Add New Option": "Onjezerani Chisankho china",
   "Collection not found": "Kutolera sizikupezeka",
   "fruits": "zipatso",
-  "livestock": "ziweto"
+  "livestock": "ziweto",
+  "PICSA": "PICSA"
 }
diff --git a/libs/i18n/source/zm_ny.json b/libs/i18n/source/zm_ny.json
index ae1d6a1e4..2d78403db 100644
--- a/libs/i18n/source/zm_ny.json
+++ b/libs/i18n/source/zm_ny.json
@@ -250,5 +250,6 @@
   "Add New Option": "Ikani zosankha zatsopano",
   "Collection not found": "Zokonzedwa bwino sizikupezeka",
   "fruits": "zipatso",
-  "livestock": "ziweto"
+  "livestock": "ziweto",
+  "PICSA": "PICSA"
 }

From 2547322db2ece7947744d54e2c17f4284899cfa7 Mon Sep 17 00:00:00 2001
From: Chris <chris.m.clarke@live.co.uk>
Date: Sun, 23 Jul 2023 17:55:26 +0100
Subject: [PATCH 3/4] fix: resource caching

---
 .../android/app/src/main/assets/capacitor.config.json |  5 -----
 .../extension-app-native/capacitor.config.ts          | 11 ++++++-----
 apps/picsa-tools/manual-tool/project.json             |  5 +++++
 .../app/pages/form/form-view/form-view.component.ts   |  2 --
 libs/shared/src/services/native/storage-service.ts    |  4 +---
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/apps/picsa-apps/extension-app-native/android/app/src/main/assets/capacitor.config.json b/apps/picsa-apps/extension-app-native/android/app/src/main/assets/capacitor.config.json
index 9e76a62e7..dc2104a69 100644
--- a/apps/picsa-apps/extension-app-native/android/app/src/main/assets/capacitor.config.json
+++ b/apps/picsa-apps/extension-app-native/android/app/src/main/assets/capacitor.config.json
@@ -21,11 +21,6 @@
 		"@capacitor-community/firebase-crashlytics",
 		"@capacitor-firebase/performance"
 	],
-	"plugins": {
-		"CapacitorHttp": {
-			"enabled": true
-		}
-	},
 	"server": {
 		"cleartext": true
 	}
diff --git a/apps/picsa-apps/extension-app-native/capacitor.config.ts b/apps/picsa-apps/extension-app-native/capacitor.config.ts
index 99a9860c5..b1017142e 100644
--- a/apps/picsa-apps/extension-app-native/capacitor.config.ts
+++ b/apps/picsa-apps/extension-app-native/capacitor.config.ts
@@ -30,11 +30,12 @@ const config: CapacitorConfig = {
   ],
   // Enable app to use native http for requests (bypass cors)
   // https://capacitorjs.com/docs/apis/http
-  plugins: {
-    CapacitorHttp: {
-      enabled: true,
-    },
-  },
+  // TODO - check if resources still work as intended once enabled
+  // plugins: {
+  //   CapacitorHttp: {
+  //     enabled: true,
+  //   },
+  // },
   server: {
     /** Uncomment and replace with local ip to serve live-reload */
 
diff --git a/apps/picsa-tools/manual-tool/project.json b/apps/picsa-tools/manual-tool/project.json
index b8a80cff7..48dc905d1 100644
--- a/apps/picsa-tools/manual-tool/project.json
+++ b/apps/picsa-tools/manual-tool/project.json
@@ -23,6 +23,11 @@
             "input": "apps/picsa-tools/resources-tool/src/assets/resources",
             "output": "/assets/resources"
           },
+          {
+            "glob": "picsa-manual-farmer.pdf",
+            "input": "apps/picsa-tools/resources-tool/src/assets/resources",
+            "output": "/assets/resources"
+          },
           {
             "glob": "{*.min.js,op-chaining-support.js,cmaps/*,images/*,locale/en-GB/*,locale/locale.properties,standard_fonts/**}",
             "input": "node_modules/ngx-extended-pdf-viewer/assets/",
diff --git a/apps/picsa-tools/monitoring-tool/src/app/pages/form/form-view/form-view.component.ts b/apps/picsa-tools/monitoring-tool/src/app/pages/form/form-view/form-view.component.ts
index 04bb50300..74c7d3422 100644
--- a/apps/picsa-tools/monitoring-tool/src/app/pages/form/form-view/form-view.component.ts
+++ b/apps/picsa-tools/monitoring-tool/src/app/pages/form/form-view/form-view.component.ts
@@ -1,6 +1,5 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Capacitor, CapacitorHttp } from '@capacitor/core';
 import { PicsaCommonComponentsService } from '@picsa/components/src';
 import { PicsaDialogService } from '@picsa/shared/features';
 import { xmlNodeReplaceContent, xmlToJson } from '@picsa/utils';
@@ -8,7 +7,6 @@ import type { IEnketoFormEntry } from 'dist/libs/webcomponents/dist/types/compon
 import { RxDocument } from 'rxdb';
 import { Subject, takeUntil } from 'rxjs';
 
-import { environment } from '../../../../environments/environment';
 import { IFormSubmission } from '../../../schema/submissions';
 import { MonitoringToolService } from '../../../services/monitoring-tool.service';
 
diff --git a/libs/shared/src/services/native/storage-service.ts b/libs/shared/src/services/native/storage-service.ts
index f1d5f8cc7..f8295ce36 100644
--- a/libs/shared/src/services/native/storage-service.ts
+++ b/libs/shared/src/services/native/storage-service.ts
@@ -126,7 +126,6 @@ export class NativeStorageService {
 
   public checkFileCached(entry: IStorageFileEntry) {
     const cachedEntry = this.cachedFilesList[entry.relativePath];
-    console.log('check file cached', entry.relativePath);
     if (!cachedEntry) {
       return false;
     }
@@ -157,7 +156,6 @@ export class NativeStorageService {
         updates$.next({ progress, subscription });
       },
       complete: async () => {
-        console.log('download to cache completed');
         if (data) {
           const directory = Directory.Data;
           const { relativePath } = fileMeta;
@@ -169,7 +167,7 @@ export class NativeStorageService {
             recursive: true,
             fast_mode: true,
             on_fallback(error) {
-              console.error(error);
+              console.error('blobl write error', cachePath, error);
               throw error;
             },
           });

From 20da5fadb2272d7a217806382e2aa342d5a94a67 Mon Sep 17 00:00:00 2001
From: Chris <chris.m.clarke@live.co.uk>
Date: Sun, 23 Jul 2023 17:55:58 +0100
Subject: [PATCH 4/4] chore: pdf reader improvements

---
 .../src/app/components/pdf-viewer/pdf-viewer.component.html | 5 +++--
 .../src/app/components/pdf-viewer/pdf-viewer.component.scss | 6 ++++++
 .../src/app/components/pdf-viewer/pdf-viewer.component.ts   | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/apps/picsa-tools/manual-tool/src/app/components/pdf-viewer/pdf-viewer.component.html b/apps/picsa-tools/manual-tool/src/app/components/pdf-viewer/pdf-viewer.component.html
index 8a1c07ec2..6da513ce5 100644
--- a/apps/picsa-tools/manual-tool/src/app/components/pdf-viewer/pdf-viewer.component.html
+++ b/apps/picsa-tools/manual-tool/src/app/components/pdf-viewer/pdf-viewer.component.html
@@ -27,12 +27,13 @@
 
       <!-- <pdf-find-button [showFindButton]="true" [textLayer]="true"></pdf-find-button> -->
     </div>
-    <div [class.invisible]="false" id="toolbarViewerMiddle">
+    <!-- Only show zoom in/out buttons on web (native uses pinch zoom) -->
+    <div [class.invisible]="false" id="toolbarViewerMiddle" *ngIf="!isNative">
       <pdf-zoom-out id="zoomOut"></pdf-zoom-out>
       <pdf-zoom-in id="zoomIn"></pdf-zoom-in>
     </div>
     <div id="toolbarViewerRight">
-      <pdf-paging-area></pdf-paging-area>
+      <pdf-paging-area> </pdf-paging-area>
     </div>
   </div>
 </ng-template>
diff --git a/apps/picsa-tools/manual-tool/src/app/components/pdf-viewer/pdf-viewer.component.scss b/apps/picsa-tools/manual-tool/src/app/components/pdf-viewer/pdf-viewer.component.scss
index ffd007d3f..a8d12d949 100644
--- a/apps/picsa-tools/manual-tool/src/app/components/pdf-viewer/pdf-viewer.component.scss
+++ b/apps/picsa-tools/manual-tool/src/app/components/pdf-viewer/pdf-viewer.component.scss
@@ -11,6 +11,12 @@ ngx-extended-pdf-viewer {
   .toolbarButton {
     color: var(--color-primary-contrast) !important;
   }
+
+  // hide first/last page buttons
+  #primaryFirstPage,
+  #primaryLastPage {
+    display: none;
+  }
 }
 
 .error-message {
diff --git a/apps/picsa-tools/manual-tool/src/app/components/pdf-viewer/pdf-viewer.component.ts b/apps/picsa-tools/manual-tool/src/app/components/pdf-viewer/pdf-viewer.component.ts
index 8149accdf..ca61c912a 100644
--- a/apps/picsa-tools/manual-tool/src/app/components/pdf-viewer/pdf-viewer.component.ts
+++ b/apps/picsa-tools/manual-tool/src/app/components/pdf-viewer/pdf-viewer.component.ts
@@ -1,4 +1,5 @@
 import { Component, Input, ViewEncapsulation } from '@angular/core';
+import { Capacitor } from '@capacitor/core';
 import { pdfDefaultOptions } from 'ngx-extended-pdf-viewer';
 
 @Component({
@@ -10,6 +11,7 @@ import { pdfDefaultOptions } from 'ngx-extended-pdf-viewer';
 export class PdfViewerComponent {
   legacyBrowser = true;
   sidebarOpen = false;
+  public isNative = Capacitor.isNativePlatform();
   @Input() page?: number;
   @Input() src: string;
   constructor() {