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

Reviewed-on: #3

lib/pages/collection_page.dart

@@ -102,10 +102,16 @@ class _CollectionPageState extends State<CollectionPage> {
             ),
         ],
       ),
-      body: ListView.builder(
-        itemBuilder: (context, index) =>
-            bookmarksListItemBuilder(context, bookmarks.elementAt(index)),
-        itemCount: bookmarks.length,
+      body: Center(
+        child: SizedBox(
+          width: MediaQuery.of(context).size.width * 0.9,
+          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

@@ -110,12 +110,18 @@ class _CollectionsListPageState extends State<CollectionsListPage> {
         child: Icon(Icons.add),
       ),
       body: collections.isNotEmpty
-          ? ListView.builder(
-              itemBuilder: (context, index) => collectionsListItemBuilder(
-                context,
-                collections.elementAt(index),
+          ? Center(
+              child: SizedBox(
+                width: MediaQuery.of(context).size.width * 0.9,
+                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(
-        children: [
-          SearchBarWidget(
-            onEditingComplete: context.read<SearchProvider>().setSearchText,
-            onResetSearch: context.read<SearchProvider>().removeSearchText,
+      body: Center(
+        child: SizedBox(
+          width: MediaQuery.of(context).size.width * 0.9,
+          child: Column(
+            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/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(
-  seedColor: Colors.deepPurple,
-  brightness: Brightness.dark,
-);
+ColorScheme get _darkColorScheme =>
+    ColorScheme.fromSeed(seedColor: _seed, brightness: Brightness.dark);
 
-ColorScheme get _lightColorScheme => ColorScheme.fromSeed(
-  seedColor: Colors.deepPurple,
-  brightness: Brightness.light,
-);
+ThemeData get lightTheme => _baseTheme(_lightColorScheme);
+
+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));