Merge pull request #2988 from numbersprotocol/milesonte-v230808

CHANGELOG.md

@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.83.2] - 2023-08-15
+
+### Added
+
+1. Feature v230808 configure capture app to receive deep links (#2974)
+1. Feature v230725 showing order information in the transaction (#2971)
+1. Feature set ios minimum version to 15.7 (#2967)
+1. Feature v230725 showing order information in the transaction (#2965)
+
+### Fixed
+
+1. Fix v230808 Update Invite Friends Message Text (#2980)
+1. Fix v230808 After edit caption need to press back button (#2973)
+1. Fix v230725 Update Icon to Reflect Completed Email Verification Process (#2963)
+1. Fix v230725 appsflyer after capacitor 5 migration (#2962)
+
 ## [0.82.4] - 2023-08-01
 
 ### Fixed
@@ -2164,7 +2180,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.82.4...HEAD
+[unreleased]: https://github.com/numbersprotocol/capture-lite/compare/0.83.2...HEAD
+[0.82.4]: https://github.com/numbersprotocol/capture-lite/compare/0.82.4...0.83.2
 [0.82.4]: https://github.com/numbersprotocol/capture-lite/compare/0.82.3...0.82.4
 [0.82.3]: https://github.com/numbersprotocol/capture-lite/compare/0.82.2...0.82.3
 [0.82.2]: https://github.com/numbersprotocol/capture-lite/compare/0.81.2...0.82.2

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "io.numbersprotocol.capturelite"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 824
-        versionName "0.82.4"
+        versionCode 832
+        versionName "0.83.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildFeatures {

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Permissions -->
 
@@ -41,6 +42,9 @@
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
     <!-- For in-app purchases -->
     <uses-permission android:name="com.android.vending.BILLING" />
+    <!-- https://dev.appsflyer.com/hc/docs/install-android-sdk#revoking-the-ad_id-permission -->
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"
+        tools:node="remove"/>
 
 
     <queries>
@@ -83,6 +87,15 @@
 
                 <data android:scheme="@string/custom_url_scheme" />
             </intent-filter>
+
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="https" android:host="capture-cam-deep-links.web.app" />
+            </intent-filter>
         </activity>
 
         <provider

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 = 824;
+				CURRENT_PROJECT_VERSION = 832;
 				DEVELOPMENT_TEAM = G7NB5YCKAP;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = G7NB5YCKAP;
 				INFOPLIST_FILE = App/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.82.4;
+				MARKETING_VERSION = 0.83.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 = 824;
+				CURRENT_PROJECT_VERSION = 832;
 				DEVELOPMENT_TEAM = G7NB5YCKAP;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = G7NB5YCKAP;
 				INFOPLIST_FILE = App/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.82.4;
+				MARKETING_VERSION = 0.83.2;
 				PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV4;

ios/App/App/App.entitlements

@@ -4,15 +4,19 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:capture-cam-deep-links.web.app</string>
+	</array>
 	<key>com.apple.developer.networking.HotspotConfiguration</key>
-    <true/>
-    <key>com.apple.developer.networking.networkextension</key>
-    <array>
-        <string>app-proxy-provider</string>
-    </array>
-    <key>com.apple.external-accessory.wireless-configuration</key>
-    <true/>
-    <key>com.apple.developer.networking.wifi-info</key>
-    <true/>
+	<true/>
+	<key>com.apple.developer.networking.networkextension</key>
+	<array>
+		<string>app-proxy-provider</string>
+	</array>
+	<key>com.apple.developer.networking.wifi-info</key>
+	<true/>
+	<key>com.apple.external-accessory.wireless-configuration</key>
+	<true/>
 </dict>
 </plist>

ios/App/Podfile.lock

@@ -18,7 +18,7 @@ PODS:
     - Capacitor
   - CapacitorClipboard (5.0.4):
     - Capacitor
-  - CapacitorCommunityAdvertisingId (1.0.0):
+  - CapacitorCommunityAdvertisingId (5.0.0):
     - Capacitor
   - CapacitorCommunityBluetoothLe (2.2.3):
     - Capacitor
@@ -223,7 +223,7 @@ SPEC CHECKSUMS:
   CapacitorBrowser: 2688852d02f1e89560a31b70521c71a5e7348860
   CapacitorCamera: 9b5c8e809c1042f263994f97ba846aa37e974f12
   CapacitorClipboard: 46f3959735fa0d96b9989dafcc4aed52e624d163
-  CapacitorCommunityAdvertisingId: ffbeee30080f0057f7af6e465a7552b68a3d3fdf
+  CapacitorCommunityAdvertisingId: 41543d8212fb12b6913b798bf1442c2a6bc1ae91
   CapacitorCommunityBluetoothLe: 7de4f21022a05b15195abfb002872884d00715fc
   CapacitorCommunityHttp: 7be90668527ef14ee10d08135b0e00fac9cf8247
   CapacitorCommunityWifi: 47188c74f2c6bcaefb619380863be8c67b1917c8

package.json

@@ -1,6 +1,6 @@
 {
   "name": "capture-lite",
-  "version": "0.82.4",
+  "version": "0.83.2",
   "author": "numbersprotocol",
   "homepage": "https://numbersprotocol.io/",
   "scripts": {
@@ -31,7 +31,7 @@
     "@angular/router": "^14.2.0",
     "@awesome-cordova-plugins/core": "^5.46.0",
     "@awesome-cordova-plugins/in-app-purchase-2": "^5.43.0",
-    "@capacitor-community/advertising-id": "^1.0.0",
+    "@capacitor-community/advertising-id": "^5.0.0",
     "@capacitor-community/bluetooth-le": "^2.2.3",
     "@capacitor-community/http": "github:numbersprotocol/http#fix-catch-disabled-Local-Network-case-on-iOS",
     "@capacitor-community/wifi": "github:numbersprotocol/community-capacitor-wifi#capacitor3",

src/app/app.component.ts

@@ -1,6 +1,8 @@
-import { Component } from '@angular/core';
+import { Component, NgZone } from '@angular/core';
 import { MatIconRegistry } from '@angular/material/icon';
 import { DomSanitizer } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import { App, URLOpenListenerEvent } from '@capacitor/app';
 import { SplashScreen } from '@capacitor/splash-screen';
 import { Platform } from '@ionic/angular';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
@@ -38,6 +40,8 @@ export class AppComponent {
     private readonly cameraService: CameraService,
     private readonly errorService: ErrorService,
     private readonly inAppStoreService: InAppStoreService,
+    private readonly zone: NgZone,
+    private readonly router: Router,
     appsFlyerService: AppsFlyerService,
     notificationService: NotificationService,
     pushNotificationService: PushNotificationService,
@@ -58,6 +62,7 @@ export class AppComponent {
       .subscribe();
     this.inAppStoreService.initialize();
     this.initializeApp();
+    this.initializeDeepLinking();
     this.restoreAppState();
     this.initializeCollector();
     this.registerIcon();
@@ -81,6 +86,15 @@ export class AppComponent {
     await SplashScreen.hide();
   }
 
+  async initializeDeepLinking() {
+    App.addListener('appUrlOpen', (event: URLOpenListenerEvent) => {
+      this.zone.run(() => {
+        const slug = event.url.split('.app').pop();
+        if (slug) this.router.navigateByUrl(slug);
+      });
+    });
+  }
+
   private restoreAppState() {
     this.cameraService.restoreKilledCaptureEvent$
       .pipe(

src/app/features/home/activities/activities.page.html

@@ -22,7 +22,7 @@
       [text]="t('userGuide.viewNetworkActionsHistory')"
     >
       <ion-label>
-        {{ t('networkActions') }}
+        {{ t('orders') }}
       </ion-label>
     </ion-segment-button>
   </ion-segment>

src/app/features/home/activities/activities.page.scss

@@ -3,3 +3,11 @@ mat-toolbar {
     padding-right: 40px;
   }
 }
+
+ion-segment {
+  display: flex;
+
+  ion-segment-button {
+    flex: 1;
+  }
+}