Skip to content

Commit 8165da9

Browse files
shc261392shc261392
authored
Merge pull request #3031 from numbersprotocol/milestone-v230905
2 parents 50c83d3 + 2422a83 commit 8165da9

30 files changed

+736
-227
lines changed

‎CHANGELOG.md

+23-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [0.85.2] - 2023-09-21
11+
12+
### Added
13+
14+
1. Feature sprint 1 edit profile (#3028)
15+
16+
### Fixed
17+
18+
1. Fix v230905 issue order details iframe url is broken (#3027)
19+
20+
## [0.84.0] - 2023-08-29
21+
22+
### Added
23+
24+
1. Feature v230822 use appsflyer official plugin (#3012)
25+
1. Feature v230822 Remove options from list on ionic asset page (#3013)
26+
27+
### Fixed
28+
29+
1. Fix v230814 issue Some asset can't show "share asset profile" on asset page (#3014)
30+
1031
## [0.83.2] - 2023-08-15
1132

1233
### Added
@@ -2180,7 +2201,8 @@ This is the first release! _Capture Lite_ is a cross-platform app adapted from [
21802201
- Web - see the demo [here](https://github.com/numbersprotocol/capture-lite#demo-app)
21812202
- Android - the APK file `app-debug.apk` is attached to this release
21822203

2183-
[unreleased]: https://github.com/numbersprotocol/capture-lite/compare/0.83.2...HEAD
2204+
[unreleased]: https://github.com/numbersprotocol/capture-lite/compare/0.85.2...HEAD
2205+
[0.83.2]: https://github.com/numbersprotocol/capture-lite/compare/0.82.4...0.85.2
21842206
[0.82.4]: https://github.com/numbersprotocol/capture-lite/compare/0.82.4...0.83.2
21852207
[0.82.4]: https://github.com/numbersprotocol/capture-lite/compare/0.82.3...0.82.4
21862208
[0.82.3]: https://github.com/numbersprotocol/capture-lite/compare/0.82.2...0.82.3

‎android/app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
applicationId "io.numbersprotocol.capturelite"
88
minSdkVersion rootProject.ext.minSdkVersion
99
targetSdkVersion rootProject.ext.targetSdkVersion
10-
versionCode 832
11-
versionName "0.83.2"
10+
versionCode 852
11+
versionName "0.85.2"
1212
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1313
}
1414
buildFeatures {

‎ios/App/App.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -368,13 +368,13 @@
368368
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
369369
CODE_SIGN_IDENTITY = "iPhone Distribution";
370370
CODE_SIGN_STYLE = Manual;
371-
CURRENT_PROJECT_VERSION = 832;
371+
CURRENT_PROJECT_VERSION = 852;
372372
DEVELOPMENT_TEAM = G7NB5YCKAP;
373373
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = G7NB5YCKAP;
374374
INFOPLIST_FILE = App/Info.plist;
375375
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
376376
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
377-
MARKETING_VERSION = 0.83.2;
377+
MARKETING_VERSION = 0.85.2;
378378
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
379379
PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
380380
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -395,13 +395,13 @@
395395
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
396396
CODE_SIGN_IDENTITY = "iPhone Distribution";
397397
CODE_SIGN_STYLE = Manual;
398-
CURRENT_PROJECT_VERSION = 832;
398+
CURRENT_PROJECT_VERSION = 852;
399399
DEVELOPMENT_TEAM = G7NB5YCKAP;
400400
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = G7NB5YCKAP;
401401
INFOPLIST_FILE = App/Info.plist;
402402
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
403403
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
404-
MARKETING_VERSION = 0.83.2;
404+
MARKETING_VERSION = 0.85.2;
405405
PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
406406
PRODUCT_NAME = "$(TARGET_NAME)";
407407
PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV4;

‎ios/App/Podfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'
22

3-
platform :ios, '13.0'
3+
platform :ios, '15.6'
44
use_frameworks!
55

6+
$AppsFlyerStrictMode=true
7+
68
# workaround to avoid Xcode caching of Pods that requires
79
# Product -> Clean Build Folder after new Cordova plugins installed
810
# Requires CocoaPods 1.6 or newer

‎ios/App/Podfile.lock

+31-33
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
PODS:
2-
- AppsflyerCapacitorPlugin (6.11.0):
3-
- AppsFlyerFramework (= 6.10.1)
2+
- AppsflyerCapacitorPlugin (6.12.1):
3+
- AppsFlyerFramework/Strict (= 6.12.1)
44
- Capacitor
5-
- AppsFlyerFramework (6.10.1):
6-
- AppsFlyerFramework/Main (= 6.10.1)
7-
- AppsFlyerFramework/Main (6.10.1)
5+
- AppsFlyerFramework/Strict (6.12.1)
86
- Capacitor (5.0.5):
97
- CapacitorCordova
108
- CapacitorApp (5.0.3):
@@ -51,23 +49,23 @@ PODS:
5149
- Capacitor
5250
- CordovaPlugins (5.0.5):
5351
- CapacitorCordova
54-
- Firebase/CoreOnly (10.10.0):
55-
- FirebaseCore (= 10.10.0)
56-
- Firebase/Messaging (10.10.0):
52+
- Firebase/CoreOnly (10.14.0):
53+
- FirebaseCore (= 10.14.0)
54+
- Firebase/Messaging (10.14.0):
5755
- Firebase/CoreOnly
58-
- FirebaseMessaging (~> 10.10.0)
59-
- FirebaseCore (10.10.0):
56+
- FirebaseMessaging (~> 10.14.0)
57+
- FirebaseCore (10.14.0):
6058
- FirebaseCoreInternal (~> 10.0)
6159
- GoogleUtilities/Environment (~> 7.8)
6260
- GoogleUtilities/Logger (~> 7.8)
63-
- FirebaseCoreInternal (10.10.0):
61+
- FirebaseCoreInternal (10.14.0):
6462
- "GoogleUtilities/NSData+zlib (~> 7.8)"
65-
- FirebaseInstallations (10.10.0):
63+
- FirebaseInstallations (10.14.0):
6664
- FirebaseCore (~> 10.0)
6765
- GoogleUtilities/Environment (~> 7.8)
6866
- GoogleUtilities/UserDefaults (~> 7.8)
6967
- PromisesObjC (~> 2.1)
70-
- FirebaseMessaging (10.10.0):
68+
- FirebaseMessaging (10.14.0):
7169
- FirebaseCore (~> 10.0)
7270
- FirebaseInstallations (~> 10.0)
7371
- GoogleDataTransport (~> 9.2)
@@ -79,26 +77,26 @@ PODS:
7977
- GCDWebServer (3.5.4):
8078
- GCDWebServer/Core (= 3.5.4)
8179
- GCDWebServer/Core (3.5.4)
82-
- GoogleDataTransport (9.2.3):
80+
- GoogleDataTransport (9.2.5):
8381
- GoogleUtilities/Environment (~> 7.7)
8482
- nanopb (< 2.30910.0, >= 2.30908.0)
8583
- PromisesObjC (< 3.0, >= 1.2)
86-
- GoogleUtilities/AppDelegateSwizzler (7.11.1):
84+
- GoogleUtilities/AppDelegateSwizzler (7.11.5):
8785
- GoogleUtilities/Environment
8886
- GoogleUtilities/Logger
8987
- GoogleUtilities/Network
90-
- GoogleUtilities/Environment (7.11.1):
88+
- GoogleUtilities/Environment (7.11.5):
9189
- PromisesObjC (< 3.0, >= 1.2)
92-
- GoogleUtilities/Logger (7.11.1):
90+
- GoogleUtilities/Logger (7.11.5):
9391
- GoogleUtilities/Environment
94-
- GoogleUtilities/Network (7.11.1):
92+
- GoogleUtilities/Network (7.11.5):
9593
- GoogleUtilities/Logger
9694
- "GoogleUtilities/NSData+zlib"
9795
- GoogleUtilities/Reachability
98-
- "GoogleUtilities/NSData+zlib (7.11.1)"
99-
- GoogleUtilities/Reachability (7.11.1):
96+
- "GoogleUtilities/NSData+zlib (7.11.5)"
97+
- GoogleUtilities/Reachability (7.11.5):
10098
- GoogleUtilities/Logger
101-
- GoogleUtilities/UserDefaults (7.11.1):
99+
- GoogleUtilities/UserDefaults (7.11.5):
102100
- GoogleUtilities/Logger
103101
- nanopb (2.30909.0):
104102
- nanopb/decode (= 2.30909.0)
@@ -111,7 +109,7 @@ PODS:
111109
- Capacitor
112110
- NumbersprotocolPreviewVideo (0.0.4):
113111
- Capacitor
114-
- PromisesObjC (2.2.0)
112+
- PromisesObjC (2.3.1)
115113

116114
DEPENDENCIES:
117115
- AppsflyerCapacitorPlugin (from `../../node_modules/appsflyer-capacitor-plugin`)
@@ -215,8 +213,8 @@ EXTERNAL SOURCES:
215213
:path: "../../node_modules/@numbersprotocol/preview-video"
216214

217215
SPEC CHECKSUMS:
218-
AppsflyerCapacitorPlugin: 2b93f94960811a58bd658bc6f21b25ea38b1ceca
219-
AppsFlyerFramework: 88a6eed37ad52bcee4ad74232efa8e22809d06c9
216+
AppsflyerCapacitorPlugin: 3cc3df807ba8f28f7ef44252b0107ffc2b4cb994
217+
AppsFlyerFramework: e29b63fc5441400a38a31c5501c1da500b9d53d0
220218
Capacitor: b1248915663add1bd6567e2b67c1c1fa3abcf5e8
221219
CapacitorApp: 7a5dec8b33573707164b293475d5c89ba684364a
222220
CapacitorBlobWriter: 110eeaf80611f19bf01a8a05ff3672149ed0baad
@@ -240,20 +238,20 @@ SPEC CHECKSUMS:
240238
CapacitorStorage: 8ec2cf8fec179d829288b16c6fba6c3c43d2bdc9
241239
CapawesomeCapacitorFilePicker: f354c9ec6e4722908876032939a85ffb94642630
242240
CordovaPlugins: c905b3b4dfc87d2a11bdbdaf396289c4a22c39dd
243-
Firebase: facd334e557a979bd03a0b58d90fd56b52b8aba0
244-
FirebaseCore: d027ff503d37edb78db98429b11f580a24a7df2a
245-
FirebaseCoreInternal: 971029061d326000d65bfdc21f5502c75c8b0893
246-
FirebaseInstallations: 52153982b057d3afcb4e1fbb3eb0b6d00611e681
247-
FirebaseMessaging: 8a3b9a8b98ce72a42d22e69865cf662e38d2d6f5
241+
Firebase: 6c1bf3f534bc422d52af2e41fe0d50bf08b6b773
242+
FirebaseCore: 6fc17ac9f03509d51c131298aacb3ee5698b4f02
243+
FirebaseCoreInternal: d558159ee6cc4b823c2296ecc193de9f6d9a5bb3
244+
FirebaseInstallations: f672b1eda64e6381c21d424a2f680a943fd83f3b
245+
FirebaseMessaging: 1077a4499f0c0a140b9a2e34fe08a1acc806b36d
248246
GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
249-
GoogleDataTransport: f0308f5905a745f94fb91fea9c6cbaf3831cb1bd
250-
GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749
247+
GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2
248+
GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
251249
nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
252250
NumbersprotocolPreviewCamera: 85a8c8bbb09f68b0bdb16e0853795c6c0205b1d5
253251
NumbersprotocolPreviewMemory: ffeff13462e015bfaf9f777525a949034860f4cb
254252
NumbersprotocolPreviewVideo: 2cfa3fa666c83850903a220d74dc855ac5b6a520
255-
PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
253+
PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4
256254

257-
PODFILE CHECKSUM: 1f26ed9e4dde2462db99e6f11d4db07ca2c91d05
255+
PODFILE CHECKSUM: 24ca1bcaa3932b2d964431fb23583535c4454ed9
258256

259257
COCOAPODS: 1.12.1

‎package-lock.json

+9-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "capture-lite",
3-
"version": "0.83.2",
3+
"version": "0.85.2",
44
"author": "numbersprotocol",
55
"homepage": "https://numbersprotocol.io/",
66
"scripts": {
@@ -68,7 +68,7 @@
6868
"@pqina/angular-pintura": "^8.44.1",
6969
"@pqina/pintura": "^8.44.1",
7070
"@techiediaries/ngx-qrcode": "^9.1.0",
71-
"appsflyer-capacitor-plugin": "github:numbersprotocol/appsflyer-capacitor-plugin",
71+
"appsflyer-capacitor-plugin": "^6.12.1",
7272
"async-mutex": "^0.3.2",
7373
"buffer": "^5.7.1",
7474
"capacitor-blob-writer": "^1.0.4",

‎src/app/app.component.ts

+2
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ export class AppComponent {
136136
'capture',
137137
'profile',
138138
'search',
139+
'edit',
140+
'capture-rebrand-add',
139141
];
140142

141143
for (const iconName of captureRebrandedIconNames) {

‎src/app/features/home/activities/network-action-order-details/network-action-order-details.page.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export class NetworkActionOrderDetailsPage {
7272
*/
7373
if (assetId) queryParams.append('asset_id', assetId);
7474

75-
return `${BUBBLE_IFRAME_URL}/version-test/order_details?${queryParams}`;
75+
return `${BUBBLE_IFRAME_URL}/order_details?${queryParams}`;
7676
})
7777
);
7878

‎src/app/features/home/capture-tab/capture-tab.component.html

+9-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,16 @@
33
<ion-refresher-content></ion-refresher-content>
44
</ion-refresher>
55
<mat-card *transloco="let t" class="user-card" id="user-card">
6-
<app-avatar mat-card-avatar></app-avatar>
6+
<app-avatar mat-card-avatar [editable]="false"></app-avatar>
77
<mat-card-header>
8-
<mat-card-title (click)="editUsername()">{{
9-
username$ | ngrxPush
10-
}}</mat-card-title>
8+
<mat-card-title>
9+
{{ username$ | ngrxPush }}
10+
<ion-icon
11+
src="assets/images/icons/edit.svg"
12+
*ngIf="networkConnected$ | async"
13+
routerLink="edit-profile"
14+
></ion-icon>
15+
</mat-card-title>
1116
<div class="vertical-space-8"></div>
1217
<mat-card-subtitle>{{ email$ | ngrxPush }} </mat-card-subtitle>
1318
</mat-card-header>

‎src/app/features/home/capture-tab/capture-tab.component.scss

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ mat-card {
1717
mat-card-title {
1818
text-align: center;
1919
margin-top: 32px;
20+
21+
ion-icon {
22+
transform: translateY(2px);
23+
}
2024
}
2125

2226
mat-card-subtitle {

‎src/app/features/home/details/details.page.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</ng-container>
1414
<button
1515
*ngIf="(isFromSeriesPage$ | ngrxPush) === false"
16-
(click)="openOptionsMenuEvenOffline()"
16+
(click)="openOptionsMenuWithAvailableOptions()"
1717
mat-mini-fab
1818
class="capture-rebranded-button"
1919
joyrideStep="highlightDetailsPageOptionsMenu"

0 commit comments

Comments
 (0)