Merge pull request 'Theme changes' (#4) from development into main

Reviewed-on: #4

lib/pages/collection_page.dart

@@ -102,10 +102,16 @@ class _CollectionPageState extends State<CollectionPage> {
             ),
         ],
       ),
-      body: ListView.builder(
+      body: Center(
-        itemBuilder: (context, index) =>
+        child: SizedBox(
-            bookmarksListItemBuilder(context, bookmarks.elementAt(index)),
+          width: MediaQuery.of(context).size.width * 0.9,
-        itemCount: bookmarks.length,
+          child: ListView.separated(
+            itemBuilder: (context, index) =>
+                bookmarksListItemBuilder(context, bookmarks.elementAt(index)),
+            itemCount: bookmarks.length,
+            separatorBuilder: (context, index) => SizedBox(height: 10),
+          ),
+        ),
       ),
       floatingActionButton: FloatingActionButton(
         onPressed: onAddButtonPressed,

lib/pages/collections_list_page.dart

@@ -21,7 +21,7 @@ class CollectionsListPage extends StatefulWidget {
 
 class _CollectionsListPageState extends State<CollectionsListPage> {
   bool addingNewBookmark = false;
-  final bookmarkCountMap = Storage.loadPerCollectionBookmarkCount();
+  var bookmarkCountMap = <int, int>{};
 
   Widget bottomSheetBuilder(BuildContext context) {
     final titleTextFieldController = TextEditingController(
@@ -84,8 +84,9 @@ class _CollectionsListPageState extends State<CollectionsListPage> {
   @override
   Widget build(BuildContext context) {
     final collections = Storage.loadCollections();
-    final provider = context.watch<SharedLinkProvider>();
+    bookmarkCountMap = Storage.loadPerCollectionBookmarkCount();
-    addingNewBookmark = provider.currentMapsLinkMetadata != null;
+    addingNewBookmark =
+        context.watch<SharedLinkProvider>().currentMapsLinkMetadata != null;
     return Scaffold(
       appBar: AppBar(
         title: addingNewBookmark
@@ -94,7 +95,8 @@ class _CollectionsListPageState extends State<CollectionsListPage> {
         actions: [
           if (addingNewBookmark)
             TextButton(
-              onPressed: () => provider.removeCurrentMapsLink(),
+              onPressed: () =>
+                  context.read<SharedLinkProvider>().removeCurrentMapsLink(),
               child: Text(AppLocalizations.of(context)!.cancel),
             )
           else
@@ -110,12 +112,18 @@ class _CollectionsListPageState extends State<CollectionsListPage> {
         child: Icon(Icons.add),
       ),
       body: collections.isNotEmpty
-          ? ListView.builder(
+          ? Center(
-              itemBuilder: (context, index) => collectionsListItemBuilder(
+              child: SizedBox(
-                context,
+                width: MediaQuery.of(context).size.width * 0.9,
-                collections.elementAt(index),
+                child: ListView.separated(
+                  itemBuilder: (context, index) => collectionsListItemBuilder(
+                    context,
+                    collections.elementAt(index),
+                  ),
+                  itemCount: collections.length,
+                  separatorBuilder: (context, index) => SizedBox(height: 10),
+                ),
               ),
-              itemCount: collections.length,
             )
           : Center(
               child: Text(AppLocalizations.of(context)!.tipCreateCollections),

lib/pages/search_page.dart

@@ -14,14 +14,21 @@ class SearchPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(title: Text(AppLocalizations.of(context)!.search)),
-      body: Column(
+      body: Center(
-        children: [
+        child: SizedBox(
-          SearchBarWidget(
+          width: MediaQuery.of(context).size.width * 0.9,
-            onEditingComplete: context.read<SearchProvider>().setSearchText,
+          child: Column(
-            onResetSearch: context.read<SearchProvider>().removeSearchText,
+            children: [
+              Padding(padding: EdgeInsetsGeometry.only(top: 10)),
+              SearchBarWidget(
+                onEditingComplete: context.read<SearchProvider>().setSearchText,
+                onResetSearch: context.read<SearchProvider>().removeSearchText,
+              ),
+              Padding(padding: EdgeInsetsGeometry.only(top: 10)),
+              Expanded(child: SearchResultsWidget()),
+            ],
           ),
-          Expanded(child: SearchResultsWidget()),
+        ),
-        ],
       ),
     );
   }

lib/service/notifying.dart

@@ -8,13 +8,31 @@ class Notifying {
     required String text,
     bool isError = false,
   }) {
+    ScaffoldMessenger.of(context).hideCurrentSnackBar();
     ScaffoldMessenger.of(context).showSnackBar(
       SnackBar(
-        content: Text(
+        backgroundColor: Theme.of(context).colorScheme.error,
-          text,
+        content: SizedBox(
-          style: isError
+          height: 30,
-              ? TextStyle(color: Theme.of(context).colorScheme.error)
+          child: Row(
-              : null,
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            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,
+                ),
+              ),
+            ],
+          ),
         ),
       ),
     );

lib/theme.dart

@@ -1,15 +1,26 @@
 import 'package:flutter/material.dart';
 
-ThemeData get lightTheme => ThemeData.from(colorScheme: _lightColorScheme);
+const _seed = Colors.deepPurple;
 
-ThemeData get darkTheme => ThemeData.from(colorScheme: _darkColorScheme);
+ColorScheme get _lightColorScheme =>
+    ColorScheme.fromSeed(seedColor: _seed, brightness: Brightness.light);
 
-ColorScheme get _darkColorScheme => ColorScheme.fromSeed(
+ColorScheme get _darkColorScheme =>
-  seedColor: Colors.deepPurple,
+    ColorScheme.fromSeed(seedColor: _seed, brightness: Brightness.dark);
-  brightness: Brightness.dark,
-);
 
-ColorScheme get _lightColorScheme => ColorScheme.fromSeed(
+ThemeData get lightTheme => _baseTheme(_lightColorScheme);
-  seedColor: Colors.deepPurple,
+
-  brightness: Brightness.light,
+ThemeData get darkTheme => _baseTheme(_darkColorScheme);
-);
+
+ThemeData _baseTheme(ColorScheme scheme) =>
+    ThemeData.from(colorScheme: scheme, useMaterial3: true).copyWith(
+      inputDecorationTheme: InputDecorationTheme(
+        border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)),
+      ),
+      listTileTheme: ListTileThemeData(
+        tileColor: scheme.surfaceContainer,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadiusGeometry.circular(12),
+        ),
+      ),
+    );

lib/widgets/create_bookmark_collection_dialog.dart

@@ -41,9 +41,7 @@ class CreateBookmarkCollectionDialog extends StatelessWidget {
           FilteringTextInputFormatter.deny(RegExp(r'\s\s+')),
         ],
         decoration: InputDecoration(
-          // TODO: Localize
           labelText: AppLocalizations.of(context)!.collectionName,
-          border: OutlineInputBorder(borderRadius: BorderRadius.circular(10)),
         ),
       ),
       actions: [

lib/widgets/create_bookmark_dialog.dart

@@ -61,9 +61,6 @@ class CreateBookmarkDialog extends StatelessWidget {
               ],
               decoration: InputDecoration(
                 labelText: AppLocalizations.of(context)!.bookmarkTitle,
-                border: OutlineInputBorder(
-                  borderRadius: BorderRadius.circular(10),
-                ),
               ),
             ),
             TextField(
@@ -78,9 +75,6 @@ class CreateBookmarkDialog extends StatelessWidget {
               ],
               decoration: InputDecoration(
                 labelText: AppLocalizations.of(context)!.url,
-                border: OutlineInputBorder(
-                  borderRadius: BorderRadius.circular(10),
-                ),
               ),
             ),
             TextField(
@@ -95,9 +89,6 @@ class CreateBookmarkDialog extends StatelessWidget {
               ],
               decoration: InputDecoration(
                 labelText: AppLocalizations.of(context)!.description,
-                border: OutlineInputBorder(
-                  borderRadius: BorderRadius.circular(10),
-                ),
               ),
             ),
           ],

lib/widgets/search_widgets/search_bar_widget.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 
+import '../../l10n/app_localizations.dart';
+
 class SearchBarWidget extends StatelessWidget {
   const SearchBarWidget({
     super.key,
@@ -28,6 +30,7 @@ class SearchBarWidget extends StatelessWidget {
           },
           icon: Icon(Icons.delete_outline_outlined),
         ),
+        labelText: AppLocalizations.of(context)!.search,
       ),
     );
   }

lib/widgets/search_widgets/search_results_widget.dart

@@ -47,9 +47,10 @@ class _SearchResultsWidgetState extends State<SearchResultsWidget> {
   @override
   Widget build(BuildContext context) {
     if (filteredBookmarks.isNotEmpty) {
-      return ListView.builder(
+      return ListView.separated(
         itemBuilder: bookmarkListItemBuilder,
         itemCount: filteredBookmarks.length,
+        separatorBuilder: (context, index) => SizedBox(height: 10),
       );
     }
     return Center(child: Text(AppLocalizations.of(context)!.tipNoResults));