From cf24442cd7b18ffd7dfe3998ea40d8e5e1d3f16e Mon Sep 17 00:00:00 2001
From: pacien
Date: Thu, 24 Aug 2017 15:54:31 +0200
Subject: Add invitation URL QR code scanning ; Refactor configuration dialogs

---
 .../res/drawable/ic_photo_camera_primary_24dp.xml  | 12 +++++++
 app/src/main/res/layout/dialog_frame.xml           | 10 ------
 .../main/res/layout/dialog_network_generate.xml    | 22 +++++++++++++
 app/src/main/res/layout/dialog_network_join.xml    | 37 ++++++++++++++++++++++
 app/src/main/res/layout/dialog_node_details.xml    | 15 +++++++++
 app/src/main/res/layout/dialog_text_monopsace.xml  | 15 ---------
 app/src/main/res/values/strings.xml                |  3 ++
 7 files changed, 89 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_photo_camera_primary_24dp.xml
 delete mode 100644 app/src/main/res/layout/dialog_frame.xml
 create mode 100644 app/src/main/res/layout/dialog_network_generate.xml
 create mode 100644 app/src/main/res/layout/dialog_network_join.xml
 create mode 100644 app/src/main/res/layout/dialog_node_details.xml
 delete mode 100644 app/src/main/res/layout/dialog_text_monopsace.xml

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

diff --git a/app/src/main/res/drawable/ic_photo_camera_primary_24dp.xml b/app/src/main/res/drawable/ic_photo_camera_primary_24dp.xml
new file mode 100644
index 0000000..28172b6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_photo_camera_primary_24dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+		android:width="24dp"
+		android:height="24dp"
+		android:viewportHeight="24.0"
+		android:viewportWidth="24.0">
+	<path
+		android:fillColor="@color/textPrimary"
+		android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
+	<path
+		android:fillColor="@color/textPrimary"
+		android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
+</vector>
diff --git a/app/src/main/res/layout/dialog_frame.xml b/app/src/main/res/layout/dialog_frame.xml
deleted file mode 100644
index 9b4a512..0000000
--- a/app/src/main/res/layout/dialog_frame.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-			  android:layout_width="match_parent"
-			  android:layout_height="wrap_content"
-			  android:orientation="vertical"
-			  android:paddingBottom="@dimen/dialog_vertical_margin"
-			  android:paddingLeft="@dimen/dialog_horizontal_margin"
-			  android:paddingRight="@dimen/dialog_horizontal_margin"
-			  android:paddingTop="@dimen/dialog_vertical_margin">
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_network_generate.xml b/app/src/main/res/layout/dialog_network_generate.xml
new file mode 100644
index 0000000..cc51b7b
--- /dev/null
+++ b/app/src/main/res/layout/dialog_network_generate.xml
@@ -0,0 +1,22 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:layout_width="match_parent"
+			  android:layout_height="wrap_content"
+			  android:orientation="vertical"
+			  android:paddingBottom="@dimen/dialog_vertical_margin"
+			  android:paddingLeft="@dimen/dialog_horizontal_margin"
+			  android:paddingRight="@dimen/dialog_horizontal_margin"
+			  android:paddingTop="@dimen/dialog_vertical_margin">
+
+	<EditText
+		android:id="@+id/new_net_name"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:hint="@string/field_net_name"/>
+
+	<EditText
+		android:id="@+id/new_node_name"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:hint="@string/field_node_name"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_network_join.xml b/app/src/main/res/layout/dialog_network_join.xml
new file mode 100644
index 0000000..2d23d4b
--- /dev/null
+++ b/app/src/main/res/layout/dialog_network_join.xml
@@ -0,0 +1,37 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+			  android:layout_width="match_parent"
+			  android:layout_height="wrap_content"
+			  android:orientation="vertical"
+			  android:paddingBottom="@dimen/dialog_vertical_margin"
+			  android:paddingLeft="@dimen/dialog_horizontal_margin"
+			  android:paddingRight="@dimen/dialog_horizontal_margin"
+			  android:paddingTop="@dimen/dialog_vertical_margin">
+
+	<EditText
+		android:id="@+id/net_name"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:hint="@string/field_net_name"/>
+
+	<LinearLayout
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:orientation="horizontal">
+
+		<EditText
+			android:id="@+id/invitation_url"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:hint="@string/field_invitation_url"/>
+
+		<ImageButton
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent"
+			android:contentDescription="@string/action_scan_qr_code"
+			android:onClick="scanCode"
+			android:src="@drawable/ic_photo_camera_primary_24dp"/>
+
+	</LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_node_details.xml b/app/src/main/res/layout/dialog_node_details.xml
new file mode 100644
index 0000000..dc2aae9
--- /dev/null
+++ b/app/src/main/res/layout/dialog_node_details.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_node_details"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:fontFamily="monospace"/>
+
+</ScrollView>
diff --git a/app/src/main/res/layout/dialog_text_monopsace.xml b/app/src/main/res/layout/dialog_text_monopsace.xml
deleted file mode 100644
index b7f6f5b..0000000
--- a/app/src/main/res/layout/dialog_text_monopsace.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<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/values/strings.xml b/app/src/main/res/values/strings.xml
index 70a13da..c909933 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,6 +50,8 @@
 	<string name="action_create">Create</string>
 	<string name="action_join">Join</string>
 	<string name="action_open_manual">Open manual</string>
+	<string name="action_scan_qr_code">Scan QR code</string>
+	<string name="action_install">Install</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>
@@ -60,6 +62,7 @@
 	<string name="message_no_configuration_for_network_format">No configuration has been found for network \"%1$s\".</string>
 	<string name="message_network_config_not_found_format">Network configuration file not found at \"%1$s\".</string>
 	<string name="message_network_config_invalid_format">Invalid network configuration:\n\n%1$s</string>
+	<string name="message_no_qr_code_scanner">No scanner could be started.\n\nInstall Barcode Scanner?</string>
 
 	<string name="value_none">none</string>
 	<string name="value_yes">yes</string>
-- 
cgit v1.2.3