Skip to content

Commit

Permalink
Version Updated to 7.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@himgupta229
himgupta229 committed Jan 17, 2019
1 parent 0739575 commit 99573e9
Show file tree
Hide file tree
Showing 18 changed files with 332 additions and 7 deletions.
15 changes: 9 additions & 6 deletions AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.payu.custombrowser"
android:versionCode="30"
android:versionName="7.2.5">
android:versionCode="31"
android:versionName="7.3.0">

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

<application>
<application
android:usesCleartextTraffic="false">
<activity
android:name=".CBActivity"
android:screenOrientation="portrait"
Expand All @@ -19,6 +21,7 @@

<activity
android:name=".upiintent.PaymentResponseActivity"
android:windowSoftInputMode="stateAlwaysHidden"
android:theme="@style/Theme.Transparent" />
<activity android:name=".PreLollipopPaymentsActivity">
<intent-filter>
Expand Down
Binary file modified CustomBrowser-release.aar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
### Integration of Custom Browser (Latest version 7.2.5)
### Integration of Custom Browser (Latest version 7.3.0)
Binary file modified libs/classes.jar
View file
Binary file not shown.
Binary file added res/drawable-xhdpi/cb_ic_vpa_verified.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions res/drawable/cb_background_round_drawable.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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="@color/cb_blue_button" />
<corners android:radius="4dp" />

</shape>
8 changes: 8 additions & 0 deletions res/drawable/cb_background_round_drawable_white.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +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="@android:color/white" />
<corners android:radius="4dp" />

</shape>
9 changes: 9 additions & 0 deletions res/drawable/cb_background_round_white.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<solid android:color="@android:color/white" />
<corners android:topLeftRadius="16dp"
android:topRightRadius="16dp" />

</shape>
9 changes: 9 additions & 0 deletions res/drawable/cb_ic_edit_black.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
</vector>
8 changes: 8 additions & 0 deletions res/drawable/cb_rectangle_round.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">

<stroke android:width="1dp" android:color="@color/cb_border_color" />
<corners android:radius="4dp" />

</shape>
191 changes: 191 additions & 0 deletions res/layout/cb_layout_generic_upi.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
<?xml version="1.0" encoding="utf-8"?>

<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto">

<LinearLayout
android:id="@+id/lltop"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="vertical">

<LinearLayout
android:id="@+id/ll_app_selector"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:orientation="vertical">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:text="@string/upi_chooser_title"
android:textColor="@color/cb_heading_color"
android:textSize="18sp" />

<android.support.v7.widget.RecyclerView
android:id="@+id/rvApps"
android:layout_width="match_parent"
android:layout_height="150dp"
android:layout_gravity="center"
android:layout_marginLeft="@dimen/eight"
android:layout_marginTop="@dimen/twelve"
android:fadeScrollbars="false"
android:scrollbarSize="10dp"
android:scrollbarThumbVertical="@android:color/darker_gray"
android:scrollbars="vertical" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_separator"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center"
android:orientation="horizontal">

<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_gravity="center"
android:layout_weight="1"
android:background="@color/cb_divider_color" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:text="Or"
android:textColor="@color/cb_or_color"
android:textSize="12sp" />

<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_gravity="center"
android:layout_weight="1"
android:background="@color/cb_divider_color" />
</LinearLayout>

<LinearLayout
android:id="@+id/ll_vpa"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="vertical"
android:paddingLeft="35dp"
android:paddingRight="35dp">


<TextView
android:id="@+id/tvHeading"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/vpa_title"
android:textColor="@color/cb_heading_color"
android:textSize="16sp" />

<RelativeLayout
android:id="@+id/rlInputVpa"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/cb_rectangle_round"
android:padding="8dp">

<TextView
android:id="@+id/tvVerifyVpa"
android:visibility="invisible"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="@string/cb_verify"
android:textColor="@color/cb_verify_color"
android:textSize="16sp" />

<EditText
android:id="@+id/edit_vpa"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toLeftOf="@id/tvVerifyVpa"
android:background="@android:color/transparent"
android:hint="@string/hint_vpa"
android:inputType="text"
android:maxLines="1"
android:textColor="@color/cb_border_color"
android:textColorHint="@color/cb_textColor" />

<com.payu.custombrowser.custombar.CircularProgressView
android:id="@+id/progressBar"
android:layout_width="24dp"
android:layout_alignParentEnd="true"
app:cpv_thickness="2dp"
android:layout_alignParentRight="true"
android:paddingRight="4dp"
android:layout_height="24dp" />
<!--<ProgressBar-->
<!--android:id="@+id/progressBar"-->
<!--android:layout_width="24dp"-->
<!--android:layout_height="24dp"-->
<!--android:layout_alignParentEnd="true"-->
<!--android:layout_alignParentRight="true"-->
<!--android:paddingRight="4dp"-->
<!--android:visibility="gone" />-->

<ImageView
android:id="@+id/ivVpaSuccess"
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/cb_ic_vpa_verified"
android:visibility="gone" />
</RelativeLayout>

<TextView
android:id="@+id/tvVpaName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:paddingBottom="4dp"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:textSize="14sp" />

</LinearLayout>


<LinearLayout
android:id="@+id/llPayment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginLeft="35dp"
android:layout_marginRight="35dp"
android:layout_marginTop="8dp"
android:background="@drawable/cb_background_round_drawable"
android:gravity="center"
android:orientation="vertical">

<TextView
android:id="@+id/tv_vpa_submit"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:padding="16dp"
android:text="@string/proceed_to_pay"
android:textAllCaps="true"
android:textColor="#ddd"
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>


</LinearLayout>
</ScrollView>
33 changes: 33 additions & 0 deletions res/layout/cb_layout_package_list.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="80dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/twelve"
android:layout_marginRight="@dimen/twelve"
android:layout_gravity="center"
android:orientation="vertical">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">

<ImageView
android:id="@+id/image"
android:layout_width="50dp"
android:layout_height="50dp"
android:background="@drawable/cb_background_round_drawable_white"
android:padding="8dp" />
</LinearLayout>

<TextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/four"
android:gravity="center"
android:ellipsize="marquee"
android:singleLine="true"
android:textColor="@color/cb_item_color"
android:textSize="12sp" />
</LinearLayout>
13 changes: 13 additions & 0 deletions res/values/attrs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,17 @@
<attr name="barSpace" format="dimension" />
<attr name="animationSpeed" format="integer" />
</declare-styleable>
<declare-styleable name="CircularProgressView">
<attr name="cpv_progress" format="float" />
<attr name="cpv_maxProgress" format="float" />
<attr name="cpv_animDuration" format="integer" />
<attr name="cpv_animSwoopDuration" format="integer" />
<attr name="cpv_animSyncDuration" format="integer" />
<attr name="cpv_color" format="color"/>
<attr name="cpv_thickness" format="dimension"/>
<attr name="cpv_indeterminate" format="boolean" />
<attr name="cpv_animAutostart" format="boolean" />
<attr name="cpv_animSteps" format="integer" />
<attr name="cpv_startAngle" format="float" />
</declare-styleable>
</resources>
7 changes: 7 additions & 0 deletions res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,11 @@
<color name="cb_payu_blue">#368ecd</color>
<color name="cb_nb_button">#615C5C</color>
<color name="cb_nb_background">#3A3434</color>
<color name="cb_verify_color">#0077ff</color>
<color name="cb_progress_bar_color">#007bff</color>
<color name="cb_divider_color">#e7e7e7</color>
<color name="cb_or_color">#9c9c9c</color>
<color name="cb_heading_color">#212529</color>
<color name="cb_item_color">#4a4a4a</color>
<color name="cb_border_color">#333333</color>
</resources>
2 changes: 2 additions & 0 deletions res/values/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@
<!-- Progressbar circle -->
<dimen name="cb_circle_indicator_radius">3dp</dimen>
<dimen name="cb_circle_indicator_outer_radius">4dp</dimen>
<dimen name="cb_package_list_height">450dp</dimen>
<dimen name="cb_column_width">130dp</dimen>
</resources>
9 changes: 9 additions & 0 deletions res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,21 @@

<string name="cb_review_order">Review Order</string>
<string name="text_or">or </string>
<string name="hint_vpa">Enter your VPA</string>
<string name="vpa_title">Enter your VPA (UPI Address)</string>
<string name="upi_chooser_title">Choose UPI app</string>
<string name="proceed_to_pay">Proceed to Pay</string>
<string name="verify_vpa">Verify VPA</string>

<string name="surepay_js">function surePayData(){var list = document.getElementsByTagName(\"input\");
"var map = {};
"for(var i =0;i&lt;list.length;i++)
"{if(list[i].type=='hidden')
"map[list[i].name]=list[i].value;}
"PayU.surePayData(JSON.stringify(map));};
"surePayData();</string>
<string name="cb_verify">Verify</string>
<string name="cb_verify_and_proceed">Verify and Proceed to Pay</string>
<string name="cb_invalid_vpa">Invalid VPA</string>

</resources>
11 changes: 11 additions & 0 deletions res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,15 @@
<!-- <item name="android:windowIsFloating">true</item>-->
<item name="android:backgroundDimEnabled">false</item>
</style>

<style name="dialog_slide_animation">
<item name="android:windowEnterAnimation">@anim/slide_up_in</item>
<item name="android:windowExitAnimation">@anim/slide_up_out</item>
</style>
<style name="FullScreenDialogStyle" parent="android:Theme">
<item name="android:windowNoTitle">true</item>
<item name="android:windowFullscreen">false</item>
<item name="android:background">@android:color/transparent</item>
<item name="android:windowIsFloating">true</item>
</style>
</resources>
Loading

0 comments on commit 99573e9

Please sign in to comment.