diff --git a/assets/google_fonts/Lato-Black.ttf b/assets/google_fonts/Lato-Black.ttf new file mode 100644 index 0000000..a4a924f Binary files /dev/null and b/assets/google_fonts/Lato-Black.ttf differ diff --git a/assets/google_fonts/Lato-BlackItalic.ttf b/assets/google_fonts/Lato-BlackItalic.ttf new file mode 100644 index 0000000..d6f8945 Binary files /dev/null and b/assets/google_fonts/Lato-BlackItalic.ttf differ diff --git a/assets/google_fonts/Lato-Bold.ttf b/assets/google_fonts/Lato-Bold.ttf new file mode 100644 index 0000000..b63a14d Binary files /dev/null and b/assets/google_fonts/Lato-Bold.ttf differ diff --git a/assets/google_fonts/Lato-BoldItalic.ttf b/assets/google_fonts/Lato-BoldItalic.ttf new file mode 100644 index 0000000..8f9a50d Binary files /dev/null and b/assets/google_fonts/Lato-BoldItalic.ttf differ diff --git a/assets/google_fonts/Lato-Italic.ttf b/assets/google_fonts/Lato-Italic.ttf new file mode 100644 index 0000000..49e9f2c Binary files /dev/null and b/assets/google_fonts/Lato-Italic.ttf differ diff --git a/assets/google_fonts/Lato-Light.ttf b/assets/google_fonts/Lato-Light.ttf new file mode 100644 index 0000000..9c0a705 Binary files /dev/null and b/assets/google_fonts/Lato-Light.ttf differ diff --git a/assets/google_fonts/Lato-LightItalic.ttf b/assets/google_fonts/Lato-LightItalic.ttf new file mode 100644 index 0000000..53b140b Binary files /dev/null and b/assets/google_fonts/Lato-LightItalic.ttf differ diff --git a/assets/google_fonts/Lato-Regular.ttf b/assets/google_fonts/Lato-Regular.ttf new file mode 100644 index 0000000..33eba8b Binary files /dev/null and b/assets/google_fonts/Lato-Regular.ttf differ diff --git a/assets/google_fonts/Lato-Thin.ttf b/assets/google_fonts/Lato-Thin.ttf new file mode 100644 index 0000000..0c599a0 Binary files /dev/null and b/assets/google_fonts/Lato-Thin.ttf differ diff --git a/assets/google_fonts/Lato-ThinItalic.ttf b/assets/google_fonts/Lato-ThinItalic.ttf new file mode 100644 index 0000000..7db3a8c Binary files /dev/null and b/assets/google_fonts/Lato-ThinItalic.ttf differ diff --git a/assets/google_fonts/OFL.txt b/assets/google_fonts/OFL.txt new file mode 100644 index 0000000..98383e3 --- /dev/null +++ b/assets/google_fonts/OFL.txt @@ -0,0 +1,93 @@ +Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic (team@latofonts.com) with Reserved Font Name "Lato" + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/lib/main.dart b/lib/main.dart index b94f3ea..385b2c3 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,6 @@ //general +import 'package:flutter/foundation.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_redux/flutter_redux.dart'; import 'package:aman_kassa_flutter/shared/app_colors.dart'; @@ -21,6 +23,11 @@ void main() async { //initialize locator await LocatorInjector.setupLocator(); + LicenseRegistry.addLicense(() async* { + final license = await rootBundle.loadString('assets/google_fonts/OFL.txt'); + yield LicenseEntryWithLineBreaks(['google_fonts'], license); + }); + await Redux.init(); runApp(MainApplication()); } diff --git a/pubspec.lock b/pubspec.lock index 5d9b1f1..a91ad99 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -91,7 +91,7 @@ packages: name: equatable url: "https://pub.dartlang.org" source: hosted - version: "1.2.2" + version: "1.2.3" esys_flutter_share: dependency: "direct main" description: @@ -141,7 +141,7 @@ packages: name: get_it url: "https://pub.dartlang.org" source: hosted - version: "4.0.2" + version: "4.0.4" google_fonts: dependency: "direct main" description: @@ -183,7 +183,7 @@ packages: name: logger url: "https://pub.dartlang.org" source: hosted - version: "0.9.1" + version: "0.9.2" mask_text_input_formatter: dependency: "direct main" description: @@ -344,7 +344,7 @@ packages: name: redux url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.0.0+3" redux_persist: dependency: "direct main" description: @@ -379,7 +379,14 @@ packages: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "0.5.7+3" + version: "0.5.8" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.2+1" shared_preferences_macos: dependency: transitive description: @@ -454,7 +461,7 @@ packages: name: synchronized url: "https://pub.dartlang.org" source: hosted - version: "2.2.0+1" + version: "2.2.0+2" term_glyph: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 7418630..e6e1d00 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: aman_kassa_flutter description: A new Flutter project. -version: 1.0.3+23 +version: 1.0.4+24 environment: sdk: '>=2.3.0 <3.0.0' dependencies: @@ -43,6 +43,7 @@ flutter: - assets/images/icon_large.png - assets/lang/en.json - assets/lang/ru.json + - assets/google_fonts/ # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware.