Skip to content

Commit

Permalink
version 6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Rohit Jindal committed Mar 17, 2016
1 parent 537f880 commit f6ac74c
Show file tree
Hide file tree
Showing 32 changed files with 292 additions and 184 deletions.
13 changes: 11 additions & 2 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.payu.custombrowser"
android:versionCode="12"
android:versionName="5.3.7" >
android:versionCode="13"
android:versionName="6.0.0" >

<uses-sdk
android:minSdkVersion="9"
android:targetSdkVersion="23" />

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission
android:name="android.permission.RECEIVE_SMS"
android:protectionLevel="signature" />

<application>
<activity
android:name="com.payu.custombrowser.CBActivity"
android:screenOrientation="portrait"
android:windowSoftInputMode="stateAlwaysHidden" >
</activity>
</application>

</manifest>
Binary file modified CustomBrowser-release.aar
Binary file not shown.
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
### Integration of Custom Browser (Latest version 5.3.6)

Note: If you are using an older version of CB please update to the latest version 5.3.6 for improved performance and better success rates

Visit the associated [**wiki**](https://github.com/payu-intrepos/Android-Custom-Browser/wiki/v5.2.2) for the latest documentation
### Integration of Custom Browser (Latest version 6.0)
Binary file modified libs/classes.jar
Binary file not shown.
27 changes: 27 additions & 0 deletions res/anim/cb_animation.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android">

<set android:fillAfter="true">

<scale
android:fromXScale="1.0"
android:toXScale="1.0"
android:fromYScale="1.0"
android:toYScale="1.0"
android:pivotX="50%"
android:pivotY="50%"
android:duration="100"
android:repeatMode="reverse"
android:repeatCount="infinite"/>
<alpha
android:fromAlpha="0.5"
android:fillAfter="true"
android:toAlpha="2.0"
android:interpolator="@android:anim/accelerate_interpolator"
android:duration="100"
android:repeatMode="reverse"
android:repeatCount="infinite"/>
</set>


</set><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/Analytics_merged/Analytics/android-sdk-test-project/CustomBrowser/res/anim/cb_animation.xml -->
2 changes: 1 addition & 1 deletion res/anim/cb_face_out.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
android:toAlpha="0.1"
android:interpolator="@android:anim/accelerate_interpolator"
android:duration="500"/>
</set><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/anim/cb_face_out.xml -->
</set><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/Analytics_merged/Analytics/android-sdk-test-project/CustomBrowser/res/anim/cb_face_out.xml -->
2 changes: 1 addition & 1 deletion res/anim/cb_fade_in.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
android:toAlpha="1.0"
android:interpolator="@android:anim/accelerate_interpolator"
android:duration="500"/>
</set><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/anim/cb_fade_in.xml -->
</set><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/Analytics_merged/Analytics/android-sdk-test-project/CustomBrowser/res/anim/cb_fade_in.xml -->
2 changes: 1 addition & 1 deletion res/anim/cb_tranlateup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
>

</translate>
</set><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/anim/cb_tranlateup.xml -->
</set><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/Analytics_merged/Analytics/android-sdk-test-project/CustomBrowser/res/anim/cb_tranlateup.xml -->
11 changes: 11 additions & 0 deletions res/anim/cb_translate.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:fillEnabled="true"
>
<translate xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/accelerate_interpolator"
android:fromYDelta="0.0"
android:toYDelta="70%"
android:duration="500" />

</set><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/Analytics_merged/Analytics/android-sdk-test-project/CustomBrowser/res/anim/cb_translate.xml -->
6 changes: 6 additions & 0 deletions res/color/otp_approve_button_color.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>

<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:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/Analytics_merged/Analytics/android-sdk-test-project/CustomBrowser/res/color/otp_approve_button_color.xml -->
2 changes: 1 addition & 1 deletion res/drawable-xhdpi/rectangle_box.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
<stroke android:color="@color/cb_input_gray" android:width="2dp" />
</shape>
</item>
</selector><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/drawable-xhdpi/rectangle_box.xml -->
</selector><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/Analytics_merged/Analytics/android-sdk-test-project/CustomBrowser/res/drawable-xhdpi/rectangle_box.xml -->
2 changes: 1 addition & 1 deletion res/drawable/approve_otp_button.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@
<solid android:color="@color/cb_otpColor" />
</shape>
</item>
</selector><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/drawable/approve_otp_button.xml -->
</selector><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/Analytics_merged/Analytics/android-sdk-test-project/CustomBrowser/res/drawable/approve_otp_button.xml -->
4 changes: 3 additions & 1 deletion res/drawable/background_drawable.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >

<solid android:color="#59000000"/>
<corners
android:radius="0dp"/>
</shape><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/drawable/background_drawable.xml -->

</shape><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/Analytics_merged/Analytics/android-sdk-test-project/CustomBrowser/res/drawable/background_drawable.xml -->
2 changes: 1 addition & 1 deletion res/drawable/cb_edit_text.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
<solid android:color="#f6f6f6" />
</shape>
</item>
</layer-list><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/drawable/cb_edit_text.xml -->
</layer-list><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/Analytics_merged/Analytics/android-sdk-test-project/CustomBrowser/res/drawable/cb_edit_text.xml -->
2 changes: 1 addition & 1 deletion res/drawable/cb_progress_bar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
</clip>
</item>

</layer-list><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/drawable/cb_progress_bar.xml -->
</layer-list><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/Analytics_merged/Analytics/android-sdk-test-project/CustomBrowser/res/drawable/cb_progress_bar.xml -->
2 changes: 1 addition & 1 deletion res/drawable/otp_button_selector.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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/shoaib/projects/android-sdk-test-project/CustomBrowser/res/drawable/otp_button_selector.xml -->
</selector><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/Analytics_merged/Analytics/android-sdk-test-project/CustomBrowser/res/drawable/otp_button_selector.xml -->
2 changes: 1 addition & 1 deletion res/drawable/pin_button_selector.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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/shoaib/projects/android-sdk-test-project/CustomBrowser/res/drawable/pin_button_selector.xml -->
</selector><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/Analytics_merged/Analytics/android-sdk-test-project/CustomBrowser/res/drawable/pin_button_selector.xml -->
2 changes: 1 addition & 1 deletion res/drawable/shape_progress.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
android:left="10dp"
android:right="10dp"
android:top="10dp" />
</shape><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/drawable/shape_progress.xml -->
</shape><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/Analytics_merged/Analytics/android-sdk-test-project/CustomBrowser/res/drawable/shape_progress.xml -->
126 changes: 91 additions & 35 deletions res/layout/bank.xml
Original file line number Diff line number Diff line change
@@ -1,44 +1,100 @@
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="wrap_content"
android:layout_height="wrap_content">
<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
android:id="@+id/help_view"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">

<WebView
android:id="@+id/webview"
android:focusable="true"
android:layout_width="match_parent"
android:layout_height="match_parent" />

<RelativeLayout
<LinearLayout
android:id="@+id/magic_retry_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:orientation="vertical"/>

<ProgressBar
android:id="@+id/cb_progressbar"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="4dp"
android:layout_alignParentTop="true"
android:max="100"
android:progress="50"
android:progressDrawable="@drawable/cb_progress_bar">
</ProgressBar>

<LinearLayout
android:id="@+id/trans_overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/background_drawable"
android:orientation="vertical"/>

<LinearLayout
android:id="@+id/parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone"
android:id="@+id/view"
android:background="@color/cb_background">
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_alignParentTop="true"
android:background="@color/cb_border"/>
<LinearLayout
android:layout_alignParentBottom="true"
android:orientation="vertical">

<ImageView
android:id="@+id/arrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/cb_top_arrow"
android:layout_gravity="center" />

<FrameLayout
android:id="@+id/help_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

<RelativeLayout
android:id="@+id/view"
android:layout_width="match_parent"
android:layout_height="30dp">
<TextView
android:layout_height="wrap_content"
android:background="@color/cb_background"
android:orientation="vertical"
android:visibility="gone">

<View
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/cb_textColor"
android:textSize="@dimen/cb_sixteenScaled"
android:layout_marginTop="@dimen/cb_eight"
android:layout_marginBottom="@dimen/cb_eight"
android:drawableTop="@drawable/slider"
android:gravity="center"/>
</LinearLayout>

</RelativeLayout>
</LinearLayout><!-- From: file:/Users/shoaib/projects/android-sdk-test-project/CustomBrowser/res/layout/bank.xml -->

android:layout_height="1dp"
android:layout_alignParentTop="true"
android:background="@color/cb_border" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="30dp">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/cb_eight"
android:layout_marginTop="@dimen/cb_eight"
android:drawableTop="@drawable/slider"
android:gravity="center"
android:textColor="@color/cb_textColor"
android:textSize="@dimen/cb_sixteenScaled" />
</LinearLayout>

<!-- <ImageView
android:layout_gravity="right|center_vertical"
android:padding="5dp"
android:layout_height="30dp"
android:layout_width="30dp"
android:layout_alignParentRight="true"
android:layout_centerHorizontal="true"
android:src="@drawable/arrow_cb">
</ImageView>-->

</RelativeLayout>
</LinearLayout>
</RelativeLayout>
<!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/Analytics_merged/Analytics/android-sdk-test-project/CustomBrowser/res/layout/bank.xml -->
46 changes: 46 additions & 0 deletions res/layout/bankold.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<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
android:id="@+id/help_view"
android:visibility="visible"
android:layout_width="match_parent"
android:layout_height="match_parent" />

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone"
android:id="@+id/view"
android:background="@color/cb_background">
<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="30dp">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/cb_textColor"
android:textSize="@dimen/cb_sixteenScaled"
android:layout_marginTop="@dimen/cb_eight"
android:layout_marginBottom="@dimen/cb_eight"
android:drawableTop="@drawable/slider"
android:gravity="center"/>
</LinearLayout>

</RelativeLayout>
</LinearLayout><!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/Analytics_merged/Analytics/android-sdk-test-project/CustomBrowser/res/layout/bankold.xml -->
20 changes: 20 additions & 0 deletions res/layout/cb_payments.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!--<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">-->

<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/main_frame"
android:visibility="visible"
android:layout_width="match_parent"
android:layout_height="match_parent"/>


<!-- <WebView
android:id="@+id/webview"
android:layout_width="match_parent"
android:layout_height="match_parent"/>-->
<!--
</RelativeLayout>-->
<!-- From: file:/Users/Minie/AndroidStudioProjects/AndroidStudioProjects/Analytics_merged/Analytics/android-sdk-test-project/CustomBrowser/res/layout/cb_payments.xml -->
Loading

0 comments on commit f6ac74c

Please sign in to comment.