Merge pull request #1542 from numbersprotocol/develop

Develop

Author: shc261392

CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.54.2 - 2022-04-21
+
+### Changed
+
+- Hide buy NUM button at wallets page
+
+### Removed
+
+- Temporarely remove custom camera ux
+
 ## 0.54.1 - 2022-04-07
 
 ### Removed

android/app/build.gradle

@@ -6,10 +6,13 @@ android {
         applicationId "io.numbersprotocol.capturelite"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 371
-        versionName "0.54.1"
+        versionCode 372
+        versionName "0.54.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
+    buildFeatures {
+        dataBinding true
+    }
     buildTypes {
         release {
             minifyEnabled false

android/app/capacitor.build.gradle

@@ -25,6 +25,7 @@ dependencies {
     implementation project(':capacitor-share')
     implementation project(':capacitor-splash-screen')
     implementation project(':capacitor-storage')
+    implementation project(':numbersprotocol-preview-video')
     implementation project(':capacitor-blob-writer')
 
 }

android/app/src/main/assets/capacitor.plugins.json

@@ -63,6 +63,10 @@
 		"pkg": "@capacitor/storage",
 		"classpath": "com.capacitorjs.plugins.storage.StoragePlugin"
 	},
+	{
+		"pkg": "@numbersprotocol/preview-video",
+		"classpath": "io.numbersprotocol.capturelite.plugins.previewvideo.PreviewVideoPlugin"
+	},
 	{
 		"pkg": "capacitor-blob-writer",
 		"classpath": "com.equimaps.capacitorblobwriter.BlobWriter"

android/capacitor.settings.gradle

@@ -50,5 +50,8 @@ 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 ':numbersprotocol-preview-video'
+project(':numbersprotocol-preview-video').projectDir = new File('../node_modules/@numbersprotocol/preview-video/android')
+
 include ':capacitor-blob-writer'
 project(':capacitor-blob-writer').projectDir = new File('../node_modules/capacitor-blob-writer/android')

ios/App/Podfile

@@ -25,6 +25,7 @@ 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 'NumbersprotocolPreviewVideo', :path => '../../node_modules/@numbersprotocol/preview-video'
   pod 'CapacitorBlobWriter', :path => '../../node_modules/capacitor-blob-writer'
 end
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "capture-lite",
-  "version": "0.54.1",
+  "version": "0.54.2",
   "author": "numbersprotocol",
   "homepage": "https://numbersprotocol.io/",
   "scripts": {
@@ -29,7 +29,7 @@
     "@angular/platform-browser-dynamic": "^12.2.4",
     "@angular/router": "^12.2.4",
     "@capacitor-community/bluetooth-le": "^1.7.0",
-    "@capacitor-community/http": "^1.4.1",
+    "@capacitor-community/http": "github:numbersprotocol/http#fix-catch-disabled-Local-Network-case-on-iOS",
     "@capacitor-community/wifi": "github:numbersprotocol/community-capacitor-wifi#capacitor3",
     "@capacitor/android": "https://gitpkg.now.sh/numbersprotocol/capacitor/android?release-3.4.1-range-request-fix",
     "@capacitor/app": "^1.1.0",
@@ -57,6 +57,7 @@
     "@ngx-formly/core": "^5.10.22",
     "@ngx-formly/material": "^5.10.22",
     "@ngx-formly/schematics": "^5.10.22",
+    "@numbersprotocol/preview-video": "github:numbersprotocol/preview-video",
     "async-mutex": "^0.3.2",
     "buffer": "^5.7.1",
     "capacitor-blob-writer": "^1.0.4",

package.json

@@ -6,17 +6,26 @@
   name="hourglass-outline"
   class="collecting"
 ></ion-icon>
-<ion-icon
-  *ngIf="hasUploaded$ | ngrxPush"
-  src="/assets/images/media-id.svg"
-  class="uploaded"
->
-</ion-icon>
-<ion-icon
-  *ngIf="hasGeolocation$ | ngrxPush"
-  src="/assets/images/location.svg"
-  class="located"
-></ion-icon>
+
+<div class="bottom-left-icons">
+  <ion-icon
+    *ngIf="hasUploaded$ | ngrxPush"
+    src="/assets/images/media-id.svg"
+    class="uploaded"
+  >
+  </ion-icon>
+  <ion-icon
+    *ngIf="hasGeolocation$ | ngrxPush"
+    src="/assets/images/location.svg"
+    class="located"
+  ></ion-icon>
+  <ion-icon
+    *ngIf="hasCaption$ | ngrxPush"
+    name="document-text-outline"
+    class="with-caption"
+  ></ion-icon>
+</div>
+
 <ion-icon
   *ngIf="isVideo$ | ngrxPush"
   name="videocam"

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

@@ -34,16 +34,30 @@ ion-icon.collecting {
   font-size: 24px;
 }
 
-ion-icon.uploaded {
+.bottom-left-icons {
   bottom: 9px;
   left: 5px;
-  font-size: 13px;
-}
+  position: absolute;
+  display: flex;
 
-ion-icon.located {
-  bottom: 8px;
-  left: 23px;
-  font-size: 16px;
+  ion-icon.uploaded {
+    position: relative;
+    font-size: 13px;
+  }
+
+  ion-icon.located {
+    left: 4px;
+    bottom: 2px;
+    position: relative;
+    font-size: 16px;
+  }
+
+  ion-icon.with-caption {
+    left: 6px;
+    bottom: 1px;
+    position: relative;
+    font-size: 14px;
+  }
 }
 
 ion-icon.is-video {