feat(sapling): show sapling transaction details, select tezos account…

… to wrap signed sapling transaction
dylanheath · May 24, 2021 · d06d0da · d06d0da
1 parent 7a1baaf
commit d06d0da
Show file tree

Hide file tree

Showing 24 changed files with 5,467 additions and 9,425 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ unit:
   script:
     - docker run --name unit-$CI_COMMIT_SHA $GOOGLE_TAG npm run test-ci
     - docker run --name lint-$CI_COMMIT_SHA $GOOGLE_TAG npm run lint-ci
-    - docker cp unit-$CI_COMMIT_SHA:/app/coverage/lcov.info lcov.info
+    - docker cp unit-$CI_COMMIT_SHA:/app/src/coverage/report-lcov/lcov.info lcov.info
     - docker cp lint-$CI_COMMIT_SHA:/app/lintReport.json lintReport.json
   after_script:
     - docker rm unit-$CI_COMMIT_SHA

diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle
@@ -9,11 +9,11 @@ android {
 
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
-
-    implementation "com.android.support:support-v4:28.+"
-    implementation "com.android.support:appcompat-v7:28.+"
+    implementation project(':capacitor-community-barcode-scanner')
+    implementation "androidx.legacy:legacy-support-v4:1.+"
+    implementation "androidx.appcompat:appcompat:1.+"
 }
-apply from: "../../node_modules/cordova-plugin-qrscanner/src/android/qrscanner.gradle"
+
 
 if (hasProperty('postBuildExtras')) {
   postBuildExtras()

diff --git a/android/app/src/main/java/it/airgap/wallet/MainActivity.java b/android/app/src/main/java/it/airgap/wallet/MainActivity.java
@@ -2,6 +2,7 @@
 
 import android.os.Bundle;
 
+import com.dutchconcepts.capacitor.barcodescanner.BarcodeScanner;
 import com.getcapacitor.BridgeActivity;
 import com.getcapacitor.Plugin;
 
@@ -20,6 +21,7 @@ public void onCreate(Bundle savedInstanceState) {
       // Additional plugins you've installed go here
       // Ex: add(TotallyAwesomePlugin.class);
       add(AppInfo.class);
+      add(BarcodeScanner.class);
       add(SaplingNative.class);
     }});
   }

diff --git a/android/app/src/main/res/xml/config.xml b/android/app/src/main/res/xml/config.xml
@@ -2,10 +2,6 @@
 <widget version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <access origin="*" />
 
-  <feature name="QRScanner">
-    <param name="android-package" value="com.bitpay.cordova.qrscanner.QRScanner"/>
-  </feature>
-
   <feature name="SQLitePlugin">
     <param name="android-package" value="io.sqlc.SQLitePlugin"/>
   </feature>

diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
@@ -1,3 +1,6 @@
 // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
 include ':capacitor-android'
 project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
+
+include ':capacitor-community-barcode-scanner'
+project(':capacitor-community-barcode-scanner').projectDir = new File('../node_modules/@capacitor-community/barcode-scanner/android')
diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -256,10 +256,10 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
+			inputFileListPaths = (
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
+			outputFileListPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;

diff --git a/ios/App/App/config.xml b/ios/App/App/config.xml
@@ -2,10 +2,6 @@
 <widget version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
   <access origin="*" />
 
-  <feature name="QRScanner">
-    <param name="ios-package" value="QRScanner"/>
-  </feature>
-
   <feature name="SQLitePlugin">
     <param name="ios-package" value="SQLitePlugin"/>
   </feature>

diff --git a/ios/App/Podfile b/ios/App/Podfile
@@ -10,6 +10,7 @@ def capacitor_pods
   # Automatic Capacitor Pod dependencies, do not delete
   pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
+  pod 'CapacitorCommunityBarcodeScanner', :path => '../../node_modules/@capacitor-community/barcode-scanner'
   pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
   # Do not delete
 end