From 4629e909c9f8dd6fdc7ec9ed1dcc4668311e134f Mon Sep 17 00:00:00 2001
From: pacien
Date: Tue, 21 Aug 2018 02:09:57 +0200
Subject: Add subnet list tab to status activity

---
 app/src/main/res/layout/status_node_list.xml       | 39 -----------------
 .../main/res/layout/status_node_list_fragment.xml  | 38 ++++++++++++++++
 .../res/layout/status_subnet_list_fragment.xml     | 38 ++++++++++++++++
 .../main/res/layout/status_subnet_list_item.xml    | 50 ++++++++++++++++++++++
 app/src/main/res/values/strings.xml                |  4 +-
 app/src/main/res/values/styles.xml                 |  1 +
 6 files changed, 130 insertions(+), 40 deletions(-)
 delete mode 100644 app/src/main/res/layout/status_node_list.xml
 create mode 100644 app/src/main/res/layout/status_node_list_fragment.xml
 create mode 100644 app/src/main/res/layout/status_subnet_list_fragment.xml
 create mode 100644 app/src/main/res/layout/status_subnet_list_item.xml

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

diff --git a/app/src/main/res/layout/status_node_list.xml b/app/src/main/res/layout/status_node_list.xml
deleted file mode 100644
index 923d20e..0000000
--- a/app/src/main/res/layout/status_node_list.xml
+++ /dev/null
@@ -1,39 +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"
-	android:id="@+id/status_node_list_wrapper"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical">
-
-	<ListView
-		android:id="@+id/status_node_list"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:divider="@drawable/horizontal_line"/>
-
-	<TextView
-		android:id="@+id/status_node_list_placeholder"
-		style="@style/AppTheme.ListBlock.Placeholder"
-		android:text="@string/status_node_list_empty_placeholder_text"/>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/status_node_list_fragment.xml b/app/src/main/res/layout/status_node_list_fragment.xml
new file mode 100644
index 0000000..fd000bb
--- /dev/null
+++ b/app/src/main/res/layout/status_node_list_fragment.xml
@@ -0,0 +1,38 @@
+<?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="match_parent"
+	android:orientation="vertical">
+
+	<ListView
+		android:id="@+id/status_node_list"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:divider="@drawable/horizontal_line"/>
+
+	<TextView
+		android:id="@+id/status_node_list_placeholder"
+		style="@style/AppTheme.ListBlock.Placeholder"
+		android:text="@string/status_node_list_empty_placeholder_text"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/status_subnet_list_fragment.xml b/app/src/main/res/layout/status_subnet_list_fragment.xml
new file mode 100644
index 0000000..1470bad
--- /dev/null
+++ b/app/src/main/res/layout/status_subnet_list_fragment.xml
@@ -0,0 +1,38 @@
+<?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="match_parent"
+	android:orientation="vertical">
+
+	<ListView
+		android:id="@+id/status_subnet_list"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:divider="@drawable/horizontal_line"/>
+
+	<TextView
+		android:id="@+id/status_subnet_list_placeholder"
+		style="@style/AppTheme.ListBlock.Placeholder"
+		android:text="@string/status_subnet_list_empty_placeholder_text"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/status_subnet_list_item.xml b/app/src/main/res/layout/status_subnet_list_item.xml
new file mode 100644
index 0000000..8f8e2c4
--- /dev/null
+++ b/app/src/main/res/layout/status_subnet_list_item.xml
@@ -0,0 +1,50 @@
+<?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>
+
+		<variable
+			name="subnetInfo"
+			type="org.pacien.tincapp.activities.status.subnets.SubnetInfo"/>
+
+	</data>
+
+	<LinearLayout
+		style="@style/AppTheme.ListBlock"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:orientation="horizontal">
+
+		<TextView
+			style="@style/AppTheme.BlockTitle"
+			android:layout_weight="1"
+			android:text="@{subnetInfo.ipRange}"/>
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_weight="0"
+			android:text="@{subnetInfo.owner}"/>
+
+	</LinearLayout>
+
+</layout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3f2e800..827e996 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -115,8 +115,9 @@
 
 	<!-- Status activity -->
 	<string name="status_activity_state_connected_to_format">Connected to %s</string>
-	<string name="status_activity_title_node_list">Nodes</string>
 	<string name="status_activity_title_network_info">Network</string>
+	<string name="status_activity_title_node_list">Nodes</string>
+	<string name="status_activity_title_subnet_list">Subnets</string>
 
 	<string name="status_network_info_network_name_label">Network name</string>
 	<string name="status_network_info_ip_addresses_label">IP addresses</string>
@@ -140,6 +141,7 @@
 	<string name="status_node_info_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>
+	<string name="status_subnet_list_empty_placeholder_text">Loading…</string>
 
 	<!-- Log viewer activity -->
 	<string name="log_view_state_level_format">Log level: %s</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 813b040..fc4a6c3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -60,6 +60,7 @@
 		<item name="android:paddingRight">@dimen/activity_horizontal_margin</item>
 		<item name="android:paddingTop">@dimen/activity_vertical_margin</item>
 		<item name="android:orientation">vertical</item>
+		<item name="android:focusable">true</item>
 	</style>
 
 	<style name="AppTheme.ListBlock.Clickable">
-- 
cgit v1.2.3