Skip to content

Commit 38cb184

Browse files
committed
ui: reorder constraints to fix detail fragment overlap
Signed-off-by: Harsh Shandilya <[email protected]>
1 parent 5d14caf commit 38cb184

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

ui/src/main/res/layout/tunnel_detail_fragment.xml

+7-3
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@
221221
style="@style/DetailText"
222222
android:layout_width="0dp"
223223
android:layout_height="wrap_content"
224+
android:layout_marginBottom="8dp"
224225
android:contentDescription="@string/listen_port"
225226
android:nextFocusRight="@id/mtu_text"
226227
android:nextFocusUp="@id/dns_search_domains_text"
@@ -229,6 +230,7 @@
229230
android:onClick="@{ClipboardUtils::copyTextView}"
230231
android:text="@{config.interface.listenPort}"
231232
android:visibility="@{!config.interface.listenPort.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
233+
app:layout_constraintBottom_toTopOf="@id/applications_label"
232234
app:layout_constraintEnd_toStartOf="@id/mtu_label"
233235
app:layout_constraintHorizontal_weight="0.5"
234236
app:layout_constraintStart_toStartOf="parent"
@@ -254,13 +256,15 @@
254256
style="@style/DetailText"
255257
android:layout_width="0dp"
256258
android:layout_height="wrap_content"
259+
android:layout_marginBottom="8dp"
257260
android:contentDescription="@string/mtu"
258261
android:nextFocusLeft="@id/listen_port_text"
259262
android:nextFocusUp="@id/dns_servers_text"
260263
android:nextFocusForward="@id/applications_text"
261264
android:onClick="@{ClipboardUtils::copyTextView}"
262265
android:text="@{config.interface.mtu}"
263266
android:visibility="@{!config.interface.mtu.isPresent() ? android.view.View.GONE : android.view.View.VISIBLE}"
267+
app:layout_constraintBottom_toTopOf="@id/applications_label"
264268
app:layout_constraintEnd_toEndOf="parent"
265269
app:layout_constraintHorizontal_weight="0.5"
266270
app:layout_constraintStart_toEndOf="@id/listen_port_label"
@@ -276,8 +280,8 @@
276280
android:labelFor="@+id/applications_text"
277281
android:text="@string/applications"
278282
android:visibility="@{config.interface.includedApplications.isEmpty() &amp;&amp; config.interface.excludedApplications.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
279-
app:layout_constraintStart_toStartOf="parent"
280-
app:layout_constraintTop_toBottomOf="@id/listen_port_text" />
283+
app:layout_constraintBottom_toTopOf="@id/applications_text"
284+
app:layout_constraintStart_toStartOf="parent" />
281285

282286
<TextView
283287
android:id="@+id/applications_text"
@@ -291,8 +295,8 @@
291295
android:onClick="@{ClipboardUtils::copyTextView}"
292296
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())}"
293297
android:visibility="@{config.interface.includedApplications.isEmpty() &amp;&amp; config.interface.excludedApplications.isEmpty() ? android.view.View.GONE : android.view.View.VISIBLE}"
298+
app:layout_constraintBottom_toBottomOf="parent"
294299
app:layout_constraintStart_toStartOf="parent"
295-
app:layout_constraintTop_toBottomOf="@+id/applications_label"
296300
tools:text="8 excluded" />
297301
</androidx.constraintlayout.widget.ConstraintLayout>
298302
</com.google.android.material.card.MaterialCardView>

0 commit comments

Comments
 (0)