0.27.0

RazerMS · Jul 2, 2019 · c998ced · c998ced
1 parent e471a3d
commit c998ced
Show file tree

Hide file tree

Showing 26 changed files with 1,261 additions and 8 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,18 +1,23 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 22
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0.0"
     }
 }
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    implementation 'com.molpay:molpay-mobile-xdk-android:3.25.0'
+    testImplementation 'junit:junit:4.12'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.volley:volley:1.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
 }
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -1,4 +1,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.molpayxdk">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <application>
+        <activity android:name=".MOLPayActivity"
+            android:configChanges="orientation|screenSize" />
+    </application>
+
+
 </manifest>
diff --git a/android/src/main/assets/molpay-mobile-xdk-www/fonts/FontAwesome.otf b/android/src/main/assets/molpay-mobile-xdk-www/fonts/FontAwesome.otf
diff --git a/android/src/main/assets/molpay-mobile-xdk-www/fonts/fontawesome-webfont.eot b/android/src/main/assets/molpay-mobile-xdk-www/fonts/fontawesome-webfont.eot
diff --git a/android/src/main/assets/molpay-mobile-xdk-www/fonts/fontawesome-webfont.svg b/android/src/main/assets/molpay-mobile-xdk-www/fonts/fontawesome-webfont.svg
diff --git a/android/src/main/assets/molpay-mobile-xdk-www/fonts/fontawesome-webfont.ttf b/android/src/main/assets/molpay-mobile-xdk-www/fonts/fontawesome-webfont.ttf
diff --git a/android/src/main/assets/molpay-mobile-xdk-www/fonts/fontawesome-webfont.woff b/android/src/main/assets/molpay-mobile-xdk-www/fonts/fontawesome-webfont.woff
diff --git a/android/src/main/assets/molpay-mobile-xdk-www/fonts/fontawesome-webfont.woff2 b/android/src/main/assets/molpay-mobile-xdk-www/fonts/fontawesome-webfont.woff2
diff --git a/android/src/main/assets/molpay-mobile-xdk-www/images/ImageUnavailable.png b/android/src/main/assets/molpay-mobile-xdk-www/images/ImageUnavailable.png
diff --git a/android/src/main/assets/molpay-mobile-xdk-www/images/poweredByMOLPay.png b/android/src/main/assets/molpay-mobile-xdk-www/images/poweredByMOLPay.png
diff --git a/android/src/main/assets/molpay-mobile-xdk-www/index.html b/android/src/main/assets/molpay-mobile-xdk-www/index.html
@@ -0,0 +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.68a3f254.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-cloak ng-show="isStarting || isLoading" class="text-center"> <br> <p>{{label_preparing}}</p> <p>{{label_pleasewait}}</p> </div> <div class="footer"> </div> <div ng-cloak 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.993ae4d8.js"></script> <script src="scripts/scripts.9ab80e46.js"></script> </body> </html>
diff --git a/android/src/main/assets/molpay-mobile-xdk-www/scripts/scripts.9ab80e46.js b/android/src/main/assets/molpay-mobile-xdk-www/scripts/scripts.9ab80e46.js
diff --git a/android/src/main/assets/molpay-mobile-xdk-www/scripts/vendor.993ae4d8.js b/android/src/main/assets/molpay-mobile-xdk-www/scripts/vendor.993ae4d8.js
diff --git a/android/src/main/assets/molpay-mobile-xdk-www/styles/main.68a3f254.css b/android/src/main/assets/molpay-mobile-xdk-www/styles/main.68a3f254.css
diff --git a/android/src/main/assets/molpay-mobile-xdk-www/styles/vendor.34eb91d2.css b/android/src/main/assets/molpay-mobile-xdk-www/styles/vendor.34eb91d2.css
diff --git a/android/src/main/java/com/molpayxdk/MOLPayActivity.java b/android/src/main/java/com/molpayxdk/MOLPayActivity.java
diff --git a/android/src/main/java/com/molpayxdk/MOLPayReact.java b/android/src/main/java/com/molpayxdk/MOLPayReact.java
@@ -4,7 +4,7 @@
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.molpay.molpayxdk.MOLPayActivity;
+import com.molpayxdk.MOLPayActivity;
 import android.content.Intent;
 
 import android.app.Activity;

diff --git a/android/src/main/res/layout/activity_molpay.xml b/android/src/main/res/layout/activity_molpay.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/MPContainer"
+    tools:context="com.molpayxdk.MOLPayActivity">
+
+    <WebView
+        android:id="@+id/MPMainUI"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="false"
+        android:layout_centerHorizontal="true" />
+    <WebView
+        android:id="@+id/MPMOLPayUI"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="false"
+        android:layout_centerHorizontal="true" />
+
+</RelativeLayout>
diff --git a/android/src/main/res/menu/menu_molpay.xml b/android/src/main/res/menu/menu_molpay.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.molpayxdk.MOLPayActivity">
+    <item
+        android:id="@+id/closeBtn"
+        android:orderInCategory="100"
+        android:title="@string/close"
+        app:showAsAction="always" />
+</menu>
diff --git a/android/src/main/res/values-w820dp/dimens.xml b/android/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/android/src/main/res/values/dimens.xml b/android/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+</resources>
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name">MOLPayXDK</string>
+    <string name="close">Close</string>
+</resources>
diff --git a/ios/MOLPayXDK.bundle/molpay-mobile-xdk-www/index.html b/ios/MOLPayXDK.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.68a3f254.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-cloak ng-show="isStarting || isLoading" class="text-center"> <br> <p>{{label_preparing}}</p> <p>{{label_pleasewait}}</p> </div> <div class="footer"> </div> <div ng-cloak 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.993ae4d8.js"></script> <script src="scripts/scripts.1437d623.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.68a3f254.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-cloak ng-show="isStarting || isLoading" class="text-center"> <br> <p>{{label_preparing}}</p> <p>{{label_pleasewait}}</p> </div> <div class="footer"> </div> <div ng-cloak 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.993ae4d8.js"></script> <script src="scripts/scripts.9ab80e46.js"></script> </body> </html>
diff --git a/ios/MOLPayXDK.bundle/molpay-mobile-xdk-www/scripts/scripts.1437d623.js b/ios/MOLPayXDK.bundle/molpay-mobile-xdk-www/scripts/scripts.1437d623.js
diff --git a/ios/MOLPayXDK.bundle/molpay-mobile-xdk-www/scripts/scripts.9ab80e46.js b/ios/MOLPayXDK.bundle/molpay-mobile-xdk-www/scripts/scripts.9ab80e46.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "molpay-mobile-xdk-reactnative-beta",
-  "version": "0.25.0",
+  "version": "0.27.0",
   "description": "Razer Merchant Services mobile payment for React Native (BETA)",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"