Skip to content

Commit

Permalink
PayUmoney PnP SDK 1.1.0 released
Browse files Browse the repository at this point in the history
  • Loading branch information
Dolly Mittal committed Jan 29, 2018
1 parent b4443a9 commit a06efd3
Show file tree
Hide file tree
Showing 52 changed files with 300 additions and 114 deletions.
Binary file modified .DS_Store
View file
Binary file not shown.
Empty file modified IntegrationSampleApp-PayumoneyPnP.iml
100644 → 100755
View file
Empty file.
Binary file modified app/.DS_Store
100644 → 100755
View file
Binary file not shown.
Empty file modified app/.gitignore
100644 → 100755
View file
Empty file.
53 changes: 27 additions & 26 deletions app/app.iml
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
Expand Down Expand Up @@ -95,15 +95,16 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.aakira/expandable-layout/1.6.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.payu.custombrowser/payu-custom-browser/6.1.3/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.payu.magicretry/magicretry/1.0.5/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.payumoney.core/payumoney-sdk/7.0.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.payumoney.graphics/asset-download-sdk/0.1.9/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.payumoney.sdkui/plug-n-play/1.0.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.payumoney.core/payumoney-sdk/7.1.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.payumoney.graphics/asset-download-sdk/0.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.payumoney.sdkui/plug-n-play/1.1.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/io.fabric.sdk.android/fabric/1.3.14/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
Expand All @@ -114,27 +115,27 @@
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="magicretry-1.0.5" level="project" />
<orderEntry type="library" exported="" name="fabric-1.3.14" level="project" />
<orderEntry type="library" exported="" name="crashlytics-2.6.5" level="project" />
<orderEntry type="library" exported="" name="gson-2.6.2" level="project" />
<orderEntry type="library" exported="" name="beta-1.2.2" level="project" />
<orderEntry type="library" exported="" name="answers-1.3.10" level="project" />
<orderEntry type="library" exported="" name="design-23.2.1" level="project" />
<orderEntry type="library" exported="" name="asset-download-sdk-0.1.9" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-23.2.1" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-23.2.1" level="project" />
<orderEntry type="library" exported="" name="disklrucache-2.0.2" level="project" />
<orderEntry type="library" exported="" name="crashlytics-core-2.3.14" level="project" />
<orderEntry type="library" exported="" name="payu-custom-browser-6.1.3" level="project" />
<orderEntry type="library" exported="" name="volley-1.0.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.2.1" level="project" />
<orderEntry type="library" exported="" name="expandable-layout-1.6.0" level="project" />
<orderEntry type="library" exported="" name="payumoney-sdk-7.0.1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.2.1" level="project" />
<orderEntry type="library" exported="" name="animated-vector-drawable-23.2.1" level="project" />
<orderEntry type="library" exported="" name="support-vector-drawable-23.2.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.2.1" level="project" />
<orderEntry type="library" exported="" name="plug-n-play-1.0.0" level="project" />
<orderEntry type="library" exported="" name="com.android.support:support-vector-drawable-23.2.1" level="project" />
<orderEntry type="library" exported="" name="com.android.support:support-v4-23.2.1" level="project" />
<orderEntry type="library" exported="" name="com.crashlytics.sdk.android:answers-1.3.10" level="project" />
<orderEntry type="library" exported="" name="com.payumoney.graphics:asset-download-sdk-0.2.0" level="project" />
<orderEntry type="library" exported="" name="com.android.support:animated-vector-drawable-23.2.1" level="project" />
<orderEntry type="library" exported="" name="com.android.support:cardview-v7-23.2.1" level="project" />
<orderEntry type="library" exported="" name="com.android.support:support-annotations:23.2.1@jar" level="project" />
<orderEntry type="library" exported="" name="com.android.support:design-23.2.1" level="project" />
<orderEntry type="library" exported="" name="com.crashlytics.sdk.android:beta-1.2.2" level="project" />
<orderEntry type="library" exported="" name="com.android.support:appcompat-v7-23.2.1" level="project" />
<orderEntry type="library" exported="" name="com.github.aakira:expandable-layout-1.6.0" level="project" />
<orderEntry type="library" exported="" name="com.google.code.gson:gson:2.6.2@jar" level="project" />
<orderEntry type="library" exported="" name="com.crashlytics.sdk.android:crashlytics-2.6.5" level="project" />
<orderEntry type="library" exported="" name="com.android.volley:volley-1.0.0" level="project" />
<orderEntry type="library" exported="" name="com.payumoney.core:payumoney-sdk-7.1.0" level="project" />
<orderEntry type="library" exported="" name="com.payu.custombrowser:payu-custom-browser-6.1.3" level="project" />
<orderEntry type="library" exported="" name="io.fabric.sdk.android:fabric-1.3.14" level="project" />
<orderEntry type="library" exported="" name="com.jakewharton:disklrucache:2.0.2@jar" level="project" />
<orderEntry type="library" exported="" name="com.payumoney.sdkui:plug-n-play-1.1.0" level="project" />
<orderEntry type="library" exported="" name="com.payu.magicretry:magicretry-1.0.5" level="project" />
<orderEntry type="library" exported="" name="com.android.support:recyclerview-v7-23.2.1" level="project" />
<orderEntry type="library" exported="" name="com.crashlytics.sdk.android:crashlytics-core-2.3.14" level="project" />
</component>
</module>
12 changes: 6 additions & 6 deletions app/build.gradle
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,12 @@ android {
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
debug {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
release {
minifyEnabled false
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
Expand All @@ -43,10 +47,6 @@ dependencies {

compile 'com.android.support:cardview-v7:23.2.1'
compile 'com.android.support:appcompat-v7:23.2.1'
compile('com.payumoney.sdkui:plug-n-play:1.0.0'){
transitive = true;
exclude module: 'payumoney-sdk'
}
compile('com.payumoney.sdkui:plug-n-play:1.1.0')

compile 'com.payumoney.core:payumoney-sdk:7.0.1'
}
Empty file modified app/proguard-rules.pro
100644 → 100755
View file
Empty file.
Empty file modified app/src/.DS_Store
100644 → 100755
View file
Empty file.
Empty file modified ...idTest/java/com/rahulhooda/integrationsampleapp_payumoneypnp/ExampleInstrumentedTest.java
100644 → 100755
View file
Empty file.
Empty file modified app/src/main/.DS_Store
100644 → 100755
View file
Empty file.
Empty file modified app/src/main/AndroidManifest.xml
100644 → 100755
View file
Empty file.
Empty file modified app/src/main/java/.DS_Store
100644 → 100755
View file
Empty file.
Empty file modified app/src/main/java/com/.DS_Store
100644 → 100755
View file
Empty file.
Empty file modified app/src/main/java/com/rahulhooda/.DS_Store
100644 → 100755
View file
Empty file.
Empty file modified app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/.DS_Store
100644 → 100755
View file
Empty file.
12 changes: 6 additions & 6 deletions app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/AppEnvironment.java
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ public boolean debug() {
PRODUCTION {
@Override
public String merchant_Key() {
return "O15vkB";
}
return "dcwQGU";
} //O15vkB

@Override
public String merchant_ID() {
return "4819816";
}
return "4931752";
} //4819816

@Override
public String furl() {
Expand All @@ -60,8 +60,8 @@ public String surl() {

@Override
public String salt() {
return "LU1EhObh";
}
return "dzC2i5pp";
} //LU1EhObh

@Override
public boolean debug() {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/AppPreference.java
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class AppPreference {
private String dummyEmail = "[email protected]";
private String productInfo = "product_info";
private String firstName = "firstname";
private boolean isOverrideResultScreen = false;
private boolean isOverrideResultScreen = true;

This comment has been minimized.

Sign in to view

Copy link
@Rahul-Hooda

Rahul-Hooda Jan 30, 2018

Contributor

This will override the result screen. We should share the merchant app with isOverrideResultScreen set as false.

public static final String USER_EMAIL = "user_email";
public static final String USER_MOBILE = "user_mobile";
Expand Down
Empty file modified app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/BaseActivity.java
100644 → 100755
View file
Empty file.
Empty file modified app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/BaseApplication.java
100644 → 100755
View file
Empty file.
8 changes: 4 additions & 4 deletions app/src/main/java/com/rahulhooda/integrationsampleapp_payumoneypnp/MainActivity.java
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
// Response from SURl and FURL
String merchantResponse = transactionResponse.getTransactionDetails();

new AlertDialog.Builder(this)
new AlertDialog.Builder(this)
.setCancelable(false)
.setMessage("Payu's Data : " + payuResponse + "\n\n\n Merchant's Data: " + merchantResponse)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
Expand Down Expand Up @@ -347,7 +347,7 @@ private void initListeners() {
radioGroup_color_theme.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(RadioGroup radioGroup, @IdRes int i) {
mAppPreference.setOverrideResultScreen(false);
mAppPreference.setOverrideResultScreen(true);

switch (i) {
case R.id.radio_btn_theme_default:
Expand Down Expand Up @@ -513,8 +513,8 @@ private void launchPayUMoneyFlow() {
* Do not use below code when going live
* Below code is provided to generate hash from sdk.
* It is recommended to generate hash from server side only.
* *//*
mPaymentParams = calculateServerSideHashAndInitiatePayment1(mPaymentParams);
* */
/* mPaymentParams = calculateServerSideHashAndInitiatePayment1(mPaymentParams);
if (AppPreference.selectedTheme != -1) {
PayUmoneyFlowManager.startPayUMoneyFlow(mPaymentParams,MainActivity.this, AppPreference.selectedTheme,mAppPreference.isOverrideResultScreen());
Expand Down
Empty file modified app/src/main/res/drawable/app_logo.xml
100644 → 100755
View file
Empty file.
Empty file modified app/src/main/res/drawable/bg_rounded_button.xml
100644 → 100755
View file
Empty file.
Empty file modified app/src/main/res/layout/.DS_Store
100644 → 100755
View file
Empty file.
Empty file modified app/src/main/res/layout/activity_main.xml
100644 → 100755
View file
Empty file.
Empty file modified app/src/main/res/mipmap-hdpi/ic_launcher.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/mipmap-hdpi/ic_launcher_round.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/mipmap-mdpi/ic_launcher.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/mipmap-mdpi/ic_launcher_round.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/mipmap-xhdpi/ic_launcher.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/mipmap-xxhdpi/ic_launcher.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/src/main/res/values/color.xml
100644 → 100755
View file
Empty file.
Empty file modified app/src/main/res/values/colors.xml
100644 → 100755
View file
Empty file.
Empty file modified app/src/main/res/values/dimens.xml
100644 → 100755
View file
Empty file.
Empty file modified app/src/main/res/values/strings.xml
100644 → 100755
View file
Empty file.
Empty file modified app/src/main/res/values/styles.xml
100644 → 100755
View file
Empty file.
Empty file modified app/src/test/java/com/rahulhooda/integrationsampleapp_payumoneypnp/ExampleUnitTest.java
100644 → 100755
View file
Empty file.
Empty file modified build.gradle
100644 → 100755
View file
Empty file.
Empty file modified build/generated/mockable-android-23.jar
100644 → 100755
View file
Empty file.
Loading

1 comment on commit a06efd3

@Rahul-Hooda
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review Done.

Please sign in to comment.