Merge pull request 'small theme changes' (#3) from development into main

Reviewed-on: #3

lib/pages/collections_list_page.dart

@@ -21,7 +21,7 @@ class CollectionsListPage extends StatefulWidget {
 
 class _CollectionsListPageState extends State<CollectionsListPage> {
   bool addingNewBookmark = false;
-  var bookmarkCountMap = <int, int>{};
+  final bookmarkCountMap = Storage.loadPerCollectionBookmarkCount();
 
   Widget bottomSheetBuilder(BuildContext context) {
     final titleTextFieldController = TextEditingController(
@@ -84,9 +84,8 @@ class _CollectionsListPageState extends State<CollectionsListPage> {
   @override
   Widget build(BuildContext context) {
     final collections = Storage.loadCollections();
-    bookmarkCountMap = Storage.loadPerCollectionBookmarkCount();
+    final provider = context.watch<SharedLinkProvider>();
-    addingNewBookmark =
+    addingNewBookmark = provider.currentMapsLinkMetadata != null;
-        context.watch<SharedLinkProvider>().currentMapsLinkMetadata != null;
     return Scaffold(
       appBar: AppBar(
         title: addingNewBookmark
@@ -95,8 +94,7 @@ class _CollectionsListPageState extends State<CollectionsListPage> {
         actions: [
           if (addingNewBookmark)
             TextButton(
-              onPressed: () =>
+              onPressed: () => provider.removeCurrentMapsLink(),
-                  context.read<SharedLinkProvider>().removeCurrentMapsLink(),
               child: Text(AppLocalizations.of(context)!.cancel),
             )
           else

lib/service/notifying.dart

@@ -8,31 +8,13 @@ class Notifying {
     required String text,
     bool isError = false,
   }) {
-    ScaffoldMessenger.of(context).hideCurrentSnackBar();
     ScaffoldMessenger.of(context).showSnackBar(
       SnackBar(
-        backgroundColor: Theme.of(context).colorScheme.error,
+        content: Text(
-        content: SizedBox(
+          text,
-          height: 30,
+          style: isError
-          child: Row(
+              ? TextStyle(color: Theme.of(context).colorScheme.error)
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              : null,
-            children: [
-              Text(
-                text,
-                style: isError
-                    ? TextStyle(color: Theme.of(context).colorScheme.onError)
-                    : null,
-              ),
-              IconButton(
-                onPressed: () =>
-                    ScaffoldMessenger.of(context).hideCurrentSnackBar(),
-                icon: Icon(
-                  Icons.close_rounded,
-                  color: Theme.of(context).colorScheme.onError,
-                ),
-              ),
-            ],
-          ),
         ),
       ),
     );