From 4156d29a0999c560c78b3d88c35c3d2baefdf890 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/layout/tunnel_detail_fragment.xml | 37 ++++++++++++++++++++---
 1 file changed, 33 insertions(+), 4 deletions(-)

(limited to 'ui/src/main/res/layout/tunnel_detail_fragment.xml')

diff --git a/ui/src/main/res/layout/tunnel_detail_fragment.xml b/ui/src/main/res/layout/tunnel_detail_fragment.xml
index 164fabf0..aef71e18 100644
--- a/ui/src/main/res/layout/tunnel_detail_fragment.xml
+++ b/ui/src/main/res/layout/tunnel_detail_fragment.xml
@@ -5,6 +5,8 @@
 
     <data>
 
+        <import type="android.os.Build" />
+
         <import type="com.wireguard.android.backend.Tunnel.State" />
 
         <import type="com.wireguard.android.util.ClipboardUtils" />
@@ -224,7 +226,7 @@
                         android:contentDescription="@string/listen_port"
                         android:nextFocusRight="@id/mtu_text"
                         android:nextFocusUp="@id/dns_search_domains_text"
-                        android:nextFocusDown="@id/applications_text"
+                        android:nextFocusDown="@id/http_proxy_text"
                         android:nextFocusForward="@id/mtu_text"
                         android:onClick="@{ClipboardUtils::copyTextView}"
                         android:text="@{config.interface.listenPort}"
@@ -257,7 +259,7 @@
                         android:contentDescription="@string/mtu"
                         android:nextFocusLeft="@id/listen_port_text"
                         android:nextFocusUp="@id/dns_servers_text"
-                        android:nextFocusForward="@id/applications_text"
+                        android:nextFocusForward="@id/http_proxy_text"
                         android:onClick="@{ClipboardUtils::copyTextView}"
                         android:text="@{config.interface.mtu}"
                         android:visibility="@{!config.interface.mtu.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
@@ -275,6 +277,33 @@
                         app:barrierDirection="bottom"
                         app:constraint_referenced_ids="listen_port_text,mtu_text" />
 
+                    <TextView
+                        android:id="@+id/http_proxy_label"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:labelFor="@+id/http_proxy_text"
+                        android:text="@string/http_proxy"
+                        android:visibility="@{(Build.VERSION.SDK_INT &lt; Build.VERSION_CODES.Q || !config.interface.httpProxy.isPresent()) ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/listen_port_mtu_barrier" />
+
+                    <TextView
+                        android:id="@+id/http_proxy_text"
+                        style="@style/DetailText"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:contentDescription="@string/http_proxy"
+                        android:nextFocusUp="@id/listen_port_text"
+                        android:nextFocusDown="@id/applications_text"
+                        android:nextFocusForward="@id/applications_text"
+                        android:onClick="@{ClipboardUtils::copyTextView}"
+                        android:text="@{config.interface.httpProxy}"
+                        android:visibility="@{(Build.VERSION.SDK_INT &lt; Build.VERSION_CODES.Q || !config.interface.httpProxy.isPresent()) ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        app:layout_constraintTop_toBottomOf="@id/http_proxy_label"
+                        app:layout_constraintStart_toStartOf="parent"
+                        tools:text="http://example.com:8888" />
+
                     <TextView
                         android:id="@+id/applications_label"
                         android:layout_width="match_parent"
@@ -283,7 +312,7 @@
                         android:labelFor="@+id/applications_text"
                         android:text="@string/applications"
                         android:visibility="@{config.interface.includedApplications.isEmpty() &amp;&amp; config.interface.excludedApplications.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
-                        app:layout_constraintTop_toBottomOf="@+id/listen_port_mtu_barrier"
+                        app:layout_constraintTop_toBottomOf="@+id/http_proxy_text"
                         app:layout_constraintStart_toStartOf="parent" />
 
                     <TextView
@@ -318,4 +347,4 @@
                 tools:ignore="UselessLeaf" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
-</layout>
\ No newline at end of file
+</layout>
-- 
cgit v1.2.3