updated CB version 5.2

payu-intrepos · Sep 17, 2015 · da70249 · da70249
1 parent c39dbf0
commit da70249
Show file tree

Hide file tree

Showing 31 changed files with 58 additions and 39 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -2,15 +2,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.payu.custombrowser"
     android:versionCode="5"
-    android:versionName="5.1.1" >
+    android:versionName="5.2" >
 
     <uses-sdk
         android:minSdkVersion="9"
-        android:targetSdkVersion="22" />
+        android:targetSdkVersion="23" />
 
-    <uses-permission android:name="android.permission.RECEIVE_SMS" />
     <uses-permission android:name="android.permission.READ_SMS" />
-
-    <application />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission
+        android:name="android.permission.RECEIVE_SMS"
+        android:protectionLevel="signature" />
 
 </manifest>
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
@@ -24,4 +24,4 @@
     </set>
 
 
-</set><!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/anim/cb_animation.xml -->
+</set><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/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:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/anim/cb_face_out.xml -->
+</set><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/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:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/anim/cb_fade_in.xml -->
+</set><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/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:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/anim/cb_tranlateup.xml -->
+</set><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/anim/cb_tranlateup.xml -->
diff --git a/res/anim/cb_translate.xml b/res/anim/cb_translate.xml
@@ -8,4 +8,4 @@
         android:toYDelta="70%"
         android:duration="500" />
 
-</set><!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/anim/cb_translate.xml -->
+</set><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/anim/cb_translate.xml -->
diff --git a/res/color/otp_approve_button_color.xml b/res/color/otp_approve_button_color.xml
@@ -3,4 +3,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="false" android:color="@color/cb_otpDisabledTextColor" />
     <item android:color="@android:color/white"/>
-</selector><!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/color/otp_approve_button_color.xml -->
+</selector><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/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:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/drawable-xhdpi/rectangle_box.xml -->
+</selector><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/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:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/drawable/approve_otp_button.xml -->
+</selector><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/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
@@ -5,4 +5,4 @@
     <corners
         android:radius="0dp"/>
 
-</shape><!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/drawable/background_drawable.xml -->
+</shape><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/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:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/drawable/cb_edit_text.xml -->
+</layer-list><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/drawable/cb_edit_text.xml -->
diff --git a/res/drawable/inner_circle.xml b/res/drawable/inner_circle.xml
@@ -4,4 +4,4 @@
     <solid android:angle="360"
         android:color="#1E90FF"/>
     <size android:width="8dp" android:height="8dp"/>
-</shape><!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/drawable/inner_circle.xml -->
+</shape><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/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:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/drawable/otp_button_selector.xml -->
+</selector><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/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
@@ -9,4 +9,4 @@
         android:color="#FFFFFF"
         />
     <size android:width="8dp" android:height="8dp"/>
-</shape><!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/drawable/outer_circle.xml -->
+</shape><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/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:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/drawable/pin_button_selector.xml -->
+</selector><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/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:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/drawable/shape_progress.xml -->
+</shape><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/drawable/shape_progress.xml -->
diff --git a/res/layout/bank.xml b/res/layout/bank.xml
@@ -50,4 +50,4 @@
         </ImageView>-->
 
     </RelativeLayout>
-</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/bank.xml -->
+</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/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
@@ -51,4 +51,4 @@
 
 
 
-</RelativeLayout><!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/cb_prog_dialog.xml -->
+</RelativeLayout><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/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
@@ -5,7 +5,7 @@
     android:layout_gravity="center"
     android:gravity="center"
     android:background="@color/cb_background">
-    <LinearLayout
+   <!-- <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
@@ -90,7 +90,22 @@
                 >
             </LinearLayout>
         </RelativeLayout>
-    </LinearLayout>
+    </LinearLayout>-->
+
+    <!-- ProgressBar
+        android:id="@+id/indeterminate_horizontal_progress"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal" / -->
+
+    <com.payu.custombrowser.DotsProgressBar
+        android:layout_marginLeft="6dp"
+        android:id="@+id/dotsProgressBar"
+        android:layout_centerInParent="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/twelve" />
 
 
-</RelativeLayout><!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/cb_progressdialog.xml -->
+</RelativeLayout><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/cb_progressdialog.xml -->
diff --git a/res/layout/choose_action.xml b/res/layout/choose_action.xml
@@ -189,4 +189,4 @@
         </LinearLayout>
     </LinearLayout>
 
-</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/choose_action.xml -->
+</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/choose_action.xml -->
diff --git a/res/layout/error_page.xml b/res/layout/error_page.xml
@@ -70,4 +70,4 @@
        </View>
    </LinearLayout>
 
-</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/error_page.xml -->
+</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/error_page.xml -->
diff --git a/res/layout/loading.xml b/res/layout/loading.xml
@@ -129,4 +129,4 @@
 
     </LinearLayout>
 
-</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/loading.xml -->
+</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/loading.xml -->
diff --git a/res/layout/mainprogress.xml b/res/layout/mainprogress.xml
@@ -8,4 +8,4 @@
     layout="@layout/cb_progressdialog"
     ></include>
 </LinearLayout>
-<!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/mainprogress.xml -->
+<!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/mainprogress.xml -->
diff --git a/res/layout/nb_layout.xml b/res/layout/nb_layout.xml
@@ -38,4 +38,4 @@
             android:layout_alignParentRight="true"
             android:id="@+id/native_button">
         </Button>
-</RelativeLayout><!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/nb_layout.xml -->
+</RelativeLayout><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/nb_layout.xml -->
diff --git a/res/layout/register.xml b/res/layout/register.xml
@@ -87,4 +87,4 @@
         </LinearLayout>
     </RelativeLayout>
 </LinearLayout>
-<!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/register.xml -->
+<!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/register.xml -->
diff --git a/res/layout/register_pin.xml b/res/layout/register_pin.xml
@@ -139,4 +139,4 @@
         </RelativeLayout>
     </LinearLayout>
 
-</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/register_pin.xml -->
+</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/register_pin.xml -->
diff --git a/res/layout/retry_otp.xml b/res/layout/retry_otp.xml
@@ -239,4 +239,4 @@
 
     </LinearLayout>
 
-</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/retry_otp.xml -->
+</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/retry_otp.xml -->
diff --git a/res/layout/wait_for_otp.xml b/res/layout/wait_for_otp.xml
@@ -34,7 +34,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-
             <LinearLayout
                 android:orientation="vertical"
                 android:gravity="center"
@@ -45,6 +44,7 @@
                     android:id="@+id/progress"
                     layout="@layout/cb_progressdialog"
                     ></include>
+
                 <TextView android:id="@+id/timer"
                     android:layout_marginTop="@dimen/four"
                     android:fontFamily="sans-serif-light"
@@ -265,4 +265,4 @@
 
 
 
-</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/wait_for_otp.xml -->
+</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/layout/wait_for_otp.xml -->
diff --git a/res/values/values.xml b/res/values/values.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/values/colors.xml -->
+    <!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/values/colors.xml -->
     <eat-comment/>
     <color name="cb_background">#f6f6f6</color>
     <color name="cb_blue_button">#368ecd</color>
@@ -15,10 +15,13 @@
     <color name="cb_otpDisabledTextColor">#bec4d9</color>
     <color name="cb_otpReceivedColor">#769b12</color>
     <color name="cb_textColor">#8f8d8d</color>
-    <!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/values/dimens.xml -->
+    <color name="payu_blue">#368ecd</color>
+    <!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/values/dimens.xml -->
     <eat-comment/>
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="circle_indicator_outer_radius">4dp</dimen>
+    <dimen name="circle_indicator_radius">3dp</dimen>
     <dimen name="eight">8dp</dimen>
     <dimen name="eighteen">18dp</dimen>
     <dimen name="four">4dp</dimen>
@@ -33,7 +36,7 @@
     <dimen name="twelveScaled">12sp</dimen>
     <dimen name="twentyfour">24dp</dimen>
     <dimen name="two">2dp</dimen>
-    <!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/values/strings.xml -->
+    <!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/values/strings.xml -->
     <eat-comment/>
     <string name="analytics_waiting_for_otp">waiting_for_otp</string>
     <string name="approve_otp">Approve</string>
@@ -90,7 +93,7 @@
     <string name="success">success</string>
     <string name="use_sms_otp">USE SMS OTP</string>
     <string name="waiting_for_otp">Waiting for OTP</string>
-    <!-- From: file:/home/minie/AndroidStudioProjects/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/values/styles.xml -->
+    <!-- From: file:/home/minie/AndroidStudioProjects/optimised/gitlatestcustombrowser/android-sdk-test-project/CustomBrowser/res/values/styles.xml -->
     <eat-comment/>
     <style name="ProgressDialog" parent="@android:style/Theme.Dialog">
         <item name="android:windowFullscreen">true</item>