From 80394001852e8400fd2c3d30e441306957d32243 Mon Sep 17 00:00:00 2001
From: Pacien TRAN-GIRARD
Date: Tue, 4 Jul 2017 18:51:57 +0200
Subject: Add status activity

---
 app/src/main/res/drawable/ic_build_black_24dp.xml  |   9 --
 .../main/res/drawable/ic_build_primary_24dp.xml    |   9 ++
 app/src/main/res/drawable/ic_stop_primary_24dp.xml |   9 ++
 app/src/main/res/layout/dialog_frame.xml           |   1 -
 app/src/main/res/layout/dialog_text_monopsace.xml  |  15 +++
 .../res/layout/fragment_network_status_header.xml  | 122 +++++++++++++++++++++
 app/src/main/res/layout/page_status.xml            |  22 ++++
 app/src/main/res/menu/menu_start.xml               |   2 +-
 app/src/main/res/menu/menu_status.xml              |  14 +++
 app/src/main/res/values/strings.xml                |  17 +++
 10 files changed, 209 insertions(+), 11 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_build_black_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_build_primary_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_stop_primary_24dp.xml
 create mode 100644 app/src/main/res/layout/dialog_text_monopsace.xml
 create mode 100644 app/src/main/res/layout/fragment_network_status_header.xml
 create mode 100644 app/src/main/res/layout/page_status.xml
 create mode 100644 app/src/main/res/menu/menu_status.xml

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

diff --git a/app/src/main/res/drawable/ic_build_black_24dp.xml b/app/src/main/res/drawable/ic_build_black_24dp.xml
deleted file mode 100644
index b099a5c..0000000
--- a/app/src/main/res/drawable/ic_build_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/textPrimary"
-        android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_build_primary_24dp.xml b/app/src/main/res/drawable/ic_build_primary_24dp.xml
new file mode 100644
index 0000000..b099a5c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_build_primary_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/textPrimary"
+        android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_stop_primary_24dp.xml b/app/src/main/res/drawable/ic_stop_primary_24dp.xml
new file mode 100644
index 0000000..9d41e25
--- /dev/null
+++ b/app/src/main/res/drawable/ic_stop_primary_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+		android:width="24dp"
+		android:height="24dp"
+		android:viewportWidth="24.0"
+		android:viewportHeight="24.0">
+	<path
+		android:fillColor="@color/textPrimary"
+		android:pathData="M6,6h12v12H6z"/>
+</vector>
diff --git a/app/src/main/res/layout/dialog_frame.xml b/app/src/main/res/layout/dialog_frame.xml
index 82a130f..9b4a512 100644
--- a/app/src/main/res/layout/dialog_frame.xml
+++ b/app/src/main/res/layout/dialog_frame.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 			  android:layout_width="match_parent"
 			  android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_text_monopsace.xml b/app/src/main/res/layout/dialog_text_monopsace.xml
new file mode 100644
index 0000000..b7f6f5b
--- /dev/null
+++ b/app/src/main/res/layout/dialog_text_monopsace.xml
@@ -0,0 +1,15 @@
+<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_text_monospace"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:fontFamily="monospace"/>
+
+</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
new file mode 100644
index 0000000..947183b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_network_status_header.xml
@@ -0,0 +1,122 @@
+<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"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/page_status.xml b/app/src/main/res/layout/page_status.xml
new file mode 100644
index 0000000..22faaf1
--- /dev/null
+++ b/app/src/main/res/layout/page_status.xml
@@ -0,0 +1,22 @@
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:orientation="vertical"
+	tools:context="org.pacien.tincapp.activities.StatusActivity">
+
+	<ListView
+		android:id="@+id/node_list"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:divider="@drawable/horizontal_line"
+		android:footerDividersEnabled="false"
+		android:headerDividersEnabled="false"/>
+
+	<TextView
+		android:id="@+id/node_list_empty"
+		style="@style/AppTheme.ListBlock.Placeholder"
+		android:text="@string/message_no_known_node"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/menu/menu_start.xml b/app/src/main/res/menu/menu_start.xml
index 4f455d1..89ad0a2 100644
--- a/app/src/main/res/menu/menu_start.xml
+++ b/app/src/main/res/menu/menu_start.xml
@@ -5,7 +5,7 @@
 
 	<item
 		android:id="@+id/menu_about"
-		android:icon="@drawable/ic_build_black_24dp"
+		android:icon="@drawable/ic_build_primary_24dp"
 		android:onClick="openConfigureActivity"
 		android:tint="@color/colorAccent"
 		android:title="@string/menu_configure"
diff --git a/app/src/main/res/menu/menu_status.xml b/app/src/main/res/menu/menu_status.xml
new file mode 100644
index 0000000..8884136
--- /dev/null
+++ b/app/src/main/res/menu/menu_status.xml
@@ -0,0 +1,14 @@
+<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">
+
+	<item
+		android:id="@+id/menu_disconnect"
+		android:icon="@drawable/ic_stop_primary_24dp"
+		android:onClick="stopVpn"
+		android:tint="@color/colorAccent"
+		android:title="@string/menu_disconnect"
+		app:showAsAction="ifRoom"/>
+
+</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 750edbb..4b4be51 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,16 +12,28 @@
 
 	<string name="menu_about">About this app</string>
 	<string name="menu_configure">Configure</string>
+	<string name="menu_disconnect">Disconnect</string>
 
 	<string name="field_net_name">Tinc network name</string>
 
 	<string name="title_connect_to_network">Connect to network</string>
 	<string name="title_request_vpn_permissions">Request VPN permissions</string>
 	<string name="title_path_info">Path info</string>
+	<string name="title_node_info">Node info</string>
 	<string name="title_tools">Tools</string>
 	<string name="title_configuration_directory">Configuration directory</string>
 	<string name="title_log_directory">Log directory</string>
 	<string name="title_tinc_binary">Tinc binary</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="action_close">Close</string>
 	<string name="action_open_project_website">Project website</string>
@@ -29,4 +41,9 @@
 	<string name="action_join_network_via_invitation_url">Join network via invitation URL</string>
 
 	<string name="message_no_network_configuration_found">No network configuration has been found.</string>
+	<string name="message_no_known_node">No known node</string>
+
+	<string name="value_none">none</string>
+	<string name="value_yes">yes</string>
+	<string name="value_no">no</string>
 </resources>
-- 
cgit v1.2.3