Merge pull request #1724 from numbersprotocol/develop

Develop
numbersprotocol · Jun 21, 2022 · 56e852a · 56e852a
2 parents c485e6d + c19752a
commit 56e852a
Show file tree

Hide file tree

Showing 52 changed files with 1,523 additions and 85 deletions.
diff --git a/.github/workflows/build-apks.yml b/.github/workflows/build-apks.yml
@@ -40,7 +40,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '16.15.0'
 
       - name: Check if version has been updated
         id: version_check
@@ -54,6 +54,7 @@ jobs:
           NUMBERS_STORAGE_BASE_URL: ${{ secrets[matrix.storage_base_url] }}
           NUMBERS_STORAGE_TRUSTED_CLIENT_KEY: ${{ secrets[matrix.storage_trusted_client_key] }}
           NUMBERS_BUBBLE_DB_URL: ${{ secrets[matrix.bubble_db_url] }}
+          BUBBLE_API_URL: ${{ secrets.BUBBLE_API_URL }}
         run: |
           npm install -g @ionic/cli
           npm install

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '16.15.0'
 
       - name: Install Ionic CLI
         run: npm install -g @ionic/cli
@@ -34,7 +34,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '16.15.0'
 
       - name: Install Ionic CLI
         run: npm install -g @ionic/cli
@@ -63,7 +63,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '16.15.0'
 
       - name: Install Ionic CLI
         run: npm install -g @ionic/cli
@@ -76,6 +76,7 @@ jobs:
           NUMBERS_STORAGE_BASE_URL: ${{ secrets.NUMBERS_STORAGE_BASE_URL }}
           NUMBERS_STORAGE_TRUSTED_CLIENT_KEY: ${{ secrets.NUMBERS_STORAGE_TRUSTED_CLIENT_KEY }}
           NUMBERS_BUBBLE_DB_URL: ${{ secrets.NUMBERS_BUBBLE_DB_URL }}
+          BUBBLE_API_URL: ${{ secrets.BUBBLE_API_URL }}
         run: npm run build
 
       - name: Build Android
@@ -96,7 +97,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '16.15.0'
 
       - name: Install Ionic CLI
         run: npm install -g @ionic/cli
@@ -109,6 +110,7 @@ jobs:
           NUMBERS_STORAGE_BASE_URL: ${{ secrets.NUMBERS_STORAGE_BASE_URL }}
           NUMBERS_STORAGE_TRUSTED_CLIENT_KEY: ${{ secrets.NUMBERS_STORAGE_TRUSTED_CLIENT_KEY }}
           NUMBERS_BUBBLE_DB_URL: ${{ secrets.NUMBERS_BUBBLE_DB_URL }}
+          BUBBLE_API_URL: ${{ secrets.BUBBLE_API_URL }}
         run: npm run build
 
       - name: Import the Code-Signing PKCS12 Certificate

diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -15,7 +15,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '16.15.0'
 
       - name: Check if version has been updated
         id: version_check
@@ -30,6 +30,7 @@ jobs:
           NUMBERS_STORAGE_BASE_URL: ${{ secrets.NUMBERS_STORAGE_BASE_URL }}
           NUMBERS_STORAGE_TRUSTED_CLIENT_KEY: ${{ secrets.NUMBERS_STORAGE_TRUSTED_CLIENT_KEY }}
           NUMBERS_BUBBLE_DB_URL: ${{ secrets.NUMBERS_BUBBLE_DB_URL }}
+          BUBBLE_API_URL: ${{ secrets.BUBBLE_API_URL }}
         run: |
           npm install -g @ionic/cli
           npm install
@@ -75,7 +76,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '16.15.0'
 
       - name: Check if version has been updated
         id: version_check
@@ -90,6 +91,7 @@ jobs:
           NUMBERS_STORAGE_BASE_URL: ${{ secrets.NUMBERS_STORAGE_BASE_URL }}
           NUMBERS_STORAGE_TRUSTED_CLIENT_KEY: ${{ secrets.NUMBERS_STORAGE_TRUSTED_CLIENT_KEY }}
           NUMBERS_BUBBLE_DB_URL: ${{ secrets.NUMBERS_BUBBLE_DB_URL }}
+          BUBBLE_API_URL: ${{ secrets.BUBBLE_API_URL }}
         run: |
           npm install -g @ionic/cli
           npm install
@@ -185,7 +187,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '16.15.0'
 
       - name: Check if version has been updated
         id: version_check
@@ -199,6 +201,7 @@ jobs:
           NUMBERS_STORAGE_BASE_URL: ${{ secrets[matrix.storage_base_url] }}
           NUMBERS_STORAGE_TRUSTED_CLIENT_KEY: ${{ secrets[matrix.storage_trusted_client_key] }}
           NUMBERS_BUBBLE_DB_URL: ${{ secrets[matrix.bubble_db_url] }}
+          BUBBLE_API_URL: ${{ secrets.BUBBLE_API_URL }}
         run: |
           npm install -g @ionic/cli
           npm install
@@ -227,7 +230,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '16.15.0'
 
       - name: Check if version has been updated
         id: version_check
@@ -242,6 +245,7 @@ jobs:
           NUMBERS_STORAGE_BASE_URL: ${{ secrets.NUMBERS_STORAGE_BASE_URL }}
           NUMBERS_STORAGE_TRUSTED_CLIENT_KEY: ${{ secrets.NUMBERS_STORAGE_TRUSTED_CLIENT_KEY }}
           NUMBERS_BUBBLE_DB_URL: ${{ secrets.NUMBERS_BUBBLE_DB_URL }}
+          BUBBLE_API_URL: ${{ secrets.BUBBLE_API_URL }}
         run: |
           npm install -g @ionic/cli
           npm install

diff --git a/.github/workflows/uiux-release.yml b/.github/workflows/uiux-release.yml
@@ -13,13 +13,14 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '16.15.0'
 
       - name: Build Ionic
         env:
           NUMBERS_STORAGE_BASE_URL: ${{ secrets.NUMBERS_STORAGE_BASE_URL }}
           NUMBERS_STORAGE_TRUSTED_CLIENT_KEY: ${{ secrets.NUMBERS_STORAGE_TRUSTED_CLIENT_KEY }}
           NUMBERS_BUBBLE_DB_URL: ${{ secrets.NUMBERS_BUBBLE_DB_URL }}
+          BUBBLE_API_URL: ${{ secrets.BUBBLE_API_URL }}
         run: |
           npm install -g @ionic/cli
           npm install

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,19 @@ 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.59.0 - 2222-06-21
+
+### Added
+
+- In App Purchase NUM points
+- In App Upgrade nontification
+- Integration with Apps Flyer SDK
+
+### Fixed
+
+- Fix phone verification error messages on phone submit
+- Show capture options menu regardless of backend response
+
 ## 0.58.2 - 2022-06-07
 
 ### Fixed

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "io.numbersprotocol.capturelite"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 402
-        versionName "0.58.2"
+        versionCode 410
+        versionName "0.59.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildFeatures {

diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle
@@ -9,6 +9,7 @@ android {
 
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
+    implementation project(':capacitor-community-advertising-id')
     implementation project(':capacitor-community-bluetooth-le')
     implementation project(':capacitor-community-http')
     implementation project(':capacitor-community-wifi')
@@ -27,8 +28,9 @@ dependencies {
     implementation project(':capacitor-storage')
     implementation project(':numbersprotocol-preview-camera')
     implementation project(':numbersprotocol-preview-video')
+    implementation project(':appsflyer-capacitor-plugin')
     implementation project(':capacitor-blob-writer')
-
+    implementation "com.android.billingclient:billing:4.0.0"
 }
 
 

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -44,6 +44,8 @@
     <!-- Needed only if your app communicates with already-paired Bluetooth
         devices. -->
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <!-- For in-app purchases -->
+    <uses-permission android:name="com.android.vending.BILLING" />
 
 
     <queries>

diff --git a/android/app/src/main/assets/capacitor.plugins.json b/android/app/src/main/assets/capacitor.plugins.json
@@ -1,4 +1,8 @@
 [
+	{
+		"pkg": "@capacitor-community/advertising-id",
+		"classpath": "com.thomasvidas.advertising.AdvertisingIdPlugin"
+	},
 	{
 		"pkg": "@capacitor-community/bluetooth-le",
 		"classpath": "com.capacitorjs.community.plugins.bluetoothle.BluetoothLe"
@@ -71,6 +75,10 @@
 		"pkg": "@numbersprotocol/preview-video",
 		"classpath": "io.numbersprotocol.capturelite.plugins.previewvideo.PreviewVideoPlugin"
 	},
+	{
+		"pkg": "appsflyer-capacitor-plugin",
+		"classpath": "capacitor.plugin.appsflyer.sdk.AppsFlyerPlugin"
+	},
 	{
 		"pkg": "capacitor-blob-writer",
 		"classpath": "com.equimaps.capacitorblobwriter.BlobWriter"

diff --git a/android/app/src/main/res/xml/config.xml b/android/app/src/main/res/xml/config.xml
@@ -2,5 +2,9 @@
 <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="InAppBillingPlugin">
+    <param name="android-package" value="cc.fovea.PurchasePlugin"/>
+  </feature>
+
 
 </widget>
diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
@@ -2,6 +2,9 @@
 include ':capacitor-android'
 project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
 
+include ':capacitor-community-advertising-id'
+project(':capacitor-community-advertising-id').projectDir = new File('../node_modules/@capacitor-community/advertising-id/android')
+
 include ':capacitor-community-bluetooth-le'
 project(':capacitor-community-bluetooth-le').projectDir = new File('../node_modules/@capacitor-community/bluetooth-le/android')
 
@@ -56,5 +59,8 @@ project(':numbersprotocol-preview-camera').projectDir = new File('../node_module
 include ':numbersprotocol-preview-video'
 project(':numbersprotocol-preview-video').projectDir = new File('../node_modules/@numbersprotocol/preview-video/android')
 
+include ':appsflyer-capacitor-plugin'
+project(':appsflyer-capacitor-plugin').projectDir = new File('../node_modules/appsflyer-capacitor-plugin/android')
+
 include ':capacitor-blob-writer'
 project(':capacitor-blob-writer').projectDir = new File('../node_modules/capacitor-blob-writer/android')
diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -31,6 +31,7 @@
 		AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
 		DE095CFF277AF00900242276 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
+		DE2706742854C3960046512E /* Configuration.storekit */ = {isa = PBXFileReference; lastKnownFileType = text; path = Configuration.storekit; sourceTree = "<group>"; };
 		DE28998F27B790A900F6581C /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
 		FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.debug.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -58,6 +59,7 @@
 		504EC2FB1FED79650016851F = {
 			isa = PBXGroup;
 			children = (
+				DE2706742854C3960046512E /* Configuration.storekit */,
 				504EC3061FED79650016851F /* App */,
 				504EC3051FED79650016851F /* Products */,
 				7F8756D8B27F46E3366F6CEA /* Pods */,

diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist
@@ -86,5 +86,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>
+	<key>NSUserTrackingUsageDescription</key>
+	<string>We collect your data only for counting download numbers and will never share it with any 3rd party</string>
 </dict>
 </plist>
diff --git a/ios/App/App/config.xml b/ios/App/App/config.xml
@@ -2,5 +2,10 @@
 <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="InAppPurchase">
+    <param name="ios-package" value="InAppPurchase"/>
+    <param name="onload" value="true"/>
+  </feature>
+
 
 </widget>
diff --git a/ios/App/Configuration.storekit b/ios/App/Configuration.storekit
@@ -0,0 +1,78 @@
+{
+  "identifier" : "509552BA",
+  "nonRenewingSubscriptions" : [
+
+  ],
+  "products" : [
+    {
+      "displayPrice" : "0.99",
+      "familyShareable" : false,
+      "internalID" : "68D9071C",
+      "localizations" : [
+        {
+          "description" : "Bronze Pack (Description)",
+          "displayName" : "Bronze Pack",
+          "locale" : "en_US"
+        }
+      ],
+      "productID" : "cap_lite_consumable_bronze_pack_099",
+      "referenceName" : "Bronze Pack",
+      "type" : "Consumable"
+    },
+    {
+      "displayPrice" : "1.99",
+      "familyShareable" : false,
+      "internalID" : "9A0F041B",
+      "localizations" : [
+        {
+          "description" : "Silver Pack (Description)",
+          "displayName" : "Silver Pack",
+          "locale" : "en_US"
+        }
+      ],
+      "productID" : "cap_lite_consumable_silver_pack_199",
+      "referenceName" : "Silver Pack",
+      "type" : "Consumable"
+    },
+    {
+      "displayPrice" : "2.99",
+      "familyShareable" : false,
+      "internalID" : "D92B12C1",
+      "localizations" : [
+        {
+          "description" : "Gold Pack (Description)",
+          "displayName" : "Gold Pack",
+          "locale" : "en_US"
+        }
+      ],
+      "productID" : "cap_lite_consumable_gold_pack_299",
+      "referenceName" : "Gold Pack",
+      "type" : "Consumable"
+    },
+    {
+      "displayPrice" : "3.99",
+      "familyShareable" : false,
+      "internalID" : "D0441E1B",
+      "localizations" : [
+        {
+          "description" : "Platinum Pack (Description)",
+          "displayName" : "Platinum Pack",
+          "locale" : "en_US"
+        }
+      ],
+      "productID" : "cap_lite_consumable_platinum_pack_399",
+      "referenceName" : "Platinum Pack",
+      "type" : "Consumable"
+    }
+  ],
+  "settings" : {
+
+  },
+  "subscriptionGroups" : [
+
+  ],
+  "version" : {
+    "major" : 1,
+    "minor" : 2
+  }
+}
diff --git a/ios/App/Podfile b/ios/App/Podfile
@@ -9,6 +9,7 @@ install! 'cocoapods', :disable_input_output_paths => true
 def capacitor_pods
   pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
   pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
+  pod 'CapacitorCommunityAdvertisingId', :path => '../../node_modules/@capacitor-community/advertising-id'
   pod 'CapacitorCommunityBluetoothLe', :path => '../../node_modules/@capacitor-community/bluetooth-le'
   pod 'CapacitorCommunityHttp', :path => '../../node_modules/@capacitor-community/http'
   pod 'CapacitorCommunityWifi', :path => '../../node_modules/@capacitor-community/wifi'
@@ -27,7 +28,9 @@ def capacitor_pods
   pod 'CapacitorStorage', :path => '../../node_modules/@capacitor/storage'
   pod 'NumbersprotocolPreviewCamera', :path => '../../node_modules/@numbersprotocol/preview-camera'
   pod 'NumbersprotocolPreviewVideo', :path => '../../node_modules/@numbersprotocol/preview-video'
+  pod 'AppsflyerCapacitorPlugin', :path => '../../node_modules/appsflyer-capacitor-plugin'
   pod 'CapacitorBlobWriter', :path => '../../node_modules/capacitor-blob-writer'
+  pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
 end
 
 target 'App' do