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.

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

fix: #2291 - removed flawed specific font (back to default fonts) #2657

Merged
merged 1 commit into from
Jul 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
93 changes: 0 additions & 93 deletions packages/smooth_app/assets/plus_jakarta_sans_regular/OFL.txt

This file was deleted.

Binary file not shown.
Binary file not shown.
11 changes: 0 additions & 11 deletions packages/smooth_app/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import 'package:device_preview/device_preview.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/scheduler.dart';
import 'package:flutter/services.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_native_splash/flutter_native_splash.dart';
import 'package:openfoodfacts/personalized_search/product_preferences_selection.dart';
Expand Down Expand Up @@ -33,16 +32,6 @@ import 'package:smooth_app/widgets/smooth_scaffold.dart';
late bool _screenshots;

Future<void> main({final bool screenshots = false}) async {
// Adding google font licenses
LicenseRegistry.addLicense(() async* {
final String license =
await rootBundle.loadString('assets/plus_jakarta_sans_regular/OFL.txt');
yield LicenseEntryWithLineBreaks(
<String>['plus_jakarta_sans_regular'],
license,
);
});

_screenshots = screenshots;
if (_screenshots) {
await _init1();
Expand Down
1 change: 0 additions & 1 deletion packages/smooth_app/lib/themes/smooth_theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ class SmoothTheme {

return ThemeData(
primaryColor: const Color(0xFF341100),
fontFamily: 'PlusJakartaSans',
colorScheme: myColorScheme,
bottomNavigationBarTheme: BottomNavigationBarThemeData(
selectedIconTheme: const IconThemeData(size: 24.0),
Expand Down
8 changes: 0 additions & 8 deletions packages/smooth_app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,6 @@ flutter:
uses-material-design: true
generate: true

fonts:
- family: PlusJakartaSans
fonts:
- asset: assets/plus_jakarta_sans_regular/PlusJakartaSans-Regular.ttf
- asset: assets/plus_jakarta_sans_regular/PlusJakartaSans-Bold.ttf
weight: 700

assets:
- assets/actions/
- assets/app/
Expand All @@ -168,5 +161,4 @@ flutter:
- assets/product/
- assets/ikonate_thin/
- assets/ikonate_bold/
- assets/plus_jakarta_sans_regular/
- assets/icons/visor_icon.svg