Add invitation URL QR code scanning ; Refactor configuration dialogs

3 files changed, 50 insertions, 1 deletions

diff --git a/app/src/main/res/layout/dialog_frame.xml b/app/src/main/res/layout/dialog_network_generate.xml
index 9b4a512..cc51b7b 100644
--- a/app/src/main/res/layout/dialog_frame.xml
+++ b/app/src/main/res/layout/dialog_network_generate.xml
@@ -7,4 +7,16 @@
                           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_text_monopsace.xml b/app/src/main/res/layout/dialog_node_details.xml
index b7f6f5b..dc2aae9 100644
--- a/app/src/main/res/layout/dialog_text_monopsace.xml
+++ b/app/src/main/res/layout/dialog_node_details.xml
@@ -7,7 +7,7 @@
                         android:paddingTop="@dimen/dialog_vertical_margin">
 
         <TextView
-                android:id="@+id/dialog_text_monospace"
+                android:id="@+id/dialog_node_details"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="monospace"/>