Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(#13) : fix login issues for Facebook #174

Merged
merged 5 commits into from
Oct 3, 2023
Merged

fix(#13) : fix login issues for Facebook #174

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8077b10
fix(#13) : fix login issues for Facebook
bhoomikshetty Oct 2, 2023
2d53a90
fix(JordyHers-org#13) : fix login issues for Facebook
bhoomikshetty Oct 2, 2023
8741c10
Merge branch 'dev' into master
JordyHers Oct 2, 2023
1b90815
added <String "app_name">
bhoomikshetty Oct 2, 2023
12725fa
Merge branch 'dev' into master
JordyHers Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions android/app/src/development/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Parental Control</string>
<string name="facebook_app_id">176011390810650</string>
<string name="fb_login_protocol_scheme">fb176011390810650</string>
<string name="facebook_app_id">176011390810650</string>
<string name="fb_login_protocol_scheme">fb176011390810650</string>
<string name="facebook_client_token">7747884d502137dfa05db2bcb1234f77</string>
</resources>
26 changes: 23 additions & 3 deletions android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,27 @@
</intent-filter>
</activity>

<meta-data android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_app_id"/>
<!-- <meta-data android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_app_id"/> -->
<meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/facebook_app_id"/>
<meta-data android:name="com.facebook.sdk.ClientToken" android:value="@string/facebook_client_token"/>

<activity android:name="com.facebook.FacebookActivity"
android:configChanges=
"keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="@string/app_name" />
bhoomikshetty marked this conversation as resolved.
Show resolved Hide resolved
<activity
android:name="com.facebook.CustomTabActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="@string/fb_login_protocol_scheme" />
</intent-filter>
</activity>

<!-- <activity android:name="com.facebook.FacebookActivity"
android:configChanges= "keyboard|keyboardHidden|screenLayout|screenSize|orientation"
android:label="@string/app_name" />
<activity
Expand All @@ -71,14 +89,16 @@

<data android:scheme="@string/fb_login_protocol_scheme" />
</intent-filter>
</activity>
</activity> -->

<meta-data
android:name="com.google.firebase.messaging.default_notification_channel_id"
android:value="high_importance_channel" />
<meta-data
android:name="com.google.android.geo.API_KEY"
android:value="${GOOGLE_MAPS_API_KEY}" />


<!-- Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
<meta-data
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Parental Control</string>
<string name="facebook_app_id">176011390810650</string>
<string name="fb_login_protocol_scheme">fb176011390810650</string>
<string name="facebook_client_token">7747884d502137dfa05db2bcb1234f77</string>
</resources>
2 changes: 1 addition & 1 deletion android/app/src/staging/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Parental Control</string>
<string name="facebook_app_id">176011390810650</string>
<string name="fb_login_protocol_scheme">fb176011390810650</string>
<string name="facebook_client_token">7747884d502137dfa05db2bcb1234f77</string>
</resources>