From e4b2f9101d2ecf16fa016f2f78492fe1c4a16b69 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikma@users.sourceforge.net>
Date: Sun, 19 Dec 2021 02:33:12 +0100
Subject: ui,tunnel: add HTTP proxy setting to Go backend

Only make the HTTP proxy settings visible on supported Android versions,
i.e. Android 10 (AKA Android Q) and later.

Signed-off-by: Mikael Magnusson <mikma@users.sourceforge.net>
---
 ui/src/main/res/values/strings.xml | 5 +++++
 ui/src/main/res/values/styles.xml  | 4 ++++
 2 files changed, 9 insertions(+)

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

diff --git a/ui/src/main/res/values/strings.xml b/ui/src/main/res/values/strings.xml
index 6c090199..c10c4ea7 100644
--- a/ui/src/main/res/values/strings.xml
+++ b/ui/src/main/res/values/strings.xml
@@ -70,6 +70,7 @@
     <string name="bad_config_explanation_pka">: Must be positive and no more than 65535</string>
     <string name="bad_config_explanation_positive_number">: Must be positive</string>
     <string name="bad_config_explanation_udp_port">: Must be a valid UDP port number</string>
+    <string name="bad_config_explanation_http_proxy">: Must be valid proxy hostname and port</string>
     <string name="bad_config_reason_invalid_key">Invalid key</string>
     <string name="bad_config_reason_invalid_number">Invalid number</string>
     <string name="bad_config_reason_invalid_value">Invalid value</string>
@@ -126,6 +127,10 @@
     <string name="hint_optional">(optional)</string>
     <string name="hint_optional_discouraged">(optional, not recommended)</string>
     <string name="hint_random">(random)</string>
+    <string name="http_proxy">Proxy</string>
+    <string name="http_proxy_hostname">Proxy hostname</string>
+    <string name="http_proxy_pac">Proxy Auto-Config URL</string>
+    <string name="http_proxy_port">Proxy port</string>
     <string name="illegal_filename_error">Illegal file name “%s”</string>
     <string name="import_error">Unable to import tunnel: %s</string>
     <string name="import_from_qr_code">Import Tunnel from QR Code</string>
diff --git a/ui/src/main/res/values/styles.xml b/ui/src/main/res/values/styles.xml
index 396f156c..da3c2cb7 100644
--- a/ui/src/main/res/values/styles.xml
+++ b/ui/src/main/res/values/styles.xml
@@ -61,4 +61,8 @@
     <style name="ThemeOverlay.AppTheme.TextInputEditText.OutlinedBox" parent="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox">
         <item name="colorControlActivated">@color/color_control_normal</item>
     </style>
+
+    <style name="ExposedDropDownMenu" parent="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
+        <item name="boxStrokeColor">?attr/colorSecondary</item>
+    </style>
 </resources>
-- 
cgit v1.2.3