5 files changed, 103 insertions, 15 deletions

diff --git a/app/src/main/res/layout/configure_activity.xml b/app/src/main/res/layout/configure_activity.xml
index 6097384..5d796fb 100644
--- a/app/src/main/res/layout/configure_activity.xml
+++ b/app/src/main/res/layout/configure_activity.xml
@@ -2,7 +2,7 @@
 
 <!--
  * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ * Copyright (C) 2017-2023 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
@@ -28,23 +28,23 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <TextView
+                <TextView
                         style="@style/AppTheme.SectionTitle"
-                        android:text="@string/configure_activity_title_path_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"/>
 
                 <TextView
                         style="@style/AppTheme.SectionTitle"
-                        android:text="@string/configure_activity_title_tools"/>
+                        android:text="@string/configure_activity_title_internal_paths_info"/>
 
                 <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.PathInfoFragment"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"/>
 
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
index 376fa3d..c6d9777 100644
--- a/app/src/main/res/layout/configure_tools_path_info_fragment.xml
+++ b/app/src/main/res/layout/configure_tools_path_info_fragment.xml
@@ -51,7 +51,7 @@
 
                         <TextView
                                 style="@style/AppTheme.BlockContent"
-                                android:text="@{appPaths.cacheDir().absolutePath}"
+                                android:text="@{appPaths.logDir().absolutePath}"
                                 android:textIsSelectable="true"/>
 
                 </LinearLayout>
diff --git a/app/src/main/res/layout/start_activity.xml b/app/src/main/res/layout/start_activity.xml
index a5f22ad..f2069d5 100644
--- a/app/src/main/res/layout/start_activity.xml
+++ b/app/src/main/res/layout/start_activity.xml
@@ -2,7 +2,7 @@
 
 <!--
  * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ * Copyright (C) 2017-2023 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
@@ -18,9 +18,28 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -->
 
-<fragment
+<LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/start_activity_network_list_fragment"
-        android:name="org.pacien.tincapp.activities.start.NetworkListFragment"
+        android:id="@+id/start_network_list_wrapper"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+                android:id="@+id/start_network_list_warning_text"
+                style="@style/AppTheme.ListBlock.Placeholder"
+                android:text="@string/start_network_list_warning_text"/>
+
+        <fragment
+                android:id="@+id/start_activity_error_notification_fragment"
+                android:name="org.pacien.tincapp.activities.start.ErrorNotificationFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+        <fragment
+                android:id="@+id/start_activity_network_list_fragment"
+                android:name="org.pacien.tincapp.activities.start.NetworkListFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/start_error_notification.xml b/app/src/main/res/layout/start_error_notification.xml
new file mode 100644
index 0000000..3d2169d
--- /dev/null
+++ b/app/src/main/res/layout/start_error_notification.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2023 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>
+
+                <import type="android.view.View"/>
+
+                <variable
+                        name="errorNotification"
+                        type="org.pacien.tincapp.context.AppNotificationManager.ErrorNotification"/>
+
+                <!-- '<' escaping: https://stackoverflow.com/q/40970686 -->
+                <variable
+                        name="openManualAction"
+                        type="kotlin.jvm.functions.Function0&lt;kotlin.Unit>"/>
+
+        </data>
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="@{errorNotification == null ? View.GONE : View.VISIBLE}">
+
+                <TextView
+                        android:text="@{errorNotification.title}"
+                        style="@style/AppTheme.SectionTitle.Error" />
+
+                <LinearLayout style="@style/AppTheme.ListBlock">
+
+                        <TextView
+                                style="@style/AppTheme.BlockTitle"
+                                android:text="@{errorNotification.message}" />
+
+                        <LinearLayout
+                                style="@style/AppTheme.ListBlock.Clickable"
+                                android:visibility="@{errorNotification.manualLink == null ? View.GONE : View.VISIBLE}"
+                                android:onClick="@{() -> openManualAction.invoke()}">
+
+                                <TextView
+                                        style="@style/AppTheme.BlockTitle"
+                                        android:text="@string/notification_error_action_open_manual" />
+
+                        </LinearLayout>
+
+                </LinearLayout>
+
+        </LinearLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/start_network_list.xml b/app/src/main/res/layout/start_network_list.xml
index 02a78d1..508e720 100644
--- a/app/src/main/res/layout/start_network_list.xml
+++ b/app/src/main/res/layout/start_network_list.xml
@@ -2,7 +2,7 @@
 
 <!--
  * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ * Copyright (C) 2017-2023 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