mirror/NetGuard
1
0
Fork 0
mirror of https://github.com/M66B/NetGuard.git synced 2025-02-21 22:07:15 +00:00
Code Issues Releases Wiki Activity

New subscription policies

Browse source 
https://android-developers.googleblog.com/2020/04/building-user-trust-through-more.html
This commit is contained in:
M66B 2020-04-17 09:30:27 +02:00
parent 4b87c1ecf8
commit 30ed5ba3cc
2 changed files with 59 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
app/src/main/res/layout/pro.xml
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:padding="16dp" android:padding="16dp"
tools:context=".ActivityPro"> tools:context=".ActivityPro">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -16,14 +16,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/title_pro_description" android:text="@string/title_pro_description"
android:textAppearance="@style/TextMedium"/> android:textAppearance="@style/TextMedium" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:layout_marginBottom="8dip"
android:layout_marginTop="8dip" android:layout_marginTop="8dip"
android:background="@android:color/darker_gray"/> android:layout_marginBottom="8dip"
android:background="@android:color/darker_gray" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -38,7 +38,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_weight="2" android:layout_weight="2"
android:text="@string/title_pro_log" android:text="@string/title_pro_log"
android:textAppearance="@style/TextSmall"/> android:textAppearance="@style/TextSmall" />
<Button <Button
android:id="@+id/btnLog" android:id="@+id/btnLog"
@ -48,7 +48,7 @@
android:layout_weight="1" android:layout_weight="1"
android:enabled="false" android:enabled="false"
android:text="@string/title_pro_buy" android:text="@string/title_pro_buy"
android:visibility="gone"/> android:visibility="gone" />
<TextView <TextView
android:id="@+id/tvLog" android:id="@+id/tvLog"
@ -60,7 +60,7 @@
android:text="@string/title_pro_bought" android:text="@string/title_pro_bought"
android:textAppearance="@style/TextMedium" android:textAppearance="@style/TextMedium"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone"/> android:visibility="gone" />
<TextView <TextView
android:id="@+id/tvLogUnavailable" android:id="@+id/tvLogUnavailable"
@ -72,7 +72,7 @@
android:text="@string/title_pro_unavailable" android:text="@string/title_pro_unavailable"
android:textAppearance="@style/TextMedium" android:textAppearance="@style/TextMedium"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone"/> android:visibility="gone" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -88,7 +88,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_weight="2" android:layout_weight="2"
android:text="@string/title_pro_filter" android:text="@string/title_pro_filter"
android:textAppearance="@style/TextSmall"/> android:textAppearance="@style/TextSmall" />
<Button <Button
android:id="@+id/btnFilter" android:id="@+id/btnFilter"
@ -98,7 +98,7 @@
android:layout_weight="1" android:layout_weight="1"
android:enabled="false" android:enabled="false"
android:text="@string/title_pro_buy" android:text="@string/title_pro_buy"
android:visibility="gone"/> android:visibility="gone" />
<TextView <TextView
android:id="@+id/tvFilter" android:id="@+id/tvFilter"
@ -110,7 +110,7 @@
android:text="@string/title_pro_bought" android:text="@string/title_pro_bought"
android:textAppearance="@style/TextMedium" android:textAppearance="@style/TextMedium"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone"/> android:visibility="gone" />
<TextView <TextView
android:id="@+id/tvFilterUnavailable" android:id="@+id/tvFilterUnavailable"
@ -122,7 +122,7 @@
android:text="@string/title_pro_unavailable" android:text="@string/title_pro_unavailable"
android:textAppearance="@style/TextMedium" android:textAppearance="@style/TextMedium"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone"/> android:visibility="gone" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -138,7 +138,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_weight="2" android:layout_weight="2"
android:text="@string/title_pro_notify" android:text="@string/title_pro_notify"
android:textAppearance="@style/TextSmall"/> android:textAppearance="@style/TextSmall" />
<Button <Button
android:id="@+id/btnNotify" android:id="@+id/btnNotify"
@ -148,7 +148,7 @@
android:layout_weight="1" android:layout_weight="1"
android:enabled="false" android:enabled="false"
android:text="@string/title_pro_buy" android:text="@string/title_pro_buy"
android:visibility="gone"/> android:visibility="gone" />
<TextView <TextView
android:id="@+id/tvNotify" android:id="@+id/tvNotify"
@ -160,7 +160,7 @@
android:text="@string/title_pro_bought" android:text="@string/title_pro_bought"
android:textAppearance="@style/TextMedium" android:textAppearance="@style/TextMedium"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone"/> android:visibility="gone" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -176,7 +176,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_weight="2" android:layout_weight="2"
android:text="@string/title_pro_speed" android:text="@string/title_pro_speed"
android:textAppearance="@style/TextSmall"/> android:textAppearance="@style/TextSmall" />
<Button <Button
android:id="@+id/btnSpeed" android:id="@+id/btnSpeed"
@ -186,7 +186,7 @@
android:layout_weight="1" android:layout_weight="1"
android:enabled="false" android:enabled="false"
android:text="@string/title_pro_buy" android:text="@string/title_pro_buy"
android:visibility="gone"/> android:visibility="gone" />
<TextView <TextView
android:id="@+id/tvSpeed" android:id="@+id/tvSpeed"
@ -198,7 +198,7 @@
android:text="@string/title_pro_bought" android:text="@string/title_pro_bought"
android:textAppearance="@style/TextMedium" android:textAppearance="@style/TextMedium"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone"/> android:visibility="gone" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -214,7 +214,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_weight="2" android:layout_weight="2"
android:text="@string/title_pro_theme" android:text="@string/title_pro_theme"
android:textAppearance="@style/TextSmall"/> android:textAppearance="@style/TextSmall" />
<Button <Button
android:id="@+id/btnTheme" android:id="@+id/btnTheme"
@ -224,7 +224,7 @@
android:layout_weight="1" android:layout_weight="1"
android:enabled="false" android:enabled="false"
android:text="@string/title_pro_buy" android:text="@string/title_pro_buy"
android:visibility="gone"/> android:visibility="gone" />
<TextView <TextView
android:id="@+id/tvTheme" android:id="@+id/tvTheme"
@ -236,15 +236,15 @@
android:text="@string/title_pro_bought" android:text="@string/title_pro_bought"
android:textAppearance="@style/TextMedium" android:textAppearance="@style/TextMedium"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone"/> android:visibility="gone" />
</LinearLayout> </LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:layout_marginBottom="8dip"
android:layout_marginTop="8dip" android:layout_marginTop="8dip"
android:background="@android:color/darker_gray"/> android:layout_marginBottom="8dip"
android:background="@android:color/darker_gray" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -252,14 +252,14 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="=" android:text="="
android:textAppearance="@style/TextLarge" android:textAppearance="@style/TextLarge"
android:textSize="36sp"/> android:textSize="36sp" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:layout_marginBottom="8dip"
android:layout_marginTop="8dip" android:layout_marginTop="8dip"
android:background="@android:color/darker_gray"/> android:layout_marginBottom="8dip"
android:background="@android:color/darker_gray" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -274,7 +274,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_weight="2" android:layout_weight="2"
android:text="@string/title_pro_all" android:text="@string/title_pro_all"
android:textAppearance="@style/TextSmall"/> android:textAppearance="@style/TextSmall" />
<Button <Button
android:id="@+id/btnAll" android:id="@+id/btnAll"
@ -284,7 +284,7 @@
android:layout_weight="1" android:layout_weight="1"
android:enabled="false" android:enabled="false"
android:text="@string/title_pro_buy" android:text="@string/title_pro_buy"
android:visibility="gone"/> android:visibility="gone" />
<TextView <TextView
android:id="@+id/tvAll" android:id="@+id/tvAll"
@ -296,15 +296,15 @@
android:text="@string/title_pro_bought" android:text="@string/title_pro_bought"
android:textAppearance="@style/TextMedium" android:textAppearance="@style/TextMedium"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone"/> android:visibility="gone" />
</LinearLayout> </LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:layout_marginBottom="8dip"
android:layout_marginTop="8dip" android:layout_marginTop="8dip"
android:background="@android:color/darker_gray"/> android:layout_marginBottom="8dip"
android:background="@android:color/darker_gray" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
@ -312,14 +312,14 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="≠" android:text="≠"
android:textAppearance="@style/TextLarge" android:textAppearance="@style/TextLarge"
android:textSize="36sp"/> android:textSize="36sp" />
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:layout_marginBottom="8dip"
android:layout_marginTop="8dip" android:layout_marginTop="8dip"
android:background="@android:color/darker_gray"/> android:layout_marginBottom="8dip"
android:background="@android:color/darker_gray" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -334,7 +334,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_weight="2" android:layout_weight="2"
android:text="@string/title_pro_dev" android:text="@string/title_pro_dev"
android:textAppearance="@style/TextSmall"/> android:textAppearance="@style/TextSmall" />
<Button <Button
android:id="@+id/btnDev1" android:id="@+id/btnDev1"
@ -344,7 +344,7 @@
android:layout_weight="1" android:layout_weight="1"
android:enabled="false" android:enabled="false"
android:text="@string/title_pro_buy" android:text="@string/title_pro_buy"
android:visibility="gone"/> android:visibility="gone" />
<TextView <TextView
android:id="@+id/tvDev1" android:id="@+id/tvDev1"
@ -356,7 +356,7 @@
android:text="@string/title_pro_bought" android:text="@string/title_pro_bought"
android:textAppearance="@style/TextMedium" android:textAppearance="@style/TextMedium"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone"/> android:visibility="gone" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -372,7 +372,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_weight="2" android:layout_weight="2"
android:text="@string/title_pro_dev" android:text="@string/title_pro_dev"
android:textAppearance="@style/TextSmall"/> android:textAppearance="@style/TextSmall" />
<Button <Button
android:id="@+id/btnDev2" android:id="@+id/btnDev2"
@ -382,7 +382,7 @@
android:layout_weight="1" android:layout_weight="1"
android:enabled="false" android:enabled="false"
android:text="@string/title_pro_buy" android:text="@string/title_pro_buy"
android:visibility="gone"/> android:visibility="gone" />
<TextView <TextView
android:id="@+id/tvDev2" android:id="@+id/tvDev2"
@ -394,21 +394,28 @@
android:text="@string/title_pro_bought" android:text="@string/title_pro_bought"
android:textAppearance="@style/TextMedium" android:textAppearance="@style/TextMedium"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone"/> android:visibility="gone" />
</LinearLayout> </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 <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="2dip" android:layout_height="2dip"
android:layout_marginBottom="8dip"
android:layout_marginTop="8dip" android:layout_marginTop="8dip"
android:background="@android:color/darker_gray"/> android:layout_marginBottom="8dip"
android:background="@android:color/darker_gray" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:text="@string/title_pro_details" android:text="@string/title_pro_details"
android:textAppearance="@style/TextMedium"/> android:textAppearance="@style/TextMedium" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

4
app/src/main/res/values/strings.xml
View file

@ -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_challenge">Challenge</string>
<string name="title_pro_reponse">Response</string> <string name="title_pro_reponse">Response</string>
<string name="title_pro_feature">This is a pro feature</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"> <string-array name="themeNames">
<item>teal/orange</item> <item>teal/orange</item>