version 5.3.7

payu-intrepos · Jan 20, 2016 · 537f880 · 537f880
1 parent 671f14c
commit 537f880
Show file tree

Hide file tree

Showing 32 changed files with 104 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="11"
-    android:versionName="5.3.6" >
+    android:versionCode="12"
+    android:versionName="5.3.7" >
 
     <uses-sdk
         android:minSdkVersion="9"

diff --git a/CustomBrowser-release.aar b/CustomBrowser-release.aar
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_face_out.xml b/res/anim/cb_face_out.xml
@@ -8,4 +8,4 @@
         android:toAlpha="0.1"
         android:interpolator="@android:anim/accelerate_interpolator"
         android:duration="500"/>
-</set><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/harmeetissue/android-sdk-test-project/CustomBrowser/res/anim/cb_face_out.xml -->
+</set><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/anim/cb_face_out.xml -->
diff --git a/res/anim/cb_fade_in.xml b/res/anim/cb_fade_in.xml
@@ -8,4 +8,4 @@
         android:toAlpha="1.0"
         android:interpolator="@android:anim/accelerate_interpolator"
         android:duration="500"/>
-</set><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/harmeetissue/android-sdk-test-project/CustomBrowser/res/anim/cb_fade_in.xml -->
+</set><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/anim/cb_fade_in.xml -->
diff --git a/res/anim/cb_tranlateup.xml b/res/anim/cb_tranlateup.xml
@@ -9,4 +9,4 @@
         >
 
         </translate>
-</set><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/harmeetissue/android-sdk-test-project/CustomBrowser/res/anim/cb_tranlateup.xml -->
+</set><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/anim/cb_tranlateup.xml -->
diff --git a/res/anim/cb_translate.xml b/res/anim/cb_translate.xml
diff --git a/res/color/otp_approve_button_color.xml b/res/color/otp_approve_button_color.xml
diff --git a/res/drawable-xhdpi/rectangle_box.xml b/res/drawable-xhdpi/rectangle_box.xml
@@ -21,4 +21,4 @@
             <stroke android:color="@color/cb_input_gray" android:width="2dp" />
         </shape>
     </item>
-</selector><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/harmeetissue/android-sdk-test-project/CustomBrowser/res/drawable-xhdpi/rectangle_box.xml -->
+</selector><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/drawable-xhdpi/rectangle_box.xml -->
diff --git a/res/drawable/approve_otp_button.xml b/res/drawable/approve_otp_button.xml
@@ -31,4 +31,4 @@
             <solid android:color="@color/cb_otpColor" />
         </shape>
     </item>
-</selector><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/harmeetissue/android-sdk-test-project/CustomBrowser/res/drawable/approve_otp_button.xml -->
+</selector><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/drawable/approve_otp_button.xml -->
diff --git a/res/drawable/background_drawable.xml b/res/drawable/background_drawable.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-
-    <solid android:color="#59000000"></solid>
+    <solid android:color="#59000000"/>
     <corners
         android:radius="0dp"/>
-
-</shape><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/harmeetissue/android-sdk-test-project/CustomBrowser/res/drawable/background_drawable.xml -->
+</shape><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/drawable/background_drawable.xml -->
diff --git a/res/drawable/cb_edit_text.xml b/res/drawable/cb_edit_text.xml
@@ -20,4 +20,4 @@
             <solid android:color="#f6f6f6" />
         </shape>
     </item>
-</layer-list><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/harmeetissue/android-sdk-test-project/CustomBrowser/res/drawable/cb_edit_text.xml -->
+</layer-list><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/drawable/cb_edit_text.xml -->
diff --git a/res/drawable/cb_progress_bar.xml b/res/drawable/cb_progress_bar.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape android:shape="rectangle">
+            <corners android:radius="0dip"  />
+            <solid android:color="@android:color/transparent"/>
+
+        </shape>
+    </item>
+
+
+    <item
+        android:id="@android:id/progress"
+        >
+        <clip>
+            <shape>
+                <corners
+                    android:radius="0dip" />
+                <gradient
+                    android:startColor="@color/cb_blue_button_light"
+                    android:endColor="@color/cb_blue_button"
+                    android:angle="270" />
+            </shape>
+        </clip>
+    </item>
+
+</layer-list><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/drawable/cb_progress_bar.xml -->
diff --git a/res/drawable/inner_circle.xml b/res/drawable/inner_circle.xml
diff --git a/res/drawable/otp_button_selector.xml b/res/drawable/otp_button_selector.xml
@@ -5,4 +5,4 @@
     <item android:drawable="@drawable/otp_icon_large"
         android:state_focused="true" />
     <item android:drawable="@drawable/otp_icon_large" />
-</selector><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/harmeetissue/android-sdk-test-project/CustomBrowser/res/drawable/otp_button_selector.xml -->
+</selector><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/drawable/otp_button_selector.xml -->
diff --git a/res/drawable/outer_circle.xml b/res/drawable/outer_circle.xml
diff --git a/res/drawable/pin_button_selector.xml b/res/drawable/pin_button_selector.xml
@@ -5,4 +5,4 @@
     <item android:drawable="@drawable/password_icon_large"
         android:state_focused="true" />
     <item android:drawable="@drawable/password_icon_large" />
-</selector><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/harmeetissue/android-sdk-test-project/CustomBrowser/res/drawable/pin_button_selector.xml -->
+</selector><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/drawable/pin_button_selector.xml -->
diff --git a/res/drawable/shape_progress.xml b/res/drawable/shape_progress.xml
@@ -11,4 +11,4 @@
         android:left="10dp"
         android:right="10dp"
         android:top="10dp" />
-</shape><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/harmeetissue/android-sdk-test-project/CustomBrowser/res/drawable/shape_progress.xml -->
+</shape><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/drawable/shape_progress.xml -->
diff --git a/res/layout/bank.xml b/res/layout/bank.xml
@@ -6,6 +6,7 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:contentDescription="@string/cb_top_arrow"
         android:layout_gravity="center"
         android:id="@+id/arrow"/>
     <FrameLayout
@@ -40,4 +41,4 @@
         </LinearLayout>
 
     </RelativeLayout>
-</LinearLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/harmeetissue/android-sdk-test-project/CustomBrowser/res/layout/bank.xml -->
+</LinearLayout><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/layout/bank.xml -->
diff --git a/res/layout/cb_prog_dialog.xml b/res/layout/cb_prog_dialog.xml
@@ -22,6 +22,7 @@
             android:id="@+id/imageView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:contentDescription="@string/cb_payu_icon"
             android:scaleType="centerInside"
             />
 
@@ -33,15 +34,15 @@
             android:id="@+id/dialog_title"
             android:layout_gravity="center_horizontal"
             android:textStyle="normal"
-            android:text="Processing Your Request">
+            android:text="@string/cb_process_request">
         </TextView>
         <TextView
             android:paddingTop="10dp"
             android:layout_height="wrap_content"
             android:textStyle="italic"
             android:textSize="15dp"
             android:layout_width="wrap_content"
-            android:text="Please Wait"
+            android:text="@string/cb_please_wait"
             android:id="@+id/dialog_desc">
         </TextView>
 
@@ -51,4 +52,4 @@
 
 
 
-</RelativeLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/harmeetissue/android-sdk-test-project/CustomBrowser/res/layout/cb_prog_dialog.xml -->
+</RelativeLayout><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/layout/cb_prog_dialog.xml -->
diff --git a/res/layout/cb_progressdialog.xml b/res/layout/cb_progressdialog.xml
@@ -108,4 +108,4 @@
         android:paddingTop="@dimen/cb_twelve" />
 
 
-</RelativeLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/harmeetissue/android-sdk-test-project/CustomBrowser/res/layout/cb_progressdialog.xml -->
+</RelativeLayout><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/layout/cb_progressdialog.xml -->
diff --git a/res/layout/choose_action.xml b/res/layout/choose_action.xml
@@ -46,7 +46,7 @@
                 android:textSize="18sp"
                 android:textStyle="normal"
                 android:textColor="@color/cb_errorRed"
-                android:text="Incorrect OTP!"
+                android:text="@string/cb_incorrect_otp_e"
                 android:layout_marginBottom="@dimen/cb_four"/>
 
             <TextView
@@ -86,7 +86,7 @@
                             android:layout_height="wrap_content"
                             android:gravity="center"
                             android:textSize="13sp"
-                            android:text="PASSWORD"
+                            android:text="@string/cb_password"
                             android:textColor="@color/cb_textColor"
                             android:layout_centerInParent="true"
                             android:textStyle="bold"
@@ -150,7 +150,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="30dp"
                             android:textSize="15sp"
-                            android:text="Powered by"
+                            android:text="@string/cb_powered_by"
                             android:gravity="center_vertical"
                             android:textColor="@color/cb_textColor"
                             android:drawablePadding="@dimen/cb_four"
@@ -180,6 +180,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingRight="5dp"
+
+                        android:contentDescription="@string/cb_bank_logo"
                         android:layout_gravity="right|center_vertical"
                         />
                         </LinearLayout>
@@ -189,4 +191,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</LinearLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/harmeetissue/android-sdk-test-project/CustomBrowser/res/layout/choose_action.xml -->
+</LinearLayout><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/layout/choose_action.xml -->
diff --git a/res/layout/error_page.xml b/res/layout/error_page.xml
@@ -9,7 +9,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="ERROR_TITLE"
+        android:text="@string/cb_error_title"
         android:layout_gravity="center_horizontal"
         android:fontFamily="sans-serif-light"
         android:textColor="@android:color/black"
@@ -37,8 +37,8 @@
            android:layout_weight="1">
            </View>
     <Button
-        android:text="@string/cb_b_cancel"
         android:id="@+id/cancel"
+        android:text="@string/cb_b_cancel"
         android:layout_width="150dp"
         android:layout_height="36dp"
         android:background="@drawable/approve_otp_button"
@@ -70,4 +70,4 @@
        </View>
    </LinearLayout>
 
-</LinearLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/harmeetissue/android-sdk-test-project/CustomBrowser/res/layout/error_page.xml -->
+</LinearLayout><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/layout/error_page.xml -->
diff --git a/res/layout/loading.xml b/res/layout/loading.xml
@@ -10,13 +10,8 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_alignParentTop="true"
         android:background="@color/cb_border"/>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
           <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -48,7 +43,7 @@
                 <include
                     android:id="@+id/progress"
                     layout="@layout/cb_progressdialog"
-                    ></include>
+                    />
 
                 <TextView
                     android:id="@+id/waiting"
@@ -91,7 +86,7 @@
                           android:layout_width="wrap_content"
                           android:layout_height="30dp"
                           android:textSize="15sp"
-                          android:text="Powered by"
+                          android:text="@string/cb_powered_by"
                           android:gravity="center_vertical"
                           android:textColor="@color/cb_textColor"
                           android:drawablePadding="@dimen/cb_four"
@@ -121,12 +116,13 @@
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:paddingRight="5dp"
+                          android:contentDescription="@string/cb_bank_logo"
                           android:layout_gravity="right|center_vertical"
                           />
                   </LinearLayout>
               </RelativeLayout>
         </RelativeLayout>
 
-    </LinearLayout>
 
-</LinearLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/harmeetissue/android-sdk-test-project/CustomBrowser/res/layout/loading.xml -->
+
+</LinearLayout><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/layout/loading.xml -->
diff --git a/res/layout/mainprogress.xml b/res/layout/mainprogress.xml