summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2023-08-01 11:01:03 +0200
committerArne Schwabe <arne@rfc2549.org>2023-08-01 11:01:03 +0200
commit4540a6593578e62c4eef4375b1f07a48d4430c07 (patch)
treebeb852af8270339c0693ef1b5b115f90c6daab77
parentab5ce84a3414dd433781e05d7fcff9291f0a4f92 (diff)
Fix overlapping warning in server list (closes #1627)
-rw-r--r--main/src/ui/res/layout/connections.xml32
1 files changed, 17 insertions, 15 deletions
diff --git a/main/src/ui/res/layout/connections.xml b/main/src/ui/res/layout/connections.xml
index e3c03bf6..165f3559 100644
--- a/main/src/ui/res/layout/connections.xml
+++ b/main/src/ui/res/layout/connections.xml
@@ -41,11 +41,26 @@
</RelativeLayout>
+ <TextView
+ android:id="@+id/noserver_active_warning"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="10dp"
+ android:drawableLeft="@drawable/ic_dialog_alert"
+ android:drawableStart="@drawable/ic_dialog_alert"
+ android:drawablePadding="10dp"
+ android:elevation="2dp"
+ android:gravity="center_vertical"
+ android:padding="@dimen/stdpadding"
+ android:layout_below="@id/switchBar"
+ android:text="@string/remote_no_server_selected"
+ android:visibility="visible"
+ tools:visibility="visible" />
<androidx.recyclerview.widget.RecyclerView
android:layout_margin="@dimen/vpn_setting_padding"
android:id="@+id/connection_recycler_view"
- android:layout_below="@id/switchBar"
+ android:layout_below="@id/noserver_active_warning"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:verticalSpacing="@dimen/stdpadding"
@@ -53,20 +68,7 @@
/>
- <TextView
- android:id="@+id/noserver_active_warning"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="10dp"
- android:drawableLeft="@drawable/ic_dialog_alert"
- android:drawableStart="@drawable/ic_dialog_alert"
- android:drawablePadding="10dp"
- android:elevation="2dp"
- android:gravity="center_vertical"
- android:padding="@dimen/stdpadding"
- android:text="@string/remote_no_server_selected"
- android:visibility="visible"
- tools:visibility="visible" />
+
<include layout="@layout/connection_fab" />