From b5884b3ad4964d6bdbbb92c160bed84cdbb059a1 Mon Sep 17 00:00:00 2001
From: pacien
Date: Mon, 20 Aug 2018 00:53:22 +0200
Subject: Split status activity into tabs

Refactoring the underlying code to use lifecycle-aware classes
---
 app/src/main/res/layout/status_activity.xml        |  30 +++++
 .../res/layout/status_activity_list_header.xml     |  46 --------
 .../res/layout/status_network_info_fragment.xml    | 131 +++++++++++----------
 app/src/main/res/layout/status_node_list.xml       |  39 ++++++
 app/src/main/res/values/colors.xml                 |   2 +-
 app/src/main/res/values/strings.xml                |   2 +-
 app/src/main/res/values/styles.xml                 |   9 ++
 7 files changed, 149 insertions(+), 110 deletions(-)
 create mode 100644 app/src/main/res/layout/status_activity.xml
 delete mode 100644 app/src/main/res/layout/status_activity_list_header.xml
 create mode 100644 app/src/main/res/layout/status_node_list.xml

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

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 @@
+<?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/>.
+-->
+
+<android.support.v4.view.ViewPager
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/status_activity_pager"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<android.support.design.widget.TabLayout
+		style="@style/AppTheme.TabLayout"/>
+
+</android.support.v4.view.ViewPager>
diff --git a/app/src/main/res/layout/status_activity_list_header.xml b/app/src/main/res/layout/status_activity_list_header.xml
deleted file mode 100644
index 8030481..0000000
--- a/app/src/main/res/layout/status_activity_list_header.xml
+++ /dev/null
@@ -1,46 +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: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
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 @@
 
 		<variable
 			name="listFormatter"
-			type="org.pacien.tincapp.activities.status.VpnInterfaceConfigurationFormatter"/>
+			type="org.pacien.tincapp.activities.status.networkinfo.VpnInterfaceConfigurationFormatter"/>
 
 	</data>
 
-	<LinearLayout style="@style/AppTheme.List">
+	<ScrollView
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:orientation="vertical">
 
-		<LinearLayout style="@style/AppTheme.ListBlock">
+		<LinearLayout style="@style/AppTheme.List">
 
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/status_network_info_ip_addresses_label"/>
+			<LinearLayout style="@style/AppTheme.ListBlock">
 
-			<TextView
-				style="@style/AppTheme.BlockContent"
-				android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.addresses)}"/>
+				<TextView
+					style="@style/AppTheme.BlockTitle"
+					android:text="@string/status_network_info_ip_addresses_label"/>
 
-		</LinearLayout>
+				<TextView
+					style="@style/AppTheme.BlockContent"
+					android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.addresses)}"/>
 
-		<LinearLayout style="@style/AppTheme.ListBlock">
+			</LinearLayout>
 
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/status_network_info_routes_label"/>
+			<LinearLayout style="@style/AppTheme.ListBlock">
 
-			<TextView
-				style="@style/AppTheme.BlockContent"
-				android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.routes)}"/>
+				<TextView
+					style="@style/AppTheme.BlockTitle"
+					android:text="@string/status_network_info_routes_label"/>
 
-		</LinearLayout>
+				<TextView
+					style="@style/AppTheme.BlockContent"
+					android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.routes)}"/>
 
-		<LinearLayout style="@style/AppTheme.ListBlock">
+			</LinearLayout>
 
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/status_network_info_dns_servers_label"/>
+			<LinearLayout style="@style/AppTheme.ListBlock">
 
-			<TextView
-				style="@style/AppTheme.BlockContent"
-				android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.dnsServers)}"/>
+				<TextView
+					style="@style/AppTheme.BlockTitle"
+					android:text="@string/status_network_info_dns_servers_label"/>
 
-		</LinearLayout>
+				<TextView
+					style="@style/AppTheme.BlockContent"
+					android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.dnsServers)}"/>
 
-		<LinearLayout style="@style/AppTheme.ListBlock">
+			</LinearLayout>
 
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/status_network_info_search_domains_label"/>
+			<LinearLayout style="@style/AppTheme.ListBlock">
 
-			<TextView
-				style="@style/AppTheme.BlockContent"
-				android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.searchDomains)}"/>
+				<TextView
+					style="@style/AppTheme.BlockTitle"
+					android:text="@string/status_network_info_search_domains_label"/>
 
-		</LinearLayout>
+				<TextView
+					style="@style/AppTheme.BlockContent"
+					android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.searchDomains)}"/>
 
-		<LinearLayout
-			style="@style/AppTheme.ListBlock"
-			android:visibility="@{vpnInterfaceConfiguration.allowedApplications.isEmpty ? View.GONE : View.VISIBLE}">
+			</LinearLayout>
 
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/status_network_info_allowed_applications_label"/>
+			<LinearLayout
+				style="@style/AppTheme.ListBlock"
+				android:visibility="@{vpnInterfaceConfiguration.allowedApplications.isEmpty ? View.GONE : View.VISIBLE}">
 
-			<TextView
-				style="@style/AppTheme.BlockContent"
-				android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.allowedApplications)}"/>
+				<TextView
+					style="@style/AppTheme.BlockTitle"
+					android:text="@string/status_network_info_allowed_applications_label"/>
 
-		</LinearLayout>
+				<TextView
+					style="@style/AppTheme.BlockContent"
+					android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.allowedApplications)}"/>
 
-		<LinearLayout
-			style="@style/AppTheme.ListBlock"
-			android:visibility="@{vpnInterfaceConfiguration.disallowedApplications.isEmpty ? View.GONE : View.VISIBLE}">
+			</LinearLayout>
 
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/status_network_info_disallowed_applications_label"/>
+			<LinearLayout
+				style="@style/AppTheme.ListBlock"
+				android:visibility="@{vpnInterfaceConfiguration.disallowedApplications.isEmpty ? View.GONE : View.VISIBLE}">
 
-			<TextView
-				style="@style/AppTheme.BlockContent"
-				android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.disallowedApplications)}"/>
+				<TextView
+					style="@style/AppTheme.BlockTitle"
+					android:text="@string/status_network_info_disallowed_applications_label"/>
 
-		</LinearLayout>
+				<TextView
+					style="@style/AppTheme.BlockContent"
+					android:text="@{listFormatter.formatList(vpnInterfaceConfiguration.disallowedApplications)}"/>
+
+			</LinearLayout>
+
+			<LinearLayout style="@style/AppTheme.ListBlock">
 
-		<LinearLayout style="@style/AppTheme.ListBlock">
+				<TextView
+					style="@style/AppTheme.BlockTitle"
+					android:text="@string/status_network_info_allow_bypass_label"/>
 
-			<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}"/>
 
-			<TextView
-				style="@style/AppTheme.BlockContent"
-				android:text="@{vpnInterfaceConfiguration.allowBypass ? @string/status_network_info_yes_value : @string/status_network_info_no_value}"/>
+			</LinearLayout>
 
 		</LinearLayout>
 
-	</LinearLayout>
+	</ScrollView>
 
 </layout>
diff --git a/app/src/main/res/layout/status_node_list.xml b/app/src/main/res/layout/status_node_list.xml
new file mode 100644
index 0000000..d3c4831
--- /dev/null
+++ b/app/src/main/res/layout/status_node_list.xml
@@ -0,0 +1,39 @@
+<?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/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/values/colors.xml b/app/src/main/res/values/colors.xml
index 71a04b7..7520cd8 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -29,5 +29,5 @@
 	<color name="separator">#d9d9d9</color>
 
 	<color name="backgroundPrimary">#FFFFFF</color>
-	<color name="backgroundSecondary">#d9d9d9</color>
+	<color name="backgroundSecondary">#dddddd</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 98a6905..84b098f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -129,7 +129,7 @@
 	<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_empty_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>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 859d4ee..813b040 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,6 +19,7 @@
 -->
 
 <resources>
+
 	<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
 		<item name="colorPrimary">@color/headerBackgroundPrimary</item>
 		<item name="colorPrimaryDark">@color/headerBackgroundPrimaryDark</item>
@@ -81,4 +82,12 @@
 		<item name="android:layout_height">wrap_content</item>
 		<item name="android:textColor">@color/textSecondary</item>
 	</style>
+
+	<style name="AppTheme.TabLayout" parent="Widget.Design.TabLayout">
+		<item name="android:background">@color/backgroundSecondary</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:layout_width">match_parent</item>
+		<item name="tabGravity">fill</item>
+	</style>
+
 </resources>
-- 
cgit v1.2.3