diff options
| author | Mikael Magnusson <mikma@users.sourceforge.net> | 2022-11-10 21:49:51 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikma@users.sourceforge.net> | 2022-11-10 21:49:51 +0100 |
| commit | 88fff94a9444b90d368c5f4ffb4db018c561a54e (patch) | |
| tree | 3350290a84b82e14d3dfbfa11ea67679ec251735 /ui/src/main/res | |
| parent | 700bce0898b4a70209ef8da4c6e062eded5afea3 (diff) | |
| parent | 4ff564521fd42dcd54c8e0886317cae64d19d6f3 (diff) | |
Merge remote-tracking branch 'origin/master' into new/http-proxy
Diffstat (limited to 'ui/src/main/res')
| -rw-r--r-- | ui/src/main/res/layout/tunnel_detail_fragment.xml | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ui/src/main/res/layout/tunnel_detail_fragment.xml b/ui/src/main/res/layout/tunnel_detail_fragment.xml index efdd448b..b4f88308 100644 --- a/ui/src/main/res/layout/tunnel_detail_fragment.xml +++ b/ui/src/main/res/layout/tunnel_detail_fragment.xml @@ -223,7 +223,6 @@ style="@style/DetailText" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginBottom="8dp" android:contentDescription="@string/listen_port" android:nextFocusRight="@id/mtu_text" android:nextFocusUp="@id/dns_search_domains_text" @@ -232,7 +231,6 @@ 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/http_proxy_label" app:layout_constraintEnd_toStartOf="@id/mtu_label" app:layout_constraintHorizontal_weight="0.5" app:layout_constraintStart_toStartOf="parent" @@ -258,7 +256,6 @@ style="@style/DetailText" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginBottom="8dp" android:contentDescription="@string/mtu" android:nextFocusLeft="@id/listen_port_text" android:nextFocusUp="@id/dns_servers_text" @@ -266,7 +263,6 @@ 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/http_proxy_label" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_weight="0.5" app:layout_constraintStart_toEndOf="@id/listen_port_label" @@ -274,6 +270,13 @@ app:layout_constraintTop_toBottomOf="@+id/mtu_label" tools:text="1500" /> + <androidx.constraintlayout.widget.Barrier + android:id="@+id/listen_port_mtu_barrier" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:barrierDirection="bottom" + app:constraint_referenced_ids="listen_port_text,mtu_text" /> + <TextView android:id="@+id/http_proxy_label" android:layout_width="0dp" @@ -309,7 +312,7 @@ android:labelFor="@+id/applications_text" android:text="@string/applications" android:visibility="@{config.interface.includedApplications.isEmpty() && config.interface.excludedApplications.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" - app:layout_constraintBottom_toTopOf="@id/applications_text" + app:layout_constraintTop_toBottomOf="@+id/listen_port_mtu_barrier" app:layout_constraintStart_toStartOf="parent" /> <TextView @@ -324,7 +327,7 @@ android:onClick="@{ClipboardUtils::copyTextView}" android:text="@{config.interface.includedApplications.isEmpty() ? @plurals/n_excluded_applications(config.interface.excludedApplications.size(), config.interface.excludedApplications.size()) : @plurals/n_included_applications(config.interface.includedApplications.size(), config.interface.includedApplications.size())}" android:visibility="@{config.interface.includedApplications.isEmpty() && config.interface.excludedApplications.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/applications_label" app:layout_constraintStart_toStartOf="parent" tools:text="8 excluded" /> </androidx.constraintlayout.widget.ConstraintLayout> |