WIP: tunnel detail layout constrain fixesv1.0.20220516-20-g98f1ad8f

1 files changed, 7 insertions, 7 deletions

diff --git a/ui/src/main/res/layout/tunnel_detail_fragment.xml b/ui/src/main/res/layout/tunnel_detail_fragment.xml
index 6892b988..efdd448b 100644
--- a/ui/src/main/res/layout/tunnel_detail_fragment.xml
+++ b/ui/src/main/res/layout/tunnel_detail_fragment.xml
@@ -227,12 +227,12 @@
                         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}"
                         android:visibility="@{!config.interface.listenPort.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
-                        app:layout_constraintBottom_toTopOf="@id/applications_label"
+                        app:layout_constraintBottom_toTopOf="@id/http_proxy_label"
                         app:layout_constraintEnd_toStartOf="@id/mtu_label"
                         app:layout_constraintHorizontal_weight="0.5"
                         app:layout_constraintStart_toStartOf="parent"
@@ -262,11 +262,11 @@
                         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}"
-                        app:layout_constraintBottom_toTopOf="@id/applications_label"
+                        app:layout_constraintBottom_toTopOf="@id/http_proxy_label"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_weight="0.5"
                         app:layout_constraintStart_toEndOf="@id/listen_port_label"
@@ -282,8 +282,8 @@
                         android:labelFor="@+id/http_proxy_text"
                         android:text="@string/http_proxy"
                         android:visibility="@{(Build.VERSION.SDK_INT < 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_text" />
+                        app:layout_constraintBottom_toTopOf="@id/http_proxy_text"
+                        app:layout_constraintStart_toStartOf="parent" />
 
                     <TextView
                         android:id="@+id/http_proxy_text"
@@ -297,8 +297,8 @@
                         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_constraintBottom_toTopOf="@id/applications_label"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/http_proxy_label"
                         tools:text="http://example.com:8888" />
 
                     <TextView