aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/status_activity.xml30
-rw-r--r--app/src/main/res/layout/status_network_info_fragment.xml131
-rw-r--r--app/src/main/res/layout/status_node_list.xml (renamed from app/src/main/res/layout/status_activity_list_header.xml)23
3 files changed, 107 insertions, 77 deletions
diff --git a/app/src/main/res/layout/status_activity.xml b/app/src/main/res/layout/status_activity.xml
new file mode 100644
index 0000000..5da6d21
--- /dev/null
+++ b/app/src/main/res/layout/status_activity.xml
@@ -0,0 +1,30 @@
1<?xml version="1.0" encoding="utf-8"?>
2
3<!--
4 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
5 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
6 *
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
9 * the Free Software Foundation, either version 3 of the License, or
10 * (at your option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License
18 * along with this program. If not, see <https://www.gnu.org/licenses/>.
19-->
20
21<android.support.v4.view.ViewPager
22 xmlns:android="http://schemas.android.com/apk/res/android"
23 android:id="@+id/status_activity_pager"
24 android:layout_width="match_parent"
25 android:layout_height="match_parent">
26
27 <android.support.design.widget.TabLayout
28 style="@style/AppTheme.TabLayout"/>
29
30</android.support.v4.view.ViewPager>
diff --git a/app/src/main/res/layout/status_network_info_fragment.xml b/app/src/main/res/layout/status_network_info_fragment.xml
index 2dfe1bc..6bd2b30 100644
--- a/app/src/main/res/layout/status_network_info_fragment.xml
+++ b/app/src/main/res/layout/status_network_info_fragment.xml
@@ -30,100 +30,107 @@
30 30
31 <variable 31 <variable
32 name="listFormatter" 32 name="listFormatter"
33 type="org.pacien.tincapp.activities.status.VpnInterfaceConfigurationFormatter"/> 33 type="org.pacien.tincapp.activities.status.networkinfo.VpnInterfaceConfigurationFormatter"/>
34 34
35 </data> 35 </data>
36 36
37 <LinearLayout style="@style/AppTheme.List"> 37 <ScrollView
38 android:layout_width="match_parent"
39 android:layout_height="match_parent"
40 android:orientation="vertical">
38 41
39 <LinearLayout style="@style/AppTheme.ListBlock"> 42 <LinearLayout style="@style/AppTheme.List">
40 43
41 <TextView 44 <LinearLayout style="@style/AppTheme.ListBlock">
42 style="@style/AppTheme.BlockTitle"
43 android:text="@string/status_network_info_ip_addresses_label"/>
44 45
45 <TextView 46 <TextView
46 style="@style/AppTheme.BlockContent" 47 style="@style/AppTheme.BlockTitle"
47 android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.addresses)}"/> 48 android:text="@string/status_network_info_ip_addresses_label"/>
48 49
49 </LinearLayout> 50 <TextView
51 style="@style/AppTheme.BlockContent"
52 android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.addresses)}"/>
50 53
51 <LinearLayout style="@style/AppTheme.ListBlock"> 54 </LinearLayout>
52 55
53 <TextView 56 <LinearLayout style="@style/AppTheme.ListBlock">
54 style="@style/AppTheme.BlockTitle"
55 android:text="@string/status_network_info_routes_label"/>
56 57
57 <TextView 58 <TextView
58 style="@style/AppTheme.BlockContent" 59 style="@style/AppTheme.BlockTitle"
59 android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.routes)}"/> 60 android:text="@string/status_network_info_routes_label"/>
60 61
61 </LinearLayout> 62 <TextView
63 style="@style/AppTheme.BlockContent"
64 android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.routes)}"/>
62 65
63 <LinearLayout style="@style/AppTheme.ListBlock"> 66 </LinearLayout>
64 67
65 <TextView 68 <LinearLayout style="@style/AppTheme.ListBlock">
66 style="@style/AppTheme.BlockTitle"
67 android:text="@string/status_network_info_dns_servers_label"/>
68 69
69 <TextView 70 <TextView
70 style="@style/AppTheme.BlockContent" 71 style="@style/AppTheme.BlockTitle"
71 android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.dnsServers)}"/> 72 android:text="@string/status_network_info_dns_servers_label"/>
72 73
73 </LinearLayout> 74 <TextView
75 style="@style/AppTheme.BlockContent"
76 android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.dnsServers)}"/>
74 77
75 <LinearLayout style="@style/AppTheme.ListBlock"> 78 </LinearLayout>
76 79
77 <TextView 80 <LinearLayout style="@style/AppTheme.ListBlock">
78 style="@style/AppTheme.BlockTitle"
79 android:text="@string/status_network_info_search_domains_label"/>
80 81
81 <TextView 82 <TextView
82 style="@style/AppTheme.BlockContent" 83 style="@style/AppTheme.BlockTitle"
83 android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.searchDomains)}"/> 84 android:text="@string/status_network_info_search_domains_label"/>
84 85
85 </LinearLayout> 86 <TextView
87 style="@style/AppTheme.BlockContent"
88 android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.searchDomains)}"/>
86 89
87 <LinearLayout 90 </LinearLayout>
88 style="@style/AppTheme.ListBlock"
89 android:visibility="@{vpnInterfaceConfiguration.allowedApplications.isEmpty ? View.GONE : View.VISIBLE}">
90 91
91 <TextView 92 <LinearLayout
92 style="@style/AppTheme.BlockTitle" 93 style="@style/AppTheme.ListBlock"
93 android:text="@string/status_network_info_allowed_applications_label"/> 94 android:visibility="@{vpnInterfaceConfiguration.allowedApplications.isEmpty ? View.GONE : View.VISIBLE}">
94 95
95 <TextView 96 <TextView
96 style="@style/AppTheme.BlockContent" 97 style="@style/AppTheme.BlockTitle"
97 android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.allowedApplications)}"/> 98 android:text="@string/status_network_info_allowed_applications_label"/>
98 99
99 </LinearLayout> 100 <TextView
101 style="@style/AppTheme.BlockContent"
102 android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.allowedApplications)}"/>
100 103
101 <LinearLayout 104 </LinearLayout>
102 style="@style/AppTheme.ListBlock"
103 android:visibility="@{vpnInterfaceConfiguration.disallowedApplications.isEmpty ? View.GONE : View.VISIBLE}">
104 105
105 <TextView 106 <LinearLayout
106 style="@style/AppTheme.BlockTitle" 107 style="@style/AppTheme.ListBlock"
107 android:text="@string/status_network_info_disallowed_applications_label"/> 108 android:visibility="@{vpnInterfaceConfiguration.disallowedApplications.isEmpty ? View.GONE : View.VISIBLE}">
108 109
109 <TextView 110 <TextView
110 style="@style/AppTheme.BlockContent" 111 style="@style/AppTheme.BlockTitle"
111 android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.disallowedApplications)}"/> 112 android:text="@string/status_network_info_disallowed_applications_label"/>
112 113
113 </LinearLayout> 114 <TextView
115 style="@style/AppTheme.BlockContent"
116 android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.disallowedApplications)}"/>
117
118 </LinearLayout>
119
120 <LinearLayout style="@style/AppTheme.ListBlock">
114 121
115 <LinearLayout style="@style/AppTheme.ListBlock"> 122 <TextView
123