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 ++++++
 5 files changed, 228 insertions(+), 184 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/layout')

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>
-- 
cgit v1.2.3