Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial changes for new vpn paywall

Browse Source
This commit is contained in:
deeppandya
2024-08-21 03:30:53 +05:30
parent 70f177b095
commit cb7fcc634d
9 changed files with 713 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/res/drawable/ic_shield_done.xml
+10
View File
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF62757E"
android:fillType="evenOdd"
android:pathData="M11.91 3.62L5.5 6.47A0.23 0.23 0 0 0 5.36 6.7v4.3c0 4.28 2.88 8.23 6.65 9.35 3.77-1.12 6.65-5.07 6.65-9.34V6.69a0.23 0.23 0 0 0-0.14-0.22l-6.41-2.85a0.23 0.23 0 0 0-0.2 0Zm-0.65-1.46a1.83 1.83 0 0 1 1.5 0L19.16 5c0.67 0.3 1.1 0.95 1.1 1.68v4.3c0 5.1-3.53 9.86-8.26 11.01-4.73-1.16-8.25-5.91-8.25-11V6.69C3.76 5.96 4.18 5.3 4.85 5l6.41-2.85Zm1.06 12.83a0.83 0.83 0 0 1-1.2 0.14l-2.99-2.5a0.83 0.83 0 1 1 1.07-1.28l2.3 1.93L14.67 9a0.83 0.83 0 1 1 1.35 0.99l-3.69 5Z"/>
</vector>
android/java/res/drawable/vpn_plan_action_gradient.xml
+1 -1
View File
@@ -13,5 +13,5 @@
android:endColor="#ff5500"
android:startColor="#F5002D"
android:type="linear" />
<corners android:radius="26dp"/>
<corners android:radius="12dp"/>
</shape>
android/java/res/layout/activity_vpn_paywall.xml
+347
View File
@@ -0,0 +1,347 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/brave_plan_bg"
android:orientation="vertical"
tools:context=".BraveVpnPlansActivity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/BraveVpnToolbar"
android:minHeight="?attr/actionBarSize"/>
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:fadeScrollbars="false"
android:scrollbars="vertical">
<LinearLayout
android:id="@+id/plan_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:layout_marginBottom="16dp"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/DefaultRegular"
android:textAlignment="textStart"
android:layout_marginHorizontal="24dp"
android:layout_marginBottom="8dp"
android:textColor="@android:color/white"
android:drawablePadding="8dp"
android:text="@string/vpn_paywall_text_1"
app:drawableStartCompat="@drawable/ic_shield_done" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/DefaultRegular"
android:textAlignment="textStart"
android:layout_marginHorizontal="24dp"
android:layout_marginBottom="8dp"
android:textColor="@android:color/white"
android:drawablePadding="8dp"
android:text="@string/vpn_paywall_text_2"
app:drawableStartCompat="@drawable/ic_shield_done" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/DefaultRegular"
android:textAlignment="textStart"
android:layout_marginHorizontal="24dp"
android:layout_marginBottom="8dp"
android:textColor="@android:color/white"
android:drawablePadding="8dp"
android:text="@string/vpn_paywall_text_3"
app:drawableStartCompat="@drawable/ic_shield_done" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/DefaultRegular"
android:textAlignment="textStart"
android:layout_marginHorizontal="24dp"
android:layout_marginBottom="8dp"
android:textColor="@android:color/white"
android:drawablePadding="8dp"
android:text="@string/vpn_paywall_text_4"
app:drawableStartCompat="@drawable/ic_shield_done" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/DefaultRegular"
android:textAlignment="textStart"
android:layout_marginHorizontal="24dp"
android:layout_marginBottom="16dp"
android:textColor="@android:color/white"
android:drawablePadding="8dp"
android:text="@string/vpn_paywall_text_5"
app:drawableStartCompat="@drawable/ic_shield_done" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginBottom="24dp"
android:background="@color/primitive_primary_80"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/DefaultRegular"
android:drawablePadding="8dp"
android:layout_marginHorizontal="16dp"
android:text="@string/powered_by"
android:textColor="@android:color/white"
android:textAlignment="center"
android:layout_marginBottom="12dp"
app:drawableTint="@android:color/white"
app:drawableRightCompat="@drawable/ic_guardian" />
<TextView
android:id="@+id/trial_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/DefaultRegular"
android:text="@string/trial_text"
android:layout_marginHorizontal="16dp"
android:textColor="@android:color/white"
android:textAlignment="center"
android:layout_marginBottom="@dimen/vpn_plan_margin" />
<LinearLayout
android:id="@+id/yearly_selector_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="12dp"
android:layout_marginHorizontal="16dp"
android:paddingVertical="@dimen/vpn_plan_section_margin"
android:paddingHorizontal="16dp"
android:background="@drawable/vpn_plan_bg"
android:orientation="horizontal"
android:baselineAligned="false">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/one_year"
android:drawablePadding="6dp"
android:textColor="@android:color/white"
android:layout_gravity="start"
android:gravity="start"
android:textAlignment="textStart"
android:layout_marginBottom="2dp"
android:textSize="16sp"
app:drawableEndCompat="@drawable/ic_discount" />
<TextView
android:id="@+id/yearly_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/renew_monthly_save"
android:textColor="@android:color/white"
android:layout_gravity="start"
android:gravity="start"
android:textAlignment="textStart"
android:alpha="0.6"
android:textSize="16sp"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ProgressBar
android:id="@+id/yearly_plan_progress"
android:layout_width="20dp"
android:layout_height="20dp"
android:visibility="gone"
android:layout_gravity="center"
android:indeterminate="true"/>
<TextView
android:id="@+id/yearly_subscription_amount_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:layout_gravity="start"
android:gravity="start"
android:textAlignment="textStart"
android:layout_marginBottom="2dp"
android:textSize="16sp"/>
</FrameLayout>
<TextView
android:id="@+id/removed_value_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:layout_gravity="end"
android:gravity="end"
android:textAlignment="textEnd"
android:alpha="0.6"
android:textSize="16sp"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/monthly_selector_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginTop="12dp"
android:layout_marginHorizontal="16dp"
android:baselineAligned="false"
android:paddingVertical="@dimen/vpn_plan_section_margin"
android:paddingHorizontal="16dp"
android:background="@drawable/vpn_plan_bg"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/monthly_subscription_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/monthly_subscription"
android:textColor="@android:color/white"
android:layout_gravity="start"
android:gravity="start"
android:textAlignment="textStart"
android:layout_marginBottom="2dp"
android:textSize="16sp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/renews_monthly"
android:textColor="@android:color/white"
android:layout_gravity="start"
android:gravity="start"
android:textAlignment="textStart"
android:alpha="0.6"
android:textSize="16sp"/>
</LinearLayout>
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ProgressBar
android:id="@+id/monthly_plan_progress"
android:layout_width="20dp"
android:layout_height="20dp"
android:visibility="gone"
android:layout_gravity="center"
android:indeterminate="true"/>
<TextView
android:id="@+id/monthly_subscription_amount_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:layout_gravity="start"
android:gravity="start"
android:textAlignment="textStart"
android:textSize="16sp"/>
</FrameLayout>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/SmallRegular"
android:layout_margin="16dp"
android:text="@string/brave_vpn_renewal_text"
android:textColor="@color/primitive_primary_30"
android:textAlignment="textStart"
android:layout_gravity="center"
android:gravity="center"
android:textSize="14sp"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/HeadingH4"
android:layout_marginHorizontal="16dp"
android:layout_marginBottom="8dp"
android:text="@string/already_purchased"
android:textColor="@color/primitive_primary_20"
android:textAlignment="center"/>
<TextView
android:id="@+id/refresh_credentials_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/HeadingH4"
android:layout_marginHorizontal="16dp"
android:layout_marginBottom="24dp"
android:paddingHorizontal="16dp"
android:paddingVertical="12dp"
android:textColor="@android:color/white"
android:background="@drawable/refresh_credentials_bg"
android:text="@string/refresh_your_credentials"
android:textAlignment="center"/>
</LinearLayout>
</ScrollView>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/primitive_primary_70"/>
<android.widget.Button
android:id="@+id/vpn_plan_action_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@drawable/vpn_plan_action_gradient"
android:clickable="true"
android:focusable="true"
android:paddingVertical="14dp"
android:paddingHorizontal="20dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="8dp"
android:layout_marginHorizontal="16dp"
android:textAllCaps="false"
android:enabled="false"
android:text="@string/try_7_days_for_free"
android:textColor="@android:color/white" />
</LinearLayout>