aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/layout/configure_activity.xml14
-rw-r--r--app/src/main/res/layout/configure_browse_directories_fragment.xml (renamed from app/src/main/res/layout/configure_tools_path_info_fragment.xml)44
-rw-r--r--app/src/main/res/values/strings.xml8
3 files changed, 25 insertions, 41 deletions
diff --git a/app/src/main/res/layout/configure_activity.xml b/app/src/main/res/layout/configure_activity.xml
index dfb47c2..67a35d2 100644
--- a/app/src/main/res/layout/configure_activity.xml
+++ b/app/src/main/res/layout/configure_activity.xml
@@ -28,23 +28,23 @@
28 android:layout_height="wrap_content" 28 android:layout_height="wrap_content"
29 android:orientation="vertical"> 29 android:orientation="vertical">
30 30
31 <TextView 31 <TextView
32 style="@style/AppTheme.SectionTitle" 32 style="@style/AppTheme.SectionTitle"
33 android:text="@string/configure_activity_title_tools"/> 33 android:text="@string/configure_activity_title_directories"/>
34 34
35 <fragment 35 <fragment
36 android:id="@+id/configure_activity_tools_fragment" 36 android:id="@+id/configure_activity_path_info_fragment"
37 android:name="org.pacien.tincapp.activities.configure.ToolsFragment" 37 android:name="org.pacien.tincapp.activities.configure.BrowseDirectoriesFragment"
38 android:layout_width="match_parent" 38 android:layout_width="match_parent"
39 android:layout_height="wrap_content"/> 39 android:layout_height="wrap_content"/>
40 40
41 <TextView 41 <TextView
42 style="@style/AppTheme.SectionTitle" 42 style="@style/AppTheme.SectionTitle"
43 android:text="@string/configure_activity_title_internal_paths_info"/> 43 android:text="@string/configure_activity_title_tools"/>
44 44
45 <fragment 45 <fragment
46 android:id="@+id/configure_activity_path_info_fragment" 46 android:id="@+id/configure_activity_tools_fragment"
47 android:name="org.pacien.tincapp.activities.configure.PathInfoFragment" 47 android:name="org.pacien.tincapp.activities.configure.ToolsFragment"
48 android:layout_width="match_parent" 48 android:layout_width="match_parent"
49 android:layout_height="wrap_content"/> 49 android:layout_height="wrap_content"/>
50 50
diff --git a/app/src/main/res/layout/configure_tools_path_info_fragment.xml b/app/src/main/res/layout/configure_browse_directories_fragment.xml
index 5704a0f..e0fc64a 100644
--- a/app/src/main/res/layout/configure_tools_path_info_fragment.xml
+++ b/app/src/main/res/layout/configure_browse_directories_fragment.xml
@@ -2,7 +2,7 @@
2 2
3<!-- 3<!--
4 * Tinc Mesh VPN: Android client and user interface 4 * Tinc Mesh VPN: Android client and user interface
5 * Copyright (C) 2017-2018 Euxane P. TRAN-GIRARD 5 * Copyright (C) 2017-2024 Euxane P. TRAN-GIRARD
6 * 6 *
7 * This program is free software: you can redistribute it and/or modify 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 8 * it under the terms of the GNU General Public License as published by
@@ -22,50 +22,34 @@
22 22
23 <data> 23 <data>
24 24
25 <import
26 type="org.pacien.tincapp.storageprovider.FilesDocumentsProvider"/>
27
25 <variable 28 <variable
26 name="appPaths" 29 name="openDirectoryTree"
27 type="org.pacien.tincapp.context.AppPaths"/> 30 type="kotlin.jvm.functions.Function1&lt;String, kotlin.Unit>"/>
28 31
29 </data> 32 </data>
30 33
31 <LinearLayout style="@style/AppTheme.List"> 34 <LinearLayout style="@style/AppTheme.List">
32 35
33 <LinearLayout style="@style/AppTheme.ListBlock"> 36 <LinearLayout
37 style="@style/AppTheme.ListBlock.Clickable"
38 android:onClick="@{() -> openDirectoryTree.invoke(FilesDocumentsProvider.VIRTUAL_ROOT_NETWORKS)}">
34 39
35 <TextView 40 <TextView
36 style="@style/AppTheme.BlockTitle" 41 style="@style/AppTheme.BlockTitle"
37 android:text="@string/configure_path_info_title_configuration_directory"/> 42 android:text="@string/configure_browse_directories_action_open_networks_config" />
38
39 <TextView
40 style="@style/AppTheme.BlockContent"
41 android:text="@{appPaths.confDir().absolutePath}"
42 android:textIsSelectable="true"/>
43 43
44 </LinearLayout> 44 </LinearLayout>
45 45
46 <LinearLayout style="@style/AppTheme.ListBlock"> 46 <LinearLayout
47 style="@style/AppTheme.ListBlock.Clickable"
48 android:onClick="@{() -> openDirectoryTree.invoke(FilesDocumentsProvider.VIRTUAL_ROOT_LOG)}">
47 49
48 <TextView 50 <TextView
49 style="@style/AppTheme.BlockTitle" 51 style="@style/AppTheme.BlockTitle"
50 android:text="@string/configure_path_info_title_log_directory"/> 52 android:text="@string/configure_browse_directories_action_open_logs" />
51
52 <TextView
53 style="@style/AppTheme.BlockContent"
54 android:text="@{appPaths.logDir().absolutePath}"
55 android:textIsSelectable="true"/>
56
57 </LinearLayout>
58
59 <LinearLayout style="@style/AppTheme.ListBlock">
60
61 <TextView
62 style="@style/AppTheme.BlockTitle"
63 android:text="@string/configure_path_info_title_tinc_binary"/>
64
65 <TextView
66 style="@style/AppTheme.BlockContent"
67 android:text="@{appPaths.tinc().absolutePath}"
68 android:textIsSelectable="true"/>
69 53
70 </LinearLayout> 54 </LinearLayout>
71 55
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 72adb1d..8ded24f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,10 +85,10 @@
85 <string name="configure_tools_message_invalid_network_name">Invalid network name.</string> 85 <string name="configure_tools_message_invalid_network_name">Invalid network name.</string>
86 <string name="configure_tools_message_network_configuration_written">Network configuration written.</string> 86 <string name="configure_tools_message_network_configuration_written">Network configuration written.</string>
87 87
88 <string name="configure_activity_title_internal_paths_info">Internal paths info</string> 88 <string name="configure_activity_title_directories">Directories</string>
89 <string name="configure_path_info_title_configuration_directory">Configuration directory</string> 89 <string name="configure_browse_directories_action_open_networks_config">Open networks configuration directory</string>
90 <string name="configure_path_info_title_log_directory">Log directory</string> 90 <string name="configure_browse_directories_action_open_logs">Open logs directory</string>
91 <string name="configure_path_info_title_tinc_binary">tinc binary</string> 91 <string name="configure_browse_directories_error_no_file_browser">No file browser found to open target.</string>
92 92
93 <string name="configure_activity_title_tools">Tools</string> 93 <string name="configure_activity_title_tools">Tools</string>
94 <string name="configure_tools_action_generate_node_configuration_and_keys">Generate node configuration and keys</string> 94 <string name="configure_tools_action_generate_node_configuration_and_keys">Generate node configuration and keys</string>