From f08573f8a814e6e650c018eda0dfd40a48d77710 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Thu, 3 Aug 2023 18:47:30 +0800 Subject: [PATCH 01/18] Revert "feat(ci): Update GitHub Actions workflow" This reverts commit 91a457c87c7ede48d591fa3c809509cda726b987. --- .github/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 16199a750..118737525 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,8 @@ name: test -on: [push, pull_request] +on: + push: + branches: [master, develop, 'feature-*', 'fix-*', 'hotfix-*'] jobs: lint: From 76eb5be7a94018aeb9680f64e864e0d821f86036 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Thu, 3 Aug 2023 18:57:13 +0800 Subject: [PATCH 02/18] fix(test.yml): Update branch triggers to match latest changes This commit updates the branch triggers in the 'test.yml' file to align with the latest changes in our development process. The 'develop' branch has been deprecated, and we now use 'milestone-*' branches as per the guidelines in the numbers developer guideline documentation. --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 118737525..af1a8c03b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,8 @@ name: test on: push: - branches: [master, develop, 'feature-*', 'fix-*', 'hotfix-*'] + branches: + [master, 'feature-*', 'feat-*', 'fix-*', 'hotfix-*', 'milestone-*'] jobs: lint: From 78ef1a2a8ad79d1b627362b01840cab90b55f00e Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Mon, 19 Feb 2024 17:29:02 +0800 Subject: [PATCH 03/18] WIP: Add AppsFlyer and CCam custom event enums --- src/app/shared/apps-flyer/apps-flyer-enums.ts | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 src/app/shared/apps-flyer/apps-flyer-enums.ts diff --git a/src/app/shared/apps-flyer/apps-flyer-enums.ts b/src/app/shared/apps-flyer/apps-flyer-enums.ts new file mode 100644 index 000000000..6a232b19d --- /dev/null +++ b/src/app/shared/apps-flyer/apps-flyer-enums.ts @@ -0,0 +1,48 @@ +/** + * Enum representing predefined event types for AppsFlyer in-app events. + * + * Note: appsflyer-capacitor-plugin does not provide these constants. + * Therefore, they are defined manually here. + * + * For a list of predefined event names, see: + * {@link https://dev.appsflyer.com/hc/docs/in-app-events-android#event-constants|AppsFlyer Predefined Event Constants}. + */ +export enum AFInAppEventType { + LEVEL_ACHIEVED = 'af_level_achieved', +} + +/** + * Enum representing predefined event parameter names for AppsFlyer in-app events. + * + * Note: appsflyer-capacitor-plugin does not provide these constants. + * Therefore, they are defined manually here. + * + * For a list of predefined event parameters, see: + * {@link https://dev.appsflyer.com/hc/docs/in-app-events-android#predefined-event-parameters|AppsFlyer Predefined Event Parameters}. + */ +export enum AFInAppEventParameterName { + /** + * The level parameter for in-app events. + * + * Levels can be determined by the type of event. For example: + * - Level 1: User clicks on the camera shutter or navigates to explore page. + * - Level 2: Actions that require more effort such as registering an asset. + * - Level 3: User executes network actions such as Mint & Share. + * + * Consult and communicate with the product manager to determine appropriate levels. + */ + LEVEL = 'af_level', + /** + * The score parameter for in-app events. + * + * Typically, this parameter is set to 0 as no decision is currently made based on 'af_score'. + * However, it can be used to assign scores to users based on their actions in the app. + * + * Consult and communicate with the product manager to determine the usage of scores. + */ + SCORE = 'af_score', +} + +export enum CCamCustomEventType { + CCAM_TRY_CLICK_CAMERA_SHUTTER = 'ccam_try_click_camera_shutter', +} From eb14916083f26f1720c43e29327e44c9e8da475a Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Mon, 19 Feb 2024 17:30:29 +0800 Subject: [PATCH 04/18] WIP: Add logCameraShutterEvent method to AppsFlyerService --- .../shared/apps-flyer/apps-flyer.service.ts | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/src/app/shared/apps-flyer/apps-flyer.service.ts b/src/app/shared/apps-flyer/apps-flyer.service.ts index 9177f0bfb..57edcacf4 100644 --- a/src/app/shared/apps-flyer/apps-flyer.service.ts +++ b/src/app/shared/apps-flyer/apps-flyer.service.ts @@ -2,8 +2,13 @@ import { Injectable } from '@angular/core'; import { AdvertisingId } from '@capacitor-community/advertising-id'; import { Capacitor } from '@capacitor/core'; import { Platform } from '@ionic/angular'; -import { AFInit, AppsFlyer } from 'appsflyer-capacitor-plugin'; +import { AFEvent, AFInit, AppsFlyer } from 'appsflyer-capacitor-plugin'; import { APPS_FLYER_DEV_KEY } from '../dia-backend/secret'; +import { + AFInAppEventParameterName, + AFInAppEventType, + CCamCustomEventType, +} from './apps-flyer-enums'; @Injectable({ providedIn: 'root', @@ -55,4 +60,32 @@ export class AppsFlyerService { const isTruthy = Boolean(APPS_FLYER_DEV_KEY); return isTruthy && Capacitor.isNativePlatform(); } + + private async logEvent(event: AFEvent) { + try { + await AppsFlyer.logEvent(event); + } catch (error) { + // TODO: Report error to Crashlytics or any other error reporting service if available. + } + } + + /** + * Logs a camera shutter event to AppsFlyer. + * + * This event is logged when the user clicks the camera shutter button to take a photo or video. + * It does not necessarily indicate the registering of a photo or video, only the act of clicking + * the shutter button. + * + */ + async logCameraShutterEvent() { + const eventData: AFEvent = { + eventName: AFInAppEventType.LEVEL_ACHIEVED, + eventValue: { + [AFInAppEventParameterName.LEVEL]: '1', + af_score: '0', + af_achievement_id: CCamCustomEventType.CCAM_TRY_CLICK_CAMERA_SHUTTER, + }, + }; + await this.logEvent(eventData); + } } From f306704992f82296a24dd85487e1a86e79d6632c Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Mon, 19 Feb 2024 20:42:47 +0800 Subject: [PATCH 05/18] WIP: Add test for logging camera shutter event --- .../apps-flyer/apps-flyer.service.spec.ts | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/app/shared/apps-flyer/apps-flyer.service.spec.ts b/src/app/shared/apps-flyer/apps-flyer.service.spec.ts index 3d1f204a7..dc4ac3521 100644 --- a/src/app/shared/apps-flyer/apps-flyer.service.spec.ts +++ b/src/app/shared/apps-flyer/apps-flyer.service.spec.ts @@ -2,6 +2,7 @@ import { TestBed, waitForAsync } from '@angular/core/testing'; import { Platform } from '@ionic/angular'; import { SharedTestingModule } from '../shared-testing.module'; +import { AFEvent } from 'appsflyer-capacitor-plugin'; import { AppsFlyerService } from './apps-flyer.service'; describe('AppsFlyerService', () => { @@ -32,4 +33,26 @@ describe('AppsFlyerService', () => { it('should be created', () => { expect(service).toBeTruthy(); }); + + it('should log camera shutter event through Appsflyer.logEvent method', async () => { + const expectedEvent: AFEvent = { + eventName: 'af_level_achieved', + eventValue: { + af_level: '1', + af_score: '0', + af_achievement_id: 'ccam_try_click_camera_shutter', + }, + }; + // NOTE: We're accessing a private method here for testing purposes only. + // TypeScript doesn't enforce private/protected visibility at runtime, only at compile time. + // This is generally not recommended as it can lead to fragile tests and breaks encapsulation. + // However, in this case, we need to ensure that the private method 'logEvent' is called with + // the correct parameters. + const logEventSpy = spyOn(service as any, 'logEvent'); + + await service.logCameraShutterEvent(); + + expect(logEventSpy).toHaveBeenCalledWith(expectedEvent); + expect(logEventSpy).toHaveBeenCalledTimes(1); + }); }); From a79d995a5514ad173855b0526640b61cea2cb800 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Mon, 19 Feb 2024 20:48:24 +0800 Subject: [PATCH 06/18] feat(custom-camera): log appsflyer event when user click camera shutter --- src/app/features/home/custom-camera/custom-camera.page.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/features/home/custom-camera/custom-camera.page.ts b/src/app/features/home/custom-camera/custom-camera.page.ts index 1a604f8f3..1a2656e93 100644 --- a/src/app/features/home/custom-camera/custom-camera.page.ts +++ b/src/app/features/home/custom-camera/custom-camera.page.ts @@ -31,6 +31,7 @@ import { throttleTime, } from 'rxjs/operators'; import { AndroidBackButtonService } from '../../../shared/android-back-button/android-back-button.service'; +import { AppsFlyerService } from '../../../shared/apps-flyer/apps-flyer.service'; import { CaptureTabSegments, CaptureTabService, @@ -120,7 +121,8 @@ export class CustomCameraPage implements OnInit, OnDestroy { private readonly ref: ChangeDetectorRef, private readonly androidBackButtonService: AndroidBackButtonService, private readonly navController: NavController, - private readonly platform: Platform + private readonly platform: Platform, + private readonly appsflyerService: AppsFlyerService ) {} ngOnInit() { @@ -386,6 +388,7 @@ export class CustomCameraPage implements OnInit, OnDestroy { if (this.mode$.value === 'photo') { this.flashCameraScreen(); this.customCameraService.takePhoto(); + this.appsflyerService.logCameraShutterEvent(); this.userGuideService.setHasCapturedPhotoWithCustomCamera(true); } else { if (this.isRecording$.value === true) { @@ -393,6 +396,7 @@ export class CustomCameraPage implements OnInit, OnDestroy { } else { this.isRecording$.next(true); this.customCameraService.startRecord(); + this.appsflyerService.logCameraShutterEvent(); const intervalRate = 50; combineLatest([this.isRecording$, interval(intervalRate)]) .pipe( From 32ca6375ee1d5854c7cb1dcdadbee3d27212baeb Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Tue, 20 Feb 2024 00:07:44 +0800 Subject: [PATCH 07/18] refactor to Use custom AppsFlyer events for logCameraShutterEvent --- src/app/shared/apps-flyer/apps-flyer.service.ts | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/app/shared/apps-flyer/apps-flyer.service.ts b/src/app/shared/apps-flyer/apps-flyer.service.ts index 57edcacf4..fc23ab348 100644 --- a/src/app/shared/apps-flyer/apps-flyer.service.ts +++ b/src/app/shared/apps-flyer/apps-flyer.service.ts @@ -4,11 +4,7 @@ import { Capacitor } from '@capacitor/core'; import { Platform } from '@ionic/angular'; import { AFEvent, AFInit, AppsFlyer } from 'appsflyer-capacitor-plugin'; import { APPS_FLYER_DEV_KEY } from '../dia-backend/secret'; -import { - AFInAppEventParameterName, - AFInAppEventType, - CCamCustomEventType, -} from './apps-flyer-enums'; +import { CCamCustomEventType } from './apps-flyer-enums'; @Injectable({ providedIn: 'root', @@ -79,12 +75,7 @@ export class AppsFlyerService { */ async logCameraShutterEvent() { const eventData: AFEvent = { - eventName: AFInAppEventType.LEVEL_ACHIEVED, - eventValue: { - [AFInAppEventParameterName.LEVEL]: '1', - af_score: '0', - af_achievement_id: CCamCustomEventType.CCAM_TRY_CLICK_CAMERA_SHUTTER, - }, + eventName: CCamCustomEventType.CCAM_TRY_CLICK_CAMERA_SHUTTER, }; await this.logEvent(eventData); } From da62fae324f529034c08cbf15a7147bcfd4ca60b Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Tue, 20 Feb 2024 01:14:15 +0800 Subject: [PATCH 08/18] WIP: add translations for redirect to dashboard alert --- src/assets/i18n/en-us.json | 3 ++- src/assets/i18n/zh-tw.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/assets/i18n/en-us.json b/src/assets/i18n/en-us.json index c1a437662..ba37dba41 100644 --- a/src/assets/i18n/en-us.json +++ b/src/assets/i18n/en-us.json @@ -338,7 +338,8 @@ "duplicateAsset": "The asset you are trying to upload already exists on the blockchain. Please try again or contact support.", "canNotStartCamera": "Sorry, we encountered an issue while starting the camera. We apologize for the inconvenience. If the problem persists, please report the issue to our developers through the 'Contact Developers' section on the app's support page. Your feedback will help us improve the app and resolve the issue faster. Thank you for your understanding and cooperation.", "fileSizeExeedsLimit": "File size exceeds 25MB limit. Please select a smaller file and try again." - } + }, + "redirectToCaptureDashboard": "Need to upload files?
For a seamless upload experience, please visit https://dashboard.captureapp.xyz." }, "wallets": { "wallets": "Wallets", diff --git a/src/assets/i18n/zh-tw.json b/src/assets/i18n/zh-tw.json index 6a673b905..04a145f67 100644 --- a/src/assets/i18n/zh-tw.json +++ b/src/assets/i18n/zh-tw.json @@ -338,7 +338,8 @@ "duplicateAsset": "您嘗試上傳的資產已有上鏈紀錄，請重新嘗試，或聯繫開發團隊取得協助。", "canNotStartCamera": "很抱歉，我們在啟動相機時遇到問題。對於造成的不便，我們深感抱歉。如果問題持續存在，請透過應用程式支援頁面的「聯絡開發人員」區域向我們的開發人員報告問題。您的反饋將有助於我們改善應用程式並更快地解決問題。感謝您的理解和配合。", "fileSizeExeedsLimit": "檔案大小超過25MB的限制，請選擇較小的檔案並重試。" - } + }, + "redirectToCaptureDashboard": "為提供更好的上傳體驗，建議使用 https://dashboard.captureapp.xyz。" }, "wallets": { "wallets": "錢包", From 64a408f7616f4d5ec46bd775a71ea320ee2cfd99 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Tue, 20 Feb 2024 01:15:01 +0800 Subject: [PATCH 09/18] Add redirect alert to capture dashboard for better upload experience --- .../home/custom-camera/custom-camera.page.html | 4 +++- .../home/custom-camera/custom-camera.page.ts | 13 ++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/app/features/home/custom-camera/custom-camera.page.html b/src/app/features/home/custom-camera/custom-camera.page.html index 8e439ce53..cb2999e7d 100644 --- a/src/app/features/home/custom-camera/custom-camera.page.html +++ b/src/app/features/home/custom-camera/custom-camera.page.html @@ -100,7 +100,9 @@
- imagesmode + + imagesmode + Date: Tue, 20 Feb 2024 01:21:37 +0800 Subject: [PATCH 10/18] Remove capacitor-file-picker plugin --- android/app/capacitor.build.gradle | 1 - .../src/main/assets/capacitor.plugins.json | 4 ---- android/capacitor.settings.gradle | 3 --- ios/App/Podfile | 1 - ios/App/Podfile.lock | 8 +------ package-lock.json | 24 ------------------- package.json | 1 - 7 files changed, 1 insertion(+), 41 deletions(-) diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle index 6b66551e2..b201c9702 100644 --- a/android/app/capacitor.build.gradle +++ b/android/app/capacitor.build.gradle @@ -26,7 +26,6 @@ dependencies { implementation project(':capacitor-share') implementation project(':capacitor-splash-screen') implementation project(':capacitor-storage') - implementation project(':capawesome-capacitor-file-picker') implementation project(':numbersprotocol-preview-camera') implementation project(':numbersprotocol-preview-memory') implementation project(':numbersprotocol-preview-video') diff --git a/android/app/src/main/assets/capacitor.plugins.json b/android/app/src/main/assets/capacitor.plugins.json index 572645bab..dc65cc1b8 100644 --- a/android/app/src/main/assets/capacitor.plugins.json +++ b/android/app/src/main/assets/capacitor.plugins.json @@ -67,10 +67,6 @@ "pkg": "@capacitor/storage", "classpath": "com.capacitorjs.plugins.storage.StoragePlugin" }, - { - "pkg": "@capawesome/capacitor-file-picker", - "classpath": "io.capawesome.capacitorjs.plugins.filepicker.FilePickerPlugin" - }, { "pkg": "@numbersprotocol/preview-camera", "classpath": "io.numbersprotocol.capturelite.plugins.previewcamera.PreviewCameraPlugin" diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle index 7d0829ccc..94169baf7 100644 --- a/android/capacitor.settings.gradle +++ b/android/capacitor.settings.gradle @@ -53,9 +53,6 @@ project(':capacitor-splash-screen').projectDir = new File('../node_modules/@capa include ':capacitor-storage' project(':capacitor-storage').projectDir = new File('../node_modules/@capacitor/storage/android') -include ':capawesome-capacitor-file-picker' -project(':capawesome-capacitor-file-picker').projectDir = new File('../node_modules/@capawesome/capacitor-file-picker/android') - include ':numbersprotocol-preview-camera' project(':numbersprotocol-preview-camera').projectDir = new File('../node_modules/@numbersprotocol/preview-camera/android') diff --git a/ios/App/Podfile b/ios/App/Podfile index 623d63ec6..f48d85e60 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -30,7 +30,6 @@ def capacitor_pods pod 'CapacitorShare', :path => '../../node_modules/@capacitor/share' pod 'CapacitorSplashScreen', :path => '../../node_modules/@capacitor/splash-screen' pod 'CapacitorStorage', :path => '../../node_modules/@capacitor/storage' - pod 'CapawesomeCapacitorFilePicker', :path => '../../node_modules/@capawesome/capacitor-file-picker' pod 'NumbersprotocolPreviewCamera', :path => '../../node_modules/@numbersprotocol/preview-camera' pod 'NumbersprotocolPreviewMemory', :path => '../../node_modules/@numbersprotocol/preview-memory' pod 'NumbersprotocolPreviewVideo', :path => '../../node_modules/@numbersprotocol/preview-video' diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock index ce13f17fa..c8bc5ac37 100644 --- a/ios/App/Podfile.lock +++ b/ios/App/Podfile.lock @@ -45,8 +45,6 @@ PODS: - Capacitor - CapacitorStorage (1.2.4): - Capacitor - - CapawesomeCapacitorFilePicker (0.6.3): - - Capacitor - CordovaPlugins (5.0.5): - CapacitorCordova - Firebase/CoreOnly (10.14.0): @@ -134,7 +132,6 @@ DEPENDENCIES: - "CapacitorShare (from `../../node_modules/@capacitor/share`)" - "CapacitorSplashScreen (from `../../node_modules/@capacitor/splash-screen`)" - "CapacitorStorage (from `../../node_modules/@capacitor/storage`)" - - "CapawesomeCapacitorFilePicker (from `../../node_modules/@capawesome/capacitor-file-picker`)" - CordovaPlugins (from `../capacitor-cordova-ios-plugins`) - Firebase/Messaging - FirebaseCore @@ -201,8 +198,6 @@ EXTERNAL SOURCES: :path: "../../node_modules/@capacitor/splash-screen" CapacitorStorage: :path: "../../node_modules/@capacitor/storage" - CapawesomeCapacitorFilePicker: - :path: "../../node_modules/@capawesome/capacitor-file-picker" CordovaPlugins: :path: "../capacitor-cordova-ios-plugins" NumbersprotocolPreviewCamera: @@ -236,7 +231,6 @@ SPEC CHECKSUMS: CapacitorShare: 427bba238a1e3f116b2b349019aec6ea7f42cebd CapacitorSplashScreen: 93a389d4f7673c08214ae25bb6f21d867d5305c5 CapacitorStorage: 8ec2cf8fec179d829288b16c6fba6c3c43d2bdc9 - CapawesomeCapacitorFilePicker: f354c9ec6e4722908876032939a85ffb94642630 CordovaPlugins: c905b3b4dfc87d2a11bdbdaf396289c4a22c39dd Firebase: 6c1bf3f534bc422d52af2e41fe0d50bf08b6b773 FirebaseCore: 6fc17ac9f03509d51c131298aacb3ee5698b4f02 @@ -252,6 +246,6 @@ SPEC CHECKSUMS: NumbersprotocolPreviewVideo: 2cfa3fa666c83850903a220d74dc855ac5b6a520 PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4 -PODFILE CHECKSUM: 24ca1bcaa3932b2d964431fb23583535c4454ed9 +PODFILE CHECKSUM: bc27c544feb7d8f533aeb72cadce60b633a90ab4 COCOAPODS: 1.14.3 diff --git a/package-lock.json b/package-lock.json index af7bcbe38..547714311 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,6 @@ "@capacitor/share": "^5.0.4", "@capacitor/splash-screen": "^5.0.4", "@capacitor/storage": "^1.2.4", - "@capawesome/capacitor-file-picker": "^0.6.3", "@ionic/angular": "^6.2.5", "@ionic/core": "^6.2.5", "@ionic/pwa-elements": "^3.0.2", @@ -3467,24 +3466,6 @@ "@capacitor/core": "^3.0.0" } }, - "node_modules/@capawesome/capacitor-file-picker": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@capawesome/capacitor-file-picker/-/capacitor-file-picker-0.6.3.tgz", - "integrity": "sha512-ioJ7ZorgFXuC/OzJkChi2t0GwvtP0uRvR9qXQKCKIgTN4TqpLFT906J1VPdLzZMIixy3rKzELluFbdMVi8bkcQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/capawesome-team/" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/capawesome" - } - ], - "peerDependencies": { - "@capacitor/core": "^4.0.0" - } - }, "node_modules/@cspotcode/source-map-consumer": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", @@ -26483,11 +26464,6 @@ "resolved": "https://registry.npmjs.org/@capacitor/storage/-/storage-1.2.4.tgz", "integrity": "sha512-AqA4KnCQNOmFJ1HuSfmyPf5jz80JY2cX04Uy4j1hpo5ex9bY6W8mUKLsePakTzt4ScDnYuOaXsmusUrpglgPfQ==" }, - "@capawesome/capacitor-file-picker": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@capawesome/capacitor-file-picker/-/capacitor-file-picker-0.6.3.tgz", - "integrity": "sha512-ioJ7ZorgFXuC/OzJkChi2t0GwvtP0uRvR9qXQKCKIgTN4TqpLFT906J1VPdLzZMIixy3rKzELluFbdMVi8bkcQ==" - }, "@cspotcode/source-map-consumer": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", diff --git a/package.json b/package.json index 26bb3b5ee..f443e3f32 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,6 @@ "@capacitor/share": "^5.0.4", "@capacitor/splash-screen": "^5.0.4", "@capacitor/storage": "^1.2.4", - "@capawesome/capacitor-file-picker": "^0.6.3", "@ionic/angular": "^6.2.5", "@ionic/core": "^6.2.5", "@ionic/pwa-elements": "^3.0.2", From debb6e931f441314f020822e34a43930f44185ed Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Tue, 20 Feb 2024 01:22:32 +0800 Subject: [PATCH 11/18] fix(custom-camera): remove unused pickMedia method --- .../home/custom-camera/custom-camera.page.ts | 84 +------------------ 1 file changed, 1 insertion(+), 83 deletions(-) diff --git a/src/app/features/home/custom-camera/custom-camera.page.ts b/src/app/features/home/custom-camera/custom-camera.page.ts index bd6352509..1bf440211 100644 --- a/src/app/features/home/custom-camera/custom-camera.page.ts +++ b/src/app/features/home/custom-camera/custom-camera.page.ts @@ -3,7 +3,6 @@ import { Router } from '@angular/router'; import { CameraSource } from '@capacitor/camera'; import { Capacitor } from '@capacitor/core'; import { Directory, Filesystem } from '@capacitor/filesystem'; -import { FilePicker, PickedFile } from '@capawesome/capacitor-file-picker'; import { AlertController, NavController, Platform } from '@ionic/angular'; import { TranslocoService } from '@ngneat/transloco'; import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy'; @@ -39,10 +38,7 @@ import { ConfirmAlert } from '../../../shared/confirm-alert/confirm-alert.servic import { ErrorService } from '../../../shared/error/error.service'; import { UserGuideService } from '../../../shared/user-guide/user-guide.service'; import { GoProBluetoothService } from '../../settings/go-pro/services/go-pro-bluetooth.service'; -import { - MAX_RECORD_TIME_IN_MILLISECONDS, - toCustomCameraMimeType, -} from './custom-camera'; +import { MAX_RECORD_TIME_IN_MILLISECONDS } from './custom-camera'; import { CustomCameraService, SaveToCameraRollDecision, @@ -297,84 +293,6 @@ export class CustomCameraPage implements OnInit, OnDestroy { await alert.present(); } - /** - * Handles media picking, prepares it for publishing, and deals with possible errors. - */ - async pickMedia() { - try { - const filePickerResult = await FilePicker.pickMedia(); - const file = filePickerResult.files[0]; - - const filePath = await this.convertFilePath(file); - - if (filePath === undefined) return; - - const result: CaptureSuccessResult = { - mimeType: toCustomCameraMimeType(file.mimeType), - name: file.name, - path: filePath, - size: file.size, - }; - - this.prepareForPublishing(result, CameraSource.Photos); - } catch (error: any) { - // User didn't pick a file, in this case, we do not bother the user by showing any alerts. - if ( - !(error instanceof Error && error.message === 'pickFiles canceled.') - ) { - /** - * Error handling: In case the media picking or prepareForPublishing fails, - * an error should be reported to the crash reporting system (currently not in place). - * TODO: Implement error reporting to the crash reporting system when available. - */ - // Error not reported due to the absence of a crash reporting system. - this.errorService.toastError$(error.message ?? error).subscribe(); - } - } - } - - private async convertFilePath(file: PickedFile): Promise { - /** - * WORKAROUND: https://github.com/numbersprotocol/capture-lite/issues/2857 - * Convert Android picked image file path to "file:///" format for editing and saving. - * - * Here is the explanation of the WORKAROUND: - * We have a CapacitorJS project where we encounter an issue with picking images - * from the gallery on Android. When users pick media from the gallery on iOS, the - * file path is in the format "file:///", while on Android it is in the format - * "content:///". This discrepancy in file paths poses a challenge for us as we - * need to perform additional pre-publish editing, such as cropping and applying a - * grayscale filter, on the picked images. However, to save the edited image to the - * file system, we require the file path to be in the "file:///" format instead of - * "content:///". - * - * To address this issue, we have implemented a workaround that involves copying - * the picked image to the file system, ensuring that the file path is in the - * required "file:///" format. This workaround allows us to seamlessly perform the - * necessary editing operations on the image and successfully save it to the file - * system. - * - * Note: This workaround is specifically designed to handle picked images from the - * gallery on Android and does not impact the functionality on iOS. - * - */ - - if (file.path === undefined) return undefined; - - if (this.platform.is('android') && file.mimeType.startsWith('image/')) { - const readFileResult = await Filesystem.readFile({ path: file.path }); - const writeFileresult = await Filesystem.writeFile({ - data: readFileResult.data, - path: `${file.name}`, - directory: Directory.Cache, - recursive: true, - }); - return writeFileresult.uri; - } - - return file.path; - } - async flipCamera() { await this.customCameraService.flipCamera(); await this.syncCameraState(); From 907b45232f233d964b042ad0bd04c9e5781bf97f Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Tue, 20 Feb 2024 11:14:55 +0800 Subject: [PATCH 12/18] chore: Update VSCode formatting settings. On every launch VSCode keep changin codeActionsOnSave from true to "explicit". Turns out, VSCode true is set to "explicit" since VSCode 1.85.0. It seems boolean values were supported until 1.84.0. https://stackoverflow.com/a/77637765 --- .vscode/settings.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 0fd2fffcc..d8d2ff705 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,9 +2,9 @@ "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnSave": true, "editor.codeActionsOnSave": { - "source.fixAll.eslint": true, - "source.fixAll.stylelint": true, - "source.organizeImports": true + "source.fixAll.eslint": "explicit", + "source.fixAll.stylelint": "explicit", + "source.organizeImports": "explicit" }, "typescript.preferences.importModuleSpecifier": "relative" } From e733e9e4895d6c2bcbfbfeb930f051f27f14283a Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Tue, 20 Feb 2024 11:24:31 +0800 Subject: [PATCH 13/18] Remove unused enums from apps-flyer-enums.ts --- src/app/shared/apps-flyer/apps-flyer-enums.ts | 45 ------------------- 1 file changed, 45 deletions(-) diff --git a/src/app/shared/apps-flyer/apps-flyer-enums.ts b/src/app/shared/apps-flyer/apps-flyer-enums.ts index 6a232b19d..849c11640 100644 --- a/src/app/shared/apps-flyer/apps-flyer-enums.ts +++ b/src/app/shared/apps-flyer/apps-flyer-enums.ts @@ -1,48 +1,3 @@ -/** - * Enum representing predefined event types for AppsFlyer in-app events. - * - * Note: appsflyer-capacitor-plugin does not provide these constants. - * Therefore, they are defined manually here. - * - * For a list of predefined event names, see: - * {@link https://dev.appsflyer.com/hc/docs/in-app-events-android#event-constants|AppsFlyer Predefined Event Constants}. - */ -export enum AFInAppEventType { - LEVEL_ACHIEVED = 'af_level_achieved', -} - -/** - * Enum representing predefined event parameter names for AppsFlyer in-app events. - * - * Note: appsflyer-capacitor-plugin does not provide these constants. - * Therefore, they are defined manually here. - * - * For a list of predefined event parameters, see: - * {@link https://dev.appsflyer.com/hc/docs/in-app-events-android#predefined-event-parameters|AppsFlyer Predefined Event Parameters}. - */ -export enum AFInAppEventParameterName { - /** - * The level parameter for in-app events. - * - * Levels can be determined by the type of event. For example: - * - Level 1: User clicks on the camera shutter or navigates to explore page. - * - Level 2: Actions that require more effort such as registering an asset. - * - Level 3: User executes network actions such as Mint & Share. - * - * Consult and communicate with the product manager to determine appropriate levels. - */ - LEVEL = 'af_level', - /** - * The score parameter for in-app events. - * - * Typically, this parameter is set to 0 as no decision is currently made based on 'af_score'. - * However, it can be used to assign scores to users based on their actions in the app. - * - * Consult and communicate with the product manager to determine the usage of scores. - */ - SCORE = 'af_score', -} - export enum CCamCustomEventType { CCAM_TRY_CLICK_CAMERA_SHUTTER = 'ccam_try_click_camera_shutter', } From 19675d16d80e0d4a9f28cc8be6ed443247ed92a7 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Tue, 20 Feb 2024 11:28:28 +0800 Subject: [PATCH 14/18] Add JSDoc for AppsFlyer custom event enum --- src/app/shared/apps-flyer/apps-flyer-enums.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/app/shared/apps-flyer/apps-flyer-enums.ts b/src/app/shared/apps-flyer/apps-flyer-enums.ts index 849c11640..eec915ef2 100644 --- a/src/app/shared/apps-flyer/apps-flyer-enums.ts +++ b/src/app/shared/apps-flyer/apps-flyer-enums.ts @@ -1,3 +1,13 @@ +/** + * Enum representing custom event names for AppsFlyer in-app events. + * + * While it's recommended to use predefined event names, custom event names are easier for QA + * and marketing teams to understand and filter out in the AppsFlyer dashboard. Refer to the Asana + * comment https://app.asana.com/0/0/1206618451736620/1206636906894474/f for more details. + * + * Every custom event name should be prefixed with 'ccam_' which stands for Capture Cam. This prefix + * helps to distinguish between predefined AppsFlyer event names such as 'af_level_achieved', etc. + */ export enum CCamCustomEventType { CCAM_TRY_CLICK_CAMERA_SHUTTER = 'ccam_try_click_camera_shutter', } From 7a36252fe2960b1a96423957352197fafc80f012 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Tue, 20 Feb 2024 12:08:04 +0800 Subject: [PATCH 15/18] fix(AppsflyerService.logEvent): eslint-disable-next-line class-methods-use-this --- src/app/shared/apps-flyer/apps-flyer.service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/shared/apps-flyer/apps-flyer.service.ts b/src/app/shared/apps-flyer/apps-flyer.service.ts index fc23ab348..85ca74116 100644 --- a/src/app/shared/apps-flyer/apps-flyer.service.ts +++ b/src/app/shared/apps-flyer/apps-flyer.service.ts @@ -57,6 +57,7 @@ export class AppsFlyerService { return isTruthy && Capacitor.isNativePlatform(); } + // eslint-disable-next-line class-methods-use-this private async logEvent(event: AFEvent) { try { await AppsFlyer.logEvent(event); From 4bb6b6eeceed7521957bf8227ec50403431fd333 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Tue, 20 Feb 2024 12:26:05 +0800 Subject: [PATCH 16/18] fix: test `should log camera shutter event through Appsflyer.logEvent method` --- src/app/shared/apps-flyer/apps-flyer.service.spec.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/app/shared/apps-flyer/apps-flyer.service.spec.ts b/src/app/shared/apps-flyer/apps-flyer.service.spec.ts index dc4ac3521..1cd804fcd 100644 --- a/src/app/shared/apps-flyer/apps-flyer.service.spec.ts +++ b/src/app/shared/apps-flyer/apps-flyer.service.spec.ts @@ -3,6 +3,7 @@ import { Platform } from '@ionic/angular'; import { SharedTestingModule } from '../shared-testing.module'; import { AFEvent } from 'appsflyer-capacitor-plugin'; +import { CCamCustomEventType } from './apps-flyer-enums'; import { AppsFlyerService } from './apps-flyer.service'; describe('AppsFlyerService', () => { @@ -36,12 +37,7 @@ describe('AppsFlyerService', () => { it('should log camera shutter event through Appsflyer.logEvent method', async () => { const expectedEvent: AFEvent = { - eventName: 'af_level_achieved', - eventValue: { - af_level: '1', - af_score: '0', - af_achievement_id: 'ccam_try_click_camera_shutter', - }, + eventName: CCamCustomEventType.CCAM_TRY_CLICK_CAMERA_SHUTTER, }; // NOTE: We're accessing a private method here for testing purposes only. // TypeScript doesn't enforce private/protected visibility at runtime, only at compile time. From 67e6a538af34cc3381deeec8d70f0fccc05d10d7 Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Wed, 21 Feb 2024 21:06:03 +0800 Subject: [PATCH 17/18] chore: bump app version to 0.89.2 --- android/app/build.gradle | 4 ++-- ios/App/App.xcodeproj/project.pbxproj | 8 ++++---- package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 3ea910f17..9803a9514 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "io.numbersprotocol.capturelite" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 891 - versionName "0.89.1" + versionCode 892 + versionName "0.89.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildFeatures { diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 310dc5221..b62397ce9 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -368,13 +368,13 @@ CODE_SIGN_ENTITLEMENTS = App/App.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 891; + CURRENT_PROJECT_VERSION = 892; DEVELOPMENT_TEAM = G7NB5YCKAP; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = G7NB5YCKAP; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.89.1; + MARKETING_VERSION = 0.89.2; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -395,13 +395,13 @@ CODE_SIGN_ENTITLEMENTS = App/App.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 891; + CURRENT_PROJECT_VERSION = 892; DEVELOPMENT_TEAM = G7NB5YCKAP; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = G7NB5YCKAP; INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.89.1; + MARKETING_VERSION = 0.89.2; PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV4; diff --git a/package-lock.json b/package-lock.json index 547714311..540791ccc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "capture-lite", - "version": "0.89.1", + "version": "0.89.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "capture-lite", - "version": "0.89.1", + "version": "0.89.2", "dependencies": { "packages": "^0.0.8", "@angular/animations": "^14.2.0", diff --git a/package.json b/package.json index f443e3f32..b7c9ad719 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "capture-lite", - "version": "0.89.1", + "version": "0.89.2", "author": "numbersprotocol", "homepage": "https://numbersprotocol.io/", "scripts": { From 01d902ab9020eb0e19048fd3e6d37108668d0d7b Mon Sep 17 00:00:00 2001 From: sultanmyrza Date: Wed, 21 Feb 2024 21:13:49 +0800 Subject: [PATCH 18/18] chore: update CHANGELOG.md for 0.89.2 --- CHANGELOG.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc7227424..09fd29f68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [0.89.2] - 2024-02-21 + +### Added + +1. Feature track new app users shutter click (#3215) +1. Feature Disable upload feature on Capture Cam (#3216) + +### Fixed + +1. Hotfix test ci prevent actions run twice (#2989) + ## [0.88.8] - 2024-01-31 ### Changed @@ -2246,7 +2257,8 @@ This is the first release! _Capture Lite_ is a cross-platform app adapted from [ - Web - see the demo [here](https://github.com/numbersprotocol/capture-lite#demo-app) - Android - the APK file `app-debug.apk` is attached to this release -[unreleased]: https://github.com/numbersprotocol/capture-lite/compare/0.88.8...HEAD +[unreleased]: https://github.com/numbersprotocol/capture-lite/compare/0.89.2...HEAD +[0.89.2]: https://github.com/numbersprotocol/capture-lite/compare/0.88.8...0.89.2 [0.88.8]: https://github.com/numbersprotocol/capture-lite/compare/0.88.6...0.88.8 [0.88.6]: https://github.com/numbersprotocol/capture-lite/compare/0.87.1...0.88.6 [0.87.1]: https://github.com/numbersprotocol/capture-lite/compare/0.87.0...0.87.1