From a6d5f2e60b73383bcebae87eaa6dc64ecb4fb4f8 Mon Sep 17 00:00:00 2001 From: dshukertjr <18113850+dshukertjr@users.noreply.github.com> Date: Mon, 12 Jun 2023 23:14:59 +0900 Subject: [PATCH] remove constants.dart --- .../lib/components/avatar.dart | 16 ++++-- .../lib/constants.dart | 20 -------- .../flutter-user-management/lib/main.dart | 2 + .../lib/pages/account_page.dart | 50 +++++++++++++++---- .../lib/pages/login_page.dart | 17 +++++-- .../lib/pages/splash_page.dart | 2 +- 6 files changed, 67 insertions(+), 40 deletions(-) delete mode 100644 examples/user-management/flutter-user-management/lib/constants.dart diff --git a/examples/user-management/flutter-user-management/lib/components/avatar.dart b/examples/user-management/flutter-user-management/lib/components/avatar.dart index 8bd3ab13244..dfafdd4d476 100644 --- a/examples/user-management/flutter-user-management/lib/components/avatar.dart +++ b/examples/user-management/flutter-user-management/lib/components/avatar.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:image_picker/image_picker.dart'; import 'package:supabase_flutter/supabase_flutter.dart'; -import 'package:supabase_quickstart/constants.dart'; +import 'package:supabase_quickstart/main.dart'; class Avatar extends StatefulWidget { const Avatar({ @@ -76,11 +76,21 @@ class _AvatarState extends State { widget.onUpload(imageUrlResponse); } on StorageException catch (error) { if (mounted) { - context.showErrorSnackBar(message: error.message); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text(error.message), + backgroundColor: Theme.of(context).colorScheme.error, + ), + ); } } catch (error) { if (mounted) { - context.showErrorSnackBar(message: 'Unexpected error occurred'); + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: const Text('Unexpected error occurred'), + backgroundColor: Theme.of(context).colorScheme.error, + ), + ); } } diff --git a/examples/user-management/flutter-user-management/lib/constants.dart b/examples/user-management/flutter-user-management/lib/constants.dart deleted file mode 100644 index af484fd429e..00000000000 --- a/examples/user-management/flutter-user-management/lib/constants.dart +++ /dev/null @@ -1,20 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:supabase_flutter/supabase_flutter.dart'; - -final supabase = Supabase.instance.client; - -extension ShowSnackBar on BuildContext { - void showSnackBar({ - required String message, - Color backgroundColor = Colors.white, - }) { - ScaffoldMessenger.of(this).showSnackBar(SnackBar( - content: Text(message), - backgroundColor: backgroundColor, - )); - } - - void showErrorSnackBar({required String message}) { - showSnackBar(message: message, backgroundColor: Colors.red); - } -} diff --git a/examples/user-management/flutter-user-management/lib/main.dart b/examples/user-management/flutter-user-management/lib/main.dart index 5aa0f9195e2..656b7e22257 100644 --- a/examples/user-management/flutter-user-management/lib/main.dart +++ b/examples/user-management/flutter-user-management/lib/main.dart @@ -13,6 +13,8 @@ Future main() async { runApp(MyApp()); } +final supabase = Supabase.instance.client; + class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { diff --git a/examples/user-management/flutter-user-management/lib/pages/account_page.dart b/examples/user-management/flutter-user-management/lib/pages/account_page.dart index 9267071d172..d07c5b291da 100644 --- a/examples/user-management/flutter-user-management/lib/pages/account_page.dart +++ b/examples/user-management/flutter-user-management/lib/pages/account_page.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:supabase_flutter/supabase_flutter.dart'; import 'package:supabase_quickstart/components/avatar.dart'; -import 'package:supabase_quickstart/constants.dart'; +import 'package:supabase_quickstart/main.dart'; class AccountPage extends StatefulWidget { const AccountPage({super.key}); @@ -33,9 +33,15 @@ class _AccountPageState extends State { _websiteController.text = (data['website'] ?? '') as String; _avatarUrl = (data['avatar_url'] ?? '') as String; } on PostgrestException catch (error) { - context.showErrorSnackBar(message: error.message); + SnackBar( + content: Text(error.message), + backgroundColor: Theme.of(context).colorScheme.error, + ); } catch (error) { - context.showErrorSnackBar(message: 'Unexpected exception occurred'); + SnackBar( + content: const Text('Unexpected error occurred'), + backgroundColor: Theme.of(context).colorScheme.error, + ); } setState(() { @@ -60,12 +66,20 @@ class _AccountPageState extends State { try { await supabase.from('profiles').upsert(updates); if (mounted) { - context.showSnackBar(message: 'Successfully updated profile!'); + const SnackBar( + content: Text('Successfully updated profile!'), + ); } } on PostgrestException catch (error) { - context.showErrorSnackBar(message: error.message); + SnackBar( + content: Text(error.message), + backgroundColor: Theme.of(context).colorScheme.error, + ); } catch (error) { - context.showErrorSnackBar(message: 'Unexpeted error occurred'); + SnackBar( + content: const Text('Unexpected error occurred'), + backgroundColor: Theme.of(context).colorScheme.error, + ); } setState(() { _loading = false; @@ -76,9 +90,15 @@ class _AccountPageState extends State { try { await supabase.auth.signOut(); } on AuthException catch (error) { - context.showErrorSnackBar(message: error.message); + SnackBar( + content: Text(error.message), + backgroundColor: Theme.of(context).colorScheme.error, + ); } catch (error) { - context.showErrorSnackBar(message: 'Unexpected error occurred'); + SnackBar( + content: const Text('Unexpected error occurred'), + backgroundColor: Theme.of(context).colorScheme.error, + ); } if (mounted) { Navigator.of(context).pushReplacementNamed('/'); @@ -94,12 +114,20 @@ class _AccountPageState extends State { 'avatar_url': imageUrl, }); if (mounted) { - context.showSnackBar(message: 'Updated your profile image!'); + const SnackBar( + content: Text('Updated your profile image!'), + ); } } on PostgrestException catch (error) { - context.showErrorSnackBar(message: error.message); + SnackBar( + content: Text(error.message), + backgroundColor: Theme.of(context).colorScheme.error, + ); } catch (error) { - context.showErrorSnackBar(message: 'Unexpected error has occurred'); + SnackBar( + content: const Text('Unexpected error occurred'), + backgroundColor: Theme.of(context).colorScheme.error, + ); } if (!mounted) { return; diff --git a/examples/user-management/flutter-user-management/lib/pages/login_page.dart b/examples/user-management/flutter-user-management/lib/pages/login_page.dart index 37fc664dee1..81fad648304 100644 --- a/examples/user-management/flutter-user-management/lib/pages/login_page.dart +++ b/examples/user-management/flutter-user-management/lib/pages/login_page.dart @@ -3,8 +3,7 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:supabase_flutter/supabase_flutter.dart'; - -import 'package:supabase_quickstart/constants.dart'; +import 'package:supabase_quickstart/main.dart'; class LoginPage extends StatefulWidget { const LoginPage({super.key}); @@ -30,13 +29,21 @@ class _LoginPageState extends State { kIsWeb ? null : 'io.supabase.flutterquickstart://login-callback/', ); if (mounted) { - context.showSnackBar(message: 'Check your email for login link!'); + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar(content: Text('Check your email for login link!')), + ); _emailController.clear(); } } on AuthException catch (error) { - context.showErrorSnackBar(message: error.message); + SnackBar( + content: Text(error.message), + backgroundColor: Theme.of(context).colorScheme.error, + ); } catch (error) { - context.showErrorSnackBar(message: 'Unexpected error occurred'); + SnackBar( + content: const Text('Unexpected error occurred'), + backgroundColor: Theme.of(context).colorScheme.error, + ); } setState(() { diff --git a/examples/user-management/flutter-user-management/lib/pages/splash_page.dart b/examples/user-management/flutter-user-management/lib/pages/splash_page.dart index 81fa9483325..82d3e80412e 100644 --- a/examples/user-management/flutter-user-management/lib/pages/splash_page.dart +++ b/examples/user-management/flutter-user-management/lib/pages/splash_page.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:supabase_quickstart/constants.dart'; +import 'package:supabase_quickstart/main.dart'; class SplashPage extends StatefulWidget { const SplashPage({super.key});