Update sdk; add fasterpay payment method; change amount type to BigDecimal

.gitignore

@@ -1 +1,4 @@
-ignore something
+ignore something
+Demo/AndroidStudio_mirror
+*/.DS_Store
+*/.idea

Demo/AndroidStudio/.gitignore

@@ -1,8 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
+.idea
 .DS_Store
 /build
 /captures

Demo/AndroidStudio/app/build.gradle

@@ -4,11 +4,12 @@ android {
     compileSdkVersion 28
     defaultConfig {
         applicationId "com.paymentwall.pwsdkdemo"
-        minSdkVersion 14
-        targetSdkVersion 26
+        minSdkVersion 15
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        multiDexEnabled true
     }
     buildTypes {
         release {
@@ -22,15 +23,16 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:28.0.0'
-    testCompile 'junit:junit:4.12'
-    compile 'com.squareup.picasso:picasso:2.5.2'
-    compile 'com.squareup.okhttp:okhttp:2.2.0'
-    compile project(':alipaySdk-15.6.5-20190718211148')
-    compile project(':alipayadapter-release')
-    compile project(':paymentwall-android-sdk')
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    testImplementation 'junit:junit:4.12'
+    implementation 'com.squareup.picasso:picasso:2.5.2'
+    implementation 'com.squareup.okhttp:okhttp:2.2.0'
+    implementation project(':alipaySdk-15.6.5-20190718211148')
+    implementation project(':alipayadapter-release')
+    implementation project(":paymentwall-android-sdk")
+    implementation "com.fasterpay:fasterpay-android-sdk:1.0"
 }

Demo/AndroidStudio/app/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.paymentwall.testpandalib">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -18,7 +19,8 @@
         android:label="@string/app_name"
         android:icon="@mipmap/ic_launcher"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:replace="android:allowBackup">
 
         <service android:name=".BrickService"/>
 

Demo/AndroidStudio/app/src/main/java/com/paymentwall/testpandalib/Constants.java

@@ -1,5 +1,7 @@
 package com.paymentwall.testpandalib;
 
+import java.math.BigDecimal;
+
 /**
  * Created by nguyen.anh on 9/14/2016.
  */
@@ -9,7 +11,7 @@ public class Constants {
     public static final String PW_PROJECT_KEY = "YOUR_APP_KEY";
     public static final String PW_SECRET_KEY = "YOUR_SECRET_KEY";
 
-    public static final double AMOUNT = 0.01;
+    public static final BigDecimal AMOUNT = new BigDecimal(0.01);
     public static final String CURRENCY = "USD";
     public static final String ITEM_NAME = "Test item";
     public static final String ITEM_ID = "testitem1";

Demo/AndroidStudio/app/src/main/java/com/paymentwall/testpandalib/MainActivity.java

@@ -14,6 +14,8 @@
 import com.paymentwall.pwunifiedsdk.util.ResponseCode;
 import com.paymentwall.sdk.pwlocal.utils.Const;
 
+import java.util.UUID;
+
 /**
  * Created by andy.ha on 9/14/2016.
  */
@@ -62,6 +64,7 @@ private void startPayment() {
         request.addPwlocalParams(Const.P.EMAIL, "fixed");
         request.addPwlocalParams(Const.P.WIDGET, "pw");
         request.addPwlocalParams(Const.P.EVALUATION, "1");
+        request.getFasterPayRequest();
 
 
         PsAlipay alipay = new PsAlipay();
@@ -75,6 +78,12 @@ private void startPayment() {
         ExternalPs alipayPs = new ExternalPs("alipay", "Alipay", 0, alipay);
         request.add(alipayPs);
 
+        request.addFasterPay(
+            "your_key",
+            UUID.randomUUID().toString(),
+            "Demo description"
+        );
+
         Intent intent = new Intent(getApplicationContext(), PaymentSelectionActivity.class);
         intent.putExtra(Key.REQUEST_MESSAGE, request);
         startActivityForResult(intent, PaymentSelectionActivity.REQUEST_CODE);

Demo/AndroidStudio/build.gradle

@@ -21,7 +21,7 @@ allprojects {
 }
 
 ext {
-    minSdkVersion = 14
+    minSdkVersion = 15
     targetSdkVersion = 25
     compileSdkVersion = 25
     supportLibraryVersion = "25.1.1"

Demo/AndroidStudio/settings.gradle

@@ -1 +1 @@
-include ':app', ':alipayadapter-release', ':paymentwall-android-sdk', ':alipaySdk-15.6.5-20190718211148'
+include ':app', ':alipayadapter-release', ':alipaySdk-15.6.5-20190718211148', ':paymentwall-android-sdk'

README.md

@@ -7,18 +7,18 @@ Paymentwall is a global mobile payment gateway that accepts payments from more t
 
 ## HOW DOES IT WORK?
 1. Compile the library url or add jar to your project. 
-      With different areas, we provide corresponding external payment system jar files. You can add as many as you want. You can also enable/disable default payment options too. You can add any payment option as they want by importing the payment system library and library adapter provided by Paymentwall to their project
+      With different areas, we provide corresponding external payment system jar files. You can add as many as you want. You can also enable/disable default payment options too. You can add any payment option as they want by importing the payment system library and library adapter provided by Paymentwall to their project. If you want to use FasterPay payment option then you should add a [FasterPay dependency](https://github.com/FasterPay/fasterpay-android) to your project.  
 2. User requests a purchase inside your application.
-3. Paymentwall SDK initializes payment screen with 3 core payment options (Brick, MINT, Mobiamo) and the other is “Local Payments” option. 
+3. Paymentwall SDK initializes payment screen with 4 core payment options (Brick, MINT, Mobiamo, FasterPay) and the other is “Local Payments” option. 
 4. User initiates payment in-app 
       With Brick, Mint, Mobiamo the payment process will totally be native.
       With local payments, local payment screen will be shown with payment methods corresponding to user’s current location. Here users can then select a payment option they prefer.
 
 ## REQUIREMENTS
-Android 4.0.1 (API level 14) and above.
+Android 4.0.4 (API level 15) and above.
 
 ## CREDENTIALS
-Paymentwall SDK integration requires a project key. Obtain these Paymentwall API credentials in the application settings of your Merchant Account at paymentwall.com
+Paymentwall SDK integration requires a project key. Obtain these Paymentwall API credentials in the application settings of your Merchant Account at paymentwall.com. FasterPay integration requires a public key. Please check our [FasterPay FAQ](https://www.fasterpay.com/support) for details.
 
 ## ADD CORE SDK
 - [See CoreSDK integration instruction](https://github.com/paymentwall/paymentwall-android-sdk/tree/master/Core%20SDK/README.md)