From 550a6b1f622868f23413f08a766bee00723923bb Mon Sep 17 00:00:00 2001
From: pacien
Date: Sun, 30 Jul 2023 03:06:35 +0200
Subject: errors: handle notifications internally

---
 app/src/main/res/layout/start_activity.xml         |  6 ++
 .../main/res/layout/start_error_notification.xml   | 69 ++++++++++++++++++++++
 app/src/main/res/values/colors.xml                 |  3 +-
 app/src/main/res/values/styles.xml                 |  6 +-
 4 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/layout/start_error_notification.xml

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

diff --git a/app/src/main/res/layout/start_activity.xml b/app/src/main/res/layout/start_activity.xml
index 2960711..f2069d5 100644
--- a/app/src/main/res/layout/start_activity.xml
+++ b/app/src/main/res/layout/start_activity.xml
@@ -30,6 +30,12 @@
 		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"
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/values/colors.xml b/app/src/main/res/values/colors.xml
index 7520cd8..3d05b1c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.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
@@ -25,6 +25,7 @@
 	<color name="textTitle">#FFFFFFFF</color>
 	<color name="textAccent">#007f68</color>
 	<color name="textSecondary">#212121</color>
+	<color name="textError">#F44336</color>
 
 	<color name="separator">#d9d9d9</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fc4a6c3..171a1da 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.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
@@ -44,6 +44,10 @@
 		<item name="android:paddingTop">@dimen/activity_vertical_margin</item>
 	</style>
 
+	<style name="AppTheme.SectionTitle.Error">
+		<item name="android:textColor">@color/textError</item>
+	</style>
+
 	<style name="AppTheme.List">
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:layout_height">wrap_content</item>
-- 
cgit v1.2.3