From a2bfd75dee9b4952771a66c555ba1d920a072ae9 Mon Sep 17 00:00:00 2001
From: Pacien TRAN-GIRARD
Date: Tue, 11 Jul 2017 14:49:08 +0200
Subject: Implement create and join network dialogs + refactoring

---
 app/src/main/res/layout/page_configure.xml |  4 ++--
 app/src/main/res/values/strings.xml        | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

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

diff --git a/app/src/main/res/layout/page_configure.xml b/app/src/main/res/layout/page_configure.xml
index 35a7416..ab1033e 100644
--- a/app/src/main/res/layout/page_configure.xml
+++ b/app/src/main/res/layout/page_configure.xml
@@ -63,7 +63,7 @@
 
 			<LinearLayout
 				style="@style/AppTheme.ListBlock.Clickable"
-				android:onClick="generateConf">
+				android:onClick="openGenerateConfDialog">
 
 				<TextView
 					style="@style/AppTheme.BlockTitle"
@@ -73,7 +73,7 @@
 
 			<LinearLayout
 				style="@style/AppTheme.ListBlock.Clickable"
-				android:onClick="joinNetwork">
+				android:onClick="openJoinNetworkDialog">
 
 				<TextView
 					style="@style/AppTheme.BlockTitle"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4b4be51..1bb6192 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,6 +15,7 @@
 	<string name="menu_disconnect">Disconnect</string>
 
 	<string name="field_net_name">Tinc network name</string>
+	<string name="field_invitation_url">Invitation URL</string>
 
 	<string name="title_connect_to_network">Connect to network</string>
 	<string name="title_request_vpn_permissions">Request VPN permissions</string>
@@ -34,14 +35,23 @@
 	<string name="title_disallowed_applications">Disallowed applications</string>
 	<string name="title_allow_bypass">Allow bypass</string>
 	<string name="title_nodes">Nodes</string>
+	<string name="title_error">Error</string>
+	<string name="title_new_network">New network</string>
+	<string name="title_join_network">Join network</string>
 
 	<string name="action_close">Close</string>
+	<string name="action_cancel">Cancel</string>
 	<string name="action_open_project_website">Project website</string>
 	<string name="action_generate_node_configuration_and_keys">Generate node configuration and keys</string>
 	<string name="action_join_network_via_invitation_url">Join network via invitation URL</string>
+	<string name="action_create">Create</string>
+	<string name="action_join">Join</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="message_generating_configuration">Generating node configuration…</string>
+	<string name="message_joining_network">Joining network…</string>
+	<string name="message_network_configuration_created">Network configuration successfully created.</string>
 
 	<string name="value_none">none</string>
 	<string name="value_yes">yes</string>
-- 
cgit v1.2.3