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
---
 .../res/layout/status_network_info_fragment.xml    | 131 +++++++++++----------
 1 file changed, 69 insertions(+), 62 deletions(-)

(limited to 'app/src/main/res/layout/status_network_info_fragment.xml')

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