14 files changed, 389 insertions, 291 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 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<ScrollView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                        style="@style/AppTheme.SectionTitle"
+                        android:text="@string/configure_activity_title_path_info"/>
+
+                <fragment
+                        android:id="@+id/configure_activity_path_info_fragment"
+                        android:name="org.pacien.tincapp.activities.configure.PathInfoFragment"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"/>
+
+                <TextView
+                        style="@style/AppTheme.SectionTitle"
+                        android:text="@string/configure_activity_title_tools"/>
+
+                <fragment
+                        android:id="@+id/configure_activity_tools_fragment"
+                        android:name="org.pacien.tincapp.activities.configure.ToolsFragment"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"/>
+
+        </LinearLayout>
+
+</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 @@
                 android:id="@+id/enc_dec_net_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/field_net_name"
+                android:hint="@string/configure_tools_generate_config_net_name_hint"
                 android:inputType="text"/>
 
         <EditText
                 android:id="@+id/enc_dec_current_passphrase"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:hint="@string/field_current_passphrase"
+                android:hint="@string/configure_tools_private_key_encryption_current_passphrase"
                 android:inputType="textVisiblePassword"/>
 
         <EditText
                 android:id="@+id/enc_dec_new_passphrase"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:hint="@string/field_new_passphrase"
+                android:hint="@string/configure_tools_private_key_encryption_new_passphrase"
                 android:inputType="textVisiblePassword"/>
 
 </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 @@
                 android:id="@+id/new_net_name"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:hint="@string/field_net_name"
+                android:hint="@string/configure_tools_generate_config_net_name_hint"
                 android:inputType="text"/>
 
         <EditText
                 android:id="@+id/new_node_name"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:hint="@string/field_node_name"
+                android:hint="@string/configure_tools_generate_config_node_name_hint"
                 android:inputType="text"/>
 
         <EditText
                 android:id="@+id/new_passphrase"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:hint="@string/field_optional_passphrase"
+                android:hint="@string/configure_tools_generate_config_optional_passphrase_hint"
                 android:inputType="textVisiblePassword"/>
 
 </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 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+        <data>
+
+                <variable
+                        name="scanAction"
+                        type="kotlin.jvm.functions.Function0&lt;kotlin.Unit>"/>
+
+        </data>
+
+        <LinearLayout
+                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/configure_tools_generate_config_net_name_hint"
+                        android:inputType="text"/>
+
+                <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="horizontal">
+
+                        <EditText