aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
authorpacien2017-08-24 15:54:31 +0200
committerpacien2017-08-24 16:32:10 +0200
commitcf24442cd7b18ffd7dfe3998ea40d8e5e1d3f16e (patch)
treef215f87f6b9288ce77bab937570e75cb15e29f2e /app/src/main/res/layout
parent5bd162da8412d637869b62fe0631106015a11bec (diff)
downloadtincapp-cf24442cd7b18ffd7dfe3998ea40d8e5e1d3f16e.tar.gz
Add invitation URL QR code scanning ; Refactor configuration dialogs
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/dialog_network_generate.xml (renamed from app/src/main/res/layout/dialog_frame.xml)12
-rw-r--r--app/src/main/res/layout/dialog_network_join.xml37
-rw-r--r--app/src/main/res/layout/dialog_node_details.xml (renamed from app/src/main/res/layout/dialog_text_monopsace.xml)2
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 @@
7 android:paddingRight="@dimen/dialog_horizontal_margin" 7 android:paddingRight="@dimen/dialog_horizontal_margin"
8 android:paddingTop="@dimen/dialog_vertical_margin"> 8 android:paddingTop="@dimen/dialog_vertical_margin">
9 9
10 <EditText
11 android:id="@+id/new_net_name"
12 android:layout_width="match_parent"
13 android:layout_height="match_parent"
14 android:hint="@string/field_net_name"/>
15
16 <EditText
17 android:id="@+id/new_node_name"
18 android:layout_width="match_parent"
19 android:layout_height="match_parent"
20 android:hint="@string/field_node_name"/>
21
10</LinearLayout> 22</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 @@
1<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 android:layout_width="match_parent"
3 android:layout_height="wrap_content"
4 android:orientation="vertical"
5 android:paddingBottom="@dimen/dialog_vertical_margin"
6 android:paddingLeft="@dimen/dialog_horizontal_margin"
7 android:paddingRight="@dimen/dialog_horizontal_margin"
8 android:paddingTop="@dimen/dialog_vertical_margin">
9
10 <EditText
11 android:id="@+id/net_name"
12 android:layout_width="match_parent"
13 android:layout_height="wrap_content"
14 android:hint="@string/field_net_name"/>
15
16 <LinearLayout
17 android:layout_width="match_parent"
18 android:layout_height="match_parent"
19 android:orientation="horizontal">
20
21 <EditText
22 android:id="@+id/invitation_url"
23 android:layout_width="0dp"
24 android:layout_height="wrap_content"
25 android:layout_weight="1"
26 android:hint="@string/field_invitation_url"/>
27
28 <ImageButton
29 android:layout_width="wrap_content"
30 android:layout_height="match_parent"
31 android:contentDescription="@string/action_scan_qr_code"
32 android:onClick="scanCode"
33 android:src="@drawable/ic_photo_camera_primary_24dp"/>
34
35 </LinearLayout>
36
37</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 @@
7 android:paddingTop="@dimen/dialog_vertical_margin"> 7 android:paddingTop="@dimen/dialog_vertical_margin">
8 8
9 <TextView 9 <TextView
10 android:id="@+id/dialog_text_monospace" 10 android:id="@+id/dialog_node_details"
11 android:layout_width="match_parent" 11 android:layout_width="match_parent"
12 android:layout_height="wrap_content" 12 android:layout_height="wrap_content"
13 android:fontFamily="monospace"/> 13 android:fontFamily="monospace"/>