Skip to content

Commit 30b5e48

Browse files
committed
fix facebook auth; fix SocialIcons font
1 parent c85b25e commit 30b5e48

File tree

6 files changed

+21
-19
lines changed

6 files changed

+21
-19
lines changed

packages/firebase_ui_auth/example/android/app/src/main/AndroidManifest.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@
55
android:name="${applicationName}"
66
android:icon="@mipmap/ic_launcher"
77
android:usesCleartextTraffic="true">
8+
9+
<meta-data
10+
android:name="com.facebook.sdk.ApplicationId"
11+
android:value="@string/facebook_app_id"/>
12+
<meta-data
13+
android:name="com.facebook.sdk.ClientToken"
14+
android:value="@string/facebook_client_token"/>
15+
816
<activity
917
android:name=".MainActivity"
1018
android:exported="true"
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="facebook_app_id">128693022464535</string>
4+
<string name="facebook_client_token">16dbbdf0cfb309034a6ad98ac2a21688</string>
5+
</resources>

packages/firebase_ui_auth/example/pubspec.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,10 @@ flutter:
7676
# "family" key with the font family name, and a "fonts" key with a
7777
# list giving the asset and other descriptors for the font. For
7878
# example:
79-
# fonts:
80-
# - family: Schyler
81-
# fonts:
82-
# - asset: fonts/Schyler-Regular.ttf
83-
# - asset: fonts/Schyler-Italic.ttf
84-
# style: italic
79+
fonts:
80+
- family: SocialIcons
81+
fonts:
82+
- asset: packages/firebase_ui_auth/fonts/SocialIcons.ttf
8583
# - family: Trajan Pro
8684
# fonts:
8785
# - asset: fonts/TrajanPro.ttf

packages/firebase_ui_auth/lib/src/oauth/social_icons.dart

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,9 @@ class SocialIcons {
2424
SocialIcons._();
2525

2626
static const _kFontFam = 'SocialIcons';
27-
static const String _kFontPkg = 'firebase_ui_oauth';
2827

29-
static const IconData twitter =
30-
IconData(0xf099, fontFamily: _kFontFam, fontPackage: _kFontPkg);
31-
static const IconData facebook =
32-
IconData(0xf09a, fontFamily: _kFontFam, fontPackage: _kFontPkg);
33-
static const IconData apple =
34-
IconData(0xf179, fontFamily: _kFontFam, fontPackage: _kFontPkg);
35-
static const IconData google =
36-
IconData(0xf1a0, fontFamily: _kFontFam, fontPackage: _kFontPkg);
28+
static const IconData twitter = IconData(0xf099, fontFamily: _kFontFam);
29+
static const IconData facebook = IconData(0xf09a, fontFamily: _kFontFam);
30+
static const IconData apple = IconData(0xf179, fontFamily: _kFontFam);
31+
static const IconData google = IconData(0xf1a0, fontFamily: _kFontFam);
3732
}

packages/firebase_ui_auth/pubspec.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ dev_dependencies:
3939
# following page: https://dart.dev/tools/pub/pubspec
4040
# The following section is specific to Flutter.
4141
flutter:
42-
fonts:
43-
- family: SocialIcons
44-
fonts:
45-
- asset: assets/fonts/SocialIcons.ttf
4642
assets:
4743
- assets/icons/
4844
- assets/countries.json

0 commit comments

Comments
 (0)