Release/1.1.0 (#4)

* updated copyright * release v1.1.0 * release v1.1.0 * updated deps --------- Co-authored-by: MatusChomaGetnetEurope <[email protected]> Co-authored-by: matus.choma <[email protected]>
getneteurope · May 22, 2023 · 2e82152 · 2e82152
1 parent 1d7e243
commit 2e82152
Show file tree

Hide file tree

Showing 78 changed files with 614 additions and 146 deletions.
diff --git a/LICENSE b/LICENSE
@@ -3,7 +3,7 @@ Payment SDK – MIT License |Open Source
 Recitals: PagoNxt will offer the payment SDK free of charge, to any person obtaining a copy of this software and associated documentation files under the conditions below. User has to verify the effects of Payment SDK on the implemented environment and will do that at its own risk. Digital downloads are software products. Their contents are protected under copyright and intellectual property law.
 
 
-Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.  All rights reserved.
+Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,28 +1,29 @@
 /*
- * Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U. All rights reserved.
+ * Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
+ * You may not use this file except in compliance with the License which is available at https://mit-license.org/
  */
 
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 32
-
+    compileSdkVersion 33
     defaultConfig {
-        multiDexEnabled true
         applicationId "com.sdkpay.ecom.examples"
         minSdkVersion 23
-        targetSdkVersion 32
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion 33
+        versionCode 2
+        versionName "1.1.0"
         flavorDimensions "default"
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     compileOptions {
-        targetCompatibility JavaVersion.VERSION_1_8
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
     }
 
     buildTypes {
@@ -32,6 +33,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt')
         }
     }
+    configurations {
+        all {
+            exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx'
+        }
+    }
 
     productFlavors {
         normal {
@@ -45,19 +51,15 @@ android {
     }
 }
 
-repositories {
-    mavenLocal()
-}
-
 apply from: 'libs/dependencies.gradle'
 
 dependencies {
 
     implementation 'androidx.annotation:annotation:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    testImplementation "junit:junit:4.13.2"
+    androidTestImplementation "androidx.test.ext:junit:1.1.5"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
 
     implementation files('libs/alipay.aar')
     implementation files('libs/camera.aar')
@@ -67,5 +69,9 @@ dependencies {
     implementation files('libs/paypal.aar')
     implementation files('libs/sepa.aar')
     implementation files('libs/wiretransfer.aar')
+    implementation files('libs/sofort.aar')
+    implementation files('libs/ratepay.aar')
+    implementation files('libs/blik.aar')
+    implementation files('libs/bizum.aar')
 
-}
+}
diff --git a/app/gradle.properties b/app/gradle.properties
@@ -1,5 +1,6 @@
 #
-# Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U. All rights reserved.
+# Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
+# You may not use this file except in compliance with the License which is available at https://mit-license.org/
 #
 
 # Project-wide Gradle settings.

diff --git a/app/gradle/wrapper/gradle-wrapper.properties b/app/gradle/wrapper/gradle-wrapper.properties
@@ -1,10 +1,11 @@
 #
-# Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U. All rights reserved.
+# Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
+# You may not use this file except in compliance with the License which is available at https://mit-license.org/
 #
 
 #Tue Nov 20 10:58:56 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/app/gradlew b/app/gradlew
@@ -1,7 +1,8 @@
 #!/usr/bin/env sh
 
 #
-# Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U. All rights reserved.
+# Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
+# You may not use this file except in compliance with the License which is available at https://mit-license.org/
 #
 
 ##############################################################################

diff --git a/app/libs/alipay.aar b/app/libs/alipay.aar
diff --git a/app/libs/bizum.aar b/app/libs/bizum.aar
diff --git a/app/libs/blik.aar b/app/libs/blik.aar
diff --git a/app/libs/camera.aar b/app/libs/camera.aar
diff --git a/app/libs/card.aar b/app/libs/card.aar
diff --git a/app/libs/core.aar b/app/libs/core.aar
diff --git a/app/libs/dependencies.gradle b/app/libs/dependencies.gradle
@@ -1,44 +1,56 @@
 /*
- * Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U. All rights reserved.
+ * Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
+ * You may not use this file except in compliance with the License which is available at https://mit-license.org/
  */
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation 'androidx.activity:activity-ktx:1.4.0'
-    implementation 'androidx.fragment:fragment-ktx:1.4.0'
-    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
+    def kotlinVersion = "1.8.20"
+    def appCompat = "1.6.1"
+    def material = "1.8.0"
+    def actvityKtx = "1.7.1"
+    def fragmentKtx = "1.5.7"
+    def rxKotlin = "2.2.0"
+    def rxAndroid = "2.1.0"
+    def constraint = "2.1.4"
+    def coreKtx = "1.10.0"
+    def lifecycleRuntimeKtx = "2.2.0"
+    def camerax = "1.0.2"
 
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
-    implementation 'io.reactivex.rxjava2:rxkotlin:2.2.0'
+    implementation "androidx.appcompat:appcompat:$appCompat"
+    implementation "com.google.android.material:material:$material"
+    implementation "androidx.activity:activity-ktx:$actvityKtx"
+    implementation "androidx.fragment:fragment-ktx:$fragmentKtx"
+    implementation "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
 
-    implementation 'com.squareup.retrofit2:retrofit:2.6.1'
-    implementation 'com.squareup.retrofit2:converter-simplexml:2.3.0'
-    implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.11.0'
+    implementation "io.reactivex.rxjava2:rxkotlin:$rxKotlin"
+    implementation "io.reactivex.rxjava2:rxandroid:$rxAndroid"
+
+    implementation "com.squareup.retrofit2:retrofit:2.6.1"
+    implementation "com.squareup.retrofit2:converter-simplexml:2.3.0"
+    implementation "com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0"
+    implementation "com.squareup.okhttp3:logging-interceptor:3.11.0"
     implementation('org.simpleframework:simple-xml:2.7.1') {
         exclude group: 'stax', module: 'stax-api'
         exclude group: 'xpp3', module: 'xpp3'
     }
-    implementation 'com.scottyab:rootbeer-lib:0.1.0'
+    implementation "com.scottyab:rootbeer-lib:0.1.0"
     implementation "com.github.chuckerteam.chucker:library-no-op:3.5.2"
 
-    def kotlin_version = '1.0.2'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.2'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.2.0'
-    implementation 'com.jakewharton.timber:timber:4.7.1'
-    def camerax_version = '1.0.2'
-    implementation "androidx.camera:camera-camera2:$camerax_version"
-    implementation "androidx.camera:camera-lifecycle:$camerax_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+    implementation "androidx.core:core-ktx:$coreKtx"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleRuntimeKtx"
+    implementation "androidx.constraintlayout:constraintlayout:$constraint"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.5.2"
+    implementation "com.jakewharton.timber:timber:4.7.1"
+    implementation "androidx.camera:camera-camera2:$camerax"
+    implementation "androidx.camera:camera-lifecycle:$camerax"
     implementation "androidx.camera:camera-view:1.0.0-alpha32"
     implementation "com.google.android.gms:play-services-mlkit-text-recognition:17.0.0"
-    implementation 'org.iban4j:iban4j:3.2.1'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.gms:play-services-vision:17.0.2'
-    implementation 'androidx.browser:browser:1.0.0'
-}
+    implementation "org.iban4j:iban4j:3.2.1"
+    implementation "androidx.legacy:legacy-support-v4:1.0.0"
+    implementation "com.google.android.gms:play-services-vision:17.0.2"
+    implementation "androidx.browser:browser:1.4.0"
+    implementation 'com.github.BasemNasr:EasyMediaPicker:v0.1.4'
+}
diff --git a/app/libs/p24.aar b/app/libs/p24.aar
diff --git a/app/libs/paypal.aar b/app/libs/paypal.aar
diff --git a/app/libs/ratepay.aar b/app/libs/ratepay.aar
diff --git a/app/libs/sepa.aar b/app/libs/sepa.aar
diff --git a/app/libs/sofort.aar b/app/libs/sofort.aar
diff --git a/app/libs/wiretransfer.aar b/app/libs/wiretransfer.aar
diff --git a/app/src/androidTest/java/com/sdkpay/ecom/examples/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/sdkpay/ecom/examples/ExampleInstrumentedTest.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U. All rights reserved.
+ * Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
+ * You may not use this file except in compliance with the License which is available at https://mit-license.org/
  */
 
 package com.sdkpay.ecom.examples;

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U. All rights reserved.
+  ~ Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
+  ~ You may not use this file except in compliance with the License which is available at https://mit-license.org/
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
@@ -73,4 +74,4 @@
             android:value="true" />
     </application>
 
-</manifest>
+</manifest>
diff --git a/app/src/main/java/com/sdkpay/ecom/examples/AnimatedCardFieldActivity.java b/app/src/main/java/com/sdkpay/ecom/examples/AnimatedCardFieldActivity.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U. All rights reserved.
+ * Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
+ * You may not use this file except in compliance with the License which is available at https://mit-license.org/
  */
 
 package com.sdkpay.ecom.examples;

diff --git a/app/src/main/java/com/sdkpay/ecom/examples/CardFieldActivity.java b/app/src/main/java/com/sdkpay/ecom/examples/CardFieldActivity.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U. All rights reserved.
+ * Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
+ * You may not use this file except in compliance with the License which is available at https://mit-license.org/
  */
 
 package com.sdkpay.ecom.examples;

diff --git a/app/src/main/java/com/sdkpay/ecom/examples/CardFieldFragmentImplFragment.kt b/app/src/main/java/com/sdkpay/ecom/examples/CardFieldFragmentImplFragment.kt
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U. All rights reserved.
+ * Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
+ * You may not use this file except in compliance with the License which is available at https://mit-license.org/
  */
 
 package com.sdkpay.ecom.examples

diff --git a/app/src/main/java/com/sdkpay/ecom/examples/Constants.java b/app/src/main/java/com/sdkpay/ecom/examples/Constants.java
@@ -1,10 +1,11 @@
 /*
- * Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U. All rights reserved.
+ * Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
+ * You may not use this file except in compliance with the License which is available at https://mit-license.org/
  */
 
 package com.sdkpay.ecom.examples;
 
 public class Constants {
     public final static String URL_EE_TEST = "https://api-test.getneteurope.com";
     public final static int REQUEST_TIMEOUT = 30;
-}
+}
diff --git a/app/src/main/java/com/sdkpay/ecom/examples/KotlinAnimatedCardFieldActivity.kt b/app/src/main/java/com/sdkpay/ecom/examples/KotlinAnimatedCardFieldActivity.kt
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U. All rights reserved.
+ * Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
+ * You may not use this file except in compliance with the License which is available at https://mit-license.org/
  */
 
 package com.sdkpay.ecom.examples

diff --git a/app/src/main/java/com/sdkpay/ecom/examples/KotlinCardFieldActivity.kt b/app/src/main/java/com/sdkpay/ecom/examples/KotlinCardFieldActivity.kt
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U. All rights reserved.
+ * Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
+ * You may not use this file except in compliance with the License which is available at https://mit-license.org/
  */
 
 package com.sdkpay.ecom.examples

diff --git a/app/src/main/java/com/sdkpay/ecom/examples/KotlinCardFieldFragmentImplActivity.kt b/app/src/main/java/com/sdkpay/ecom/examples/KotlinCardFieldFragmentImplActivity.kt
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U. All rights reserved.
+ * Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
+ * You may not use this file except in compliance with the License which is available at https://mit-license.org/
  */
 
 package com.sdkpay.ecom.examples

diff --git a/app/src/main/java/com/sdkpay/ecom/examples/KotlinLoyaltyCardFieldActivity.kt b/app/src/main/java/com/sdkpay/ecom/examples/KotlinLoyaltyCardFieldActivity.kt
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U. All rights reserved.
+ * Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
+ * You may not use this file except in compliance with the License which is available at https://mit-license.org/
  */
 
 package com.sdkpay.ecom.examples

diff --git a/app/src/main/java/com/sdkpay/ecom/examples/KotlinStartActivity.kt b/app/src/main/java/com/sdkpay/ecom/examples/KotlinStartActivity.kt
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U. All rights reserved.
+ * Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
+ * You may not use this file except in compliance with the License which is available at https://mit-license.org/
  */
 
 package com.sdkpay.ecom.examples
@@ -93,6 +94,36 @@ class KotlinStartActivity : AppCompatActivity() {
             .startPayment(mPaymentObjectProvider.p24Payment)
     }
 
+    fun makeSofortPayment(view: View?) {
+            Client(mContext, URL_EE_TEST)
+                .startPayment(mPaymentObjectProvider.sofortPayment)
+    }
+
+    fun makeRatepayInvoicePayment(view: View?) {
+            Client(mContext, URL_EE_TEST)
+                .startPayment(mPaymentObjectProvider.ratepayInvoicePayment)
+    }
+
+    fun makeRatepayElvPayment(view: View?) {
+       Client(mContext, URL_EE_TEST)
+           .startPayment(mPaymentObjectProvider.ratepayElvPayment)
+    }
+
+    fun makeBlikRedirectPayment(view: View?) {
+        Client(mContext, URL_EE_TEST)
+            .startPayment(mPaymentObjectProvider.blikRedirectPayment)
+    }
+
+    fun makeBlikLevel0Payment(view: View?) {
+        Client(mContext, URL_EE_TEST)
+            .startPayment(mPaymentObjectProvider.blikLevel0Payment)
+    }
+
+    fun makeBizumPayment(view: View?) {
+        Client(mContext, URL_EE_TEST)
+            .startPayment(mPaymentObjectProvider.bizumPayment)
+    }
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
@@ -106,4 +137,4 @@ class KotlinStartActivity : AppCompatActivity() {
             }
         }
     }
-}
+}
diff --git a/app/src/main/java/com/sdkpay/ecom/examples/KotlinTokenAnimatedCardFieldActivity.kt b/app/src/main/java/com/sdkpay/ecom/examples/KotlinTokenAnimatedCardFieldActivity.kt
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U. All rights reserved.
+ * Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
+ * You may not use this file except in compliance with the License which is available at https://mit-license.org/
  */
 
 package com.sdkpay.ecom.examples

diff --git a/app/src/main/java/com/sdkpay/ecom/examples/ResponseHelper.java b/app/src/main/java/com/sdkpay/ecom/examples/ResponseHelper.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U. All rights reserved.
+ * Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
+ * You may not use this file except in compliance with the License which is available at https://mit-license.org/
  */
 
 package com.sdkpay.ecom.examples;

diff --git a/app/src/main/java/com/sdkpay/ecom/examples/SignatureHelper.java b/app/src/main/java/com/sdkpay/ecom/examples/SignatureHelper.java
@@ -1,5 +1,6 @@
 /*
- * Copyright © 2022 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U. All rights reserved.
+ * Copyright © 2023 PagoNxt Merchant Solutions S.L. and Santander España Merchant Services, Entidad de Pago, S.L.U.
+ * You may not use this file except in compliance with the License which is available at https://mit-license.org/
  */
 
 package com.sdkpay.ecom.examples;