diff --git a/android/build.gradle b/android/build.gradle index a39a52f..cf2dba6 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,6 +25,17 @@ def getExtOrIntegerDefault(name) { return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties['ApphudSdk_' + name]).toInteger() } +def REACT_NATIVE_VERSION = new File(['node', '--print',"JSON.parse(require('fs').readFileSync(require.resolve('react-native/package.json'), 'utf-8')).version"].execute(null, rootDir).text.trim()) + +allprojects { + configurations.all { + resolutionStrategy { + // Remove this override in 0.65+, as a proper fix is included in react-native itself. + force "com.facebook.react:react-native:" + REACT_NATIVE_VERSION + } + } +} + android { compileSdkVersion getExtOrIntegerDefault('compileSdkVersion') buildToolsVersion getExtOrDefault('buildToolsVersion') @@ -126,7 +137,7 @@ def kotlin_version = getExtOrDefault('kotlinVersion') dependencies { // noinspection GradleDynamicVersion api 'com.facebook.react:react-native:+' + implementation 'com.apphud:ApphudSDK-Android:1.8.0' implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'com.github.apphud:ApphudSDK-Android:1.6.4' - implementation 'com.android.billingclient:billing:4.0.0' + implementation 'com.android.billingclient:billing:4.1.0' } diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..41d9927 Binary files /dev/null and b/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..41dfb87 --- /dev/null +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/android/gradlew b/android/gradlew new file mode 100755 index 0000000..1b6c787 --- /dev/null +++ b/android/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/android/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/android/src/main/java/com/reactnativeapphudsdk/ApphudDataTransformer.kt b/android/src/main/java/com/reactnativeapphudsdk/ApphudDataTransformer.kt index 09c0ba8..19f15a4 100644 --- a/android/src/main/java/com/reactnativeapphudsdk/ApphudDataTransformer.kt +++ b/android/src/main/java/com/reactnativeapphudsdk/ApphudDataTransformer.kt @@ -3,8 +3,12 @@ package com.reactnativeapphudsdk import com.android.billingclient.api.SkuDetails import com.apphud.sdk.ApphudPurchaseResult import com.apphud.sdk.domain.ApphudNonRenewingPurchase +import com.apphud.sdk.domain.ApphudPaywall import com.apphud.sdk.domain.ApphudProduct import com.apphud.sdk.domain.ApphudSubscription +import com.facebook.react.bridge.ReadableMap +import com.facebook.react.bridge.ReadableNativeArray +import com.facebook.react.bridge.WritableNativeArray import com.facebook.react.bridge.WritableNativeMap class ApphudDataTransformer { @@ -24,6 +28,53 @@ class ApphudDataTransformer { return result; } + fun getSkuDetailsMap(skuDetails: SkuDetails): WritableNativeMap { + val payload: WritableNativeMap = WritableNativeMap(); + payload.putString("price", skuDetails.price); + payload.putString("sku", skuDetails.sku); + payload.putString("description", skuDetails.description); + payload.putString("title", skuDetails.title); + payload.putString("freeTrialPeriod", skuDetails.freeTrialPeriod); + payload.putString("introductoryPrice", skuDetails.introductoryPrice); + payload.putString("introductoryPriceAmountMicros", skuDetails.introductoryPriceAmountMicros.toString()); + payload.putInt("introductoryPriceCycles", skuDetails.introductoryPriceCycles); + payload.putString("introductoryPricePeriod", skuDetails.introductoryPricePeriod); + payload.putString("priceAmountMicros", skuDetails.priceAmountMicros.toString()); + payload.putString("priceCurrencyCode", skuDetails.priceCurrencyCode); + payload.putString("subscriptionPeriod", skuDetails.subscriptionPeriod); + payload.putString("type", skuDetails.type); + payload.putString("originalPrice", skuDetails.originalPrice); + payload.putString("originalPriceAmountMicros", skuDetails.originalPriceAmountMicros.toString()); + return payload; + } + + fun getApphudProductMap(apphudProduct: ApphudProduct): WritableNativeMap { + val payload: WritableNativeMap = WritableNativeMap(); + payload.putString("id", apphudProduct.id); + payload.putString("productId", apphudProduct.product_id); + payload.putString("name", apphudProduct.name); + payload.putString("store", apphudProduct.store); + payload.putString("paywallId", apphudProduct.paywall_id); + payload.putString("paywallIdentifier", apphudProduct.paywall_identifier); + payload.putMap("product", apphudProduct.skuDetails?.let { getSkuDetailsMap(it) }); + return payload; + } + + fun getApphudPaywallMap(paywall: ApphudPaywall): WritableNativeMap { + val result: WritableNativeMap = WritableNativeMap(); + result.putString("identifier", paywall.identifier); + result.putBoolean("isDefault", paywall.default); + result.putString("experimentName", paywall.experimentName); + result.putString("variationName", paywall.variationName); + result.putString("json",paywall.json.toString()); + val array: WritableNativeArray = WritableNativeArray(); + paywall.products?.map { it + array.pushMap(getApphudProductMap(it)) + } + result.putArray("products", array) + return result; + } + fun getNonRenewingPurchaseMap(purchase: ApphudNonRenewingPurchase): WritableNativeMap { val item: WritableNativeMap = WritableNativeMap(); item.putString("productId", purchase.productId); @@ -71,5 +122,23 @@ class ApphudDataTransformer { return item; } + + fun getApphudProduct(args: ReadableMap): ApphudProduct { + val productId = args.getString("productId") ?: throw IllegalArgumentException("productId is required argument"); + val id = args.getString("id"); + val name = args.getString("name"); + val store = args.getString("store") ?: throw IllegalArgumentException("store is required argument"); + val paywallId = args.getString("paywallId"); + val paywallIdentifier = args.getString("paywallIdentifier"); + return ApphudProduct( + id = id, + product_id = productId, + name = name, + store = store, + paywall_id = paywallId, + skuDetails = null, + paywall_identifier = paywallIdentifier + ) + } } } diff --git a/android/src/main/java/com/reactnativeapphudsdk/ApphudListenerHandler.kt b/android/src/main/java/com/reactnativeapphudsdk/ApphudListenerHandler.kt new file mode 100644 index 0000000..1ce2b3b --- /dev/null +++ b/android/src/main/java/com/reactnativeapphudsdk/ApphudListenerHandler.kt @@ -0,0 +1,40 @@ +package com.reactnativeapphudsdk + +import com.android.billingclient.api.SkuDetails +import com.apphud.sdk.ApphudListener +import com.apphud.sdk.domain.ApphudPaywall +import com.facebook.react.bridge.ReactApplicationContext +import com.facebook.react.bridge.ReactContextBaseJavaModule +import com.facebook.react.modules.core.DeviceEventManagerModule + +class ApphudListenerHandler(private val reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext), ApphudListener { + private var isListeningStarted: Boolean = false + private var paywallsCached: List? = null + + override fun apphudDidChangeUserID(userId: String) { + TODO("Not yet implemented") + } + + override fun apphudFetchSkuDetailsProducts(details: List) { + TODO("Not yet implemented") + } + + override fun paywallsDidFullyLoad(paywalls: List) { + paywallsCached = paywalls; + if (isListeningStarted) { + val resultMap = hashMapOf() + resultMap["paywalls"] = paywalls.map { paywall -> ApphudDataTransformer.getApphudPaywallMap(paywall) } + reactContext + .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java) + .emit("paywallsDidFullyLoad", resultMap); + } + } + + override fun userDidLoad() { + TODO("Not yet implemented") + } + + override fun getName(): String { + return "ApphudSdkEvents"; + } +} diff --git a/android/src/main/java/com/reactnativeapphudsdk/ApphudSdkModule.kt b/android/src/main/java/com/reactnativeapphudsdk/ApphudSdkModule.kt index 7cbe3ef..e3b3e87 100644 --- a/android/src/main/java/com/reactnativeapphudsdk/ApphudSdkModule.kt +++ b/android/src/main/java/com/reactnativeapphudsdk/ApphudSdkModule.kt @@ -1,7 +1,9 @@ package com.reactnativeapphudsdk import com.apphud.sdk.Apphud import com.apphud.sdk.ApphudAttributionProvider +import com.apphud.sdk.ApphudListener import com.apphud.sdk.ApphudUserPropertyKey +import com.apphud.sdk.domain.ApphudProduct import com.apphud.sdk.managers.HeadersInterceptor import com.facebook.react.bridge.* import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter @@ -17,7 +19,7 @@ class ApphudSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ init { HeadersInterceptor.X_SDK = "reactnative"; - HeadersInterceptor.X_SDK_VERSION = "1.0.7"; + HeadersInterceptor.X_SDK_VERSION = "1.1.0"; Apphud.productsFetchCallback { var arr: WritableNativeArray = WritableNativeArray(); it.map { s -> arr.pushMap(ApphudDataTransformer.getProductMap(s)) } @@ -93,6 +95,24 @@ class ApphudSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ }; } + @ReactMethod + fun purchaseProduct(args: ReadableMap, promise: Promise) { + this.currentActivity?.let { + try { + var product = ApphudDataTransformer.getApphudProduct(args) + val sku = Apphud.product(product.product_id) + product.skuDetails = sku + Apphud.purchase(it, product) { res -> + val result: WritableNativeArray = WritableNativeArray(); + result.pushMap(ApphudDataTransformer.getPurchaseMap(res)); + promise.resolve(result); + } + } catch (error: Error) { + promise.reject(this.name, error.message); + } + }; + } + @ReactMethod fun syncPurchases(promise: Promise) { Apphud.syncPurchases(); @@ -169,6 +189,16 @@ class ApphudSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ ); } + @ReactMethod + fun paywallsDidLoadCallback(promise: Promise) { + val paywalls = Apphud.paywalls(); + val result: WritableNativeArray = WritableNativeArray(); + for (paywall in paywalls) { + result.pushMap(ApphudDataTransformer.getApphudPaywallMap(paywall)); + } + promise.resolve(result); + } + @ReactMethod fun setUserProperty(key: String, value: String, setOnce: Boolean, promise: Promise) { val label = getUserPropertyKey(key); @@ -204,6 +234,16 @@ class ApphudSdkModule(reactContext: ReactApplicationContext) : ReactContextBaseJ } } + @ReactMethod + fun optOutOfTracking(promise: Promise) { + promise.resolve(Apphud.optOutOfTracking()); + } + + @ReactMethod + fun collectDeviceIdentifiers(promise: Promise) { + promise.resolve(Apphud.collectDeviceIdentifiers()); + } + private fun getUserPropertyKey(key: String): ApphudUserPropertyKey { return when (key) { "age" -> ApphudUserPropertyKey.Age diff --git a/example/android/gradle.properties b/example/android/gradle.properties index 369dd63..3f1063c 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -10,7 +10,7 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. # Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/example/ios/Podfile b/example/ios/Podfile index fed36c2..1d4ea95 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -9,7 +9,6 @@ target 'ApphudSdkExample' do use_react_native!(:path => config["reactNativePath"]) pod 'react-native-apphud-sdk', :path => '../..' - pod 'ApphudSDK', :git => 'https://github.com/apphud/ApphudSDK.git', :branch => 'master' # Enables Flipper. # diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index f53ab4f..d2fb9e7 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - ApphudSDK (2.8.6) + - ApphudSDK (2.8.8) - boost-for-react-native (1.63.0) - DoubleConversion (1.1.6) - FBLazyVector (0.63.4) @@ -186,8 +186,8 @@ PODS: - React-cxxreact (= 0.63.4) - React-jsi (= 0.63.4) - React-jsinspector (0.63.4) - - react-native-apphud-sdk (1.0.7): - - ApphudSDK (= 2.8.6) + - react-native-apphud-sdk (1.0.9): + - ApphudSDK (= 2.8.8) - React-Core - react-native-safe-area-context (3.1.9): - React-Core @@ -264,7 +264,6 @@ PODS: - Yoga (1.14.0) DEPENDENCIES: - - ApphudSDK (from `https://github.com/apphud/ApphudSDK.git`, branch `master`) - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`) @@ -303,12 +302,10 @@ DEPENDENCIES: SPEC REPOS: trunk: + - ApphudSDK - boost-for-react-native EXTERNAL SOURCES: - ApphudSDK: - :branch: master - :git: https://github.com/apphud/ApphudSDK.git DoubleConversion: :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec" FBLazyVector: @@ -376,13 +373,8 @@ EXTERNAL SOURCES: Yoga: :path: "../node_modules/react-native/ReactCommon/yoga" -CHECKOUT OPTIONS: - ApphudSDK: - :commit: 3d299069829053f3fb0d93a693107bd688aec1fa - :git: https://github.com/apphud/ApphudSDK.git - SPEC CHECKSUMS: - ApphudSDK: 244d8554b544459d897ce47f6738d69ffb71792e + ApphudSDK: ef62166ff111404f1fa01a4cd4552d266b778565 boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c DoubleConversion: cde416483dac037923206447da6e1454df403714 FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e @@ -399,7 +391,7 @@ SPEC CHECKSUMS: React-jsi: a0418934cf48f25b485631deb27c64dc40fb4c31 React-jsiexecutor: 93bd528844ad21dc07aab1c67cb10abae6df6949 React-jsinspector: 58aef7155bc9a9683f5b60b35eccea8722a4f53a - react-native-apphud-sdk: 7ff566a350960b0ecb3fa577d8244b30be7dc510 + react-native-apphud-sdk: 6581503c0fcf4750c4cfb0f0a6819e038742523f react-native-safe-area-context: b6e0e284002381d2ff29fa4fff42b4d8282e3c94 React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336 React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b @@ -418,6 +410,6 @@ SPEC CHECKSUMS: RNVectorIcons: f67a1abce2ec73e62fe4606e8110e95a832bc859 Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6 -PODFILE CHECKSUM: c1ffe5e1cfd925f00c6a8695775eabb479d2c723 +PODFILE CHECKSUM: 70aea2052840aa61851dd078eb45848c403a1df0 COCOAPODS: 1.11.3 diff --git a/example/src/screens/ActionsScreen.tsx b/example/src/screens/ActionsScreen.tsx index 8cac8a5..59d49a8 100644 --- a/example/src/screens/ActionsScreen.tsx +++ b/example/src/screens/ActionsScreen.tsx @@ -80,13 +80,13 @@ export default function ActionsScreen({ navigation }: Props) { Сheck is Non-renewing Purchase + navigation.navigate('Purchase')}> + + Purchase by id + + {Platform.OS === 'android' && ( <> - navigation.navigate('Purchase')}> - - Purchase by id - - { ApphudSdk.subscriptions() @@ -138,6 +138,19 @@ export default function ActionsScreen({ navigation }: Props) { Get User ID + { + ApphudSdk.paywallsDidLoadCallback() + .then((data) => { + Alert.alert('paywalls', JSON.stringify(data)); + }) + .catch(errorHandler); + }} + > + + Get paywalls + + ); } diff --git a/example/src/screens/HomeScreen.tsx b/example/src/screens/HomeScreen.tsx index af387ea..8ff2d78 100644 --- a/example/src/screens/HomeScreen.tsx +++ b/example/src/screens/HomeScreen.tsx @@ -7,7 +7,9 @@ import type { StackScreenProps } from '@react-navigation/stack'; export type Props = StackScreenProps; export default function HomeScreen({ navigation }: Props) { - const [apiKey, setApiKey] = React.useState(''); + const [apiKey, setApiKey] = React.useState( + 'app_4sY9cLggXpMDDQMmvc5wXUPGReMp8G' + ); const [userId, setUserId] = React.useState(null); const [deviceId, setDeviceId] = React.useState(null); const onStartHandler = () => { diff --git a/example/src/screens/PurchaseScreen.tsx b/example/src/screens/PurchaseScreen.tsx index 84a5603..a2da965 100644 --- a/example/src/screens/PurchaseScreen.tsx +++ b/example/src/screens/PurchaseScreen.tsx @@ -4,9 +4,10 @@ import { Button, Input } from 'react-native-elements'; import ApphudSdk from '@apphud/react-native-apphud-sdk'; export default function PurchaseScreen() { - const [productId, setProductId] = React.useState(null); + const [productId, setProductId] = React.useState('com.apphud.lifetime'); + const [paywallId, setPaywallId] = React.useState('e2313cea'); const onPurchaseHandler = () => { - ApphudSdk.purchase(productId).then((result) => { + ApphudSdk.purchaseProduct({ productId, paywallId }).then((result) => { Alert.alert('purchase result', JSON.stringify(result)); }); }; @@ -17,6 +18,11 @@ export default function PurchaseScreen() { value={productId} onChangeText={setProductId} /> +