BETA 0.8.0

RazerMS · Jan 18, 2017 · 26126b4 · 26126b4
1 parent 028ce8e
commit 26126b4
Show file tree

Hide file tree

Showing 40 changed files with 27 additions and 36 deletions.
diff --git a/android/build.gradle → MOLPayXDK/android/build.gradle b/android/build.gradle → MOLPayXDK/android/build.gradle
@@ -14,5 +14,5 @@ android {
 
 dependencies {
     compile 'com.facebook.react:react-native:+'
-    compile 'com.molpay:molpay-mobile-xdk-android:3.7.0'
+    compile 'com.molpay:molpay-mobile-xdk-android:3.8.0'
 }
diff --git a/android/src/main/AndroidManifest.xml → ...yXDK/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml → ...yXDK/android/src/main/AndroidManifest.xml
diff --git a/.../main/java/com/molpayxdk/MOLPayReact.java → .../main/java/com/molpayxdk/MOLPayReact.java b/.../main/java/com/molpayxdk/MOLPayReact.java → .../main/java/com/molpayxdk/MOLPayReact.java
diff --git a/...va/com/molpayxdk/MOLPayReactActivity.java → ...va/com/molpayxdk/MOLPayReactActivity.java b/...va/com/molpayxdk/MOLPayReactActivity.java → ...va/com/molpayxdk/MOLPayReactActivity.java
diff --git a/...ava/com/molpayxdk/MOLPayReactPackage.java → ...ava/com/molpayxdk/MOLPayReactPackage.java b/...ava/com/molpayxdk/MOLPayReactPackage.java → ...ava/com/molpayxdk/MOLPayReactPackage.java
diff --git a/.../src/main/res/mipmap-hdpi/ic_launcher.png → .../src/main/res/mipmap-hdpi/ic_launcher.png b/.../src/main/res/mipmap-hdpi/ic_launcher.png → .../src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/.../src/main/res/mipmap-mdpi/ic_launcher.png → .../src/main/res/mipmap-mdpi/ic_launcher.png b/.../src/main/res/mipmap-mdpi/ic_launcher.png → .../src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png b/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png b/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/android/src/main/res/values/strings.xml → ...K/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml → ...K/android/src/main/res/values/strings.xml
diff --git a/android/src/main/res/values/styles.xml → ...DK/android/src/main/res/values/styles.xml b/android/src/main/res/values/styles.xml → ...DK/android/src/main/res/values/styles.xml
diff --git a/index.android.js → MOLPayXDK/index.android.js b/index.android.js → MOLPayXDK/index.android.js
diff --git a/index.ios.js → MOLPayXDK/index.ios.js b/index.ios.js → MOLPayXDK/index.ios.js
diff --git a/ios/MOLPayReactManager.h → MOLPayXDK/ios/MOLPayReactManager.h b/ios/MOLPayReactManager.h → MOLPayXDK/ios/MOLPayReactManager.h
@@ -12,10 +12,10 @@
 
 #endif /* MOLPayReact_h */
 // CalendarManager.h
-#import "RCTBridgeModule.h"
+#import <React/RCTBridgeModule.h>
 #import <MOLPayXDK/MOLPayLib.h>
 
-#import "RCTViewManager.h"
+#import <React/RCTViewManager.h>
 
 @interface MOLPayReactManager : NSObject <RCTBridgeModule>
 @end
diff --git a/ios/MOLPayReactManager.m → MOLPayXDK/ios/MOLPayReactManager.m b/ios/MOLPayReactManager.m → MOLPayXDK/ios/MOLPayReactManager.m
@@ -8,13 +8,13 @@
 
 #import <Foundation/Foundation.h>
 #import "MOLPayReactManager.h"
-#import "RCTBridgeModule.h"
+#import <React/RCTBridgeModule.h>
 
 
 #import <MOLPayXDK/MOLPayLib.h>
 
-#import "RCTView.h"
-#import "RCTRootView.h"
+#import <React/RCTView.h>
+#import <React/RCTRootView.h>
 #include "MOLPayReactViewController.h"
 
 @interface MOLPayReactManager ()

diff --git a/ios/MOLPayReactViewController.h → MOLPayXDK/ios/MOLPayReactViewController.h b/ios/MOLPayReactViewController.h → MOLPayXDK/ios/MOLPayReactViewController.h
diff --git a/ios/MOLPayReactViewController.m → MOLPayXDK/ios/MOLPayReactViewController.m b/ios/MOLPayReactViewController.m → MOLPayXDK/ios/MOLPayReactViewController.m
diff --git a/...lpay-mobile-xdk-www/fonts/FontAwesome.otf → ...lpay-mobile-xdk-www/fonts/FontAwesome.otf b/...lpay-mobile-xdk-www/fonts/FontAwesome.otf → ...lpay-mobile-xdk-www/fonts/FontAwesome.otf
diff --git a/...ile-xdk-www/fonts/fontawesome-webfont.eot → ...ile-xdk-www/fonts/fontawesome-webfont.eot b/...ile-xdk-www/fonts/fontawesome-webfont.eot → ...ile-xdk-www/fonts/fontawesome-webfont.eot
diff --git a/...ile-xdk-www/fonts/fontawesome-webfont.svg → ...ile-xdk-www/fonts/fontawesome-webfont.svg b/...ile-xdk-www/fonts/fontawesome-webfont.svg → ...ile-xdk-www/fonts/fontawesome-webfont.svg
diff --git a/...ile-xdk-www/fonts/fontawesome-webfont.ttf → ...ile-xdk-www/fonts/fontawesome-webfont.ttf b/...ile-xdk-www/fonts/fontawesome-webfont.ttf → ...ile-xdk-www/fonts/fontawesome-webfont.ttf
diff --git a/...le-xdk-www/fonts/fontawesome-webfont.woff → ...le-xdk-www/fonts/fontawesome-webfont.woff b/...le-xdk-www/fonts/fontawesome-webfont.woff → ...le-xdk-www/fonts/fontawesome-webfont.woff
diff --git a/...e-xdk-www/fonts/fontawesome-webfont.woff2 → ...e-xdk-www/fonts/fontawesome-webfont.woff2 b/...e-xdk-www/fonts/fontawesome-webfont.woff2 → ...e-xdk-www/fonts/fontawesome-webfont.woff2
diff --git a/...obile-xdk-www/images/ImageUnavailable.png → ...obile-xdk-www/images/ImageUnavailable.png b/...obile-xdk-www/images/ImageUnavailable.png → ...obile-xdk-www/images/ImageUnavailable.png
diff --git a/...mobile-xdk-www/images/poweredByMOLPay.png → ...mobile-xdk-www/images/poweredByMOLPay.png b/...mobile-xdk-www/images/poweredByMOLPay.png → ...mobile-xdk-www/images/poweredByMOLPay.png
diff --git a/...K.bundle/molpay-mobile-xdk-www/index.html → ...K.bundle/molpay-mobile-xdk-www/index.html b/...K.bundle/molpay-mobile-xdk-www/index.html → ...K.bundle/molpay-mobile-xdk-www/index.html
@@ -1 +1 @@
-<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.d7e0b867.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting || isLoading" class="text-center"> <br> <p>Preparing...</p> <p>Please wait.</p> </div> <div class="footer"> </div> <div ng-show="isLoading || D7ARequeryActiveNow" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">Loading...</div> </div> <script src="scripts/vendor.80b0fea7.js"></script> <script src="scripts/scripts.1aa69035.js"></script> </body> </html>
+<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.d7e0b867.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting || isLoading" class="text-center"> <br> <p>{{label_preparing}}</p> <p>{{label_pleasewait}}</p> </div> <div class="footer"> </div> <div ng-show="isLoading || D7ARequeryActiveNow" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">{{label_loading}}</div> </div> <script src="scripts/vendor.1780c687.js"></script> <script src="scripts/scripts.2d2ed87b.js"></script> </body> </html>
diff --git a/MOLPayXDK/ios/MOLPayXDK.bundle/molpay-mobile-xdk-www/scripts/scripts.2d2ed87b.js b/MOLPayXDK/ios/MOLPayXDK.bundle/molpay-mobile-xdk-www/scripts/scripts.2d2ed87b.js
diff --git a/...mobile-xdk-www/scripts/vendor.80b0fea7.js → ...mobile-xdk-www/scripts/vendor.1780c687.js b/...mobile-xdk-www/scripts/vendor.80b0fea7.js → ...mobile-xdk-www/scripts/vendor.1780c687.js
diff --git a/...y-mobile-xdk-www/styles/main.d7e0b867.css → ...y-mobile-xdk-www/styles/main.d7e0b867.css b/...y-mobile-xdk-www/styles/main.d7e0b867.css → ...y-mobile-xdk-www/styles/main.d7e0b867.css
diff --git a/...mobile-xdk-www/styles/vendor.34eb91d2.css → ...mobile-xdk-www/styles/vendor.34eb91d2.css b/...mobile-xdk-www/styles/vendor.34eb91d2.css → ...mobile-xdk-www/styles/vendor.34eb91d2.css
diff --git a/ios/MOLPayXDK.framework/Headers → MOLPayXDK/ios/MOLPayXDK.framework/Headers b/ios/MOLPayXDK.framework/Headers → MOLPayXDK/ios/MOLPayXDK.framework/Headers
diff --git a/ios/MOLPayXDK.framework/MOLPayXDK → MOLPayXDK/ios/MOLPayXDK.framework/MOLPayXDK b/ios/MOLPayXDK.framework/MOLPayXDK → MOLPayXDK/ios/MOLPayXDK.framework/MOLPayXDK
diff --git a/....framework/Versions/A/Headers/MOLPayLib.h → ....framework/Versions/A/Headers/MOLPayLib.h b/....framework/Versions/A/Headers/MOLPayLib.h → ....framework/Versions/A/Headers/MOLPayLib.h
diff --git a/MOLPayXDK/ios/MOLPayXDK.framework/Versions/A/MOLPayXDK b/MOLPayXDK/ios/MOLPayXDK.framework/Versions/A/MOLPayXDK
diff --git a/ios/MOLPayXDK.framework/Versions/Current → .../ios/MOLPayXDK.framework/Versions/Current b/ios/MOLPayXDK.framework/Versions/Current → .../ios/MOLPayXDK.framework/Versions/Current
diff --git a/ios/MOLPayXDKlib.xcodeproj/project.pbxproj → ...os/MOLPayXDKlib.xcodeproj/project.pbxproj b/ios/MOLPayXDKlib.xcodeproj/project.pbxproj → ...os/MOLPayXDKlib.xcodeproj/project.pbxproj
diff --git a/README.md b/README.md
@@ -29,11 +29,14 @@ Credit card payment channel is not available in Android 4.1, 4.2, and 4.3. due t
 
 ## Installation
 
-### Android
 
-1) npm install https://github.com/MOLPay/molpay-mobile-xdk-reactnative-beta.git --save
+1) git clone https://github.com/MOLPay/molpay-mobile-xdk-reactnative-beta.git or download the file by clicking clone or download
+
+2) Copy and paste MOLPayXDK folder into node_module/
 
-2) add the following import to `MainApplication.java` (`MainActivity.java` if RN < 0.33) of your application
+### Android
+
+3) add the following import to `MainApplication.java` (`MainActivity.java` if RN < 0.33) of your application
 
 ```java
 import com.molpayxdk.MOLPayReact;
@@ -63,7 +66,7 @@ public class MainActivity extends ReactActivity {
 }
 ```
 
-3) add the following code to add the package to `MainApplication.java`` (`MainActivity.java` if RN < 0.33)
+4) add the following code to add the package to `MainApplication.java`` (`MainActivity.java` if RN < 0.33)
 
 ```java
 import com.molpayxdk.MOLPayReactPackage;
@@ -76,7 +79,7 @@ protected List<ReactPackage> getPackages() {
     }
 ```
 
-4) add the following codes to your `android/setting.gradle`
+5) add the following codes to your `android/setting.gradle`
 
 > you might have multiple 3rd party libraries, make sure that you don't create multiple include.
 
@@ -85,13 +88,13 @@ include ':app', ':MOLPayXDK'
 project(':MOLPayXDK').projectDir = new File(rootProject.projectDir, '../node_modules/MOLPayXDK/android')
 ```
 
-5) edit `android/app/build.gradle` and add the following line inside `dependencies`
+6) edit `android/app/build.gradle` and add the following line inside `dependencies`
 
 ```
 compile project(':MOLPayXDK')
 ```
 
-6) run `react-native run-android` to see if everything is compilable.
+7) run `react-native run-android` to see if everything is compilable.
 
 if have any issue when run-android please make sure your `android/local.properties` already set sdk path
 
@@ -100,7 +103,7 @@ ndk.dir=path/Android/sdk/ndk-bundle
 sdk.dir=path/Android/sdk
 ```
 
-7) (Optional) header include Close button in payment UI
+8) (Optional) header include Close button in payment UI
 change the following codes in your `android/app/src/main/res/values/styles.xml`
 ```
 <resources>
@@ -117,27 +120,25 @@ change the following codes in your `android/app/src/main/res/values/styles.xml`
 
 ### IOS
 
-1) npm install https://github.com/MOLPay/molpay-mobile-xdk-reactnative-beta.git --save
-
-2) navigate to `node_modules/MOLPayXDK/ios` and copy MOLPayXDK.bundle and MOLPayXDK.framework into the application project folder `{ReactProject}/ios/` and open Xcode to perform all imports.
+3) navigate to `node_modules/MOLPayXDK/ios` and copy MOLPayXDK.bundle and MOLPayXDK.framework into the application project folder `{ReactProject}/ios/` and open Xcode to perform all imports.
 
 <p align="center">
     <img src ="https://raw.githubusercontent.com/MOLPay/molpay-mobile-xdk-reactnative-beta/master/assets/01.png" />
 </p>
-3) In Xcode right click on  `Libraries` select `Add Files to ...` option and  navigate to `node_modules/MOLPayXDK/ios` and add `MOLPayXDKlib.xcodeproj`
+4) In Xcode right click on  `Libraries` select `Add Files to ...` option and  navigate to `node_modules/MOLPayXDK/ios` and add `MOLPayXDKlib.xcodeproj`
 
 
-4) In Xcode click on project and find `Build Phases` then expand `Link Binary With Libraries` and click `+` sign to add a new library. select `libMOLPayXDKlib.a` and click `Add` button.
+5) In Xcode click on project and find `Build Phases` then expand `Link Binary With Libraries` and click `+` sign to add a new library. select `libMOLPayXDKlib.a` and click `Add` button.
 
-5) final result will be like below (please make sure the MOLPayXDK.bundle and MOLPayXDK.framework also included)
+6) final result will be like below (please make sure the MOLPayXDK.bundle and MOLPayXDK.framework also included)
 
 <p align="center">
     <img src ="https://raw.githubusercontent.com/MOLPay/molpay-mobile-xdk-reactnative-beta/master/assets/02.png" />
 </p>
 
-6) Add 'App Transport Security Settings > Allow Arbitrary Loads > YES' to the application project info.plist
+7) Add 'App Transport Security Settings > Allow Arbitrary Loads > YES' to the application project info.plist
 
-7) Add 'NSPhotoLibraryUsageDescription' > 'Payment images' to the application project info.plist
+8) Add 'NSPhotoLibraryUsageDescription' > 'Payment images' to the application project info.plist
 
 ## Sample Result
 

diff --git a/ios/MOLPayXDK.bundle/molpay-mobile-xdk-www/scripts/scripts.1aa69035.js b/ios/MOLPayXDK.bundle/molpay-mobile-xdk-www/scripts/scripts.1aa69035.js
diff --git a/ios/MOLPayXDK.framework/Versions/A/MOLPayXDK b/ios/MOLPayXDK.framework/Versions/A/MOLPayXDK
diff --git a/package.json b/package.json
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.d7e0b867.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting \|\| isLoading" class="text-center"> <br> <p>Preparing...</p> <p>Please wait.</p> </div> <div class="footer"> </div> <div ng-show="isLoading \|\| D7ARequeryActiveNow" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">Loading...</div> </div> <script src="scripts/vendor.80b0fea7.js"></script> <script src="scripts/scripts.1aa69035.js"></script> </body> </html>
		<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.d7e0b867.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting \|\| isLoading" class="text-center"> <br> <p>{{label_preparing}}</p> <p>{{label_pleasewait}}</p> </div> <div class="footer"> </div> <div ng-show="isLoading \|\| D7ARequeryActiveNow" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">{{label_loading}}</div> </div> <script src="scripts/vendor.1780c687.js"></script> <script src="scripts/scripts.2d2ed87b.js"></script> </body> </html>