From 1e9202c3d929083220924f7c76ea01a2b6f6af9f Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 22 Jul 2021 15:31:08 +0200 Subject: first implementation of the gateway button, started to remove labels from EipFragment, implement method to get the avearage load of a location as an enum value --- app/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (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 22696c12..b6bdafa8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -155,7 +155,8 @@ Location with best connection Automatic Your traffic is currently routed through: - + Finding best connection… + Reconnecting… Starting bridges for censorship circumvention… Stopping bridges. Using bridges for censorship circumvention. @@ -181,5 +182,4 @@ Hide connection details %s has no internet connection. Please check your WiFi and cellular data settings. - -- cgit v1.2.3 From 645545a86bdd1bc832ad2d14f17f5727e352356c Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 30 Jul 2021 15:46:40 +0200 Subject: draft gateway selection UI according to simlpy secure's proposals --- app/src/main/res/values/strings.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (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 b6bdafa8..7c0c46f0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -152,9 +152,12 @@ No permissions to install app. Select location %s will find the best connection for you. - Location with best connection + Use recommended location Automatic - Your traffic is currently routed through: + Your traffic is currently routed through: + Your traffic will be routed through: + Your traffic is automatically routed through the best location: + Your traffic will be automatically routed through the best location. Finding best connection… Reconnecting… Starting bridges for censorship circumvention… -- cgit v1.2.3 From 5ab54104c6c701789e59963fcdfda05da5a83a45 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 30 Jul 2021 20:38:23 +0200 Subject: ask user to change location or disable bridges if manually selected location doesn't support bridges --- app/src/main/res/values/untranslatable.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml index a08857c1..a288d9a5 100644 --- a/app/src/main/res/values/untranslatable.xml +++ b/app/src/main/res/values/untranslatable.xml @@ -47,6 +47,9 @@ %1$s could not connect to %2$s. Do you want to try to connect automatically with best location? Try best location + %1$s doesn\'t support bridges to circumvent VPN filtering. Do you want to choose a different location or disable bridges? + Disable bridges + Choose different location \ No newline at end of file -- cgit v1.2.3 From 6d3c122bebf0ad4f7dc22d4963dc73dea4248251 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sat, 31 Jul 2021 16:34:09 +0200 Subject: adapt EIP main screen and strings to simply secure proposals --- app/src/main/res/values/untranslatable.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml index a288d9a5..ec795f57 100644 --- a/app/src/main/res/values/untranslatable.xml +++ b/app/src/main/res/values/untranslatable.xml @@ -50,6 +50,12 @@ %1$s doesn\'t support bridges to circumvent VPN filtering. Do you want to choose a different location or disable bridges? Disable bridges Choose different location - + Connection Insecure + You are connected to the recommended location + You are connected to + Connecting... + You may be leaking information to your internet provider or local network. + You have no working Internet connection. Once you get it back, you will be automatically connected to + %1$s is blocking all internet traffic. \ No newline at end of file -- cgit v1.2.3 From a2067cd5b56387405cb653de8940e7afc448449d Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sat, 31 Jul 2021 19:30:54 +0200 Subject: Add BuildConfig to disable color filtering of the main screen background, if VPN is turned off. Make EipFragment's text colors customizable --- app/src/main/res/values/colors.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index a8cdb28e..e911a6d1 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -34,6 +34,7 @@ @color/white @color/black800 + @color/black800 #B33A3A -- cgit v1.2.3 From 739e0f16c80da1bad574890d6d8c8f09fa7bbbc0 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Sun, 1 Aug 2021 00:50:06 +0200 Subject: make button text color customizable --- app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/styles.xml | 1 + 2 files changed, 2 insertions(+) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e911a6d1..86ac1128 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -35,6 +35,7 @@ @color/white @color/black800 @color/black800 + @color/black800 #B33A3A diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index b8c0bc59..9b05d3fe 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -65,6 +65,7 @@ @drawable/cust_button_primary 36dp 75dp + @color/colorFontBtn