From 63d1ccce6173445efba0028cc0fee1562e4540aa Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Wed, 3 Jul 2019 19:10:19 +0200
Subject: show a little ghost and extra information in notifications when
 trying or using an obfuscated connection

---
 app/src/main/res/values/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1b22592a..698aa91a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -110,4 +110,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="obfuscated_connection">Using an obfuscated connection.</string>
+  <string name="obfuscated_connection_try">Trying an obfuscated connection.</string>
 </resources>
-- 
cgit v1.2.3


From 990c4fa151adf9f91dc729c21b44edb0f0b55ccf Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 19 Jul 2019 18:46:12 +0200
Subject: add simple UI to enable/disable PT usage

---
 app/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 698aa91a..472a8549 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -112,4 +112,5 @@
   <string name="donate_button_donate">Donate</string>
   <string name="obfuscated_connection">Using an obfuscated connection.</string>
   <string name="obfuscated_connection_try">Trying an obfuscated connection.</string>
+  <string name="nav_drawer_obfuscated_connection">Using Bridges</string>
 </resources>
-- 
cgit v1.2.3


From 37f9cf65b3267f081c4b80c62240fc7754a30325 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Sat, 3 Aug 2019 19:00:05 +0200
Subject: create custom UI classes navigation drawer entries

---
 app/src/main/res/values/attrs.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index eb9626bc..66a351ae 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!--TODO: check that it's not needed and throw it out!-->
     <declare-styleable name="foo">
         <attr name="textColorError" format="color" />
     </declare-styleable>
+
+    <attr name="text" format="string|reference"/>
+    <attr name="icon" format="reference"/>
+    <declare-styleable name="IconSwitchEntry">
+        <attr name="text"/>
+        <attr name="icon"/>
+    </declare-styleable>
+
+    <declare-styleable name="IconTextEntry">
+        <attr name="text"/>
+        <attr name="icon"/>
+    </declare-styleable>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3


From 9044c3fdc13f02b7c21bb181d769fadb71924b75 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 19 Sep 2019 22:41:30 +0200
Subject: add subtitles to navigation drawer items - better explanation for PT

---
 app/src/main/res/values/attrs.xml   | 3 +++
 app/src/main/res/values/strings.xml | 2 ++
 2 files changed, 5 insertions(+)

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

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 66a351ae..d3a88b81 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -7,13 +7,16 @@
 
     <attr name="text" format="string|reference"/>
     <attr name="icon" format="reference"/>
+    <attr name="subtitle" format="string|reference"/>
     <declare-styleable name="IconSwitchEntry">
         <attr name="text"/>
+        <attr name="subtitle" />
         <attr name="icon"/>
     </declare-styleable>
 
     <declare-styleable name="IconTextEntry">
         <attr name="text"/>
+        <attr name="subtitle" />
         <attr name="icon"/>
     </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 472a8549..5ae52ea9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -102,6 +102,7 @@
   <string name="save_battery">Save battery</string>
   <string name="save_battery_message">Background data connections will hibernate when your phone is inactive.</string>
   <string name="always_on_vpn">Always-on VPN</string>
+  <string name="subtitle_always_on_vpn">Open Android System Settings</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>
@@ -113,4 +114,5 @@
   <string name="obfuscated_connection">Using an obfuscated connection.</string>
   <string name="obfuscated_connection_try">Trying an obfuscated connection.</string>
   <string name="nav_drawer_obfuscated_connection">Using Bridges</string>
+  <string name="nav_drawer_subtitle_obfuscated_connection">Circumvent VPN filtering</string>
 </resources>
-- 
cgit v1.2.3


From 91877ac8ed64927d14c0762cd4402e5ed736fab9 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Fri, 27 Sep 2019 12:17:52 +0200
Subject: fix flickering when restarting the vpn

---
 app/src/main/res/values/themes.xml | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 51a8ea0e..7e98ccf4 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -20,4 +20,8 @@
         <item name="android:windowBackground">@drawable/splash_page</item>
     </style>
 
+    <style name="invisibleTheme" parent="@android:style/Theme.Translucent.NoTitleBar">
+        <item name="android:windowAnimationStyle">@null</item>
+    </style>
+
 </resources>
-- 
cgit v1.2.3