Skip to content

Commit

Permalink
New subscription policies
Browse files Browse the repository at this point in the history 
https://android-developers.googleblog.com/2020/04/building-user-trust-through-more.html
  • Loading branch information
@M66B
M66B committed Apr 17, 2020
1 parent 4b87c1e commit 30ed5ba
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 48 deletions.
103 changes: 55 additions & 48 deletions app/src/main/res/layout/pro.xml
View file
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="16dp"
tools:context=".ActivityPro">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="16dp"
tools:context=".ActivityPro">

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -16,14 +16,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_pro_description"
android:textAppearance="@style/TextMedium"/>
android:textAppearance="@style/TextMedium" />

<View
android:layout_width="match_parent"
android:layout_height="2dip"
android:layout_marginBottom="8dip"
android:layout_marginTop="8dip"
android:background="@android:color/darker_gray"/>
android:layout_marginBottom="8dip"
android:background="@android:color/darker_gray" />

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -38,7 +38,7 @@
android:layout_gravity="center_vertical"
android:layout_weight="2"
android:text="@string/title_pro_log"
android:textAppearance="@style/TextSmall"/>
android:textAppearance="@style/TextSmall" />

<Button
android:id="@+id/btnLog"
Expand All @@ -48,7 +48,7 @@
android:layout_weight="1"
android:enabled="false"
android:text="@string/title_pro_buy"
android:visibility="gone"/>
android:visibility="gone" />

<TextView
android:id="@+id/tvLog"
Expand All @@ -60,7 +60,7 @@
android:text="@string/title_pro_bought"
android:textAppearance="@style/TextMedium"
android:textStyle="bold"
android:visibility="gone"/>
android:visibility="gone" />

<TextView
android:id="@+id/tvLogUnavailable"
Expand All @@ -72,7 +72,7 @@
android:text="@string/title_pro_unavailable"
android:textAppearance="@style/TextMedium"
android:textStyle="bold"
android:visibility="gone"/>
android:visibility="gone" />
</LinearLayout>

<LinearLayout
Expand All @@ -88,7 +88,7 @@
android:layout_gravity="center_vertical"
android:layout_weight="2"
android:text="@string/title_pro_filter"
android:textAppearance="@style/TextSmall"/>
android:textAppearance="@style/TextSmall" />

<Button
android:id="@+id/btnFilter"
Expand All @@ -98,7 +98,7 @@
android:layout_weight="1"
android:enabled="false"
android:text="@string/title_pro_buy"
android:visibility="gone"/>
android:visibility="gone" />

<TextView
android:id="@+id/tvFilter"
Expand All @@ -110,7 +110,7 @@
android:text="@string/title_pro_bought"
android:textAppearance="@style/TextMedium"
android:textStyle="bold"
android:visibility="gone"/>
android:visibility="gone" />

<TextView
android:id="@+id/tvFilterUnavailable"
Expand All @@ -122,7 +122,7 @@
android:text="@string/title_pro_unavailable"
android:textAppearance="@style/TextMedium"
android:textStyle="bold"
android:visibility="gone"/>
android:visibility="gone" />
</LinearLayout>

<LinearLayout
Expand All @@ -138,7 +138,7 @@
android:layout_gravity="center_vertical"
android:layout_weight="2"
android:text="@string/title_pro_notify"
android:textAppearance="@style/TextSmall"/>
android:textAppearance="@style/TextSmall" />

<Button
android:id="@+id/btnNotify"
Expand All @@ -148,7 +148,7 @@
android:layout_weight="1"
android:enabled="false"
android:text="@string/title_pro_buy"
android:visibility="gone"/>
android:visibility="gone" />

<TextView
android:id="@+id/tvNotify"
Expand All @@ -160,7 +160,7 @@
android:text="@string/title_pro_bought"
android:textAppearance="@style/TextMedium"
android:textStyle="bold"
android:visibility="gone"/>
android:visibility="gone" />
</LinearLayout>

<LinearLayout
Expand All @@ -176,7 +176,7 @@
android:layout_gravity="center_vertical"
android:layout_weight="2"
android:text="@string/title_pro_speed"
android:textAppearance="@style/TextSmall"/>
android:textAppearance="@style/TextSmall" />

<Button
android:id="@+id/btnSpeed"
Expand All @@ -186,7 +186,7 @@
android:layout_weight="1"
android:enabled="false"
android:text="@string/title_pro_buy"
android:visibility="gone"/>
android:visibility="gone" />

<TextView
android:id="@+id/tvSpeed"
Expand All @@ -198,7 +198,7 @@
android:text="@string/title_pro_bought"
android:textAppearance="@style/TextMedium"
android:textStyle="bold"
android:visibility="gone"/>
android:visibility="gone" />
</LinearLayout>

<LinearLayout
Expand All @@ -214,7 +214,7 @@
android:layout_gravity="center_vertical"
android:layout_weight="2"
android:text="@string/title_pro_theme"
android:textAppearance="@style/TextSmall"/>
android:textAppearance="@style/TextSmall" />

<Button
android:id="@+id/btnTheme"
Expand All @@ -224,7 +224,7 @@
android:layout_weight="1"
android:enabled="false"
android:text="@string/title_pro_buy"
android:visibility="gone"/>
android:visibility="gone" />

<TextView
android:id="@+id/tvTheme"
Expand All @@ -236,30 +236,30 @@
android:text="@string/title_pro_bought"
android:textAppearance="@style/TextMedium"
android:textStyle="bold"
android:visibility="gone"/>
android:visibility="gone" />
</LinearLayout>

<View
android:layout_width="match_parent"
android:layout_height="2dip"
android:layout_marginBottom="8dip"
android:layout_marginTop="8dip"
android:background="@android:color/darker_gray"/>
android:layout_marginBottom="8dip"
android:background="@android:color/darker_gray" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="="
android:textAppearance="@style/TextLarge"
android:textSize="36sp"/>
android:textSize="36sp" />

<View
android:layout_width="match_parent"
android:layout_height="2dip"
android:layout_marginBottom="8dip"
android:layout_marginTop="8dip"
android:background="@android:color/darker_gray"/>
android:layout_marginBottom="8dip"
android:background="@android:color/darker_gray" />

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -274,7 +274,7 @@
android:layout_gravity="center_vertical"
android:layout_weight="2"
android:text="@string/title_pro_all"
android:textAppearance="@style/TextSmall"/>
android:textAppearance="@style/TextSmall" />

<Button
android:id="@+id/btnAll"
Expand All @@ -284,7 +284,7 @@
android:layout_weight="1"
android:enabled="false"
android:text="@string/title_pro_buy"
android:visibility="gone"/>
android:visibility="gone" />

<TextView
android:id="@+id/tvAll"
Expand All @@ -296,30 +296,30 @@
android:text="@string/title_pro_bought"
android:textAppearance="@style/TextMedium"
android:textStyle="bold"
android:visibility="gone"/>
android:visibility="gone" />
</LinearLayout>

<View
android:layout_width="match_parent"
android:layout_height="2dip"
android:layout_marginBottom="8dip"
android:layout_marginTop="8dip"
android:background="@android:color/darker_gray"/>
android:layout_marginBottom="8dip"
android:background="@android:color/darker_gray" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="≠"
android:textAppearance="@style/TextLarge"
android:textSize="36sp"/>
android:textSize="36sp" />

<View
android:layout_width="match_parent"
android:layout_height="2dip"
android:layout_marginBottom="8dip"
android:layout_marginTop="8dip"
android:background="@android:color/darker_gray"/>
android:layout_marginBottom="8dip"
android:background="@android:color/darker_gray" />

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -334,7 +334,7 @@
android:layout_gravity="center_vertical"
android:layout_weight="2"
android:text="@string/title_pro_dev"
android:textAppearance="@style/TextSmall"/>
android:textAppearance="@style/TextSmall" />

<Button
android:id="@+id/btnDev1"
Expand All @@ -344,7 +344,7 @@
android:layout_weight="1"
android:enabled="false"
android:text="@string/title_pro_buy"
android:visibility="gone"/>
android:visibility="gone" />

<TextView
android:id="@+id/tvDev1"
Expand All @@ -356,7 +356,7 @@
android:text="@string/title_pro_bought"
android:textAppearance="@style/TextMedium"
android:textStyle="bold"
android:visibility="gone"/>
android:visibility="gone" />
</LinearLayout>

<LinearLayout
Expand All @@ -372,7 +372,7 @@
android:layout_gravity="center_vertical"
android:layout_weight="2"
android:text="@string/title_pro_dev"
android:textAppearance="@style/TextSmall"/>
android:textAppearance="@style/TextSmall" />

<Button
android:id="@+id/btnDev2"
Expand All @@ -382,7 +382,7 @@
android:layout_weight="1"
android:enabled="false"
android:text="@string/title_pro_buy"
android:visibility="gone"/>
android:visibility="gone" />

<TextView
android:id="@+id/tvDev2"
Expand All @@ -394,21 +394,28 @@
android:text="@string/title_pro_bought"
android:textAppearance="@style/TextMedium"
android:textStyle="bold"
android:visibility="gone"/>
android:visibility="gone" />
</LinearLayout>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_pro_subscription"
android:textAppearance="@style/TextSmall"
android:textStyle="italic" />

<View
android:layout_width="match_parent"
android:layout_height="2dip"
android:layout_marginBottom="8dip"
android:layout_marginTop="8dip"
android:background="@android:color/darker_gray"/>
android:layout_marginBottom="8dip"
android:background="@android:color/darker_gray" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/title_pro_details"
android:textAppearance="@style/TextMedium"/>
android:textAppearance="@style/TextMedium" />
</LinearLayout>
</ScrollView>
4 changes: 4 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Expand Up @@ -309,6 +309,10 @@ Your internet traffic is not being sent to a remote VPN server.</string>
<string name="title_pro_challenge">Challenge</string>
<string name="title_pro_reponse">Response</string>
<string name="title_pro_feature">This is a pro feature</string>
<string name="title_pro_subscription">
A monthly subscriptions of 1 or 2 euros (excluding local taxes) will activate all pro features.
You can cancel or manage a subscription via the subscription tab in the Play store app.
</string>

<string-array name="themeNames">
<item>teal/orange</item>
Expand Down

0 comments on commit 30ed5ba

Please sign in to comment.