Version updated to 7.6.0

payu-intrepos · Jan 20, 2020 · 4df17fc · 4df17fc
1 parent fd31f2c
commit 4df17fc
Show file tree

Hide file tree

Showing 19 changed files with 89 additions and 157 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.payu.custombrowser"
-    android:versionCode="37"
-    android:versionName="7.5.0">
+    android:versionCode="40"
+    android:versionName="7.6.0">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <!--Permission Disabled -->

diff --git a/CustomBrowser-release.aar b/CustomBrowser-release.aar
diff --git a/README.md b/README.md
@@ -1 +1 @@
-### Integration of Custom Browser (Latest version 7.5.0)
+### Integration of Custom Browser (Latest version 7.6.0)
diff --git a/libs/classes.jar b/libs/classes.jar
diff --git a/res/anim/cb_animation.xml b/res/anim/cb_animation.xml
diff --git a/res/anim/cb_tranlateup.xml b/res/anim/cb_tranlateup.xml
diff --git a/res/anim/cb_translate.xml b/res/anim/cb_translate.xml
diff --git a/res/drawable/ic_notifications_paused_black_24dp.xml b/res/drawable/ic_notifications_paused_black_24dp.xml
diff --git a/res/drawable/payu_shape_oval.xml b/res/drawable/payu_shape_oval.xml
@@ -3,5 +3,5 @@
     android:shape="oval">
 <size android:height="5dp"
     android:width="5dp"/>
-    <solid android:color="@color/cb_grey"></solid>
+    <solid android:color="@color/cb_grey" />
 </shape>
diff --git a/res/layout/bank.xml b/res/layout/bank.xml
@@ -86,7 +86,7 @@
         android:layout_alignParentTop="true"
         android:max="100"
         android:progress="50"
-        android:progressDrawable="@drawable/cb_progress_bar"></ProgressBar>
+        android:progressDrawable="@drawable/cb_progress_bar" />
 
     <LinearLayout
         android:id="@+id/trans_overlay"

diff --git a/res/layout/cb_payments.xml b/res/layout/cb_payments.xml
@@ -3,27 +3,29 @@ android:layout_width="match_parent"
 android:layout_height="match_parent">-->
 <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawer_layout"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <FrameLayout
-    android:id="@+id/main_frame"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:visibility="visible" />
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:id="@+id/main_frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="visible" />
 
-<!--    <Button
-        android:id="@+id/buttonone"
-        android:text="reloadWVUsingJS"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true" />
+    <!--    <Button
+            android:id="@+id/buttonone"
+            android:text="reloadWVUsingJS"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true" />
 
-    <Button
-        android:id="@+id/buttontwo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:text="reloadWVNative"/>
-</RelativeLayout>-->
+        <Button
+            android:id="@+id/buttontwo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:text="reloadWVNative"/>
+    </RelativeLayout>-->
 </android.support.v4.widget.DrawerLayout>
diff --git a/res/layout/cb_prog_dialog.xml b/res/layout/cb_prog_dialog.xml
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/transparent">
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:background="@drawable/shape_progress"
-        android:gravity="center_horizontal"
-        android:orientation="vertical"
-        android:paddingBottom="30dp"
-        android:paddingTop="30dp">
-
-        <ImageView
-            android:id="@+id/imageView"
-            style="@style/cb_image_view"
-            android:background="@android:color/white"
-            android:contentDescription="@string/cb_payu_icon"
-            android:paddingTop="10dp"
-            android:scaleType="centerInside"
-            android:src="@drawable/l_icon1" />
-
-        <TextView
-            android:id="@+id/dialog_title"
-            style="@style/cb_text_view"
-            android:layout_gravity="center_horizontal"
-            android:background="@android:color/white"
-            android:paddingTop="30dp"
-            android:text="@string/cb_process_request"
-            android:textSize="20sp"
-            android:textStyle="normal"></TextView>
-
-        <TextView
-            android:id="@+id/dialog_desc"
-            style="@style/cb_text_view"
-            android:layout_gravity="center_horizontal"
-            android:background="@android:color/white"
-            android:ellipsize="marquee"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:paddingTop="10dp"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:text="@string/cb_please_wait"
-            android:textSize="15sp"
-            android:textStyle="italic"></TextView>
-    </LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/transparent">
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:background="@drawable/shape_progress"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:paddingBottom="30dp"
+        android:paddingTop="30dp">
+
+        <ImageView
+            android:id="@+id/imageView"
+            style="@style/cb_image_view"
+            android:background="@android:color/white"
+            android:contentDescription="@string/cb_payu_icon"
+            android:paddingTop="10dp"
+            android:scaleType="centerInside"
+            android:src="@drawable/l_icon1" />
+
+        <TextView
+            android:id="@+id/dialog_title"
+            style="@style/cb_text_view"
+            android:layout_gravity="center_horizontal"
+            android:background="@android:color/white"
+            android:paddingTop="30dp"
+            android:text="@string/cb_process_request"
+            android:textSize="20sp"
+            android:textStyle="normal" />
+
+        <TextView
+            android:id="@+id/dialog_desc"
+            style="@style/cb_text_view"
+            android:layout_gravity="center_horizontal"
+            android:background="@android:color/white"
+            android:ellipsize="marquee"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:marqueeRepeatLimit="marquee_forever"
+            android:paddingTop="10dp"
+            android:scrollHorizontally="true"
+            android:singleLine="true"
+            android:text="@string/cb_please_wait"
+            android:textSize="15sp"
+            android:textStyle="italic" />
+    </LinearLayout>
 </RelativeLayout>
diff --git a/res/layout/choose_action.xml b/res/layout/choose_action.xml
@@ -85,7 +85,7 @@
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
-                        android:background="@color/cb_background"></View>
+                        android:background="@color/cb_background" />
 
                     <RelativeLayout
                         style="@style/cb_relative_layout"
@@ -109,7 +109,7 @@
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
-                        android:background="@color/cb_background"></View>
+                        android:background="@color/cb_background" />
 
                     <RelativeLayout
 
@@ -134,7 +134,7 @@
                         android:layout_width="0dp"
                         android:layout_height="match_parent"
                         android:layout_weight="1"
-                        android:background="@color/cb_background"></View>
+                        android:background="@color/cb_background" />
                 </LinearLayout>
 
                 <RelativeLayout

diff --git a/res/layout/fragment_review_order.xml b/res/layout/fragment_review_order.xml
@@ -53,7 +53,7 @@
                     android:background="@android:color/white"
                     android:orientation="vertical"
                     android:paddingLeft="20dp"
-                    android:paddingRight="20dp"></LinearLayout>
+                    android:paddingRight="20dp" />
             </ScrollView>
         </RelativeLayout>
 

diff --git a/res/layout/nb_layout.xml b/res/layout/nb_layout.xml
@@ -16,7 +16,7 @@
         android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
         android:contentDescription="@string/cb_nb_image"
-        android:visibility="gone"></ImageView>
+        android:visibility="gone" />
 
     <CheckBox
         android:id="@+id/checkbox"
@@ -28,7 +28,7 @@
         android:text="@string/cb_remember_user"
         android:textColor="@android:color/white"
         android:textSize="16sp"
-        android:visibility="gone"></CheckBox>
+        android:visibility="gone" />
 
     <Button
         android:id="@+id/b_continue"
@@ -39,5 +39,5 @@
         android:paddingLeft="15dp"
         android:paddingRight="15dp"
         android:textColor="@android:color/white"
-        android:textSize="16sp"></Button>
+        android:textSize="16sp" />
 </RelativeLayout>
diff --git a/res/layout/register.xml b/res/layout/register.xml
@@ -14,7 +14,7 @@
         android:paddingTop="20dp"
         android:text="@string/cb_registeration_detail"
         android:textColor="@color/cb_otpColor"
-        android:textSize="18sp"></TextView>
+        android:textSize="18sp" />
 
     <RelativeLayout
         style="@style/cb_relative_layout"

diff --git a/res/layout/wait_for_otp.xml b/res/layout/wait_for_otp.xml
@@ -68,7 +68,7 @@
                     android:fontFamily="sans-serif-light"
                     android:textColor="@color/cb_dark_grey"
                     android:textSize="18sp"
-                    android:textStyle="normal"></TextView>
+                    android:textStyle="normal" />
 
                 <TextView
                     android:id="@+id/waiting"
@@ -108,7 +108,7 @@
                     android:textSize="25sp"
                     android:visibility="gone">
 
-                    <requestFocus></requestFocus>
+                    <requestFocus />
                 </EditText>
 
 

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
@@ -3,7 +3,6 @@
 
 
     <dimen name="cb_twelve">12dp</dimen>
-    <dimen name="twelve">12dp</dimen>
     <dimen name="cb_twentyfour">24dp</dimen>
     <dimen name="cb_thirtysix">36dp</dimen>
 

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -126,16 +126,9 @@
     <string name="status_unknown_redirect_to_merchant">The bank could not verify the transaction at this time. Redirecting you back to the merchant...</string>
     <string name="sp_internet_restored_ttl">sp_internet_restored_ttl</string>
 
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-
     <string name="cb_review_order">Review Order</string>
     <string name="text_or">or </string>
     <string name="hint_vpa">Enter your VPA</string>
-    <string name="vpa_title">Enter your VPA (UPI Address)</string>
-    <string name="upi_chooser_title">Choose UPI app</string>
-    <string name="proceed_to_pay">Proceed to Pay</string>
-    <string name="verify_vpa">Verify VPA</string>
 
     <string name="surepay_js">function surePayData(){var list = document.getElementsByTagName(\"input\");
                     "var map = {};
@@ -144,14 +137,8 @@
                     "map[list[i].name]=list[i].value;}
                     "PayU.surePayData(JSON.stringify(map));};
                     "surePayData();</string>
-    <string name="cb_verify">Verify</string>
-    <string name="cb_verify_and_proceed">Verify and Proceed to Pay</string>
-    <string name="cb_invalid_vpa">Invalid VPA</string>
 
     <!--MetaData-->
     <string name="cb_debug_enabled">cb_debug_enabled</string>
     <string name="payu_debug_mode_enabled">payu_debug_mode_enabled</string>
-    <string name="cb_logs_level">cb_logs_level</string>
-    <string name="payu_logs_level">payu_logs_level</string>
-    <string name="payu_logging_enabled">payu_logging_enabled</string>
 </resources>