diff options
| author |   SlipkHunter <abrito025@gmail.com> | 2022-06-28 12:58:55 -0300 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2022-07-07 15:35:10 +0200 |
| commit | 284ad03ebffe41006a7a33ede0199a4d4f53abdf (patch) | |
| tree | 89c35255572af69eafcb087ca40855bfa3490edf /ui/src/main/res | |
| parent | gradle: remove crowdin kludge (diff) | |
| download | wireguard-android-284ad03ebffe41006a7a33ede0199a4d4f53abdf.tar.xz wireguard-android-284ad03ebffe41006a7a33ede0199a4d4f53abdf.zip | |
ui: add barrier to fix detail fragment overlap
When listen port and MTU are hidden, we need a barrier here.
Signed-off-by: SlipkHunter <abrito025@gmail.com>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'ui/src/main/res')
| -rw-r--r-- | ui/src/main/res/layout/tunnel_detail_fragment.xml | 17 |
1 files changed, 10 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 7a962509..164fabf0 100644 --- a/ui/src/main/res/layout/tunnel_detail_fragment.xml +++ b/ui/src/main/res/layout/tunnel_detail_fragment.xml @@ -221,7 +221,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" @@ -230,7 +229,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/applications_label" app:layout_constraintEnd_toStartOf="@id/mtu_label" app:layout_constraintHorizontal_weight="0.5" app:layout_constraintStart_toStartOf="parent" @@ -256,7 +254,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" @@ -264,7 +261,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/applications_label" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_weight="0.5" app:layout_constraintStart_toEndOf="@id/listen_port_label" @@ -272,6 +268,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/applications_label" android:layout_width="match_parent" @@ -280,7 +283,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 @@ -295,7 +298,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> @@ -315,4 +318,4 @@ tools:ignore="UselessLeaf" /> </androidx.constraintlayout.widget.ConstraintLayout> </ScrollView> -</layout> +</layout>
\ No newline at end of file |