From 58f563a79867ae5973d5d45dba265f1b293bb0c3 Mon Sep 17 00:00:00 2001
From: euxane
Date: Wed, 18 Sep 2024 23:41:13 +0200
Subject: activities/configure: replace config and log paths with browse links

---
 app/src/main/res/layout/configure_activity.xml     | 14 ++--
 .../configure_browse_directories_fragment.xml      | 58 +++++++++++++++++
 .../layout/configure_tools_path_info_fragment.xml  | 74 ----------------------
 app/src/main/res/values/strings.xml                |  8 +--
 4 files changed, 69 insertions(+), 85 deletions(-)
 create mode 100644 app/src/main/res/layout/configure_browse_directories_fragment.xml
 delete mode 100644 app/src/main/res/layout/configure_tools_path_info_fragment.xml

(limited to 'app/src/main/res')

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 @@
 		android:layout_height="wrap_content"
 		android:orientation="vertical">
 
- 		<TextView
+		<TextView
 			style="@style/AppTheme.SectionTitle"
-			android:text="@string/configure_activity_title_tools"/>
+			android:text="@string/configure_activity_title_directories"/>
 
 		<fragment
-			android:id="@+id/configure_activity_tools_fragment"
-			android:name="org.pacien.tincapp.activities.configure.ToolsFragment"
+			android:id="@+id/configure_activity_path_info_fragment"
+			android:name="org.pacien.tincapp.activities.configure.BrowseDirectoriesFragment"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"/>
 
 		<TextView
 			style="@style/AppTheme.SectionTitle"
-			android:text="@string/configure_activity_title_internal_paths_info"/>
+			android:text="@string/configure_activity_title_tools"/>
 
 		<fragment
-			android:id="@+id/configure_activity_path_info_fragment"
-			android:name="org.pacien.tincapp.activities.configure.PathInfoFragment"
+			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"/>
 
diff --git a/app/src/main/res/layout/configure_browse_directories_fragment.xml b/app/src/main/res/layout/configure_browse_directories_fragment.xml
new file mode 100644
index 0000000..e0fc64a
--- /dev/null
+++ b/app/src/main/res/layout/configure_browse_directories_fragment.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc Mesh VPN: Android client and user interface
+ * Copyright (C) 2017-2024 Euxane P. 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>
+
+		<import
+			type="org.pacien.tincapp.storageprovider.FilesDocumentsProvider"/>
+
+		<variable
+			name="openDirectoryTree"
+			type="kotlin.jvm.functions.Function1&lt;String, kotlin.Unit>"/>
+
+	</data>
+
+	<LinearLayout style="@style/AppTheme.List">
+
+		<LinearLayout
+			style="@style/AppTheme.ListBlock.Clickable"
+			android:onClick="@{() -> openDirectoryTree.invoke(FilesDocumentsProvider.VIRTUAL_ROOT_NETWORKS)}">
+
+			<TextView
+				style="@style/AppTheme.BlockTitle"
+				android:text="@string/configure_browse_directories_action_open_networks_config" />
+
+		</LinearLayout>
+
+		<LinearLayout
+			style="@style/AppTheme.ListBlock.Clickable"
+			android:onClick="@{() -> openDirectoryTree.invoke(FilesDocumentsProvider.VIRTUAL_ROOT_LOG)}">
+
+			<TextView
+				style="@style/AppTheme.BlockTitle"
+				android:text="@string/configure_browse_directories_action_open_logs" />
+
+		</LinearLayout>
+
+	</LinearLayout>
+
+</layout>
diff --git a/app/src/main/res/layout/configure_tools_path_info_fragment.xml b/app/src/main/res/layout/configure_tools_path_info_fragment.xml
deleted file mode 100644
index 5704a0f..0000000
--- a/app/src/main/res/layout/configure_tools_path_info_fragment.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Tinc Mesh VPN: Android client and user interface
- * Copyright (C) 2017-2018 Euxane P. 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="appPaths"
-			type="org.pacien.tincapp.context.AppPaths"/>
-
-	</data>
-
-	<LinearLayout style="@style/AppTheme.List">
-
-		<LinearLayout style="@style/AppTheme.ListBlock">
-
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/configure_path_info_title_configuration_directory"/>
-
-			<TextView
-				style="@style/AppTheme.BlockContent"
-				android:text="@{appPaths.confDir().absolutePath}"
-				android:textIsSelectable="true"/>
-
-		</LinearLayout>
-
-		<LinearLayout style="@style/AppTheme.ListBlock">
-
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/configure_path_info_title_log_directory"/>
-
-			<TextView
-				style="@style/AppTheme.BlockContent"
-				android:text="@{appPaths.logDir().absolutePath}"
-				android:textIsSelectable="true"/>
-
-		</LinearLayout>
-
-		<LinearLayout style="@style/AppTheme.ListBlock">
-
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/configure_path_info_title_tinc_binary"/>
-
-			<TextView
-				style="@style/AppTheme.BlockContent"
-				android:text="@{appPaths.tinc().absolutePath}"
-				android:textIsSelectable="true"/>
-
-		</LinearLayout>
-
-	</LinearLayout>
-
-</layout>
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 @@
 	<string name="configure_tools_message_invalid_network_name">Invalid network name.</string>
 	<string name="configure_tools_message_network_configuration_written">Network configuration written.</string>
 
-	<string name="configure_activity_title_internal_paths_info">Internal paths info</string>
-	<string name="configure_path_info_title_configuration_directory">Configuration directory</string>
-	<string name="configure_path_info_title_log_directory">Log directory</string>
-	<string name="configure_path_info_title_tinc_binary">tinc binary</string>
+	<string name="configure_activity_title_directories">Directories</string>
+	<string name="configure_browse_directories_action_open_networks_config">Open networks configuration directory</string>
+	<string name="configure_browse_directories_action_open_logs">Open logs directory</string>
+	<string name="configure_browse_directories_error_no_file_browser">No file browser found to open target.</string>
 
 	<string name="configure_activity_title_tools">Tools</string>
 	<string name="configure_tools_action_generate_node_configuration_and_keys">Generate node configuration and keys</string>
-- 
cgit v1.2.3