Skip to content

Commit 3d38ace

Browse files
authored
Merge pull request #9 from thepeerstack/hotfix/url-update
Hotfix/url update
2 parents 3c05c28 + 881cb25 commit 3d38ace

26 files changed

+391
-184
lines changed

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ Thepeer Android SDK gives one integration access to all fintech businesses on yo
1111

1212
## Demo
1313

14-
https://user-images.githubusercontent.com/16048595/167891393-6f198712-7648-4f45-959a-a289fab42006.mo
15-
16-
https://user-images.githubusercontent.com/16048595/167891381-2ad76193-3cf1-4abe-870b-0924fee498fb.mov
14+
| Send | Checkout | Direct Charge |
15+
|------------------------ | --------------------------------------|--------------------------------------|
16+
|![Send-shot](https://user-images.githubusercontent.com/16048595/221840767-aafc2abd-475f-4b2b-9c82-a7c2373cfd0e.png) | ![checkout-shot](https://user-images.githubusercontent.com/16048595/221840744-9efad3ca-8d5a-4186-91d4-7e9a3f408bf7.png) | ![direct-charge-shot](https://user-images.githubusercontent.com/16048595/221840760-103db030-471d-4208-aa15-b2d97e2de96b.png)|
1717

18-
https://user-images.githubusercontent.com/16048595/167891309-d6608bba-20dc-4840-be60-96c6ef390ea3.mov
1918

2019

2120
## Setup Implementation

build.gradle

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,14 @@
1-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
buildscript {
3-
ext.kotlin_version = '1.6.10'
4-
repositories {
5-
google()
6-
mavenCentral()
7-
}
8-
dependencies {
9-
classpath "com.android.tools.build:gradle:7.2.1"
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
// NOTE: Do not place your application dependencies here; they belong
12-
// in the individual module build.gradle files
13-
}
14-
}
151

162
plugins{
17-
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
3+
id 'com.android.application' version '7.4.0' apply false
4+
id 'com.android.library' version '7.4.0' apply false
5+
id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
6+
id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
187
}
198

20-
task clean(type: Delete) {
21-
delete rootProject.buildDir
22-
}
239

2410
ext {
11+
kotlin_version = '1.7.21'
2512

2613
//ktlint
2714
ktlintVersion = '0.46.1'

demo-app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@ plugins {
22
id 'com.android.application'
33
id 'kotlin-android'
44
id 'kotlin-kapt'
5-
65
}
76

87

98
android {
10-
compileSdk 31
9+
compileSdkVersion 33
1110

1211

1312
defaultConfig {
1413
applicationId "co.thepeer"
15-
minSdk 21
16-
targetSdk 31
14+
minSdkVersion 23
15+
targetSdkVersion 33
1716
versionCode 1
1817
versionName "1.0"
1918

@@ -41,11 +40,12 @@ android {
4140

4241
dependencies {
4342

44-
implementation project(':thepeer-android')
43+
implementation project(":thepeer-android")
4544
implementation 'androidx.core:core-ktx:1.7.0'
4645
implementation 'androidx.appcompat:appcompat:1.4.1'
4746
implementation 'com.google.android.material:material:1.5.0'
4847
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
48+
implementation 'androidx.core:core-ktx:+'
4949
testImplementation 'junit:junit:4.+'
5050
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
5151
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

demo-app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<meta-data
2323
android:name="co.thepeer.PublicKey"
24-
android:value="pspk_test_2aj8xasztf4domzd2nphinvzkvecpbuyxldkvr3pkuvko" />
24+
android:value="pspk_test_m7pbk9fbjaofi92shcgxq8is4pfgxl0t0bq3g3bmrp7iq" />
2525
</application>
2626

2727
</manifest>

demo-app/src/main/java/co/thepeer/MainActivity.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,4 @@ class MainActivity : AppCompatActivity() {
5959

6060
}
6161

62-
63-
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
64-
super.onActivityResult(requestCode, resultCode, data)
65-
66-
if (requestCode == INITIATE_PAYMENT_REQUEST_CODE && resultCode == RESULT_OK) {
67-
Log.v("Demo", data?.getStringExtra(KEY_RESULT) ?: "")
68-
69-
}
70-
71-
}
7262
}

demo-app/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<string name="send_money">Send Money</string>
44
<string name="checkout">Checkout</string>
55
<string name="direct_charge">Direct Charge</string>
6-
<string name="user_reference">73f03de5-1043-4ad1-bc2e-aa4d94ebee4f</string>
6+
<string name="user_reference">fd92e93b-8907-4429-86e5-9cf2fea2a9d8</string>
77
</resources>

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ android.useAndroidX=true
1818
# Automatically convert third-party libraries to use AndroidX
1919
android.enableJetifier=true
2020
# Kotlin code style for this project: "official" or "obsolete":
21-
kotlin.code.style=official
21+
kotlin.code.style=official
22+
android.disableAutomaticComponentCreation=true
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Feb 09 22:24:53 WAT 2022
1+
#Sun Jan 29 21:57:51 WAT 2023
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

java-demo/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ plugins {
33
}
44

55
android {
6-
compileSdk 31
6+
compileSdkVersion 33
77

88
defaultConfig {
99
applicationId "com.example.java_demo"
10-
minSdk 21
11-
targetSdk 31
10+
minSdkVersion 23
11+
targetSdkVersion 33
1212
versionCode 1
1313
versionName "1.0"
1414

@@ -28,10 +28,11 @@ android {
2828
}
2929

3030
dependencies {
31-
implementation project(':thepeer-android')
31+
implementation project(":thepeer-android")
3232
implementation 'androidx.appcompat:appcompat:1.4.1'
3333
implementation 'com.google.android.material:material:1.5.0'
3434
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
35+
implementation 'androidx.core:core-ktx:+'
3536
testImplementation 'junit:junit:4.+'
3637
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
3738
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

settings.gradle

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
import org.gradle.api.initialization.resolve.RepositoriesMode
22

3+
pluginManagement {
4+
repositories {
5+
google()
6+
mavenCentral()
7+
gradlePluginPortal()
8+
}
9+
}
310
dependencyResolutionManagement {
411
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
512
repositories {
613
google()
714
mavenCentral()
8-
jcenter() // Warning: this repository is going to shut down soon
915
}
1016
}
1117
rootProject.name = "thepeer-android"

0 commit comments

Comments
 (0)