Merge branch 'release-0.69.0'

.github/workflows/test.yml

@@ -20,6 +20,11 @@ jobs:
       - name: Install Ionic CLI
         run: npm install -g @ionic/cli
 
+      - name: Generate .npmrc for pintura package
+        env:
+          NUMBERS_PQINA_NPM_KEY: ${{ secrets.NUMBERS_PQINA_NPM_KEY }}
+        run: npm run preconfig.npmrc
+
       - name: Install dependencies
         run: npm install
 
@@ -41,6 +46,11 @@ jobs:
       - name: Install Ionic CLI
         run: npm install -g @ionic/cli
 
+      - name: Generate .npmrc for pintura package
+        env:
+          NUMBERS_PQINA_NPM_KEY: ${{ secrets.NUMBERS_PQINA_NPM_KEY }}
+        run: npm run preconfig.npmrc
+
       - name: Install dependencies
         run: npm install
 

CHANGELOG.md

@@ -9,6 +9,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 To check the difference between the last releaes and the latest dev status, click the link above.
 
+## [0.69.0] - 2022-11-01
+
+### Changed
+
+1. User can unpublish asset from CaptureClub (#2258)
+2. Rebrand NUM Points to Capture Credits (#2259)
+3. Move delete account button from profile page to settings page (#2260)
+
+### Fixed
+
+1. Make photo editor to respect UI design of black-white filter and HD button (#2257)
+1. Result RUL in the network app history should be URL of Capture asset page (#2255)
+1. Increase thumbnail resolution to 500x500 in profile tab (#2256)
+1. Fix CI build (#2251, #2252)
+
 ## [0.68.0] - 2022-10-25
 
 ### Changed
@@ -1877,7 +1892,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.68.0...HEAD
+[unreleased]: https://github.com/numbersprotocol/capture-lite/compare/0.69.0...HEAD
+[0.69.0]: https://github.com/numbersprotocol/capture-lite/compare/0.68.0...0.69.0
 [0.68.0]: https://github.com/numbersprotocol/capture-lite/compare/0.67.1...0.68.0
 [0.67.1]: https://github.com/numbersprotocol/capture-lite/compare/0.67.0...0.67.1
 [0.67.0]: https://github.com/numbersprotocol/capture-lite/compare/0.66.3...0.67.0

android/app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "io.numbersprotocol.capturelite"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 449
-        versionName "0.68.0"
+        versionCode 450
+        versionName "0.69.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildFeatures {

ios/App/App.xcodeproj/project.pbxproj

@@ -370,12 +370,12 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.7;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.68.0;
+				MARKETING_VERSION = 0.69.0;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV3;
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = NumbersAppDistributionV3;
+				PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV4;
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = NumbersAppDistributionV4;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG USE_PUSH";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -397,11 +397,11 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.7;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.68.0;
+				MARKETING_VERSION = 0.69.0;
 				PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV3;
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = NumbersAppDistributionV3;
+				PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV4;
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = NumbersAppDistributionV4;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = USE_PUSH;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

package.json

@@ -1,6 +1,6 @@
 {
   "name": "capture-lite",
-  "version": "0.68.0",
+  "version": "0.69.0",
   "author": "numbersprotocol",
   "homepage": "https://numbersprotocol.io/",
   "scripts": {

src/app/app.component.ts

@@ -114,6 +114,10 @@ export class AppComponent {
       'capture-rebrand-arrow-left',
       'capture-rebrand-share',
       'capture-rebrand-more-horiz',
+      'capture-reband-camera-grid',
+      'capture-rebrand-camera-hq',
+      'capture-rebrand-camera-low',
+      'capture-rebrand-camera-auto-enhance',
       'capture',
       'profile',
       'search',

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

@@ -49,13 +49,18 @@ <h4 id="network-action-name">{{ order.network_app_name_text }}</h4>
             <ion-label>{{ t('resultUrl') }}:</ion-label>
           </ion-col>
           <ion-col class="wrap-text" align="end">
-            <ion-label (click)="openResultUrl(order.result_url_text)">
-              <a *ngIf="order.result_url_text !== undefined">
-                {{ order.result_url_text }}
-              </a>
-              <ion-text *ngIf="order.result_url_text === undefined">{{
-                t('noResultUrlAvailable')
-              }}</ion-text>
+            <ion-label
+              *ngIf="order.result_url_text !== undefined"
+              (click)="openResultUrl(order.result_url_text)"
+            >
+              <a> {{ order.result_url_text }} </a>
+            </ion-label>
+
+            <ion-label
+              *ngIf="order.result_url_text === undefined"
+              (click)="openResultUrl(resultUrlFromAssetId(order.asset_id_text))"
+            >
+              <a> {{ resultUrlFromAssetId(order.asset_id_text) }} </a>
             </ion-label>
           </ion-col>
           <ion-col size="1"> </ion-col>

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

@@ -9,6 +9,7 @@ import { catchError, first, map } from 'rxjs/operators';
 import { OrderHistoryService } from '../../../../shared/actions/service/order-history.service';
 import { ErrorService } from '../../../../shared/error/error.service';
 import { isNonNullable } from '../../../../utils/rx-operators/rx-operators';
+import { getAssetProfileForCaptureIframe } from '../../../../utils/url';
 
 const { Browser, Clipboard } = Plugins;
 @UntilDestroy({ checkProperties: true })
@@ -42,13 +43,15 @@ export class NetworkActionOrderDetailsPage {
   // eslint-disable-next-line class-methods-use-this
   openResultUrl(url: string) {
     if (url) {
-      Browser.open({
-        url: `${url}`,
-        toolbarColor: '#564dfc',
-      });
+      Browser.open({ url, toolbarColor: '#000000' });
     }
   }
 
+  // eslint-disable-next-line class-methods-use-this
+  resultUrlFromAssetId(assetId: string) {
+    return getAssetProfileForCaptureIframe(assetId);
+  }
+
   async copyToClipboard(value: string) {
     await Clipboard.write({ string: value });
     this.snackBar.open(

src/app/features/home/custom-camera/custom-camera.page.html

@@ -14,6 +14,13 @@
       {{ isFlashOn ? 'flash_on' : 'flash_off' }}
     </mat-icon>
 
+    <mat-icon
+      class="camera-quality-button"
+      [svgIcon]="'capture-rebrand-camera-' + cameraQuality"
+      (click)="toggleCameraQuality()"
+    >
+    </mat-icon>
+
     <div
       class="select-from-go-pro-camera-button"
       *ngIf="lastConnectedGoProDevice$ | ngrxPush"
@@ -92,32 +99,6 @@
     </div>
   </ng-container>
 
-  <!-- fab placed in the center of the content with a list on each side -->
-  <ion-fab
-    *ngIf="(mode$ | ngrxPush) === 'capture'"
-    vertical="start"
-    style="margin-top: 80px"
-    horizontal="end"
-    slot="fixed"
-  >
-    <ion-fab-button size="small">
-      {{
-        cameraQuality === 'hq'
-          ? t('customCamera.max')
-          : t('customCamera.social')
-      }}
-    </ion-fab-button>
-
-    <ion-fab-list side="bottom">
-      <ion-fab-button (click)="setCameraQuality('hq')">
-        {{ t('customCamera.max') }}
-      </ion-fab-button>
-      <ion-fab-button (click)="setCameraQuality('low')">
-        {{ t('customCamera.social') }}
-      </ion-fab-button>
-    </ion-fab-list>
-  </ion-fab>
-
   <ng-container *ngIf="(mode$ | ngrxPush) === 'pre-publish'">
     <app-pre-publish-mode
       [curCaptureFilePath]="curCaptureFilePath"

src/app/features/home/custom-camera/custom-camera.page.scss

@@ -30,6 +30,15 @@ mat-icon.flash-camera-button {
   left: 16px;
 }
 
+mat-icon.camera-quality-button {
+  position: absolute;
+  top: 4px;
+  left: 48px;
+  font-size: 56px;
+  width: 56px;
+  height: 56px;
+}
+
 mat-icon.close-camera-button {
   position: absolute;
   top: 16px;

src/app/features/home/custom-camera/custom-camera.page.ts

@@ -258,6 +258,11 @@ export class CustomCameraPage implements OnInit, OnDestroy {
     // TODO: send change camera quality command to native side
   }
 
+  toggleCameraQuality() {
+    if (this.cameraQuality === 'hq') this.setCameraQuality('low');
+    else this.setCameraQuality('hq');
+  }
+
   private removeCurrentCapture() {
     this.customCameraService.removeFile(this.curCaptureFilePath);
     this.curCaptureFilePath = undefined;

src/app/features/home/custom-camera/pre-publish-mode/pre-publish-mode.component.html

@@ -25,6 +25,7 @@
     class="image-editor-container"
   >
     <pintura-editor
+      #pinturaEditor
       [src]="curImageBase64"
       [options]="pinturaEditorOptions"
       (processstart)="handleEditorProcessStart()"
@@ -33,6 +34,19 @@
       (process)="handleEditorProcess($event)"
     ></pintura-editor>
   </div>
+
+  <div class="image-editor-custom-buttons">
+    <button
+      (click)="applyBlackAndWhiteFilter()"
+      class="back-button"
+      mat-mini-fab
+    >
+      <mat-icon
+        class="black-and-white-filter-button"
+        svgIcon="capture-rebrand-camera-auto-enhance"
+      ></mat-icon>
+    </button>
+  </div>
 </div>
 
 <div class="footer" *ngIf="isVideo$ | ngrxPush"></div>

src/app/features/home/custom-camera/pre-publish-mode/pre-publish-mode.component.scss

@@ -11,11 +11,16 @@ $footer-padding-bottom: calc(var(--ion-safe-area-bottom) + 4px);
 $footer-total-height: calc(
   #{$footer-height} + #{$footer-padding-top} + #{$footer-padding-bottom}
 );
+$image-editor-custom-buttons-height: calc(24px + 48px);
 
 $image-editor-container-height: calc(
-  100vh - #{$action-buttons-total-height} - #{$footer-padding-bottom}
+  100vh - #{$action-buttons-total-height} - #{$footer-padding-bottom} - #{$image-editor-custom-buttons-height}
 );
 
+.h-space-12 {
+  width: 12px;
+}
+
 .action-buttons {
   position: absolute;
   top: 0;
@@ -62,7 +67,7 @@ $image-editor-container-height: calc(
   overflow: auto;
   display: flex;
   flex-direction: column;
-  justify-content: flex-end;
+  justify-content: center;
 
   app-media {
     width: 100%;
@@ -74,4 +79,12 @@ $image-editor-container-height: calc(
     height: $image-editor-container-height;
     width: 100vw;
   }
+
+  .image-editor-custom-buttons {
+    position: absolute;
+    width: 100vw;
+    bottom: 32px;
+    display: flex;
+    justify-content: center;
+  }
 }