5 files changed, 96 insertions, 104 deletions

diff --git a/app/src/main/res/layout/configure_activity.xml b/app/src/main/res/layout/configure_activity.xml
index 08f29af..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-2020 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,17 +28,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-        <TextView
-            style="@style/AppTheme.SectionTitle"
-            android:text="@string/configure_activity_title_configuration_access"/>
-
-        <fragment
-            android:id="@+id/configure_activity_configuration_sftp_server_fragment"
-            android:name="org.pacien.tincapp.activities.configure.ConfigurationAccessServerFragment"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
-
-                <TextView
+                <TextView
                         style="@style/AppTheme.SectionTitle"
                         android:text="@string/configure_activity_title_tools"/>
 
diff --git a/app/src/main/res/layout/configure_tools_configuration_access_fragment.xml b/app/src/main/res/layout/configure_tools_configuration_access_fragment.xml
deleted file mode 100644
index 24f3c36..0000000
--- a/app/src/main/res/layout/configure_tools_configuration_access_fragment.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
- * Copyright (C) 2017-2020 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="ftpEnabled"
-            type="boolean" />
-
-        <variable
-            name="ftpUsername"
-            type="String" />
-
-        <variable
-            name="ftpPassword"
-            type="String" />
-
-        <variable
-            name="ftpPort"
-            type="int" />
-
-        <variable
-            name="toggleFtpState"
-            type="kotlin.jvm.functions.Function0&lt;kotlin.Unit>" />
-
-    </data>
-
-    <LinearLayout style="@style/AppTheme.List">
-
-        <LinearLayout
-            style="@style/AppTheme.ListBlock.Clickable"
-            android:onClick="@{() -> toggleFtpState.invoke()}"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <TextView
-                    style="@style/AppTheme.BlockTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/configure_configuration_server_ftp_access" />
-
-                <TextView
-                    style="@style/AppTheme.BlockContent"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@{ftpEnabled ? @string/configure_configuration_server_ftp_access_endpoint_format(ftpUsername, ftpPassword, ftpPort) : @string/configure_configuration_server_ftp_access_not_active}"
-                    android:textIsSelectable="@{ftpEnabled}" />
-
-            </LinearLayout>
-
-            <androidx.appcompat.widget.SwitchCompat
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_weight="0"
-                android:checked="@{ftpEnabled}"
-                android:onClick="@{() -> toggleFtpState.invoke()}" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</layout>
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>"/>