aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
authorpacien2017-09-07 14:27:37 +0200
committerpacien2017-09-07 14:27:37 +0200
commit4989dad67b68b38e75416916df406dcec908b399 (patch)
tree1857d313393788234ffa75b9203122d3ae822d3f /app/src/main/res/layout
parent9e5aa1a9f95a3b5541aba7e511e13ae51b614416 (diff)
downloadtincapp-4989dad67b68b38e75416916df406dcec908b399.tar.gz
Implement encrypted private keys support
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/dialog_decrypt_keys.xml17
-rw-r--r--app/src/main/res/layout/dialog_encrypt_decrypt_keys.xml30
-rw-r--r--app/src/main/res/layout/dialog_network_generate.xml7
-rw-r--r--app/src/main/res/layout/dialog_network_join.xml7
-rw-r--r--app/src/main/res/layout/page_configure.xml16
5 files changed, 74 insertions, 3 deletions
diff --git a/app/src/main/res/layout/dialog_decrypt_keys.xml b/app/src/main/res/layout/dialog_decrypt_keys.xml
new file mode 100644
index 0000000..b8a3586
--- /dev/null
+++ b/app/src/main/res/layout/dialog_decrypt_keys.xml
@@ -0,0 +1,17 @@
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/passphrase"
12 android:layout_width="match_parent"
13 android:layout_height="match_parent"
14 android:hint="@string/field_passphrase"
15 android:inputType="textPassword"/>
16
17</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_encrypt_decrypt_keys.xml b/app/src/main/res/layout/dialog_encrypt_decrypt_keys.xml
new file mode 100644
index 0000000..1f20d9b
--- /dev/null
+++ b/app/src/main/res/layout/dialog_encrypt_decrypt_keys.xml
@@ -0,0 +1,30 @@
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/enc_dec_net_name"
12 android:layout_width="match_parent"
13 android:layout_height="wrap_content"
14 android:hint="@string/field_net_name"/>
15
16 <EditText
17 android:id="@+id/enc_dec_current_passphrase"
18 android:layout_width="match_parent"
19 android:layout_height="match_parent"
20 android:hint="@string/field_current_passphrase"
21 android:inputType="textVisiblePassword"/>
22
23 <EditText
24 android:id="@+id/enc_dec_new_passphrase"
25 android:layout_width="match_parent"
26 android:layout_height="match_parent"
27 android:hint="@string/field_new_passphrase"
28 android:inputType="textVisiblePassword"/>
29
30</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_network_generate.xml b/app/src/main/res/layout/dialog_network_generate.xml
index cc51b7b..d849ca1 100644
--- a/app/src/main/res/layout/dialog_network_generate.xml
+++ b/app/src/main/res/layout/dialog_network_generate.xml
@@ -19,4 +19,11 @@
19 android:layout_height="match_parent" 19 android:layout_height="match_parent"
20 android:hint="@string/field_node_name"/> 20 android:hint="@string/field_node_name"/>
21 21
22 <EditText
23 android:id="@+id/new_passphrase"
24 android:layout_width="match_parent"
25 android:layout_height="match_parent"
26 android:hint="@string/field_optional_passphrase"
27 android:inputType="textVisiblePassword"/>
28
22</LinearLayout> 29</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_network_join.xml b/app/src/main/res/layout/dialog_network_join.xml
index 2d23d4b..7bc8804 100644
--- a/app/src/main/res/layout/dialog_network_join.xml
+++ b/app/src/main/res/layout/dialog_network_join.xml
@@ -34,4 +34,11 @@
34 34
35 </LinearLayout> 35 </LinearLayout>
36 36
37 <EditText
38 android:id="@+id/join_passphrase"
39 android:layout_width="match_parent"
40 android:layout_height="match_parent"
41 android:hint="@string/field_optional_passphrase"
42 android:inputType="textVisiblePassword"/>
43
37</LinearLayout> 44</LinearLayout>
diff --git a/app/src/main/res/layout/page_configure.xml b/app/src/main/res/layout/page_configure.xml
index e094f7e..4f92b07 100644
--- a/app/src/main/res/layout/page_configure.xml
+++ b/app/src/main/res/layout/page_configure.xml
@@ -26,7 +26,7 @@
26 <TextView 26 <TextView
27 android:id="@+id/text_configuration_directory" 27 android:id="@+id/text_configuration_directory"
28 style="@style/AppTheme.BlockContent" 28 style="@style/AppTheme.BlockContent"
29 android:textIsSelectable="true" /> 29 android:textIsSelectable="true"/>
30 30
31 </LinearLayout> 31 </LinearLayout>
32 32
@@ -39,7 +39,7 @@
39 <TextView 39 <TextView
40 android:id="@+id/text_log_directory" 40 android:id="@+id/text_log_directory"
41 style="@style/AppTheme.BlockContent" 41 style="@style/AppTheme.BlockContent"
42 android:textIsSelectable="true" /> 42 android:textIsSelectable="true"/>
43 43
44 </LinearLayout> 44 </LinearLayout>
45 45
@@ -52,7 +52,7 @@
52 <TextView 52 <TextView
53 android:id="@+id/text_tinc_binary" 53 android:id="@+id/text_tinc_binary"
54 style="@style/AppTheme.BlockContent" 54 style="@style/AppTheme.BlockContent"
55 android:textIsSelectable="true" /> 55 android:textIsSelectable="true"/>
56 56
57 </LinearLayout> 57 </LinearLayout>
58 58
@@ -84,6 +84,16 @@
84 84
85 </LinearLayout> 85 </LinearLayout>
86 86
87 <LinearLayout
88 style="@style/AppTheme.ListBlock.Clickable"
89 android:onClick="openEncryptDecryptPrivateKeyDialog">
90
91 <TextView
92 style="@style/AppTheme.BlockTitle"
93 android:text="@string/action_encrypt_decrypt_private_keys"/>
94
95 </LinearLayout>
96
87 </LinearLayout> 97 </LinearLayout>
88 98
89 </LinearLayout> 99 </LinearLayout>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 00:05:26 +0000