Skip to content

[Gallery] Disallow GoogleFonts http loading #307

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

Merged
merged 2 commits into from
Feb 4, 2020
Merged

[Gallery] Disallow GoogleFonts http loading #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6439bdf
Update pubspec and pubspec.lock
guidezpl Feb 3, 2020
2be63df
Disallow GoogleFonts http loading
guidezpl Feb 3, 2020
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
2 changes: 2 additions & 0 deletions gallery/gallery/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/scheduler.dart' show timeDilation;
import 'package:flutter_localized_locales/flutter_localized_locales.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:gallery/constants.dart';
import 'package:gallery/data/gallery_options.dart';
import 'package:gallery/l10n/gallery_localizations.dart';
Expand All @@ -29,6 +30,7 @@ void setOverrideForDesktop() {

void main() {
setOverrideForDesktop();
GoogleFonts.config.allowHttp = false;
runApp(GalleryApp());
}

Expand Down
16 changes: 8 additions & 8 deletions gallery/gallery/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ packages:
name: flare_dart
url: "https://pub.dartlang.org"
source: hosted
version: "2.3.2"
version: "2.3.3"
flare_flutter:
dependency: "direct main"
description:
Expand Down Expand Up @@ -136,7 +136,7 @@ packages:
name: flutter_localized_locales
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.2"
version: "1.0.3"
flutter_test:
dependency: "direct dev"
description: flutter
Expand All @@ -160,7 +160,7 @@ packages:
name: google_fonts
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.5"
version: "0.3.7"
grinder:
dependency: "direct dev"
description:
Expand Down Expand Up @@ -202,7 +202,7 @@ packages:
name: intl
url: "https://pub.dartlang.org"
source: hosted
version: "0.16.0"
version: "0.16.1"
intl_translation:
dependency: "direct main"
description:
Expand Down Expand Up @@ -272,7 +272,7 @@ packages:
name: path_provider
url: "https://pub.dartlang.org"
source: hosted
version: "1.5.1"
version: "1.6.0"
pedantic:
dependency: transitive
description:
Expand Down Expand Up @@ -335,14 +335,14 @@ packages:
name: shared_preferences
url: "https://pub.dartlang.org"
source: hosted
version: "0.5.6"
version: "0.5.6+1"
shared_preferences_macos:
dependency: transitive
description:
name: shared_preferences_macos
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.1+3"
version: "0.0.1+4"
shared_preferences_platform_interface:
dependency: transitive
description:
Expand All @@ -356,7 +356,7 @@ packages:
name: shared_preferences_web
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.2+2"
version: "0.1.2+3"
shrine_images:
dependency: "direct main"
description:
Expand Down
6 changes: 3 additions & 3 deletions gallery/gallery/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@ dependencies:
intl_translation:
flutter_localized_locales:
cupertino_icons: ^0.1.2
rally_assets: 1.0.0
rally_assets: ^1.0.0
meta:
scoped_model:
shrine_images: ^1.1.2
flare_flutter: ^1.6.5
url_launcher: ^5.1.6
shared_preferences: ^0.5.4+8
collection: ^1.14.0
flutter_gallery_assets: 0.1.9+2
flutter_gallery_assets: ^0.1.9+2
package_info: ^0.4.0+13
google_fonts: ^0.3.5

dev_dependencies:
flutter_test:
sdk: flutter
grinder: ^0.8.0
string_scanner: 1.0.5
string_scanner: ^1.0.5

flutter:
assets:
Expand Down