diff options
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r-- | app/src/main/res/layout/configure_activity.xml | 53 | ||||
-rw-r--r-- | app/src/main/res/layout/configure_tools_dialog_encrypt_decrypt_keys.xml (renamed from app/src/main/res/layout/dialog_encrypt_decrypt_keys.xml) | 6 | ||||
-rw-r--r-- | app/src/main/res/layout/configure_tools_dialog_network_generate.xml (renamed from app/src/main/res/layout/dialog_network_generate.xml) | 6 | ||||
-rw-r--r-- | app/src/main/res/layout/configure_tools_dialog_network_join.xml | 78 | ||||
-rw-r--r-- | app/src/main/res/layout/configure_tools_fragment.xml | 73 | ||||
-rw-r--r-- | app/src/main/res/layout/configure_tools_path_info_fragment.xml | 74 | ||||
-rw-r--r-- | app/src/main/res/layout/dialog_network_join.xml | 66 | ||||
-rw-r--r-- | app/src/main/res/layout/page_configure.xml | 121 |
8 files changed, 284 insertions, 193 deletions
diff --git a/app/src/main/res/layout/configure_activity.xml b/app/src/main/res/layout/configure_activity.xml new file mode 100644 index 0000000..6097384 --- /dev/null +++ b/app/src/main/res/layout/configure_activity.xml | |||
@@ -0,0 +1,53 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | |||
3 | <!-- | ||
4 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon | ||
5 | * Copyright (C) 2017-2018 Pacien TRAN-GIRARD | ||
6 | * | ||
7 | * This program is free software: you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation, either version 3 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
19 | --> | ||
20 | |||
21 | <ScrollView | ||
22 | xmlns:android="http://schemas.android.com/apk/res/android" | ||
23 | android:layout_width="match_parent" | ||
24 | android:layout_height="match_parent"> | ||
25 | |||
26 | <LinearLayout | ||
27 | android:layout_width="match_parent" | ||
28 | android:layout_height="wrap_content" | ||
29 | android:orientation="vertical"> | ||
30 | |||
31 | <TextView | ||
32 | style="@style/AppTheme.SectionTitle" | ||
33 | android:text="@string/configure_activity_title_path_info"/> | ||
34 | |||
35 | <fragment | ||
36 | android:id="@+id/configure_activity_path_info_fragment" | ||
37 | android:name="org.pacien.tincapp.activities.configure.PathInfoFragment" | ||
38 | android:layout_width="match_parent" | ||
39 | android:layout_height="wrap_content"/> | ||
40 | |||
41 | <TextView | ||
42 | style="@style/AppTheme.SectionTitle" | ||
43 | android:text="@string/configure_activity_title_tools"/> | ||
44 | |||
45 | <fragment | ||
46 | android:id="@+id/configure_activity_tools_fragment" | ||
47 | android:name="org.pacien.tincapp.activities.configure.ToolsFragment" | ||
48 | android:layout_width="match_parent" | ||
49 | android:layout_height="wrap_content"/> | ||
50 | |||
51 | </LinearLayout> | ||
52 | |||
53 | </ScrollView> | ||
diff --git a/app/src/main/res/layout/dialog_encrypt_decrypt_keys.xml b/app/src/main/res/layout/configure_tools_dialog_encrypt_decrypt_keys.xml index 47433e4..1e8e64a 100644 --- a/app/src/main/res/layout/dialog_encrypt_decrypt_keys.xml +++ b/app/src/main/res/layout/configure_tools_dialog_encrypt_decrypt_keys.xml | |||
@@ -31,21 +31,21 @@ | |||
31 | android:id="@+id/enc_dec_net_name" | 31 | android:id="@+id/enc_dec_net_name" |
32 | android:layout_width="match_parent" | 32 | android:layout_width="match_parent" |
33 | android:layout_height="wrap_content" | 33 | android:layout_height="wrap_content" |
34 | android:hint="@string/field_net_name" | 34 | android:hint="@string/configure_tools_generate_config_net_name_hint" |
35 | android:inputType="text"/> | 35 | android:inputType="text"/> |
36 | 36 | ||
37 | <EditText | 37 | <EditText |
38 | android:id="@+id/enc_dec_current_passphrase" | 38 | android:id="@+id/enc_dec_current_passphrase" |
39 | android:layout_width="match_parent" | 39 | android:layout_width="match_parent" |
40 | android:layout_height="match_parent" | 40 | android:layout_height="match_parent" |
41 | android:hint="@string/field_current_passphrase" | 41 | android:hint="@string/configure_tools_private_key_encryption_current_passphrase" |
42 | android:inputType="textVisiblePassword"/> | 42 | android:inputType="textVisiblePassword"/> |
43 | 43 | ||
44 | <EditText | 44 | <EditText |
45 | android:id="@+id/enc_dec_new_passphrase" | 45 | android:id="@+id/enc_dec_new_passphrase" |
46 | android:layout_width="match_parent" | 46 | android:layout_width="match_parent" |
47 | android:layout_height="match_parent" | 47 | android:layout_height="match_parent" |
48 | android:hint="@string/field_new_passphrase" | 48 | android:hint="@string/configure_tools_private_key_encryption_new_passphrase" |
49 | android:inputType="textVisiblePassword"/> | 49 | android:inputType="textVisiblePassword"/> |
50 | 50 | ||
51 | </LinearLayout> | 51 | </LinearLayout> |
diff --git a/app/src/main/res/layout/dialog_network_generate.xml b/app/src/main/res/layout/configure_tools_dialog_network_generate.xml index 5e3d42c..614cc16 100644 --- a/app/src/main/res/layout/dialog_network_generate.xml +++ b/app/src/main/res/layout/configure_tools_dialog_network_generate.xml | |||
@@ -31,21 +31,21 @@ | |||
31 | android:id="@+id/new_net_name" | 31 | android:id="@+id/new_net_name" |
32 | android:layout_width="match_parent" | 32 | android:layout_width="match_parent" |
33 | android:layout_height="match_parent" | 33 | android:layout_height="match_parent" |
34 | android:hint="@string/field_net_name" | 34 | android:hint="@string/configure_tools_generate_config_net_name_hint" |
35 | android:inputType="text"/> | 35 | android:inputType="text"/> |
36 | 36 | ||
37 | <EditText | 37 | <EditText |
38 | android:id="@+id/new_node_name" | 38 | android:id="@+id/new_node_name" |
39 | android:layout_width="match_parent" | 39 | android:layout_width="match_parent" |
40 | android:layout_height="match_parent" | 40 | android:layout_height="match_parent" |
41 | android:hint="@string/field_node_name" | 41 | android:hint="@string/configure_tools_generate_config_node_name_hint" |
42 | android:inputType="text"/> | 42 | android:inputType="text"/> |
43 | 43 | ||
44 | <EditText | 44 | <EditText |
45 | android:id="@+id/new_passphrase" | 45 | android:id="@+id/new_passphrase" |
46 | android:layout_width="match_parent" | 46 | android:layout_width="match_parent" |
47 | android:layout_height="match_parent" | 47 | android:layout_height="match_parent" |
48 | android:hint="@string/field_optional_passphrase" | 48 | android:hint="@string/configure_tools_generate_config_optional_passphrase_hint" |
49 | android:inputType="textVisiblePassword"/> | 49 | android:inputType="textVisiblePassword"/> |
50 | 50 | ||
51 | </LinearLayout> | 51 | </LinearLayout> |
diff --git a/app/src/main/res/layout/configure_tools_dialog_network_join.xml b/app/src/main/res/layout/configure_tools_dialog_network_join.xml new file mode 100644 index 0000000..9171284 --- /dev/null +++ b/app/src/main/res/layout/configure_tools_dialog_network_join.xml | |||
@@ -0,0 +1,78 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | |||
3 | <!-- | ||
4 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon | ||
5 | * Copyright (C) 2017-2018 Pacien TRAN-GIRARD | ||
6 | * | ||
7 | * This program is free software: you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation, either version 3 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
19 | --> | ||
20 | |||
21 | <layout xmlns:android="http://schemas.android.com/apk/res/android"> | ||
22 | |||
23 | <data> | ||
24 | |||
25 | <variable | ||
26 | name="scanAction" | ||
27 | type="kotlin.jvm.functions.Function0<kotlin.Unit>"/> | ||
28 | |||
29 | </data> | ||
30 | |||
31 | <LinearLayout | ||
32 | android:layout_width="match_parent" | ||
33 | android:layout_height="wrap_content" | ||
34 | android:orientation="vertical" | ||
35 | android:paddingBottom="@dimen/dialog_vertical_margin" | ||
36 | android:paddingLeft="@dimen/dialog_horizontal_margin" | ||
37 | android:paddingRight="@dimen/dialog_horizontal_margin" | ||
38 | android:paddingTop="@dimen/dialog_vertical_margin"> | ||
39 | |||
40 | <EditText | ||
41 | android:id="@+id/net_name" | ||
42 | android:layout_width="match_parent" | ||
43 | android:layout_height="wrap_content" | ||
44 | android:hint="@string/configure_tools_generate_config_net_name_hint" | ||
45 | android:inputType="text"/> | ||
46 | |||
47 | <LinearLayout | ||
48 | android:layout_width="match_parent" | ||
49 | android:layout_height="match_parent" | ||
50 | android:orientation="horizontal"> | ||
51 | |||
52 | <EditText | ||
53 | android:id="@+id/invitation_url" | ||
54 | android:layout_width="0dp" | ||
55 | android:layout_height="wrap_content" | ||
56 | android:layout_weight="1" | ||
57 | android:hint="@string/configure_tools_join_network_field_invitation_url_hint" | ||
58 | android:inputType="textUri"/> | ||
59 | |||
60 | <ImageButton | ||
61 | android:layout_width="wrap_co |