Switch to better notification library

flutter/Makefile

@@ -10,3 +10,6 @@ test:
 gen:
 	dart run build_runner build
 	
+autoreload:
+	@# run `make run` in another terminal (or another variant of flutter run)
+	@_utils/autoreload.sh

flutter/_utils/autoreload.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+    # shellcheck disable=SC2002  # disable useless-cat warning
+
+    set -o nounset   # disallow usage of unset vars  ( set -u )
+    set -o errexit   # Exit immediately if a pipeline returns non-zero.  ( set -e )
+    set -o errtrace  # Allow the above trap be inherited by all functions in the script.  ( set -E )
+    set -o pipefail  # Return value of a pipeline is the value of the last (rightmost) command to exit with a non-zero status
+    IFS=$'\n\t'      # Set $IFS to only newline and tab.
+
+    # shellcheck disable=SC2034
+    cr=$'\n'
+
+    function black() { if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[30m$1\\x1B[0m"; else echo "$1"; fi  }
+    function red()   { if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[31m$1\\x1B[0m"; else echo "$1"; fi; }
+    function green() { if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[32m$1\\x1B[0m"; else echo "$1"; fi; }
+    function yellow(){ if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[33m$1\\x1B[0m"; else echo "$1"; fi; }
+    function blue()  { if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[34m$1\\x1B[0m"; else echo "$1"; fi; }
+    function purple(){ if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[35m$1\\x1B[0m"; else echo "$1"; fi; }
+    function cyan()  { if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[36m$1\\x1B[0m"; else echo "$1"; fi; }
+    function white() { if [ -t 1 ] && [ -n "$(tput colors)" ] && [ "$(tput colors)" -ge 8 ]; then echo -e "\\x1B[37m$1\\x1B[0m"; else echo "$1"; fi; }
+
+    # cd "$(dirname "$0")" || exit 1  # (optionally) cd to directory where script is located
+
+
+
+pid="$( pgrep -f 'flutter_tools\.[s]napshot run' || echo '' )"
+
+if [ -z "$pid" ]; then
+    red "No [flutter run] process found - exiting"
+    exit 1
+fi
+
+trap 'echo "reseived SIGNAL<EXIT> - exiting"; exit 0' EXIT
+trap 'echo "reseived SIGNAL<SIGINT> - exiting"; exit 0' SIGINT
+trap 'echo "reseived SIGNAL<SIGTERM> - exiting"; exit 0' SIGTERM
+trap 'echo "reseived SIGNAL<SIGQUIT> - exiting"; exit 0' SIGQUIT
+
+echo ""
+blue "Listening for changes in lib/ directory - sending signals to ${pid}..."
+echo ""
+
+while true; do
+    find lib/ -name '*.dart' | entr -d -p sh -c "echo 'File(s) changed - Sending SIGUSR to $pid' ; kill -USR1 $pid";
+	yellow 'File list changed - restart';
+done

flutter/android/app/src/main/kotlin/com/example/simplecloudnotifier/MainActivity.kt

@@ -3,10 +3,4 @@ package com.blackforestbytes.simplecloudnotifier
 import io.flutter.embedding.android.FlutterActivity
 
 class MainActivity: FlutterActivity() {
-    onCreate() {
-        GoogleApiAvailability.makeGooglePlayServicesAvailable() 
-    }
-    onResume() {
-        GoogleApiAvailability.makeGooglePlayServicesAvailable() 
-    }
 }

flutter/lib/api/api_client.dart

@@ -1,6 +1,5 @@
 import 'dart:convert';
 
-import 'package:fl_toast/fl_toast.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart' as http;
 import 'package:simplecloudnotifier/models/api_error.dart';
@@ -14,6 +13,7 @@ import 'package:simplecloudnotifier/state/globals.dart';
 import 'package:simplecloudnotifier/state/request_log.dart';
 import 'package:simplecloudnotifier/models/channel.dart';
 import 'package:simplecloudnotifier/models/message.dart';
+import 'package:simplecloudnotifier/utils/toaster.dart';
 
 enum ChannelSelector {
   owned(apiKey: 'owned'), // Return all channels of the user
@@ -71,7 +71,7 @@ class APIClient {
       responseHeaders = response.headers;
     } catch (exc, trace) {
       RequestLog.addRequestException(name, t0, method, uri, req.body, req.headers, exc, trace);
-      showPlatformToast(child: Text('Request "${name}" failed'), context: ToastProvider.context);
+      Toaster.error("Error", 'Request "${name}" failed');
       ApplicationLog.error('Request "${name}" failed: ' + exc.toString(), trace: trace);
       rethrow;
     }
@@ -81,14 +81,14 @@ class APIClient {
         final apierr = APIError.fromJson(jsonDecode(responseBody) as Map<String, dynamic>);
 
         RequestLog.addRequestAPIError(name, t0, method, uri, req.body, req.headers, responseStatusCode, responseBody, responseHeaders, apierr);
-        showPlatformToast(child: Text('Request "${name}" is fehlgeschlagen'), context: ToastProvider.context);
+        Toaster.error("Error", 'Request "${name}" failed');
         throw Exception(apierr.message);
       } catch (exc, trace) {
         ApplicationLog.warn('Failed to decode api response as error-object', additional: exc.toString() + "\nBody:\n" + responseBody, trace: trace);
       }
 
       RequestLog.addRequestErrorStatuscode(name, t0, method, uri, req.body, req.headers, responseStatusCode, responseBody, responseHeaders);
-      showPlatformToast(child: Text('Request "${name}" is fehlgeschlagen'), context: ToastProvider.context);
+      Toaster.error("Error", 'Request "${name}" failed');
       throw Exception('API request failed with status code ${responseStatusCode}');
     }
 
@@ -105,7 +105,7 @@ class APIClient {
       }
     } catch (exc, trace) {
       RequestLog.addRequestDecodeError(name, t0, method, uri, req.body, req.headers, responseStatusCode, responseBody, responseHeaders, exc, trace);
-      showPlatformToast(child: Text('Request "${name}" is fehlgeschlagen'), context: ToastProvider.context);
+      Toaster.error("Error", 'Request "${name}" failed');
       ApplicationLog.error('Failed to decode response: ' + exc.toString(), additional: "\nBody:\n" + responseBody, trace: trace);
       rethrow;
     }

flutter/lib/main.dart

@@ -1,5 +1,4 @@
 import 'package:firebase_messaging/firebase_messaging.dart';
-import 'package:fl_toast/fl_toast.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 import 'package:hive_flutter/hive_flutter.dart';
@@ -11,6 +10,7 @@ import 'package:simplecloudnotifier/state/globals.dart';
 import 'package:simplecloudnotifier/state/request_log.dart';
 import 'package:simplecloudnotifier/state/user_account.dart';
 import 'package:firebase_core/firebase_core.dart';
+import 'package:toastification/toastification.dart';
 import 'firebase_options.dart';
 
 void main() async {
@@ -87,7 +87,13 @@ class SCNApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Consumer<AppTheme>(
+    return ToastificationWrapper(
+      config: ToastificationConfig(
+        itemWidth: 440,
+        marginBuilder: (alignment) => EdgeInsets.symmetric(vertical: 64),
+        animationDuration: Duration(milliseconds: 200),
+      ),
+      child: Consumer<AppTheme>(
         builder: (context, appTheme, child) => MaterialApp(
           title: 'SimpleCloudNotifier',
           theme: ThemeData(
@@ -95,7 +101,8 @@ class SCNApp extends StatelessWidget {
             colorScheme: ColorScheme.fromSeed(seedColor: Colors.blue, brightness: appTheme.darkMode ? Brightness.dark : Brightness.light),
             useMaterial3: true,
           ),
-        home: const ToastProvider(child: SCNNavLayout()),
+          home: SCNNavLayout(),
+        ),
       ),
     );
   }

flutter/lib/nav_layout.dart

@@ -1,4 +1,3 @@
-import 'package:fl_toast/fl_toast.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_lazy_indexed_stack/flutter_lazy_indexed_stack.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
@@ -11,6 +10,7 @@ import 'package:simplecloudnotifier/pages/account/account.dart';
 import 'package:simplecloudnotifier/pages/message_list/message_list.dart';
 import 'package:simplecloudnotifier/pages/settings/root.dart';
 import 'package:simplecloudnotifier/state/user_account.dart';
+import 'package:simplecloudnotifier/utils/toaster.dart';
 
 class SCNNavLayout extends StatefulWidget {
   const SCNNavLayout({super.key});
@@ -33,7 +33,7 @@ class _SCNNavLayoutState extends State<SCNNavLayout> {
   void _onItemTapped(int index) {
     final userAcc = Provider.of<UserAccount>(context, listen: false);
     if (userAcc.auth == null) {
-      showPlatformToast(child: Text('Please login first or create a new account'), context: ToastProvider.context);
+      Toaster.info("Not logged in", "Please login or create a new account first");
       return;
     }
 
@@ -45,7 +45,7 @@ class _SCNNavLayoutState extends State<SCNNavLayout> {
   void _onFABTapped() {
     final userAcc = Provider.of<UserAccount>(context, listen: false);
     if (userAcc.auth == null) {
-      showPlatformToast(child: Text('Please login first or create a new account'), context: ToastProvider.context);
+      Toaster.info("Not logged in", "Please login or create a new account first");
       return;
     }
 

flutter/lib/pages/account/account.dart

@@ -44,6 +44,7 @@ class _AccountRootPageState extends State<AccountRootPage> {
     futureChannelAllCount = null;
     futureChannelSubscribedCount = null;
 
+    if (userAcc.auth != null) {
       futureChannelAllCount = () async {
         if (userAcc.auth == null) throw new Exception('not logged in');
         final channels = await APIClient.getChannelList(userAcc.auth!, ChannelSelector.all);
@@ -74,6 +75,7 @@ class _AccountRootPageState extends State<AccountRootPage> {
         return keys.length;
       }();
     }
+  }
 
   @override
   Widget build(BuildContext context) {

flutter/lib/pages/debug/debug_actions.dart

@@ -0,0 +1,52 @@
+import 'package:flutter/material.dart';
+import 'package:simplecloudnotifier/utils/toaster.dart';
+import 'package:toastification/toastification.dart';
+
+class DebugActionsPage extends StatefulWidget {
+  @override
+  _DebugActionsPageState createState() => _DebugActionsPageState();
+}
+
+class _DebugActionsPageState extends State<DebugActionsPage> {
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      child: SingleChildScrollView(
+        child: Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 12),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              ElevatedButton(
+                style: ElevatedButton.styleFrom(textStyle: const TextStyle(fontSize: 20)),
+                onPressed: () => Toaster.success("Hello World", "This was a triumph!"),
+                child: const Text('Show Success Notification'),
+              ),
+              ElevatedButton(
+                style: ElevatedButton.styleFrom(textStyle: const TextStyle(fontSize: 20)),
+                onPressed: () => Toaster.info("Hello World", "This was a triumph!"),
+                child: const Text('Show Info Notification'),
+              ),
+              ElevatedButton(
+                style: ElevatedButton.styleFrom(textStyle: const TextStyle(fontSize: 20)),
+                onPressed: () => Toaster.warn("Hello World", "This was a triumph!"),
+                child: const Text('Show Warn Notification'),
+              ),
+              ElevatedButton(
+                style: ElevatedButton.styleFrom(textStyle: const TextStyle(fontSize: 20)),
+                onPressed: () => Toaster.error("Hello World", "This was a triumph!"),
+                child: const Text('Show Info Notification'),
+              ),
+              ElevatedButton(
+                style: ElevatedButton.styleFrom(textStyle: const TextStyle(fontSize: 20)),
+                onPressed: () => Toaster.simple("Hello World"),
+                child: const Text('Show Simple Notification'),
+              ),
+              SizedBox(height: 20),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

flutter/lib/pages/debug/debug_main.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:simplecloudnotifier/components/layout/scaffold.dart';
+import 'package:simplecloudnotifier/pages/debug/debug_actions.dart';
 import 'package:simplecloudnotifier/pages/debug/debug_colors.dart';
 import 'package:simplecloudnotifier/pages/debug/debug_logs.dart';
 import 'package:simplecloudnotifier/pages/debug/debug_persistence.dart';
@@ -10,7 +12,7 @@ class DebugMainPage extends StatefulWidget {
   _DebugMainPageState createState() => _DebugMainPageState();
 }
 
-enum DebugMainPageSubPage { colors, requests, persistence, logs }
+enum DebugMainPageSubPage { colors, requests, persistence, logs, actions }
 
 class _DebugMainPageState extends State<DebugMainPage> {
   final Map<DebugMainPageSubPage, Widget> _subpages = {
@@ -18,6 +20,7 @@ class _DebugMainPageState extends State<DebugMainPage> {
     DebugMainPageSubPage.requests: DebugRequestsPage(),
     DebugMainPageSubPage.persistence: DebugPersistencePage(),
     DebugMainPageSubPage.logs: DebugLogsPage(),
+    DebugMainPageSubPage.actions: DebugActionsPage(),
   };
 
   DebugMainPageSubPage _subPage = DebugMainPageSubPage.colors;
@@ -51,11 +54,16 @@ class _DebugMainPageState extends State<DebugMainPage> {
     return SegmentedButton<DebugMainPageSubPage>(
       showSelectedIcon: false,
       segments: const <ButtonSegment<DebugMainPageSubPage>>[
-        ButtonSegment<DebugMainPageSubPage>(value: DebugMainPageSubPage.colors, label: Text('Theme')),
-        ButtonSegment<DebugMainPageSubPage>(value: DebugMainPageSubPage.requests, label: Text('Requests')),
-        ButtonSegment<DebugMainPageSubPage>(value: DebugMainPageSubPage.persistence, label: Text('Persistence')),
-        ButtonSegment<DebugMainPageSubPage>(value: DebugMainPageSubPage.logs, label: Text('Logs')),
+        ButtonSegment<DebugMainPageSubPage>(value: DebugMainPageSubPage.colors, icon: Icon(FontAwesomeIcons.solidPaintRoller, size: 14)),
+        ButtonSegment<DebugMainPageSubPage>(value: DebugMainPageSubPage.actions, icon: Icon(FontAwesomeIcons.solidHammer, size: 14)),
+        ButtonSegment<DebugMainPageSubPage>(value: DebugMainPageSubPage.requests, icon: Icon(FontAwesomeIcons.solidNetworkWired, size: 14)),
+        ButtonSegment<DebugMainPageSubPage>(value: DebugMainPageSubPage.persistence, icon: Icon(FontAwesomeIcons.solidFloppyDisk, size: 14)),
+        ButtonSegment<DebugMainPageSubPage>(value: DebugMainPageSubPage.logs, icon: Icon(FontAwesomeIcons.solidFileLines, size: 14)),
       ],
+      style: ButtonStyle(
+        padding: MaterialStateProperty.all<EdgeInsets>(EdgeInsets.fromLTRB(0, 0, 0, 0)),
+        visualDensity: VisualDensity(horizontal: -3, vertical: -3),
+      ),
       selected: <DebugMainPageSubPage>{_subPage},
       onSelectionChanged: (Set<DebugMainPageSubPage> v) {
         setState(() {

flutter/lib/pages/debug/debug_request_view.dart

@@ -1,9 +1,9 @@
-import 'package:fl_toast/fl_toast.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:simplecloudnotifier/components/layout/scaffold.dart';
 import 'package:simplecloudnotifier/state/request_log.dart';
+import 'package:simplecloudnotifier/utils/toaster.dart';
 
 class DebugRequestViewPage extends StatelessWidget {
   final SCNRequest request;
@@ -64,7 +64,7 @@ class DebugRequestViewPage extends StatelessWidget {
               constraints: BoxConstraints(),
               onPressed: () {
                 Clipboard.setData(new ClipboardData(text: value));
-                showPlatformToast(child: Text('Copied to clipboard'), context: ToastProvider.context);
+                Toaster.info("Clipboard", 'Copied text to Clipboard');
               },
             ),
           ],

flutter/lib/utils/toaster.dart

@@ -0,0 +1,101 @@
+import 'package:flutter/material.dart';
+import 'package:toastification/toastification.dart';
+
+class Toaster {
+  // https://payamzahedi.com/toastification/
+
+  static const autoCloseDuration = Duration(seconds: 4);
+  static const alignment = Alignment.topCenter;
+  static const animationDuration = Duration(milliseconds: 200);
+  static final borderRadius = BorderRadius.circular(4.0);
+
+  static void simple(String title) {
+    toastification.show(
+      type: ToastificationType.success,
+      style: ToastificationStyle.simple,
+      title: Text(title),
+      description: Text(title),
+      autoCloseDuration: autoCloseDuration,
+      borderRadius: borderRadius,
+      closeButtonShowType: CloseButtonShowType.none,
+      alignment: alignment,
+      animationDuration: animationDuration,
+      pauseOnHover: false,
+      applyBlurEffect: true,
+      closeOnClick: true,
+      showProgressBar: false,
+    );
+  }
+
+  static void success(String title, String message) {
+    toastification.show(
+      type: ToastificationType.success,
+      style: ToastificationStyle.flatColored,
+      title: Text(title),
+      description: Text(message),
+      autoCloseDuration: autoCloseDuration,
+      borderRadius: borderRadius,
+      closeButtonShowType: CloseButtonShowType.none,
+      alignment: alignment,
+      animationDuration: animationDuration,
+      pauseOnHover: false,
+      applyBlurEffect: true,
+      closeOnClick: true,
+      showProgressBar: false,
+    );
+  }
+
+  static void info(String title, String message) {
+    toastification.show(
+      type: ToastificationType.info,
+      style: ToastificationStyle.flatColored,
+      title: Text(title),
+      description: Text(message),
+      autoCloseDuration: autoCloseDuration,
+      borderRadius: borderRadius,
+      closeButtonShowType: CloseButtonShowType.none,
+      alignment: alignment,
+      animationDuration: animationDuration,
+      pauseOnHover: false,
+      applyBlurEffect: true,
+      closeOnClick: true,
+      showProgressBar: false,
+    );
+  }
+
+  static void warn(String title, String message) {
+    toastification.show(
+      type: ToastificationType.warning,
+      style: ToastificationStyle.flatColored,
+      title: Text(title),
+      description: Text(message),
+      autoCloseDuration: autoCloseDuration,
+      borderRadius: borderRadius,
+      closeButtonShowType: CloseButtonShowType.none,
+      alignment: alignment,
+      animationDuration: animationDuration,
+      pauseOnHover: false,
+      applyBlurEffect: true,
+      closeOnClick: true,
+      showProgressBar: false,
+    );
+  }
+
+  static void error(String title, String message) {
+    toastification.show(
+      type: ToastificationType.error,
+      style: ToastificationStyle.flatColored,
+      title: Text(title),
+      description: Text(message),
+      autoCloseDuration: autoCloseDuration,
+      borderRadius: borderRadius,
+      closeButtonShowType: CloseButtonShowType.none,
+      alignment: alignment,
+      animationDuration: animationDuration,
+      pauseOnHover: false,
+      applyBlurEffect: true,
+      closeOnClick: true,
+      showProgressBar: false,
+    );
+  }
+}

flutter/pubspec.lock

@@ -201,6 +201,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.0.0"
+  equatable:
+    dependency: transitive
+    description:
+      name: equatable
+      sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.5"
   fake_async:
     dependency: transitive
     description:
@@ -281,14 +289,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
-  fl_toast:
-    dependency: "direct main"
-    description:
-      name: fl_toast
-      sha256: "0f7bbce90d1b75463a414c6a5476e45bd93fa7c4adccce1690076f4d1ef77c42"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.2.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -407,6 +407,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
+  iconsax_flutter:
+    dependency: transitive
+    description:
+      name: iconsax_flutter
+      sha256: "95b65699da8ea98f87c5d232f06b0debaaf1ec1332b697e4d90969ec9a93037d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
   infinite_scroll_pagination:
     dependency: "direct main"
     description:
@@ -607,6 +615,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.1"
+  pausable_timer:
+    dependency: transitive
+    description:
+      name: pausable_timer
+      sha256: "6ef1a95441ec3439de6fb63f39a011b67e693198e7dae14e20675c3c00e86074"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.0+3"
   platform:
     dependency: transitive
     description:
@@ -780,6 +796,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.10.0"
+  sprintf:
+    dependency: transitive
+    description:
+      name: sprintf
+      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.0"
   stack_trace:
     dependency: transitive
     description:
@@ -836,6 +860,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.1"
+  toastification:
+    dependency: "direct main"
+    description:
+      name: toastification
+      sha256: "5e751acc2fb5b8d008138dac255d62290fde4e5a24824f29809ac098c3dfe395"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
   typed_data:
     dependency: transitive
     description:
@@ -908,6 +940,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.1"
+  uuid:
+    dependency: transitive
+    description:
+      name: uuid
+      sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.4.0"
   vector_math:
     dependency: transitive
     description:

flutter/pubspec.yaml

@@ -23,12 +23,12 @@ dependencies:
   path_provider: ^2.1.3
   hive_flutter: ^1.1.0
   package_info_plus: ^8.0.0
-  fl_toast: ^3.2.0
   xid: ^1.2.1
   flutter_lazy_indexed_stack: ^0.0.6
   firebase_core: ^2.32.0
   firebase_messaging: ^14.9.4
   device_info_plus: ^10.1.0
+  toastification: ^2.0.0
 
 
 dependency_overrides: