Version updated to 7.0

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="15"
-    android:versionName="6.1.1" >
+    android:versionCode="19"
+    android:versionName="7.0.0" >
 
     <uses-sdk
         android:minSdkVersion="9"

README.md

@@ -1 +1 @@
-### Integration of Custom Browser (Latest version 6.1)
+### Integration of Custom Browser (Latest version 7.0)

res/anim/slide_up_in.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="500"
+        android:fromYDelta="100%p"
+        android:interpolator="@android:anim/linear_interpolator"
+        android:toYDelta="0%p">
+
+    </translate>
+</set>

res/anim/slide_up_out.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="500"
+        android:fromYDelta="0%p"
+        android:interpolator="@android:anim/linear_interpolator"
+        android:toYDelta="100%p">
+
+    </translate>
+</set>

res/drawable/payu_shape_oval.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+<size android:height="5dp"
+    android:width="5dp"/>
+    <solid android:color="@color/cb_grey"></solid>
+</shape>

res/drawable/shadow_top.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <size android:width="50dp" android:height="100dp" />
+            <gradient android:angle="90" android:centerColor="#00464600" android:endColor="#00464600" android:startColor="@color/cb_dark_grey" />
+        </shape>
+    </item>
+</selector>

res/layout/bank.xml

@@ -10,6 +10,66 @@
         android:background="@android:color/transparent"
         android:focusable="true" />
 
+   <RelativeLayout
+        android:layout_alignParentBottom="true"
+        android:id="@+id/r_payu_review_order"
+        style="@style/cb_relative_layout"
+        android:layout_height="30dp"
+        android:orientation="vertical"
+        android:visibility="visible">
+
+        <View
+            style="@style/cb_horizontal_line"
+            android:layout_alignParentTop="true"
+            android:id="@+id/v_payu_review_line"/>
+
+            <TextView
+                style="@style/cb_text_view"
+                android:layout_width="match_parent"
+                android:layout_marginBottom="@dimen/cb_eight"
+                android:layout_below="@id/v_payu_review_line"
+                android:layout_marginTop="@dimen/cb_eight"
+                android:drawableTop="@drawable/slider"
+                android:gravity="center"
+                android:textColor="@color/cb_textColor"
+                android:textSize="@dimen/cb_sixteenScaled" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:text="@string/cb_review_order"
+                android:id="@+id/t_payu_review_order"
+                android:layout_alignParentRight="true"
+                android:visibility="gone"
+                android:layout_below="@id/v_payu_review_line"
+                android:textColor="@color/cb_blue_button"
+                android:elevation="10dp"
+                android:paddingTop="5dp"
+                android:textStyle="bold"
+                android:paddingBottom="5dp"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:layout_height="wrap_content" />
+        </RelativeLayout>
+
+    <!--<RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_alignParentBottom="true"
+        android:id="@+id/r_payu_review_order"
+        android:background="@color/cb_dark_grey"
+        android:layout_height="wrap_content">
+        <TextView
+            android:layout_width="wrap_content"
+            android:text="Review Order"
+            android:id="@+id/t_payu_review_order"
+            android:layout_alignParentRight="true"
+            android:textColor="@color/cb_grey"
+            android:elevation="10dp"
+            android:paddingTop="5dp"
+            android:paddingBottom="5dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:layout_height="wrap_content" />
+    </RelativeLayout>-->
+
     <LinearLayout
         android:id="@+id/magic_retry_container"
         android:layout_width="wrap_content"
@@ -41,7 +101,6 @@
         android:background="@android:color/white"
         android:visibility="gone"/>
 
-
     <LinearLayout
         android:id="@+id/parent"
         style="@style/cb_linear_layout"
@@ -70,10 +129,12 @@
 
             <View
                 style="@style/cb_horizontal_line"
+                android:id="@+id/v_payu_cb_horizontal_line"
                 android:layout_alignParentTop="true" />
 
-            <LinearLayout
+            <RelativeLayout
                 style="@style/cb_linear_layout"
+                android:layout_below="@+id/v_payu_cb_horizontal_line"
                 android:layout_height="30dp">
 
                 <TextView
@@ -85,7 +146,21 @@
                     android:gravity="center"
                     android:textColor="@color/cb_textColor"
                     android:textSize="@dimen/cb_sixteenScaled" />
-            </LinearLayout>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:text="@string/cb_review_order"
+                    android:id="@+id/t_payu_review_order_cb"
+                    android:layout_alignParentRight="true"
+                    android:textColor="@color/cb_blue_button"
+                    android:elevation="10dp"
+                    android:paddingTop="5dp"
+                    android:paddingBottom="5dp"
+                    android:paddingLeft="10dp"
+                    android:paddingRight="10dp"
+                    android:textStyle="bold"
+                    android:visibility="gone"
+                    android:layout_height="wrap_content" />
+            </RelativeLayout>
 
             <!-- <ImageView
                  android:layout_gravity="right|center_vertical"
@@ -99,4 +174,11 @@
 
         </RelativeLayout>
     </LinearLayout>
+    <FrameLayout android:id="@+id/payu_review_order"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="visible"
+        android:background="@android:color/transparent"
+        android:layout_alignParentBottom="true"
+        />
 </RelativeLayout>

res/layout/bankold.xml

@@ -4,7 +4,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
-
+    <FrameLayout android:id="@+id/payu_review_order"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        />
     <ImageView
         android:id="@+id/arrow"
         android:layout_width="wrap_content"

res/layout/cb_payments.xml

@@ -1,8 +1,11 @@
 <!--<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 android:layout_width="match_parent"
 android:layout_height="match_parent">-->
-
-    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -23,3 +26,4 @@ android:layout_height="match_parent">-->
         android:layout_alignParentRight="true"
         android:text="reloadWVNative"/>
 </RelativeLayout>-->
+</android.support.v4.widget.DrawerLayout>

res/layout/cb_prog_dialog.xml

@@ -8,8 +8,8 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:layout_marginLeft="30dp"
-        android:layout_marginRight="30dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
         android:background="@drawable/shape_progress"
         android:gravity="center_horizontal"
         android:orientation="vertical"

res/layout/choose_action.xml

@@ -14,10 +14,21 @@
         android:gravity="center_vertical"
         android:orientation="vertical">
 
-        <LinearLayout
+        <RelativeLayout
             style="@style/cb_linear_layout"
             android:layout_height="30dp">
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:text="@string/cb_payu_review_order"
+                android:paddingRight="10dp"
+                android:textColor="@color/cb_blue_button"
+                android:gravity="center_vertical"
+               android:textStyle="bold"
+                android:elevation="10dp"
+                android:layout_alignParentRight="true"
+                android:id="@+id/t_payu_review_option"/>
             <TextView
                 style="@style/cb_text_view"
                 android:layout_width="match_parent"
@@ -26,7 +37,7 @@
                 android:drawableTop="@drawable/slider"
                 android:gravity="center"
                 android:textSize="@dimen/cb_sixteenScaled" />
-        </LinearLayout>
+        </RelativeLayout>
 
         <LinearLayout
             style="@style/cb_linear_layout"

res/layout/fragment_review_order.xml

@@ -0,0 +1,70 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:background="@android:color/transparent"
+    android:layout_height="match_parent"
+    android:clickable="true"
+    tools:context="com.payu.custombrowser.ReviewOrderFragment">
+
+    <View
+        style="@style/cb_horizontal_line"
+        android:layout_alignParentTop="true"
+        android:id="@+id/v_payu_review_shadow"/>
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:background="@android:color/transparent"
+        android:id="@+id/r_payu_constant_height"
+        android:layout_below="@id/v_payu_review_shadow"
+        android:layout_height="wrap_content">
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/white"
+            android:id="@+id/r_payu_review_order"
+            >
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:background="@android:color/white"
+                android:layout_alignParentTop="true"
+                android:layout_gravity="center_vertical"
+                android:fontFamily="sans-serif-regular"
+                android:padding="10dp"
+                android:id="@+id/t_payu_review_order_information"
+                android:text="@string/order_information"
+                android:textColor="@color/cb_dark_grey"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+
+
+            <ScrollView
+                android:id="@+id/s_payu_review_details"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_below="@id/t_payu_review_order_information"
+                android:scrollbars="vertical">
+
+                <LinearLayout
+                    android:id="@+id/payu_review_order_list"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@android:color/white"
+                    android:orientation="vertical"
+                    android:paddingLeft="20dp"
+                    android:paddingRight="20dp"></LinearLayout>
+            </ScrollView>
+        </RelativeLayout>
+
+        <ImageView
+            android:id="@+id/i_payu_close_review"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_alignParentRight="true"
+            android:paddingBottom="2dp"
+            android:paddingRight="10dp"
+            android:paddingTop="5dp"
+            android:src="@drawable/cb_payu_close_grey" />
+    </RelativeLayout>
+</RelativeLayout>

res/layout/loading.xml

@@ -13,21 +13,30 @@
 
     <RelativeLayout style="@style/cb_relative_layout">
 
-        <LinearLayout
-            android:id="@+id/header"
+        <RelativeLayout
             style="@style/cb_linear_layout"
-            android:layout_height="30dp"
-            android:layout_alignParentTop="true">
+            android:layout_height="30dp">
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:text="@string/cb_payu_review_order"
+                android:paddingRight="10dp"
+                android:textColor="@color/cb_blue_button"
+                android:gravity="center_vertical"
+                android:textStyle="bold"
+                android:elevation="10dp"
+                android:layout_alignParentRight="true"
+                android:id="@+id/t_payu_review_option"/>
             <TextView
                 style="@style/cb_text_view"
                 android:layout_width="match_parent"
-                android:layout_marginBottom="@dimen/cb_eight"
+                android:layout_marginBottom="@dimen/cb_twelve"
                 android:layout_marginTop="@dimen/cb_eight"
                 android:drawableTop="@drawable/slider"
                 android:gravity="center"
                 android:textSize="@dimen/cb_sixteenScaled" />
-        </LinearLayout>
+        </RelativeLayout>
 
         <LinearLayout
             style="@style/cb_linear_layout"

res/layout/nb_layout.xml

@@ -3,6 +3,7 @@
     android:id="@+id/l_nativebutton"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:clickable="true"
     android:background="@color/cb_nb_background"
     android:gravity="right"
     android:orientation="horizontal"