From 2e1c94d3f51dc6d667435b2a2bbd81a036d57bae Mon Sep 17 00:00:00 2001
From: akuma <akuma>
Date: Sun, 8 Sep 2019 20:40:29 +0200
Subject: New icon and text for Excluded Apps. Using PreferenceHelper. Test
 done.

---
 .../ic_shield_remove_grey600_36dp.png              | Bin 0 -> 1628 bytes
 .../ic_shield_remove_grey600_36dp.png              | Bin 0 -> 1192 bytes
 .../ic_shield_remove_grey600_36dp.png              | Bin 0 -> 1930 bytes
 .../ic_shield_remove_grey600_36dp.png              | Bin 0 -> 2902 bytes
 .../ic_shield_remove_grey600_36dp.png              | Bin 0 -> 3686 bytes
 app/src/main/res/layout/allowed_vpn_apps.xml       |  37 ++++++---------------
 app/src/main/res/values/colors.xml                 |   2 ++
 app/src/main/res/values/strings-icsopenvpn.xml     |   1 -
 app/src/main/res/values/strings.xml                |   4 ++-
 9 files changed, 16 insertions(+), 28 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_shield_remove_grey600_36dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_shield_remove_grey600_36dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_shield_remove_grey600_36dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_shield_remove_grey600_36dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_shield_remove_grey600_36dp.png

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable-hdpi/ic_shield_remove_grey600_36dp.png b/app/src/main/res/drawable-hdpi/ic_shield_remove_grey600_36dp.png
new file mode 100644
index 00000000..98dec84c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_shield_remove_grey600_36dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_shield_remove_grey600_36dp.png b/app/src/main/res/drawable-mdpi/ic_shield_remove_grey600_36dp.png
new file mode 100644
index 00000000..d4b61030
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_shield_remove_grey600_36dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_shield_remove_grey600_36dp.png b/app/src/main/res/drawable-xhdpi/ic_shield_remove_grey600_36dp.png
new file mode 100644
index 00000000..3eae1fdc
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_shield_remove_grey600_36dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_shield_remove_grey600_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_shield_remove_grey600_36dp.png
new file mode 100644
index 00000000..c6761744
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_shield_remove_grey600_36dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_shield_remove_grey600_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_shield_remove_grey600_36dp.png
new file mode 100644
index 00000000..ad08be94
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_shield_remove_grey600_36dp.png differ
diff --git a/app/src/main/res/layout/allowed_vpn_apps.xml b/app/src/main/res/layout/allowed_vpn_apps.xml
index 93327944..1219da54 100644
--- a/app/src/main/res/layout/allowed_vpn_apps.xml
+++ b/app/src/main/res/layout/allowed_vpn_apps.xml
@@ -9,33 +9,20 @@
     android:layout_width="match_parent"
     tools:ignore="RtlCompat"
     android:layout_height="match_parent">
-<!--
-    <RelativeLayout
+
+    <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="?android:attr/actionBarSize"
-        android:background="@drawable/bg_switchbar"
-        android:paddingStart="@dimen/switchbar_pad"
-        android:elevation="1dp"
-        android:paddingEnd="@dimen/switchbar_pad"
-        tools:ignore="NewApi">
+        android:gravity="center"
+        android:textStyle="bold"
+        android:textColor="@color/colorWarning"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/warning_exclude_apps_message" />
 
-        <Switch
-            android:id="@+id/default_allow"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-             />
-        <TextView
-            android:id="@+id/default_allow_text"
-            style="@android:style/TextAppearance.Medium.Inverse"
-            tools:text="@string/vpn_disallow_radio"
-            android:layout_toStartOf="@id/default_allow"
-            android:layout_width="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_height="wrap_content" />
-        </RelativeLayout>-->
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="?android:attr/listDivider"/>
 
     <ListView
         android:visibility="gone"
@@ -46,8 +33,6 @@
         android:clipToPadding="false"
         android:scrollbarStyle="outsideOverlay" />
 
-
-
     <LinearLayout
         android:id="@+id/loading_container"
         android:orientation="vertical"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d8873017..a8cdb28e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -35,4 +35,6 @@
     <color name="colorActionBarTitleFont">@color/white</color>
     <color name="colorActionBarSubtitleFont">@color/black800</color>
 
+    <color name="colorWarning">#B33A3A</color>
+
 </resources>
diff --git a/app/src/main/res/values/strings-icsopenvpn.xml b/app/src/main/res/values/strings-icsopenvpn.xml
index b390ecec..b552715a 100755
--- a/app/src/main/res/values/strings-icsopenvpn.xml
+++ b/app/src/main/res/values/strings-icsopenvpn.xml
@@ -486,5 +486,4 @@
     <string name="external_authenticator">External Authenticator</string>
     <string name="configure">Configure</string>
     <string name="extauth_not_configured">External Authneticator not configured</string>
-
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e794c75c..e685cff5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,7 +32,7 @@
   <string name="password_mismatch">Passwords do not match</string>
   <string name="user_message">User message</string>
   <string name="about_fragment_title">About</string>
-  <string name="allow_apps_fragment_title">Select Apps</string>
+  <string name="exclude_apps_fragment_title">Exclude apps from VPN</string>
   <string name="error_srp_math_error_user_message">Try again: Server math error</string>
   <string name="error_bad_user_password_user_message">Incorrect username or password</string>
   <string name="error_not_valid_password_user_message">It must be at least 8 characters long</string>
@@ -111,4 +111,6 @@
   <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>
   <string name="donate_button_remind_later">Remind me later</string>
   <string name="donate_button_donate">Donate</string>
+  <string name="warning_exclude_apps_message">Be careful of excluding apps from VPN. This will reveal your identity and compromise your security.</string>
+
 </resources>
-- 
cgit v1.2.3