Skip to content

Commit

Permalink
Merge pull request #3031 from numbersprotocol/milestone-v230905
Browse files Browse the repository at this point in the history
  • Loading branch information
shc261392 authored Sep 21, 2023
2 parents 50c83d3 + 2422a83 commit 8165da9
Show file tree
Hide file tree
Showing 30 changed files with 736 additions and 227 deletions.
24 changes: 23 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.85.2] - 2023-09-21

### Added

1. Feature sprint 1 edit profile (#3028)

### Fixed

1. Fix v230905 issue order details iframe url is broken (#3027)

## [0.84.0] - 2023-08-29

### Added

1. Feature v230822 use appsflyer official plugin (#3012)
1. Feature v230822 Remove options from list on ionic asset page (#3013)

### Fixed

1. Fix v230814 issue Some asset can't show "share asset profile" on asset page (#3014)

## [0.83.2] - 2023-08-15

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

[unreleased]: https:/numbersprotocol/capture-lite/compare/0.83.2...HEAD
[unreleased]: https:/numbersprotocol/capture-lite/compare/0.85.2...HEAD
[0.83.2]: https:/numbersprotocol/capture-lite/compare/0.82.4...0.85.2
[0.82.4]: https:/numbersprotocol/capture-lite/compare/0.82.4...0.83.2
[0.82.4]: https:/numbersprotocol/capture-lite/compare/0.82.3...0.82.4
[0.82.3]: https:/numbersprotocol/capture-lite/compare/0.82.2...0.82.3
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId "io.numbersprotocol.capturelite"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 832
versionName "0.83.2"
versionCode 852
versionName "0.85.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildFeatures {
Expand Down
8 changes: 4 additions & 4 deletions ios/App/App.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -368,13 +368,13 @@
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 832;
CURRENT_PROJECT_VERSION = 852;
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.83.2;
MARKETING_VERSION = 0.85.2;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -395,13 +395,13 @@
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 832;
CURRENT_PROJECT_VERSION = 852;
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.83.2;
MARKETING_VERSION = 0.85.2;
PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV4;
Expand Down
4 changes: 3 additions & 1 deletion ios/App/Podfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
require_relative '../../node_modules/@capacitor/ios/scripts/pods_helpers'

platform :ios, '13.0'
platform :ios, '15.6'
use_frameworks!

$AppsFlyerStrictMode=true

# workaround to avoid Xcode caching of Pods that requires
# Product -> Clean Build Folder after new Cordova plugins installed
# Requires CocoaPods 1.6 or newer
Expand Down
64 changes: 31 additions & 33 deletions ios/App/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
PODS:
- AppsflyerCapacitorPlugin (6.11.0):
- AppsFlyerFramework (= 6.10.1)
- AppsflyerCapacitorPlugin (6.12.1):
- AppsFlyerFramework/Strict (= 6.12.1)
- Capacitor
- AppsFlyerFramework (6.10.1):
- AppsFlyerFramework/Main (= 6.10.1)
- AppsFlyerFramework/Main (6.10.1)
- AppsFlyerFramework/Strict (6.12.1)
- Capacitor (5.0.5):
- CapacitorCordova
- CapacitorApp (5.0.3):
Expand Down Expand Up @@ -51,23 +49,23 @@ PODS:
- Capacitor
- CordovaPlugins (5.0.5):
- CapacitorCordova
- Firebase/CoreOnly (10.10.0):
- FirebaseCore (= 10.10.0)
- Firebase/Messaging (10.10.0):
- Firebase/CoreOnly (10.14.0):
- FirebaseCore (= 10.14.0)
- Firebase/Messaging (10.14.0):
- Firebase/CoreOnly
- FirebaseMessaging (~> 10.10.0)
- FirebaseCore (10.10.0):
- FirebaseMessaging (~> 10.14.0)
- FirebaseCore (10.14.0):
- FirebaseCoreInternal (~> 10.0)
- GoogleUtilities/Environment (~> 7.8)
- GoogleUtilities/Logger (~> 7.8)
- FirebaseCoreInternal (10.10.0):
- FirebaseCoreInternal (10.14.0):
- "GoogleUtilities/NSData+zlib (~> 7.8)"
- FirebaseInstallations (10.10.0):
- FirebaseInstallations (10.14.0):
- FirebaseCore (~> 10.0)
- GoogleUtilities/Environment (~> 7.8)
- GoogleUtilities/UserDefaults (~> 7.8)
- PromisesObjC (~> 2.1)
- FirebaseMessaging (10.10.0):
- FirebaseMessaging (10.14.0):
- FirebaseCore (~> 10.0)
- FirebaseInstallations (~> 10.0)
- GoogleDataTransport (~> 9.2)
Expand All @@ -79,26 +77,26 @@ PODS:
- GCDWebServer (3.5.4):
- GCDWebServer/Core (= 3.5.4)
- GCDWebServer/Core (3.5.4)
- GoogleDataTransport (9.2.3):
- GoogleDataTransport (9.2.5):
- GoogleUtilities/Environment (~> 7.7)
- nanopb (< 2.30910.0, >= 2.30908.0)
- PromisesObjC (< 3.0, >= 1.2)
- GoogleUtilities/AppDelegateSwizzler (7.11.1):
- GoogleUtilities/AppDelegateSwizzler (7.11.5):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- GoogleUtilities/Environment (7.11.1):
- GoogleUtilities/Environment (7.11.5):
- PromisesObjC (< 3.0, >= 1.2)
- GoogleUtilities/Logger (7.11.1):
- GoogleUtilities/Logger (7.11.5):
- GoogleUtilities/Environment
- GoogleUtilities/Network (7.11.1):
- GoogleUtilities/Network (7.11.5):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Reachability
- "GoogleUtilities/NSData+zlib (7.11.1)"
- GoogleUtilities/Reachability (7.11.1):
- "GoogleUtilities/NSData+zlib (7.11.5)"
- GoogleUtilities/Reachability (7.11.5):
- GoogleUtilities/Logger
- GoogleUtilities/UserDefaults (7.11.1):
- GoogleUtilities/UserDefaults (7.11.5):
- GoogleUtilities/Logger
- nanopb (2.30909.0):
- nanopb/decode (= 2.30909.0)
Expand All @@ -111,7 +109,7 @@ PODS:
- Capacitor
- NumbersprotocolPreviewVideo (0.0.4):
- Capacitor
- PromisesObjC (2.2.0)
- PromisesObjC (2.3.1)

DEPENDENCIES:
- AppsflyerCapacitorPlugin (from `../../node_modules/appsflyer-capacitor-plugin`)
Expand Down Expand Up @@ -215,8 +213,8 @@ EXTERNAL SOURCES:
:path: "../../node_modules/@numbersprotocol/preview-video"

SPEC CHECKSUMS:
AppsflyerCapacitorPlugin: 2b93f94960811a58bd658bc6f21b25ea38b1ceca
AppsFlyerFramework: 88a6eed37ad52bcee4ad74232efa8e22809d06c9
AppsflyerCapacitorPlugin: 3cc3df807ba8f28f7ef44252b0107ffc2b4cb994
AppsFlyerFramework: e29b63fc5441400a38a31c5501c1da500b9d53d0
Capacitor: b1248915663add1bd6567e2b67c1c1fa3abcf5e8
CapacitorApp: 7a5dec8b33573707164b293475d5c89ba684364a
CapacitorBlobWriter: 110eeaf80611f19bf01a8a05ff3672149ed0baad
Expand All @@ -240,20 +238,20 @@ SPEC CHECKSUMS:
CapacitorStorage: 8ec2cf8fec179d829288b16c6fba6c3c43d2bdc9
CapawesomeCapacitorFilePicker: f354c9ec6e4722908876032939a85ffb94642630
CordovaPlugins: c905b3b4dfc87d2a11bdbdaf396289c4a22c39dd
Firebase: facd334e557a979bd03a0b58d90fd56b52b8aba0
FirebaseCore: d027ff503d37edb78db98429b11f580a24a7df2a
FirebaseCoreInternal: 971029061d326000d65bfdc21f5502c75c8b0893
FirebaseInstallations: 52153982b057d3afcb4e1fbb3eb0b6d00611e681
FirebaseMessaging: 8a3b9a8b98ce72a42d22e69865cf662e38d2d6f5
Firebase: 6c1bf3f534bc422d52af2e41fe0d50bf08b6b773
FirebaseCore: 6fc17ac9f03509d51c131298aacb3ee5698b4f02
FirebaseCoreInternal: d558159ee6cc4b823c2296ecc193de9f6d9a5bb3
FirebaseInstallations: f672b1eda64e6381c21d424a2f680a943fd83f3b
FirebaseMessaging: 1077a4499f0c0a140b9a2e34fe08a1acc806b36d
GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
GoogleDataTransport: f0308f5905a745f94fb91fea9c6cbaf3831cb1bd
GoogleUtilities: 9aa0ad5a7bc171f8bae016300bfcfa3fb8425749
GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2
GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
NumbersprotocolPreviewCamera: 85a8c8bbb09f68b0bdb16e0853795c6c0205b1d5
NumbersprotocolPreviewMemory: ffeff13462e015bfaf9f777525a949034860f4cb
NumbersprotocolPreviewVideo: 2cfa3fa666c83850903a220d74dc855ac5b6a520
PromisesObjC: 09985d6d70fbe7878040aa746d78236e6946d2ef
PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4

PODFILE CHECKSUM: 1f26ed9e4dde2462db99e6f11d4db07ca2c91d05
PODFILE CHECKSUM: 24ca1bcaa3932b2d964431fb23583535c4454ed9

COCOAPODS: 1.12.1
17 changes: 9 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "capture-lite",
"version": "0.83.2",
"version": "0.85.2",
"author": "numbersprotocol",
"homepage": "https://numbersprotocol.io/",
"scripts": {
Expand Down Expand Up @@ -68,7 +68,7 @@
"@pqina/angular-pintura": "^8.44.1",
"@pqina/pintura": "^8.44.1",
"@techiediaries/ngx-qrcode": "^9.1.0",
"appsflyer-capacitor-plugin": "github:numbersprotocol/appsflyer-capacitor-plugin",
"appsflyer-capacitor-plugin": "^6.12.1",
"async-mutex": "^0.3.2",
"buffer": "^5.7.1",
"capacitor-blob-writer": "^1.0.4",
Expand Down
2 changes: 2 additions & 0 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ export class AppComponent {
'capture',
'profile',
'search',
'edit',
'capture-rebrand-add',
];

for (const iconName of captureRebrandedIconNames) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export class NetworkActionOrderDetailsPage {
*/
if (assetId) queryParams.append('asset_id', assetId);

return `${BUBBLE_IFRAME_URL}/version-test/order_details?${queryParams}`;
return `${BUBBLE_IFRAME_URL}/order_details?${queryParams}`;
})
);

Expand Down
13 changes: 9 additions & 4 deletions src/app/features/home/capture-tab/capture-tab.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@
<ion-refresher-content></ion-refresher-content>
</ion-refresher>
<mat-card *transloco="let t" class="user-card" id="user-card">
<app-avatar mat-card-avatar></app-avatar>
<app-avatar mat-card-avatar [editable]="false"></app-avatar>
<mat-card-header>
<mat-card-title (click)="editUsername()">{{
username$ | ngrxPush
}}</mat-card-title>
<mat-card-title>
{{ username$ | ngrxPush }}
<ion-icon
src="assets/images/icons/edit.svg"
*ngIf="networkConnected$ | async"
routerLink="edit-profile"
></ion-icon>
</mat-card-title>
<div class="vertical-space-8"></div>
<mat-card-subtitle>{{ email$ | ngrxPush }} </mat-card-subtitle>
</mat-card-header>
Expand Down
4 changes: 4 additions & 0 deletions src/app/features/home/capture-tab/capture-tab.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ mat-card {
mat-card-title {
text-align: center;
margin-top: 32px;

ion-icon {
transform: translateY(2px);
}
}

mat-card-subtitle {
Expand Down
2 changes: 1 addition & 1 deletion src/app/features/home/details/details.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</ng-container>
<button
*ngIf="(isFromSeriesPage$ | ngrxPush) === false"
(click)="openOptionsMenuEvenOffline()"
(click)="openOptionsMenuWithAvailableOptions()"
mat-mini-fab
class="capture-rebranded-button"
joyrideStep="highlightDetailsPageOptionsMenu"
Expand Down
Loading

0 comments on commit 8165da9

Please sign in to comment.