From 35f27d50f46c65748d311a8ccbf7070f3b775325 Mon Sep 17 00:00:00 2001 From: Rexios Date: Thu, 3 Nov 2022 23:47:54 -0400 Subject: [PATCH 1/5] Added `label` field to `ThemedOAuthProviderButtonStyle` --- .../lib/src/widgets/internal/oauth_provider_button.dart | 4 +++- packages/firebase_ui_auth/pubspec.yaml | 4 ++++ .../lib/src/oauth_provider_button_style.dart | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/firebase_ui_auth/lib/src/widgets/internal/oauth_provider_button.dart b/packages/firebase_ui_auth/lib/src/widgets/internal/oauth_provider_button.dart index 5f737e8e18cb..e73c8ff9b3f7 100644 --- a/packages/firebase_ui_auth/lib/src/widgets/internal/oauth_provider_button.dart +++ b/packages/firebase_ui_auth/lib/src/widgets/internal/oauth_provider_button.dart @@ -91,6 +91,7 @@ class OAuthProviderButton extends StatelessWidget { Widget build(BuildContext context) { final labels = FirebaseUILocalizations.labelsOf(context); final brightness = Theme.of(context).brightness; + final label = provider.style.label; return AuthFlowBuilder( provider: provider, @@ -110,7 +111,8 @@ class OAuthProviderButton extends StatelessWidget { ), label: variant == OAuthButtonVariant.icon ? '' - : resolveProviderButtonLabel(provider.providerId, labels), + : label ?? + resolveProviderButtonLabel(provider.providerId, labels), auth: auth, ); diff --git a/packages/firebase_ui_auth/pubspec.yaml b/packages/firebase_ui_auth/pubspec.yaml index 2b1736e24a20..183f80aa49f0 100644 --- a/packages/firebase_ui_auth/pubspec.yaml +++ b/packages/firebase_ui_auth/pubspec.yaml @@ -28,6 +28,10 @@ dev_dependencies: flutter_lints: ^2.0.0 mockito: ^5.2.0 +dependency_overrides: + firebase_ui_oauth: + path: ../firebase_ui_oauth + # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec # The following section is specific to Flutter. diff --git a/packages/firebase_ui_oauth/lib/src/oauth_provider_button_style.dart b/packages/firebase_ui_oauth/lib/src/oauth_provider_button_style.dart index f01ab565e459..a41b2511ec2e 100644 --- a/packages/firebase_ui_oauth/lib/src/oauth_provider_button_style.dart +++ b/packages/firebase_ui_oauth/lib/src/oauth_provider_button_style.dart @@ -45,6 +45,7 @@ abstract class ThemedOAuthProviderButtonStyle { ThemedColor get borderColor => backgroundColor; double get iconPadding => 0; String get assetsPackage; + String? get label => null; /// {@macro ui.oauth.themed_oauth_provider_button_style} const ThemedOAuthProviderButtonStyle(); From 9518ed48f97ae2320f674214115828d880148dc1 Mon Sep 17 00:00:00 2001 From: Rexios Date: Thu, 3 Nov 2022 23:52:33 -0400 Subject: [PATCH 2/5] Added comment --- .../lib/src/oauth_provider_button_style.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/firebase_ui_oauth/lib/src/oauth_provider_button_style.dart b/packages/firebase_ui_oauth/lib/src/oauth_provider_button_style.dart index a41b2511ec2e..969d92d776ab 100644 --- a/packages/firebase_ui_oauth/lib/src/oauth_provider_button_style.dart +++ b/packages/firebase_ui_oauth/lib/src/oauth_provider_button_style.dart @@ -45,6 +45,10 @@ abstract class ThemedOAuthProviderButtonStyle { ThemedColor get borderColor => backgroundColor; double get iconPadding => 0; String get assetsPackage; + + /// A custom label string. + /// + /// Required for custom OAuth providers. String? get label => null; /// {@macro ui.oauth.themed_oauth_provider_button_style} From 8f0b11cbe09d458936648d8365b1982b122b41e1 Mon Sep 17 00:00:00 2001 From: Rexios Date: Fri, 4 Nov 2022 03:44:21 -0400 Subject: [PATCH 3/5] Code simplification --- .../lib/src/widgets/internal/oauth_provider_button.dart | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/firebase_ui_auth/lib/src/widgets/internal/oauth_provider_button.dart b/packages/firebase_ui_auth/lib/src/widgets/internal/oauth_provider_button.dart index e73c8ff9b3f7..74209d3a264f 100644 --- a/packages/firebase_ui_auth/lib/src/widgets/internal/oauth_provider_button.dart +++ b/packages/firebase_ui_auth/lib/src/widgets/internal/oauth_provider_button.dart @@ -91,7 +91,6 @@ class OAuthProviderButton extends StatelessWidget { Widget build(BuildContext context) { final labels = FirebaseUILocalizations.labelsOf(context); final brightness = Theme.of(context).brightness; - final label = provider.style.label; return AuthFlowBuilder( provider: provider, @@ -111,7 +110,7 @@ class OAuthProviderButton extends StatelessWidget { ), label: variant == OAuthButtonVariant.icon ? '' - : label ?? + : provider.style.label ?? resolveProviderButtonLabel(provider.providerId, labels), auth: auth, ); From 70fc068ebfe83729be7ca37ec6d7032bb47c17fc Mon Sep 17 00:00:00 2001 From: Rexios Date: Fri, 4 Nov 2022 13:20:27 -0400 Subject: [PATCH 4/5] Formatting --- .../firebase_ui_oauth/lib/src/oauth_provider_button_style.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/firebase_ui_oauth/lib/src/oauth_provider_button_style.dart b/packages/firebase_ui_oauth/lib/src/oauth_provider_button_style.dart index 969d92d776ab..078fa19e5f99 100644 --- a/packages/firebase_ui_oauth/lib/src/oauth_provider_button_style.dart +++ b/packages/firebase_ui_oauth/lib/src/oauth_provider_button_style.dart @@ -47,7 +47,7 @@ abstract class ThemedOAuthProviderButtonStyle { String get assetsPackage; /// A custom label string. - /// + /// /// Required for custom OAuth providers. String? get label => null; From c0a003c9ac8feb9da2eb7933f3a91783bc74d76d Mon Sep 17 00:00:00 2001 From: Rexios Date: Fri, 4 Nov 2022 14:22:13 -0400 Subject: [PATCH 5/5] Removed dependency overrides --- packages/firebase_ui_auth/pubspec.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/firebase_ui_auth/pubspec.yaml b/packages/firebase_ui_auth/pubspec.yaml index 183f80aa49f0..2b1736e24a20 100644 --- a/packages/firebase_ui_auth/pubspec.yaml +++ b/packages/firebase_ui_auth/pubspec.yaml @@ -28,10 +28,6 @@ dev_dependencies: flutter_lints: ^2.0.0 mockito: ^5.2.0 -dependency_overrides: - firebase_ui_oauth: - path: ../firebase_ui_oauth - # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec # The following section is specific to Flutter.