From 3b353c4037f3c52710287777a17110dad6b9d720 Mon Sep 17 00:00:00 2001
From: pacien
Date: Sat, 11 Aug 2018 01:54:04 +0200
Subject: Refactor part of Status activity

---
 app/src/main/res/layout/dialog_node_details.xml    |  37 ------
 .../res/layout/fragment_network_status_header.xml  | 147 ---------------------
 .../res/layout/status_activity_list_header.xml     |  46 +++++++
 .../res/layout/status_network_info_fragment.xml    | 145 ++++++++++++++++++++
 .../main/res/layout/status_node_info_dialog.xml    |  37 ++++++
 app/src/main/res/menu/menu_status.xml              |   2 +-
 app/src/main/res/values-zh-rCN/strings.xml         |  28 ++--
 app/src/main/res/values-zh-rHK/strings.xml         |  28 ++--
 app/src/main/res/values-zh-rTW/strings.xml         |  28 ++--
 app/src/main/res/values/strings.xml                |  38 +++---
 10 files changed, 293 insertions(+), 243 deletions(-)
 delete mode 100644 app/src/main/res/layout/dialog_node_details.xml
 delete mode 100644 app/src/main/res/layout/fragment_network_status_header.xml
 create mode 100644 app/src/main/res/layout/status_activity_list_header.xml
 create mode 100644 app/src/main/res/layout/status_network_info_fragment.xml
 create mode 100644 app/src/main/res/layout/status_node_info_dialog.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/dialog_node_details.xml b/app/src/main/res/layout/dialog_node_details.xml
deleted file mode 100644
index 938c2a2..0000000
--- a/app/src/main/res/layout/dialog_node_details.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:paddingBottom="@dimen/dialog_vertical_margin"
-						android:paddingLeft="@dimen/dialog_horizontal_margin"
-						android:paddingRight="@dimen/dialog_horizontal_margin"
-						android:paddingTop="@dimen/dialog_vertical_margin">
-
-	<TextView
-		android:id="@+id/dialog_node_details"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:fontFamily="monospace"
-		android:text="@string/message_loading"
-		android:textColor="@color/textSecondary"/>
-
-</ScrollView>
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
--->
-
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:id="@+id/page_configure"
-	android:layout_width="match_parent"
-	android:layout_height="wrap_content"
-	android:orientation="vertical"
-	tools:context="org.pacien.tincapp.activities.StatusActivity">
-
-	<TextView
-		style="@style/AppTheme.SectionTitle"
-		android:text="@string/title_network_info"/>
-
-	<LinearLayout style="@style/AppTheme.List">
-
-		<LinearLayout style="@style/AppTheme.ListBlock">
-
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/title_network_name"/>
-
-			<TextView
-				android:id="@+id/text_network_name"
-				style="@style/AppTheme.BlockContent"/>
-
-		</LinearLayout>
-
-		<LinearLayout style="@style/AppTheme.ListBlock">
-
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/title_ip_addresses"/>
-
-			<TextView
-				android:id="@+id/text_network_ip_addresses"
-				style="@style/AppTheme.BlockContent"/>
-
-		</LinearLayout>
-
-		<LinearLayout style="@style/AppTheme.ListBlock">
-
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/title_routes"/>
-
-			<TextView
-				android:id="@+id/text_network_routes"
-				style="@style/AppTheme.BlockContent"/>
-
-		</LinearLayout>
-
-		<LinearLayout style="@style/AppTheme.ListBlock">
-
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/title_dns_servers"/>
-
-			<TextView
-				android:id="@+id/text_network_dns_servers"
-				style="@style/AppTheme.BlockContent"/>
-
-		</LinearLayout>
-
-		<LinearLayout style="@style/AppTheme.ListBlock">
-
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/title_search_domains"/>
-
-			<TextView
-				android:id="@+id/text_network_search_domains"
-				style="@style/AppTheme.BlockContent"/>
-
-		</LinearLayout>
-
-		<LinearLayout
-			android:id="@+id/block_network_allowed_applications"
-			style="@style/AppTheme.ListBlock">
-
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/title_allowed_applications"/>
-
-			<TextView
-				android:id="@+id/text_network_allowed_applications"
-				style="@style/AppTheme.BlockContent"/>
-
-		</LinearLayout>
-
-		<LinearLayout
-			android:id="@+id/block_network_disallowed_applications"
-			style="@style/AppTheme.ListBlock">
-
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/title_disallowed_applications"/>
-
-			<TextView
-				android:id="@+id/text_network_disallowed_applications"
-				style="@style/AppTheme.BlockContent"/>
-
-		</LinearLayout>
-
-		<LinearLayout style="@style/AppTheme.ListBlock">
-
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/title_allow_bypass"/>
-
-			<TextView
-				android:id="@+id/text_network_allow_bypass"
-				style="@style/AppTheme.BlockContent"/>
-
-		</LinearLayout>
-
-	</LinearLayout>
-
-	<TextView
-		style="@style/AppTheme.SectionTitle"
-		android:text="@string/title_nodes"/>
-
-	<TextView
-		android:id="@+id/node_list_placeholder"
-		style="@style/AppTheme.ListBlock.Placeholder"
-		android:text="@string/message_loading"/>
-
-</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 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<TextView
+		style="@style/AppTheme.SectionTitle"
+		android:text="@string/status_activity_title_network_info"/>
+
+	<fragment
+		android:id="@+id/status_activity_network_info_fragment"
+		android:name="org.pacien.tincapp.activities.status.NetworkInfoFragment"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"/>
+
+	<TextView
+		style="@style/AppTheme.SectionTitle"
+		android:text="@string/status_activity_title_node_list"/>
+
+	<TextView
+		android:id="@+id/status_activity_node_list_placeholder"
+		style="@style/AppTheme.ListBlock.Placeholder"
+		android:text="@string/status_activity_node_list_placeholder_text"/>
+
+</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 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<data>
+
+		<import type="android.view.View"/>
+
+		<variable
+			name="netName"
+			type="String"/>
+
+		<variable
+			name="vpnInterfaceConfiguration"
+			type="org.pacien.tincapp.data.VpnInterfaceConfiguration"/>
+
+		<variable
+			name="listFormatter"
+			type="org.pacien.tincapp.activities.status.VpnInterfaceConfigurationFormatter"/>
+
+	</data>
+
+	<LinearLayout style="@style/AppTheme.List">
+
+		<LinearLayout style="@style/AppTheme.ListBlock">
+
+			<TextView
+				style="@style/AppTheme.BlockTitle"
+				android:text="@string/status_network_info_network_name_label"/>
+
+			<TextView
+				style="@style/AppTheme.BlockContent"
+				android:text="@{netName ?? @string/status_network_info_yes_value}"/>
+
+		</LinearLayout>
+
+		<LinearLayout style="@style/AppTheme.ListBlock">
+
+			<TextView
+				style="@style/AppTheme.BlockTitle"
+				android:text="@string/status_network_info_ip_addresses_label"/>
+
+			<TextView
+				style="@style/AppTheme.BlockContent"
+				android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.addresses)}"/>
+
+		</LinearLayout>
+
+		<LinearLayout style="@style/AppTheme.ListBlock">
+
+			<TextView
+				style="@style/AppTheme.BlockTitle"
+				android:text="@string/status_network_info_routes_label"/>
+
+			<TextView
+				style="@style/AppTheme.BlockContent"
+				android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.routes)}"/>
+
+		</LinearLayout>
+
+		<LinearLayout style="@style/AppTheme.ListBlock">
+
+			<TextView
+				style="@style/AppTheme.BlockTitle"
+				android:text="@string/status_network_info_dns_servers_label"/>
+
+			<TextView
+				style="@style/AppTheme.BlockContent"
+				android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.dnsServers)}"/>
+
+		</LinearLayout>
+
+		<LinearLayout style="@style/AppTheme.ListBlock">
+
+			<TextView
+				style="@style/AppTheme.BlockTitle"
+				android:text="@string/status_network_info_search_domains_label"/>
+
+			<TextView
+				style="@style/AppTheme.BlockContent"
+				android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.searchDomains)}"/>
+
+		</LinearLayout>
+
+		<LinearLayout
+			style="@style/AppTheme.ListBlock"
+			android:visibility="@{vpnInterfaceConfiguration.allowedApplications.isEmpty ? View.GONE : View.VISIBLE}">
+
+			<TextView
+				style="@style/AppTheme.BlockTitle"
+				android:text="@string/status_network_info_allowed_applications_label"/>
+
+			<TextView
+				style="@style/AppTheme.BlockContent"
+				android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.allowedApplications)}"/>
+
+		</LinearLayout>
+
+		<LinearLayout
+			style="@style/AppTheme.ListBlock"
+			android:visibility="@{vpnInterfaceConfiguration.disallowedApplications.isEmpty ? View.GONE : View.VISIBLE}">
+
+			<TextView
+				style="@style/AppTheme.BlockTitle"
+				android:text="@string/status_network_info_disallowed_applications_label"/>
+
+			<TextView
+				style="@style/AppTheme.BlockContent"
+				android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.disallowedApplications)}"/>
+
+		</LinearLayout>
+
+		<LinearLayout style="@style/AppTheme.ListBlock">
+
+			<TextView
+				style="@style/AppTheme.BlockTitle"
+				android:text="@string/status_network_info_allow_bypass_label"/>
+
+			<TextView
+				style="@style/AppTheme.BlockContent"
+				android:text="@{vpnInterfaceConfiguration.allowBypass ? @string/status_network_info_yes_value : @string/status_network_info_no_value}"/>
+
+		</LinearLayout>
+
+	</LinearLayout>
+
+</layout>
diff --git a/app/src/main/res/layout/status_node_info_dialog.xml b/app/src/main/res/layout/status_node_info_dialog.xml
new file mode 100644
index 0000000..36f3e86
--- /dev/null
+++ b/app/src/main/res/layout/status_node_info_dialog.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:paddingBottom="@dimen/dialog_vertical_margin"
+						android:paddingLeft="@dimen/dialog_horizontal_margin"
+						android:paddingRight="@dimen/dialog_horizontal_margin"
+						android:paddingTop="@dimen/dialog_vertical_margin">
+
+	<TextView
+		android:id="@+id/dialog_node_details"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:fontFamily="monospace"
+		android:text="@string/status_node_list_modal_placeholder_text"
+		android:textColor="@color/textSecondary"/>
+
+</ScrollView>
diff --git a/app/src/main/res/menu/menu_status.xml b/app/src/main/res/menu/menu_status.xml
index e6baf0f..a6ad5bf 100644
--- a/app/src/main/res/menu/menu_status.xml
+++ b/app/src/main/res/menu/menu_status.xml
@@ -21,7 +21,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 			xmlns:app="http://schemas.android.com/apk/res-auto"
 			xmlns:tools="http://schemas.android.com/tools"
-			tools:context="org.pacien.tincapp.activities.StatusActivity">
+			tools:context="org.pacien.tincapp.activities.status.StatusActivity">
 
 	<item
 		android:id="@+id/menu_disconnect"
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 35e39a2..f9a2a7d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -46,21 +46,21 @@
 	<string name="title_connect_to_network">连接到网络</string>
 	<string name="title_request_vpn_permissions">请求 VPN 权限</string>
 	<string name="configure_activity_title_path_info">路径信息</string>
-	<string name="title_node_info">节点信息</string>
+	<string name="status_node_info_dialog_title">节点信息</string>
 	<string name="configure_activity_title_tools">工具</string>
 	<string name="configure_path_info_title_configuration_directory">配置目录</string>
 	<string name="configure_path_info_title_log_directory">日志目录</string>
 	<string name="configure_path_info_title_tinc_binary">Tinc 二进制文件</string>
-	<string name="title_network_info">网络信息</string>
-	<string name="title_network_name">网络名称</string>
-	<string name="title_ip_addresses">IP 地址</string>
-	<string name="title_routes">路由</string>
-	<string name="title_dns_servers">DNS 服务器</string>
-	<string name="title_search_domains">搜索域</string>
-	<string name="title_allowed_applications">允许的应用程序</string>
-	<string name="title_disallowed_applications">不允许的应用程序</string>
-	<string name="title_allow_bypass">允许旁路</string>
-	<string name="title_nodes">节点</string>
+	<string name="status_activity_title_network_info">网络信息</string>
+	<string name="status_network_info_network_name_label">网络名称</string>
+	<string name="status_network_info_ip_addresses_label">IP 地址</string>
+	<string name="status_network_info_routes_label">路由</string>
+	<string name="status_network_info_dns_servers_label">DNS 服务器</string>
+	<string name="status_network_info_search_domains_label">搜索域</string>
+	<string name="status_network_info_allowed_applications_label">允许的应用程序</string>
+	<string name="status_network_info_disallowed_applications_label">不允许的应用程序</string>
+	<string name="status_network_info_allow_bypass_label">允许旁路</string>
+	<string name="status_activity_title_node_list">节点</string>
 	<string name="title_error">错误</string>
 	<string name="configure_tools_generate_config_title">新建网络</string>
 	<string name="configure_tools_join_network_title">加入网络</string>
@@ -93,7 +93,7 @@
 	<string name="configure_tools_private_keys_encryption_encrypting">加密/解密私钥</string>
 	<string name="message_could_not_decrypt_private_keys_format">无法解密私钥：\n%1$s</string>
 
-	<string name="value_none">无</string>
-	<string name="value_yes">是</string>
-	<string name="value_no">否</string>
+	<string name="status_network_info_none_value">无</string>
+	<string name="status_network_info_yes_value">是</string>
+	<string name="status_network_info_no_value">否</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index c56e1ab..4804d29 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -46,21 +46,21 @@
 	<string name="title_connect_to_network">連接到網絡</string>
 	<string name="title_request_vpn_permissions">請求 VPN 權限</string>
 	<string name="configure_activity_title_path_info">路徑信息</string>
-	<string name="title_node_info">節點信息</string>
+	<string name="status_node_info_dialog_title">節點信息</string>
 	<string name="configure_activity_title_tools">工具</string>
 	<string name="configure_path_info_title_configuration_directory">配置目錄</string>
 	<string name="configure_path_info_title_log_directory">日誌目錄</string>
 	<string name="configure_path_info_title_tinc_binary">Tinc 二進制文件</string>
-	<string name="title_network_info">網絡信息</string>
-	<string name="title_network_name">網絡名稱</string>
-	<string name="title_ip_addresses">IP 地址</string>
-	<string name="title_routes">路由</string>
-	<string name="title_dns_servers">DNS 服務器</string>
-	<string name="title_search_domains">搜索域</string>
-	<string name="title_allowed_applications">允許的應用程序</string>
-	<string name="title_disallowed_applications">不允許的應用程序</string>
-	<string name="title_allow_bypass">允許旁路</string>
-	<string name="title_nodes">節點</string>
+	<string name="status_activity_title_network_info">網絡信息</string>
+	<string name="status_network_info_network_name_label">網絡名稱</string>
+	<string name="status_network_info_ip_addresses_label">IP 地址</string>
+	<string name="status_network_info_routes_label">路由</string>
+	<string name="status_network_info_dns_servers_label">DNS 服務器</string>
+	<string name="status_network_info_search_domains_label">搜索域</string>
+	<string name="status_network_info_allowed_applications_label">允許的應用程序</string>
+	<string name="status_network_info_disallowed_applications_label">不允許的應用程序</string>
+	<string name="status_network_info_allow_bypass_label">允許旁路</string>
+	<string name="status_activity_title_node_list">節點</string>
 	<string name="title_error">錯誤</string>
 	<string name="configure_tools_generate_config_title">新建網絡</string>
 	<string name="configure_tools_join_network_title">加入網絡</string>
@@ -93,7 +93,7 @@
 	<string name="configure_tools_private_keys_encryption_encrypting">加密/解密私鑰</string>
 	<string name="message_could_not_decrypt_private_keys_format">無法解密私鑰：\n%1$s</string>
 
-	<string name="value_none">無</string>
-	<string name="value_yes">是</string>
-	<string name="value_no">否</string>
+	<string name="status_network_info_none_value">無</string>
+	<string name="status_network_info_yes_value">是</string>
+	<string name="status_network_info_no_value">否</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index b110498..a7e37d5 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -46,21 +46,21 @@
 	<string name="title_connect_to_network">連線到網路</string>
 	<string name="title_request_vpn_permissions">請求 VPN 許可權</string>
 	<string name="configure_activity_title_path_info">路徑資訊</string>
-	<string name="title_node_info">節點資訊</string>
+	<string name="status_node_info_dialog_title">節點資訊</string>
 	<string name="configure_activity_title_tools">工具</string>
 	<string name="configure_path_info_title_configuration_directory">配置目錄</string>
 	<string name="configure_path_info_title_log_directory">日誌目錄</string>
 	<string name="configure_path_info_title_tinc_binary">Tinc 二進位制檔案</string>
-	<string name="title_network_info">網路資訊</string>
-	<string name="title_network_name">網路名稱</string>
-	<string name="title_ip_addresses">IP 地址</string>
-	<string name="title_routes">路由</string>
-	<string name="title_dns_servers">DNS 伺服器</string>
-	<string name="title_search_domains">搜尋域</string>
-	<string name="title_allowed_applications">允許的應用程式</string>
-	<string name="title_disallowed_applications">不允許的應用程式</string>
-	<string name="title_allow_bypass">允許旁路</string>
-	<string name="title_nodes">節點</string>
+	<string name="status_activity_title_network_info">網路資訊</string>
+	<string name="status_network_info_network_name_label">網路名稱</string>
+	<string name="status_network_info_ip_addresses_label">IP 地址</string>
+	<string name="status_network_info_routes_label">路由</string>
+	<string name="status_network_info_dns_servers_label">DNS 伺服器</string>
+	<string name="status_network_info_search_domains_label">搜尋域</string>
+	<string name="status_network_info_allowed_applications_label">允許的應用程式</string>
+	<string name="status_network_info_disallowed_applications_label">不允許的應用程式</string>
+	<string name="status_network_info_allow_bypass_label">允許旁路</string>
+	<string name="status_activity_title_node_list">節點</string>
 	<string name="title_error">錯誤</string>
 	<string name="configure_tools_generate_config_title">新建網路</string>
 	<string name="configure_tools_join_network_title">加入網路</string>
@@ -93,7 +93,7 @@
 	<string name="configure_tools_private_keys_encryption_encrypting">加密/解密私鑰</string>
 	<string name="message_could_not_decrypt_private_keys_format">無法解密私鑰：\n%1$s</string>
 
-	<string name="value_none">無</string>
-	<string name="value_yes">是</string>
-	<string name="value_no">否</string>
+	<string name="status_network_info_none_value">無</string>
+	<string name="status_network_info_yes_value">是</string>
+	<string name="status_network_info_no_value">否</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fc689fd..a27fab7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -45,17 +45,6 @@
 
 	<string name="title_connect_to_network">Connect to network</string>
 	<string name="title_request_vpn_permissions">Request VPN permissions</string>
-	<string name="title_node_info">Node info</string>
-	<string name="title_network_info">Network info</string>
-	<string name="title_network_name">Network name</string>
-	<string name="title_ip_addresses">IP addresses</string>
-	<string name="title_routes">Routes</string>
-	<string name="title_dns_servers">DNS servers</string>
-	<string name="title_search_domains">Search domains</string>
-	<string name="title_allowed_applications">Allowed applications</string>
-	<string name="title_disallowed_applications">Disallowed applications</string>
-	<string name="title_allow_bypass">Allow bypass</string>
-	<string name="title_nodes">Nodes</string>
 	<string name="title_error">Error</string>
 	<string name="title_unable_to_start_tinc">Unable to start tinc</string>
 	<string name="title_unlock_private_keys">Unlock tinc private keys</string>
@@ -85,7 +74,6 @@
 	<string name="message_disconnecting_vpn">Disconnecting VPN…</string>
 	<string name="message_passphrase_required">A passphrase is required to unlock the keyring.</string>
 	<string name="message_daemon_exited">Tinc daemon exited during startup:\n%1$s\nCheck the logs for more details.</string>
-	<string name="message_loading">Loading…</string>
 	<string name="message_log_level_set">Log level set to %1$d.</string>
 	<string name="message_log_paused">Logging paused.</string>
 	<string name="message_could_not_configure_iface">Could not apply network interface configuration:\n%1$s</string>
@@ -97,10 +85,6 @@
 	<string name="message_could_not_read_network_configuration_format">Could not read network interface configuration:\n%1$s</string>
 	<string name="message_could_not_read_private_key_format">Could not read tinc private keys:\n%1$s</string>
 
-	<string name="value_none">none</string>
-	<string name="value_yes">yes</string>
-	<string name="value_no">no</string>
-
 	<!-- Configure activity -->
 	<string name="configure_activity_title_path_info">Path info</string>
 	<string name="configure_path_info_title_configuration_directory">Configuration directory</string>
@@ -130,4 +114,26 @@
 	<string name="configure_tools_private_key_encryption_new_passphrase">New passphrase\n(leave empty to decrypt)</string>
 	<string name="configure_tools_private_keys_encryption_action">Apply</string>
 	<string name="configure_tools_private_keys_encryption_encrypting">Encrypting/decrypting private keys</string>
+
+	<!-- Status activity -->
+	<string name="status_activity_title_node_list">Nodes</string>
+	<string name="status_activity_title_network_info">Network info</string>
+
+	<string name="status_network_info_network_name_label">Network name</string>
+	<string name="status_network_info_ip_addresses_label">IP addresses</string>
+	<string name="status_network_info_routes_label">Routes</string>
+	<string name="status_network_info_dns_servers_label">DNS servers</string>
+	<string name="status_network_info_search_domains_label">Search domains</string>
+	<string name="status_network_info_allowed_applications_label">Allowed applications</string>
+	<string name="status_network_info_disallowed_applications_label">Disallowed applications</string>
+	<string name="status_network_info_allow_bypass_label">Allow bypass</string>
+
+	<string name="status_network_info_yes_value">yes</string>
+	<string name="status_network_info_no_value">no</string>
+	<string name="status_network_info_none_value">none</string>
+
+	<string name="status_activity_node_list_placeholder_text">Loading…</string>
+	<string name="status_node_list_modal_placeholder_text">Loading…</string>
+	<string name="status_node_info_dialog_title">Node info</string>
+	<string name="status_node_info_dialog_close_action">Close</string>
 </resources>
-- 
cgit v1.2.3