aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorpacien2023-07-30 01:41:00 +0200
committerpacien2023-07-30 03:53:20 +0200
commit6077eae9077edc5b7bde4b58071a302edbb4667e (patch)
tree96ae7a2c1fbd281fd13ba5dd3853d1c2b8ae4805 /app
parentb01ad7059d7b7f58c54efc952a299ff7cfa53d78 (diff)
downloadtincapp-6077eae9077edc5b7bde4b58071a302edbb4667e.tar.gz
activity/start: move warning note to parent activity layout file
Diffstat (limited to 'app')
-rw-r--r--app/src/main/res/layout/start_activity.xml23
-rw-r--r--app/src/main/res/layout/start_network_list.xml5
2 files changed, 18 insertions, 10 deletions
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 @@
2 2
3<!-- 3<!--
4 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon 4 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
5 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD 5 * Copyright (C) 2017-2023 Pacien TRAN-GIRARD
6 * 6 *
7 * This program is free software: you can redistribute it and/or modify 7 * This program is free software: you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
@@ -18,9 +18,22 @@
18 * along with this program. If not, see <https://www.gnu.org/licenses/>. 18 * along with this program. If not, see <https://www.gnu.org/licenses/>.
19--> 19-->
20 20
21<fragment 21<LinearLayout
22 xmlns:android="http://schemas.android.com/apk/res/android" 22 xmlns:android="http://schemas.android.com/apk/res/android"
23 android:id="@+id/start_activity_network_list_fragment" 23 android:id="@+id/start_network_list_wrapper"
24 android:name="org.pacien.tincapp.activities.start.NetworkListFragment"
25 android:layout_width="match_parent" 24 android:layout_width="match_parent"
26 android:layout_height="match_parent"/> 25 android:layout_height="match_parent"
26 android:orientation="vertical">
27
28 <TextView
29 android:id="@+id/start_network_list_warning_text"
30 style="@style/AppTheme.ListBlock.Placeholder"
31 android:text="@string/start_network_list_warning_text"/>
32
33 <fragment
34 android:id="@+id/start_activity_network_list_fragment"
35 android:name="org.pacien.tincapp.activities.start.NetworkListFragment"
36 android:layout_width="match_parent"
37 android:layout_height="match_parent"/>
38
39</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 @@
25 android:layout_height="match_parent" 25 android:layout_height="match_parent"
26 android:orientation="vertical"> 26 android:orientation="vertical">
27 27
28 <TextView
29 android:id="@+id/start_network_list_warning_text"
30 style="@style/AppTheme.ListBlock.Placeholder"
31 android:text="@string/start_network_list_warning_text"/>
32
33 <ListView 28 <ListView
34 android:id="@+id/start_network_list" 29 android:id="@+id/start_network_list"
35 android:layout_width="match_parent" 30 android:layout_width="match_parent"