Skip to contentSkip to conversation

Change "Deselect All" to "Toggle All" in Excluded apps settings

PATCH In review [email protected] 2 participants 3 messages Feb 14, 2020 – Feb 16, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Change "Deselect All" to "Toggle All" in Excluded apps settings

From: sebcbi1 <[email protected]>

Android : Change functionality in excluded apps dialog for better user experience when user wants only one or few apps to use wireguard Please review italian and russian translation

---
 .../com/wireguard/android/fragment/AppListDialogFragment.java | 4 ++--
 app/src/main/res/values-it/strings.xml                        | 2 +-
 app/src/main/res/values-ru/strings.xml                        | 2 +-
 app/src/main/res/values/strings.xml                           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
app/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.java +2 -2
index 67059c7..c513d47 100644
@@ -98,7 +98,7 @@ public class AppListDialogFragment extends DialogFragment {
 
         alertDialogBuilder.setPositiveButton(R.string.set_exclusions, (dialog, which) -> setExclusionsAndDismiss());
         alertDialogBuilder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
-        alertDialogBuilder.setNeutralButton(R.string.deselect_all, (dialog, which) -> {
+        alertDialogBuilder.setNeutralButton(R.string.toggle_all, (dialog, which) -> {
         });
 
         binding.setFragment(this);
@@ -109,7 +109,7 @@ public class AppListDialogFragment extends DialogFragment {
         final AlertDialog dialog = alertDialogBuilder.create();
         dialog.setOnShowListener(d -> dialog.getButton(DialogInterface.BUTTON_NEUTRAL).setOnClickListener(view -> {
             for (final ApplicationData app : appData)
-                app.setExcludedFromTunnel(false);
+                app.setExcludedFromTunnel(!app.isExcludedFromTunnel());
         }));
         return dialog;
     }
app/src/main/res/values-it/strings.xml +1 -1
index 2aba5f8..b37d792 100644
@@ -66,7 +66,7 @@
     <string name="dark_theme_summary_on">Stai usando il tema scuro (notte)</string>
     <string name="dark_theme_title">Usa tema scuro</string>
     <string name="delete">Elimina</string>
-    <string name="deselect_all">Deseleziona tutto</string>
+    <string name="toggle_all">Inverti tutto</string>
     <string name="dns_servers">Server DNS</string>
     <string name="edit">Modifica</string>
     <string name="endpoint">Endpoint</string>
app/src/main/res/values-ru/strings.xml +1 -1
index 2f2c03b..00b96fb 100644
@@ -66,7 +66,7 @@
     <string name="dark_theme_summary_on">В данный момент используется темная (ночная) тема</string>
     <string name="dark_theme_title">Использовать темную тему</string>
     <string name="delete">Удалить</string>
-    <string name="deselect_all">Снять выделенное</string>
+    <string name="toggle_all">Инвертировать все</string>
     <string name="dns_servers">DNS-серверы</string>
     <string name="edit">Редактировать</string>
     <string name="endpoint">Конечная точка</string>
app/src/main/res/values/strings.xml +1 -1
index 336cd4e..89a32c0 100644
@@ -66,7 +66,7 @@
     <string name="dark_theme_summary_on">Currently using dark (night) theme</string>
     <string name="dark_theme_title">Use dark theme</string>
     <string name="delete">Delete</string>
-    <string name="deselect_all">Deselect All</string>
+    <string name="toggle_all">Toggle All</string>
     <string name="dns_servers">DNS servers</string>
     <string name="edit">Edit</string>
     <string name="endpoint">Endpoint</string>
Signature · 6 lines
2.25.0

_______________________________________________
WireGuard mailing list
[email protected]
https://lists.zx2c4.com/mailman/listinfo/wireguard
#2 lore raw
---
 .../com/wireguard/android/fragment/AppListDialogFragment.java | 4 ++--
 app/src/main/res/values-it/strings.xml                        | 2 +-
 app/src/main/res/values-ru/strings.xml                        | 2 +-
 app/src/main/res/values/strings.xml                           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.java b/app/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.java index 67059c7..c513d47 100644
---
a/app/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.java
+++
b/app/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.java @@ -98,7 +98,7 @@ public class AppListDialogFragment extends DialogFragment {

alertDialogBuilder.setPositiveButton(R.string.set_exclusions,
(dialog, which) -> setExclusionsAndDismiss());
alertDialogBuilder.setNegativeButton(R.string.cancel, (dialog,
which) -> dialog.dismiss());
- alertDialogBuilder.setNeutralButton(R.string.deselect_all,
(dialog, which) -> {
+ alertDialogBuilder.setNeutralButton(R.string.toggle_all, (dialog,

which) -> {
         });

         binding.setFragment(this);
@@ -109,7 +109,7 @@ public class AppListDialogFragment extends
DialogFragment {
         final AlertDialog dialog = alertDialogBuilder.create();
         dialog.setOnShowListener(d ->

dialog.getButton(DialogInterface.BUTTON_NEUTRAL).setOnClickListener(view -> {
for (final ApplicationData app : appData)
- app.setExcludedFromTunnel(false);

+                app.setExcludedFromTunnel(!app.isExcludedFromTunnel());
         }));
         return dialog;
     }
(quoted diff) +0 -0

b/app/src/main/res/values-it/strings.xml
index 2aba5f8..b37d792 100644

app/src/main/res/values-it/strings.xml +0 -0
@@ -66,7 +66,7 @@
     <string name="dark_theme_summary_on">Stai usando il tema scuro

(notte)</string>
<string name="dark_theme_title">Usa tema scuro</string> <string name="delete">Elimina</string>
- <string name="deselect_all">Deseleziona tutto</string>
+ <string name="toggle_all">Inverti tutto</string>
<string name="dns_servers">Server DNS</string> <string name="edit">Modifica</string>
<string name="endpoint">Endpoint</string>

(quoted diff) +0 -0

b/app/src/main/res/values-ru/strings.xml
index 2f2c03b..00b96fb 100644

app/src/main/res/values-ru/strings.xml +0 -0
@@ -66,7 +66,7 @@
     <string name="dark_theme_summary_on">В данный момент используется

темная (ночная) тема</string>
<string name="dark_theme_title">Использовать темную тему</string> <string name="delete">Удалить</string>
- <string name="deselect_all">Снять выделенное</string>
+ <string name="toggle_all">Инвертировать все</string>
<string name="dns_servers">DNS-серверы</string> <string name="edit">Редактировать</string>
<string name="endpoint">Конечная точка</string>

(quoted diff) +0 -0

b/app/src/main/res/values/strings.xml
index 336cd4e..89a32c0 100644

app/src/main/res/values/strings.xml +0 -0
@@ -66,7 +66,7 @@
     <string name="dark_theme_summary_on">Currently using dark (night)

theme</string>
<string name="dark_theme_title">Use dark theme</string> <string name="delete">Delete</string>
- <string name="deselect_all">Deselect All</string>
+ <string name="toggle_all">Toggle All</string>
<string name="dns_servers">DNS servers</string> <string name="edit">Edit</string>
<string name="endpoint">Endpoint</string>

Signature · 1 line
2.25.0

_______________________________________________
WireGuard mailing list
[email protected]
https://lists.zx2c4.com/mailman/listinfo/wireguard