Skip to content

Commit

Permalink
CB version 5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
unknown committed Aug 4, 2015
1 parent 70b716d commit 010365d
Show file tree
Hide file tree
Showing 62 changed files with 115 additions and 32 deletions.
4 changes: 2 additions & 2 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.payu.custombrowser"
android:versionCode="5"
android:versionName="0.0.7" >
android:versionName="5.1" >

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

<uses-permission android:name="android.permission.RECEIVE_SMS" />
Expand Down
Binary file modified CustomBrowser-release.aar
Binary file not shown.
Binary file modified libs/classes.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion res/anim/cb_animation.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
</set>


</set><!-- From: file:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/anim/cb_animation.xml -->
</set><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/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:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/anim/cb_face_out.xml -->
</set><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/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:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/anim/cb_fade_in.xml -->
</set><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/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:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/anim/cb_tranlateup.xml -->
</set><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/anim/cb_tranlateup.xml -->
2 changes: 1 addition & 1 deletion res/anim/cb_translate.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
android:toYDelta="70%"
android:duration="500" />

</set><!-- From: file:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/anim/cb_translate.xml -->
</set><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/anim/cb_translate.xml -->
2 changes: 1 addition & 1 deletion res/color/otp_approve_button_color.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/color/otp_approve_button_color.xml -->
</selector><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/color/otp_approve_button_color.xml -->
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
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:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/drawable-xhdpi/rectangle_box.xml -->
</selector><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/drawable-xhdpi/rectangle_box.xml -->
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
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:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/drawable/approve_otp_button.xml -->
</selector><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/drawable/approve_otp_button.xml -->
2 changes: 1 addition & 1 deletion res/drawable/background_drawable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
<corners
android:radius="0dp"/>

</shape><!-- From: file:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/drawable/background_drawable.xml -->
</shape><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/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:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/drawable/cb_edit_text.xml -->
</layer-list><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/drawable/cb_edit_text.xml -->
2 changes: 1 addition & 1 deletion res/drawable/inner_circle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
<solid android:angle="360"
android:color="#1E90FF"/>
<size android:width="8dp" android:height="8dp"/>
</shape><!-- From: file:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/drawable/inner_circle.xml -->
</shape><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/drawable/inner_circle.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:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/drawable/otp_button_selector.xml -->
</selector><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/drawable/otp_button_selector.xml -->
2 changes: 1 addition & 1 deletion res/drawable/outer_circle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
android:color="#FFFFFF"
/>
<size android:width="8dp" android:height="8dp"/>
</shape><!-- From: file:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/drawable/outer_circle.xml -->
</shape><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/drawable/outer_circle.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:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/drawable/pin_button_selector.xml -->
</selector><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/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:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/drawable/shape_progress.xml -->
</shape><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/drawable/shape_progress.xml -->
2 changes: 1 addition & 1 deletion res/layout/bank.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@
</ImageView>-->

</RelativeLayout>
</LinearLayout><!-- From: file:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/layout/bank.xml -->
</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/layout/bank.xml -->
2 changes: 1 addition & 1 deletion res/layout/cb_prog_dialog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@



</RelativeLayout><!-- From: file:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/layout/cb_prog_dialog.xml -->
</RelativeLayout><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/layout/cb_prog_dialog.xml -->
2 changes: 1 addition & 1 deletion res/layout/cb_progressdialog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,4 @@
</LinearLayout>


</RelativeLayout><!-- From: file:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/layout/cb_progressdialog.xml -->
</RelativeLayout><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/layout/cb_progressdialog.xml -->
2 changes: 1 addition & 1 deletion res/layout/choose_action.xml
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,4 @@
</LinearLayout>
</LinearLayout>

</LinearLayout><!-- From: file:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/layout/choose_action.xml -->
</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/layout/choose_action.xml -->
73 changes: 73 additions & 0 deletions res/layout/error_page.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<?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:background="@color/cb_background"
android:paddingTop="40dp"
android:paddingBottom="40dp"
android:layout_height="wrap_content">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="ERROR_TITLE"
android:layout_gravity="center_horizontal"
android:fontFamily="sans-serif-light"
android:textColor="@android:color/black"
android:textSize="18sp"
android:id="@+id/error_title"/>
<!-- <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:fontFamily="sans-serif-light"
android:textSize="18sp"
android:text="ERROR_MESSAGE"
android:id="@+id/error_message"
android:paddingTop="10dp"
android:layout_gravity="center_horizontal"/>-->

<LinearLayout
android:layout_width="wrap_content"
android:layout_gravity="center_horizontal"
android:paddingTop="20dp"
android:layout_height="wrap_content">
<View
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
</View>
<Button
android:text="@string/b_cancel"
android:id="@+id/cancel"
android:layout_width="150dp"
android:layout_height="36dp"
android:background="@drawable/approve_otp_button"
style="@style/approve_otp"
android:textSize="12sp"
android:paddingRight="@dimen/eight"
android:paddingLeft="@dimen/eight"
android:textStyle="bold"/>
<!-- <View
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
</View>
<Button
android:text="@string/b_retry"
android:id="@+id/retry"
android:layout_width="150dp"
android:layout_height="36dp"
android:background="@drawable/approve_otp_button"
style="@style/approve_otp"
android:textSize="12sp"
android:paddingRight="@dimen/eight"
android:paddingLeft="@dimen/eight"
android:textStyle="bold"/>-->
<View
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
</View>
</LinearLayout>

</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/layout/error_page.xml -->
2 changes: 1 addition & 1 deletion res/layout/loading.xml
Original file line number Diff line number Diff line change
Expand Up @@ -129,4 +129,4 @@

</LinearLayout>

</LinearLayout><!-- From: file:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/layout/loading.xml -->
</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/layout/loading.xml -->
2 changes: 1 addition & 1 deletion res/layout/mainprogress.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
layout="@layout/cb_progressdialog"
></include>
</LinearLayout>
<!-- From: file:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/layout/mainprogress.xml -->
<!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/layout/mainprogress.xml -->
2 changes: 1 addition & 1 deletion res/layout/nb_layout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@
android:layout_alignParentRight="true"
android:id="@+id/native_button">
</Button>
</RelativeLayout><!-- From: file:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/layout/nb_layout.xml -->
</RelativeLayout><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/layout/nb_layout.xml -->
2 changes: 1 addition & 1 deletion res/layout/register.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@
</LinearLayout>
</RelativeLayout>
</LinearLayout>
<!-- From: file:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/layout/register.xml -->
<!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/layout/register.xml -->
2 changes: 1 addition & 1 deletion res/layout/register_pin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,4 @@
</RelativeLayout>
</LinearLayout>

</LinearLayout><!-- From: file:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/layout/register_pin.xml -->
</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/layout/register_pin.xml -->
2 changes: 1 addition & 1 deletion res/layout/retry_otp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -239,4 +239,4 @@

</LinearLayout>

</LinearLayout><!-- From: file:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/layout/retry_otp.xml -->
</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/layout/retry_otp.xml -->
10 changes: 9 additions & 1 deletion res/layout/wait_for_otp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@
android:id="@+id/progress"
layout="@layout/cb_progressdialog"
></include>
<TextView android:id="@+id/timer"
android:layout_marginTop="@dimen/four"
android:fontFamily="sans-serif-light"
android:textSize="18sp"
android:textStyle="normal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
</TextView>
<TextView
android:id="@+id/waiting"
android:layout_width="wrap_content"
Expand Down Expand Up @@ -257,4 +265,4 @@



</LinearLayout><!-- From: file:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/layout/wait_for_otp.xml -->
</LinearLayout><!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/layout/wait_for_otp.xml -->
10 changes: 6 additions & 4 deletions res/values/values.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- From: file:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/values/colors.xml -->
<!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/android-sdk-test-project/CustomBrowser/res/values/colors.xml -->
<eat-comment/>
<color name="cb_background">#f6f6f6</color>
<color name="cb_blue_button">#368ecd</color>
Expand All @@ -15,7 +15,7 @@
<color name="cb_otpDisabledTextColor">#bec4d9</color>
<color name="cb_otpReceivedColor">#769b12</color>
<color name="cb_textColor">#8f8d8d</color>
<!-- From: file:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/values/dimens.xml -->
<!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/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>
Expand All @@ -33,12 +33,14 @@
<dimen name="twelveScaled">12sp</dimen>
<dimen name="twentyfour">24dp</dimen>
<dimen name="two">2dp</dimen>
<!-- From: file:/home/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/values/strings.xml -->
<!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/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>
<string name="approved_otp">approved OTP</string>
<string name="authenticate_with">Select an option for Faster Payment</string>
<string name="b_cancel">Cancel</string>
<string name="b_retry">Retry</string>
<string name="bank_page_loading">Please wait. Bank page is loading..</string>
<string name="btn_action">btn_action</string>
<string name="cancel">cancel</string>
Expand Down Expand Up @@ -88,7 +90,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/franklin/AndroidStudioProjects/gitlab/android-sdk-test-project/CustomBrowser/res/values/styles.xml -->
<!-- From: file:/home/minie/AndroidStudioProjects/HDFCIssueFix/latestcode/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>
Expand Down

0 comments on commit 010365d

Please sign in to comment.