aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/fragment_network_status_header.xml147
-rw-r--r--app/src/main/res/layout/status_activity_list_header.xml46
-rw-r--r--app/src/main/res/layout/status_network_info_fragment.xml145
-rw-r--r--app/src/main/res/layout/status_node_info_dialog.xml (renamed from app/src/main/res/layout/dialog_node_details.xml)2
-rw-r--r--app/src/main/res/menu/menu_status.xml2
-rw-r--r--app/src/main/res/values-zh-rCN/strings.xml28
-rw-r--r--app/src/main/res/values-zh-rHK/strings.xml28
-rw-r--r--app/src/main/res/values-zh-rTW/strings.xml28
-rw-r--r--app/src/main/res/values/strings.xml38
9 files changed, 257 insertions, 207 deletions
diff --git a/app/src/main/res/layout/fragment_network_status_header.xml b/app/src/main/res/layout/fragment_network_status_header.xml
deleted file mode 100644
index b96229d..0000000
--- a/app/src/main/res/layout/fragment_network_status_header.xml
+++ /dev/null
@@ -1,147 +0,0 @@
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<LinearLayout
22 xmlns:android="http://schemas.android.com/apk/res/android"
23 xmlns:tools="http://schemas.android.com/tools"
24 android:id="@+id/page_configure"
25 android:layout_width="match_parent"
26 android:layout_height="wrap_content"
27 android:orientation="vertical"
28 tools:context="org.pacien.tincapp.activities.StatusActivity">
29
30 <TextView
31 style="@style/AppTheme.SectionTitle"
32 android:text="@string/title_network_info"/>
33
34 <LinearLayout style="@style/AppTheme.List">
35
36 <LinearLayout style="@style/AppTheme.ListBlock">
37
38 <TextView
39 style="@style/AppTheme.BlockTitle"
40 android:text="@string/title_network_name"/>
41
42 <TextView
43 android:id="@+id/text_network_name"
44 style="@style/AppTheme.BlockContent"/>
45
46 </LinearLayout>
47
48 <LinearLayout style="@style/AppTheme.ListBlock">
49
50 <TextView
51 style="@style/AppTheme.BlockTitle"
52 android:text="@string/title_ip_addresses"/>
53
54 <TextView
55 android:id="@+id/text_network_ip_addresses"
56 style="@style/AppTheme.BlockContent"/>
57
58 </LinearLayout>
59
60 <LinearLayout style="@style/AppTheme.ListBlock">
61
62 <TextView
63 style="@style/AppTheme.BlockTitle"
64 android:text="@string/title_routes"/>
65
66 <TextView
67 android:id="@+id/text_network_routes"
68 style="@style/AppTheme.BlockContent"/>
69
70 </LinearLayout>
71
72 <LinearLayout style="@style/AppTheme.ListBlock">
73
74 <TextView
75 style="@style/AppTheme.BlockTitle"
76 android:text="@string/title_dns_servers"/>
77
78 <TextView
79 android:id="@+id/text_network_dns_servers"
80 style="@style/AppTheme.BlockContent"/>
81
82 </LinearLayout>
83
84 <LinearLayout style="@style/AppTheme.ListBlock">
85
86 <TextView
87 style="@style/AppTheme.BlockTitle"
88 android:text="@string/title_search_domains"/>
89
90 <TextView
91 android:id="@+id/text_network_search_domains"
92 style="@style/AppTheme.BlockContent"/>
93
94 </LinearLayout>
95
96 <LinearLayout
97 android:id="@+id/block_network_allowed_applications"
98 style="@style/AppTheme.ListBlock">
99
100 <TextView
101 style="@style/AppTheme.BlockTitle"
102 android:text="@string/title_allowed_applications"/>
103
104 <TextView
105 android:id="@+id/text_network_allowed_applications"
106 style="@style/AppTheme.BlockContent"/>
107
108 </LinearLayout>
109
110 <LinearLayout
111 android:id="@+id/block_network_disallowed_applications"
112 style="@style/AppTheme.ListBlock">
113
114 <TextView
115 style="@style/AppTheme.BlockTitle"
116 android:text="@string/title_disallowed_applications"/>
117
118 <TextView
119 android:id="@+id/text_network_disallowed_applications"
120 style="@style/AppTheme.BlockContent"/>
121
122 </LinearLayout>
123
124 <LinearLayout style="@style/AppTheme.ListBlock">
125
126 <TextView
127 style="@style/AppTheme.BlockTitle"
128 android:text="@string/title_allow_bypass"/>
129
130 <TextView
131 android:id="@+id/text_network_allow_bypass"
132 style="@style/AppTheme.BlockContent"/>
133
134 </LinearLayout>
135
136 </LinearLayout>
137
138 <TextView
139 style="@style/AppTheme.SectionTitle"
140 android:text="@string/title_nodes"/>
141
142 <TextView
143 android:id="@+id/node_list_placeholder"
144 style="@style/AppTheme.ListBlock.Placeholder"
145 android:text="@string/message_loading"/>
146
147</LinearLayout>
diff --git a/app/src/main/res/layout/status_activity_list_header.xml b/app/src/main/res/layout/status_activity_list_header.xml
new file mode 100644
index 0000000..8030481
--- /dev/null
+++ b/app/src/main/res/layout/status_activity_list_header.xml
@@ -0,0 +1,46 @@
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<LinearLayout
22 xmlns:android="http://schemas.android.com/apk/res/android"
23 android:layout_width="match_parent"
24 android:layout_height="wrap_content"
25 android:orientation="vertical">
26
27 <TextView
28 style="@style/AppTheme.SectionTitle"
29 android:text="@string/status_activity_title_network_info"/>
30
31 <fragment
32 android:id="@+id/status_activity_network_info_fragment"
33 android:name="org.pacien.tincapp.activities.status.NetworkInfoFragment"
34 android:layout_width="match_parent"
35 android:layout_height="wrap_content"/>
36
37 <TextView
38 style="@style/AppTheme.SectionTitle"
39 android:text="@string/status_activity_title_node_list"/>
40
41 <TextView
42 android:id="@+id/status_activity_node_list_placeholder"
43 style="@style/AppTheme.ListBlock.Placeholder"
44 android:text="@string/status_activity_node_list_placeholder_text"/>
45
46</LinearLayout>
diff --git a/app/src/main/res/layout/status_network_info_fragment.xml b/app/src/main/res/layout/status_network_info_fragment.xml
new file mode 100644
index 0000000..8038180
--- /dev/null
+++ b/app/src/main/res/layout/status_network_info_fragment.xml
@@ -0,0 +1,145 @@
1<?xml version="1.0" encoding="utf-8"?>