summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2019-07-12 10:38:00 -0700
committercyberta <cyberta@riseup.net>2019-07-12 10:38:00 -0700
commit6c9a29082a8543991b8485c8613e7c586fed636f (patch)
tree3e6730b27eff129a54f6104c2dd2f487ffea2887 /app/src/main/res
parent144244cab15014d495985f396c618729209a8f8a (diff)
parent50667074dd6729eb47400273f4275ceba2457575 (diff)
Merge branch 'improve_blocking_vpn' into 'master'
Improve blocking vpn See merge request leap/bitmask_android!91
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/drawable/cust_button_secondary.xml8
-rw-r--r--app/src/main/res/layout/d_checkbox_confirm.xml73
-rw-r--r--app/src/main/res/values-de/strings.xml1
-rw-r--r--app/src/main/res/values/strings.xml1
4 files changed, 62 insertions, 21 deletions
diff --git a/app/src/main/res/drawable/cust_button_secondary.xml b/app/src/main/res/drawable/cust_button_secondary.xml
index 553adca8..baed7b44 100644
--- a/app/src/main/res/drawable/cust_button_secondary.xml
+++ b/app/src/main/res/drawable/cust_button_secondary.xml
@@ -4,16 +4,16 @@
<shape android:shape="rectangle" >
<corners android:radius="50dp" />
<padding android:left="8dp" android:right="8dp"/>
- <solid android:color="@android:color/transparent"/>
- <stroke android:width="2dp" android:color="@color/colorPrimary"/>
+ <solid android:color="#20000000"/>
+ <stroke android:width="2dp" android:color="@color/colorPrimaryDark"/>
</shape>
</item>
<item android:state_focused="true">
<shape android:shape="rectangle" >
<corners android:radius="50dp" />
<padding android:left="8dp" android:right="8dp"/>
- <solid android:color="@android:color/transparent"/>
- <stroke android:width="2dp" android:color="@color/colorPrimary"/>
+ <solid android:color="#20000000"/>
+ <stroke android:width="2dp" android:color="@color/colorPrimaryDark"/>
</shape>
</item>
<item >
diff --git a/app/src/main/res/layout/d_checkbox_confirm.xml b/app/src/main/res/layout/d_checkbox_confirm.xml
index 6dd22417..a9a84c0e 100644
--- a/app/src/main/res/layout/d_checkbox_confirm.xml
+++ b/app/src/main/res/layout/d_checkbox_confirm.xml
@@ -1,24 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
- <se.leap.bitmaskclient.views.IconTextView
- android:id="@+id/user_message"
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="@dimen/activity_horizontal_margin"
- android:layout_marginBottom="0dp"
- android:autoLink="web"
- />
+ xmlns:tools="http://schemas.android.com/tools"
+ android:orientation="vertical">
+ <android.support.v7.widget.AppCompatTextView
+ android:id="@+id/tvTitle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/standard_margin"
+ android:layout_marginTop="@dimen/add_button_margin"
+ android:layout_marginLeft="@dimen/activity_horizontal_margin"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:text="@string/always_on_vpn"
+ android:textAllCaps="true"
+ android:textAppearance="@style/TextAppearance.AppCompat.Title"
+ android:textStyle="bold"
+ />
- <CheckBox
- android:id="@+id/do_not_show_again"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/stdpadding"
- android:text="@string/do_not_show_again" />
+ <se.leap.bitmaskclient.views.IconTextView
+ android:id="@+id/user_message"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/activity_horizontal_margin"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_marginBottom="0dp"
+ android:autoLink="web"
+ tools:text="@string/always_on_vpn_user_message"
+ android:textSize="17sp"
+ />
+
+ <android.support.v7.widget.AppCompatTextView
+ android:id="@+id/block_vpn_user_message"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/activity_horizontal_margin"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_marginTop="@dimen/standard_margin"
+ android:layout_marginBottom="@dimen/standard_margin"
+ android:text="@string/always_on_blocking_vpn_user_message"
+ android:visibility="gone"
+ tools:visibility="visible"
+ android:textSize="17sp"
+ />
+
+
+ <CheckBox
+ android:id="@+id/do_not_show_again"
+ android:textAppearance="@style/TextAppearance.AppCompat"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/stdpadding"
+ android:text="@string/do_not_show_again" />
-</LinearLayout> \ No newline at end of file
+ </LinearLayout>
+</ScrollView> \ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0fba388e..0b25a2a2 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -113,6 +113,7 @@
<string name="always_on_vpn">VPN immer anlassen</string>
<string name="do_not_show_again">Nicht erneut anzeigen</string>
<string name="always_on_vpn_user_message">Um durchgehend aktives VPN in den Android VPN Einstellungen einzuschalten, klicke auf das Zahnrad [img src] und aktiviere den Schalter.</string>
+ <string name="always_on_blocking_vpn_user_message">Aktiviere zusätzlich die Option \"Verbindungen nur über VPN zulassen\", um deine Privatsphäre optimal zu schützen.</string>
<string name="donate_title">Spenden</string>
<string name="donate_default_message">Spende noch heute, wenn du sichere Kommunikation wertschätzt, die sowohl für Endnutzer*innen als auch Menschen die den Service bereit stellen leicht nutzbar ist.</string>
<string name="donate_message">LEAP benötigt Spenden und Stipendien. Spende noch heute wenn du sichere Kommunikation wertschätzt, die sowohl für Enandwender*innen als auch Menschen die den Dienst anbieten leicht nutzbar ist.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 551b7cb1..1b22592a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -104,6 +104,7 @@
<string name="always_on_vpn">Always-on VPN</string>
<string name="do_not_show_again">Do not show again</string>
<string name="always_on_vpn_user_message">To enable always-on VPN in Android VPN Settings click on the configure icon [img src] and turn the switch on.</string>
+ <string name="always_on_blocking_vpn_user_message">To protect your privacy optimally, you should also activate the option \"Block connections without VPN\".</string>
<string name="donate_title">Donate</string>
<string name="donate_default_message">Please donate today if you value secure communication that is easy for both the end-user and the service provider.</string>
<string name="donate_message">LEAP depends on donations and grants. Please donate today if you value secure communication that is easy for both the end-user and the service provider.</string>