Skip to content

Commit b2dc611

Browse files
AhlaamK-tapAhlaamK-tap
committed
update the checkout sdk with latest 36
1 parent 5247fd1 commit b2dc611

35 files changed

+874
-317
lines changed

‎.idea/caches/deviceStreaming.xml‎

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ plugins {
88

99
android {
1010
namespace 'com.tap.company.checkout_android'
11-
compileSdk 35
11+
compileSdk 36
1212

1313
defaultConfig {
1414
applicationId "com.tap.company.checkout_android"
1515
minSdk 24
16-
targetSdk 35
16+
targetSdk 36
1717
versionCode 1
1818
versionName "1.0.0"
1919

@@ -54,10 +54,10 @@ dependencies {
5454

5555

5656

57-
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
58-
implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
59-
implementation 'com.google.code.gson:gson:2.10.1'
60-
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
61-
implementation 'com.github.Tap-Payments:TapAndroidForm:0.0.3'
57+
api 'com.squareup.retrofit2:retrofit:2.9.0'
58+
api 'com.squareup.okhttp3:logging-interceptor:4.9.0'
59+
api 'com.google.code.gson:gson:2.13.2'
60+
api 'com.squareup.retrofit2:converter-gson:2.9.0'
61+
api 'com.github.Tap-Payments:TapAndroidForm:0.0.3'
6262
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
6363
}

‎app/src/main/java/com/tap/company/checkout_android/MainActivity.kt‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,22 @@ class MainActivity : AppCompatActivity() , TapCheckoutStatusDelegate {
182182
configuration.put("order", order)
183183

184184
val cardOptions = JSONObject()
185-
cardOptions.put("showBrands", getPrefBooleanValue("displayPymtBrndKey",true))
186-
cardOptions.put("showLoadingState", getPrefBooleanValue("showLoadingStateKey",false))
187-
cardOptions.put("collectHolderName", getPrefBooleanValue("collectCardHodlernameKey",true))
185+
186+
cardOptions.put("showBrands", true)
187+
cardOptions.put("showLoadingState",false)
188+
cardOptions.put("collectHolderName", true)
189+
cardOptions.put("preLoadCardName", "")
190+
cardOptions.put("cardNameEditable", true)
191+
cardOptions.put("showBrands", true)
192+
cardOptions.put("showLoadingState", false)
193+
cardOptions.put("collectHolderName", true)
188194
cardOptions.put("preLoadCardName", "")
189-
cardOptions.put("cardNameEditable", getPrefBooleanValue("cardNameEditableeKey",true))
190-
/* val cardFundingSource= getPrefStringSetValue("supportedFundSourceKey", emptySet())
195+
cardOptions.put("cardNameEditable",
196+
true)
197+
198+
199+
200+
/* val cardFundingSource= getPrefStringSetValue("supportedFundSourceKey", emptySet())
191201
val jsonArraycardFundingSource = JSONArray(cardFundingSource)
192202
193203

‎app/src/main/java/com/tap/company/checkout_android/SettingsActivity.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import com.chillibits.simplesettings.tool.getPrefBooleanValue
2020
import com.chillibits.simplesettings.tool.getPrefStringSetValue
2121
import com.chillibits.simplesettings.tool.getPrefStringValue
2222
import com.chillibits.simplesettings.tool.getPrefs
23+
import com.tap.commondatamodels.TapTheme
2324

2425
class SettingsActivity : AppCompatActivity(),SimpleSettingsConfig.PreferenceCallback {
2526
override fun onCreate(savedInstanceState: Bundle?) {

‎app/src/main/res/values/colors.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77
<color name="teal_700">#FF018786</color>
88
<color name="black">#FF000000</color>
99
<color name="white">#FFFFFFFF</color>
10+
<color name="black_color">#000000</color>
1011
</resources>

‎tapcheckoutsdk/build.gradle‎

Lines changed: 84 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@ plugins {
1010
id("com.android.library")
1111
id("org.jetbrains.kotlin.android")
1212
id 'kotlin-parcelize'
13+
id 'maven-publish'
1314
}
1415

1516
android {
1617
namespace = "company.tap.tapcheckout_android"
17-
compileSdk = 34
18+
compileSdk = 36
1819

1920
defaultConfig {
2021
minSdk = 24
21-
targetSdk = 34
22+
targetSdk = 36
2223

2324
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2425
consumerProguardFiles("consumer-rules.pro")
@@ -45,44 +46,100 @@ android {
4546
dependencies {
4647
def lifecycle_version = "2.6.2"
4748

48-
implementation("androidx.core:core-ktx:1.12.0")
49-
implementation "org.jetbrains.kotlin:kotlin-stdlib:1.6.0"
50-
implementation("androidx.appcompat:appcompat:1.6.1")
51-
implementation("com.google.android.material:material:1.11.0")
49+
api("androidx.core:core-ktx:1.12.0")
50+
51+
api("androidx.appcompat:appcompat:1.6.1")
52+
api("com.google.android.material:material:1.11.0")
5253

5354
testImplementation("junit:junit:4.13.2")
5455
androidTestImplementation("androidx.test.ext:junit:1.1.5")
5556
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
5657

57-
implementation 'io.reactivex.rxjava3:rxjava:3.1.5'
58-
implementation 'io.reactivex.rxjava3:rxandroid:3.0.2'
59-
implementation 'com.github.Tap-Payments:TapNetwrok-Android:0.2.2.45'
60-
api 'com.google.code.gson:gson:2.10'
61-
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
62-
implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
63-
implementation 'com.github.Tap-Payments:LocalisationManager-Android:0.0.1.34'
64-
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
65-
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1"
66-
implementation "com.squareup.retrofit2:converter-gson:2.9.0"
67-
implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
68-
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
69-
implementation 'com.github.Tap-Payments:TapUIKit-Android:2.0.16'
70-
71-
implementation 'com.github.Tap-Payments:TapNFCCardReaderKit-Android:0.0.5'
72-
api 'com.github.Tap-Payments:TapCardScannerKit-Android:0.0.9.9'
58+
api 'io.reactivex.rxjava3:rxjava:3.1.5'
59+
api 'io.reactivex.rxjava3:rxandroid:3.0.2'
60+
api 'com.github.Tap-Payments:TapNetwrok-Android:0.2.2.45'
61+
api 'com.google.code.gson:gson:2.13.2'
62+
api 'com.squareup.retrofit2:retrofit:2.9.0'
63+
api 'com.squareup.okhttp3:logging-interceptor:4.9.0'
64+
api 'com.github.Tap-Payments:LocalisationManager-Android:0.0.1.34'
65+
api "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
66+
api "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1"
67+
api "com.squareup.retrofit2:converter-gson:2.9.0"
68+
api 'androidx.lifecycle:lifecycle-process:2.6.2'
69+
api "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
70+
// api 'com.github.Tap-Payments:TapUIKit-Android:2.0.16'
71+
api 'com.koushikdutta.ion:ion:3.1.0'
72+
73+
api 'com.intuit.sdp:sdp-android:1.1.1'
74+
75+
api 'com.github.Tap-Payments:TapNFCCardReaderKit-Android:0.0.5'
76+
api 'com.github.Tap-Payments:TapCardScannerKit-Android:0.0.12'
7377
/**
7478
* update this library in tapUiLibrary to be used automatically
7579
*/
76-
implementation 'jp.wasabeef:blurry:4.0.1'
77-
implementation 'com.github.bumptech.glide:glide:4.12.0'
78-
api 'com.github.Tap-Payments:CommonDataModelsWeb-Andriod:0.0.14'
79-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
80+
api 'jp.wasabeef:blurry:4.0.1'
81+
api 'com.github.bumptech.glide:glide:4.12.0'
82+
api 'com.github.Tap-Payments:CommonDataModelsWeb-Andriod:0.0.15'
83+
api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
8084

8185

8286
def lottieVersion = "6.1.0"
83-
implementation "com.airbnb.android:lottie:$lottieVersion"
87+
api "com.airbnb.android:lottie:$lottieVersion"
88+
89+
90+
91+
92+
}
8493

94+
// Create sources and Javadoc JARs
95+
task releaseSourcesJar(type: Jar) {
96+
archiveClassifier.set('sources')
97+
from android.sourceSets.main.java.srcDirs
98+
from android.sourceSets.main.kotlin.srcDirs
99+
}
85100

101+
task releaseJavadoc(type: Jar) {
102+
archiveClassifier.set('javadoc')
103+
from android.sourceSets.main.java.srcDirs
104+
from android.sourceSets.main.kotlin.srcDirs
105+
}
86106

107+
afterEvaluate {
108+
publishing {
109+
publications {
110+
create("release", MavenPublication) {
111+
// Publish AAR
112+
artifact("$buildDir/outputs/aar/${project.name}-release.aar") {
113+
builtBy tasks.named("assembleRelease")
114+
}
115+
116+
// Attach sources and javadoc
117+
artifact(tasks.named("releaseSourcesJar"))
118+
artifact(tasks.named("releaseJavadoc"))
119+
120+
groupId = "com.github.Tap-Payments"
121+
artifactId = "Checkout-Android"
122+
version = "1.0.3"
123+
124+
// Variant-aware: ensure dependencies are included in POM
125+
pom.withXml {
126+
def dependenciesNode = asNode().appendNode('dependencies')
127+
configurations.api.allDependencies.each { dep ->
128+
def depNode = dependenciesNode.appendNode('dependency')
129+
depNode.appendNode('groupId', dep.group)
130+
depNode.appendNode('artifactId', dep.name)
131+
depNode.appendNode('version', dep.version)
132+
depNode.appendNode('scope', 'compile')
133+
}
134+
}
135+
}
136+
}
137+
}
87138

139+
// Ensure metadata waits for sources/javadoc
140+
tasks.named("generateMetadataFileForReleasePublication") {
141+
dependsOn(tasks.named("releaseSourcesJar"))
142+
dependsOn(tasks.named("releaseJavadoc"))
143+
}
88144
}
145+

‎tapcheckoutsdk/src/main/java/company/tap/tapcheckout_android/Extension.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import com.bumptech.glide.Glide
2727
import com.google.gson.Gson
2828
import company.tap.tapcheckout_android.enums.rawFolderRefrence
2929
import company.tap.tapcheckout_android.models.ThreeDsResponseCardPayButtons
30+
import company.tap.tapcheckout_android.theme.ThemeManager
3031

3132

32-
import company.tap.tapuilibrary.themekit.ThemeManager
3333
import jp.wasabeef.blurry.Blurry
3434
import java.net.URLEncoder
3535
import java.util.*
@@ -130,15 +130,15 @@ fun ViewGroup.addLoaderWithBlurryToView(showLoadingIcon: Boolean, invokeAfterLoa
130130
@DrawableRes
131131
val loaderGif: Int =
132132
if (ThemeManager.currentTheme.isNotEmpty() && ThemeManager.currentTheme.contains("dark")) {
133-
company.tap.tapuilibrary.R.drawable.loader
133+
R.drawable.loader
134134
} else if (ThemeManager.currentTheme.isNotEmpty() && !ThemeManager.currentTheme.contains(
135135
"dark"
136136
)
137137
) {
138138
R.drawable.output_black_loader_nobg
139139
// R.drawable.loader
140140
} else
141-
company.tap.tapuilibrary.R.drawable.loader
141+
R.drawable.loader
142142

143143

144144

‎tapcheckoutsdk/src/main/java/company/tap/tapcheckout_android/TapCheckout.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package company.tap.tapcheckout_android
22

33

4-
import TapTheme
4+
55
import android.annotation.SuppressLint
66
import android.app.Dialog
77
import android.content.Context
@@ -31,6 +31,7 @@ import android.widget.LinearLayout
3131
import androidx.annotation.RequiresApi
3232
import androidx.core.os.postDelayed
3333
import com.google.gson.Gson
34+
import com.tap.commondatamodels.TapTheme
3435
import company.tap.nfcreader.open.utils.TapNfcUtils
3536
import company.tap.tapcheckout_android.enums.SCHEMES
3637
import company.tap.tapcheckout_android.enums.TapCheckoutDelegates
@@ -44,8 +45,10 @@ import company.tap.tapcheckout_android.models.ThreeDsResponseCardPayButtons
4445
import company.tap.tapcheckout_android.nfcbottomsheet.NFCBottomSheetActivity
4546
import company.tap.tapcheckout_android.popup_window.WebChrome
4647
import company.tap.tapcheckout_android.scanner_activity.ScannerActivity
48+
import company.tap.tapcheckout_android.theme.ThemeManager
4749
import company.tap.tapcheckout_android.threeDsWebview.ThreeDsWebViewActivityButton
48-
import company.tap.tapuilibrary.themekit.ThemeManager
50+
51+
4952
import okhttp3.Call
5053
import okhttp3.Callback
5154
import okhttp3.MediaType.Companion.toMediaTypeOrNull

‎tapcheckoutsdk/src/main/java/company/tap/tapcheckout_android/TapCheckoutDataConfiguration.kt‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
package company.tap.tapcheckout_android
22

3-
import Customer
4-
import TapAuthentication
3+
54
import android.annotation.SuppressLint
65
import android.app.Activity
76
import android.content.Context
87
import android.content.res.Resources
98
import android.util.Log
9+
import com.tap.commondatamodels.Customer
10+
import com.tap.commondatamodels.TapAuthentication
11+
import company.tap.tapcheckout_android.TapCheckoutDataConfiguration.lanuage
1012
import company.tap.tapcheckout_android.TapCheckoutDataConfiguration.lanuage
13+
import company.tap.tapcheckout_android.theme.ThemeManager
1114
import company.tap.taplocalizationkit.LocalizationManager
1215

13-
import company.tap.tapuilibrary.themekit.ThemeManager
1416
import java.util.Locale
1517

1618
/**

0 commit comments

Comments
 (0)