From d90ddf790e6d532b988e02677df4554d3f028d89 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikma@users.sourceforge.net>
Date: Fri, 3 Mar 2023 00:39:07 +0100
Subject: WIP: add dhcp addresses to tunnel details

---
 ui/src/main/res/layout/tunnel_detail_fragment.xml | 35 ++++++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

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

diff --git a/ui/src/main/res/layout/tunnel_detail_fragment.xml b/ui/src/main/res/layout/tunnel_detail_fragment.xml
index aef71e18..d869216e 100644
--- a/ui/src/main/res/layout/tunnel_detail_fragment.xml
+++ b/ui/src/main/res/layout/tunnel_detail_fragment.xml
@@ -142,8 +142,8 @@
                         android:layout_height="wrap_content"
                         android:contentDescription="@string/addresses"
                         android:nextFocusUp="@id/public_key_text"
-                        android:nextFocusDown="@id/dns_servers_text"
-                        android:nextFocusForward="@id/dns_servers_text"
+                        android:nextFocusDown="@id/dhcp_addresses_text"
+                        android:nextFocusForward="@id/dhcp_addresses_text"
                         android:onClick="@{ClipboardUtils::copyTextView}"
                         android:text="@{config.interface.addresses}"
                         android:visibility="@{config.interface.addresses.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
@@ -151,6 +151,33 @@
                         app:layout_constraintTop_toBottomOf="@+id/addresses_label"
                         tools:text="fc00:bbbb:bbbb:bb11::3:368b/128" />
 
+                    <TextView
+                        android:id="@+id/dhcp_addresses_label"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:labelFor="@+id/dhcp_addresses_text"
+                        android:text="@string/dhcp_addresses"
+                        android:visibility="@{tunnel.dhcp == null ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/addresses_text" />
+
+                    <TextView
+                        android:id="@+id/dhcp_addresses_text"
+                        style="@style/DetailText"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:contentDescription="@string/dhcp_addresses"
+                        android:nextFocusUp="@id/addresses_text"
+                        android:nextFocusDown="@id/dns_servers_text"
+                        android:nextFocusForward="@id/dns_servers_text"
+                        android:onClick="@{ClipboardUtils::copyTextView}"
+                        android:text="@{tunnel.dhcp.addresses}"
+                        android:visibility="@{tunnel.dhcp == null ? android.view.View.GONE : android.view.View.VISIBLE}"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/dhcp_addresses_label"
+                        tools:text="fc00:bbbb:bbbb:bb11::3:368b/128" />
+
                     <TextView
                         android:id="@+id/dns_servers_label"
                         android:layout_width="match_parent"
@@ -160,7 +187,7 @@
                         android:text="@string/dns_servers"
                         android:visibility="@{config.interface.dnsServers.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/addresses_text" />
+                        app:layout_constraintTop_toBottomOf="@id/dhcp_addresses_text" />
 
                     <TextView
                         android:id="@+id/dns_servers_text"
@@ -168,7 +195,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:contentDescription="@string/dns_servers"
-                        android:nextFocusUp="@id/addresses_text"
+                        android:nextFocusUp="@id/dhcp_addresses_text"
                         android:nextFocusDown="@id/dns_search_domains_text"
                         android:nextFocusForward="@id/dns_search_domains_text"
                         android:onClick="@{ClipboardUtils::copyTextView}"
-- 
cgit v1.2.3