From 6077eae9077edc5b7bde4b58071a302edbb4667e Mon Sep 17 00:00:00 2001
From: pacien
Date: Sun, 30 Jul 2023 01:41:00 +0200
Subject: activity/start: move warning note to parent activity layout file

---
 app/src/main/res/layout/start_activity.xml     | 23 ++++++++++++++++++-----
 app/src/main/res/layout/start_network_list.xml |  5 -----
 2 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'app/src/main')

diff --git a/app/src/main/res/layout/start_activity.xml b/app/src/main/res/layout/start_activity.xml
index a5f22ad..2960711 100644
--- a/app/src/main/res/layout/start_activity.xml
+++ b/app/src/main/res/layout/start_activity.xml
@@ -2,7 +2,7 @@
 
 <!--
  * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ * Copyright (C) 2017-2023 Pacien TRAN-GIRARD
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,9 +18,22 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -->
 
-<fragment
+<LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/start_activity_network_list_fragment"
-	android:name="org.pacien.tincapp.activities.start.NetworkListFragment"
+	android:id="@+id/start_network_list_wrapper"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"/>
+	android:layout_height="match_parent"
+	android:orientation="vertical">
+
+	<TextView
+		android:id="@+id/start_network_list_warning_text"
+		style="@style/AppTheme.ListBlock.Placeholder"
+		android:text="@string/start_network_list_warning_text"/>
+
+	<fragment
+		android:id="@+id/start_activity_network_list_fragment"
+		android:name="org.pacien.tincapp.activities.start.NetworkListFragment"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/start_network_list.xml b/app/src/main/res/layout/start_network_list.xml
index 10083da..508e720 100644
--- a/app/src/main/res/layout/start_network_list.xml
+++ b/app/src/main/res/layout/start_network_list.xml
@@ -25,11 +25,6 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical">
 
-	<TextView
-		android:id="@+id/start_network_list_warning_text"
-		style="@style/AppTheme.ListBlock.Placeholder"
-		android:text="@string/start_network_list_warning_text"/>
-
 	<ListView
 		android:id="@+id/start_network_list"
 		android:layout_width="match_parent"
-- 
cgit v1.2.3