diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies new file mode 100644 index 0000000..7742670 --- /dev/null +++ b/.flutter-plugins-dependencies @@ -0,0 +1 @@ +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_webview_plugin","path":"/Users/balvinderz/Downloads/flutter/.pub-cache/git/flutter_webview_plugin-b9dfe40cc6c66f69fe55bd224ccf81110e631094/","dependencies":[]},{"name":"connectivity","path":"/Users/balvinderz/Downloads/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity-0.4.4/","dependencies":[]},{"name":"get_version","path":"/Users/balvinderz/Downloads/flutter/.pub-cache/hosted/pub.dartlang.org/get_version-0.1.0/","dependencies":["package_info"]},{"name":"package_info","path":"/Users/balvinderz/Downloads/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.3/","dependencies":[]},{"name":"path_provider","path":"/Users/balvinderz/Downloads/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.22/","dependencies":[]},{"name":"shared_preferences","path":"/Users/balvinderz/Downloads/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.3+2/","dependencies":[]},{"name":"url_launcher","path":"/Users/balvinderz/Downloads/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.1.0/","dependencies":[]}],"android":[{"name":"flutter_webview_plugin","path":"/Users/balvinderz/Downloads/flutter/.pub-cache/git/flutter_webview_plugin-b9dfe40cc6c66f69fe55bd224ccf81110e631094/","dependencies":[]},{"name":"connectivity","path":"/Users/balvinderz/Downloads/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity-0.4.4/","dependencies":[]},{"name":"get_version","path":"/Users/balvinderz/Downloads/flutter/.pub-cache/hosted/pub.dartlang.org/get_version-0.1.0/","dependencies":["package_info"]},{"name":"package_info","path":"/Users/balvinderz/Downloads/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.3/","dependencies":[]},{"name":"path_provider","path":"/Users/balvinderz/Downloads/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.22/","dependencies":[]},{"name":"shared_preferences","path":"/Users/balvinderz/Downloads/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.5.3+2/","dependencies":[]},{"name":"url_launcher","path":"/Users/balvinderz/Downloads/flutter/.pub-cache/hosted/pub.dartlang.org/url_launcher-5.1.0/","dependencies":[]}],"macos":[{"name":"package_info","path":"/Users/balvinderz/Downloads/flutter/.pub-cache/hosted/pub.dartlang.org/package_info-0.4.3/","dependencies":[]},{"name":"path_provider_macos","path":"/Users/balvinderz/Downloads/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+4/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/Users/balvinderz/Downloads/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/","dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"/Users/balvinderz/Downloads/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-0.0.4+1/","dependencies":[]}],"web":[]},"dependencyGraph":[{"name":"flutter_webview_plugin","dependencies":[]},{"name":"connectivity","dependencies":[]},{"name":"get_version","dependencies":["package_info"]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux","path_provider_windows"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"shared_preferences","dependencies":[]},{"name":"url_launcher","dependencies":[]}],"date_created":"2020-10-30 22:53:23.994149","version":"1.24.0-4.0.pre.56"} \ No newline at end of file diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7fbe898..42068e4 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -9,7 +9,6 @@ @@ -27,6 +26,13 @@ + + diff --git a/android/app/src/main/java/com/example/ofypets_mobile_app/MainActivity.java b/android/app/src/main/java/com/example/ofypets_mobile_app/MainActivity.java index da4a288..4aaa1d3 100644 --- a/android/app/src/main/java/com/example/ofypets_mobile_app/MainActivity.java +++ b/android/app/src/main/java/com/example/ofypets_mobile_app/MainActivity.java @@ -1,13 +1,7 @@ package com.example.ofypets_mobile_app; -import android.os.Bundle; -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; +import io.flutter.embedding.android.FlutterActivity; public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } + } diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index dcd3152..0e8dde8 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -6,5 +6,8 @@ @drawable/launch_background true + #7ED956 diff --git a/android/gradle.properties b/android/gradle.properties index 8bd86f6..38c8d45 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1 +1,4 @@ org.gradle.jvmargs=-Xmx1536M +android.enableR8=true +android.useAndroidX=true +android.enableJetifier=true diff --git a/fonts/RobotoCondensed-Bold.ttf b/fonts/RobotoCondensed-Bold.ttf deleted file mode 100755 index 8c7a08b..0000000 Binary files a/fonts/RobotoCondensed-Bold.ttf and /dev/null differ diff --git a/fonts/RobotoCondensed-Light.ttf b/fonts/RobotoCondensed-Light.ttf deleted file mode 100755 index 67e8408..0000000 Binary files a/fonts/RobotoCondensed-Light.ttf and /dev/null differ diff --git a/fonts/RobotoCondensed-Regular.ttf b/fonts/RobotoCondensed-Regular.ttf old mode 100755 new mode 100644 diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh index 7628e77..01d2902 100755 --- a/ios/Flutter/flutter_export_environment.sh +++ b/ios/Flutter/flutter_export_environment.sh @@ -1,10 +1,15 @@ #!/bin/sh # This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=/Users/sakina/development/flutter" -export "FLUTTER_APPLICATION_PATH=/Users/sakina/development/ofypets/flutter-ecommerce" +export "FLUTTER_ROOT=/Users/balvinderz/Downloads/flutter" +export "FLUTTER_APPLICATION_PATH=/Users/balvinderz/AndroidStudioProjects/flutter-ecommerce" export "FLUTTER_TARGET=lib/main.dart" export "FLUTTER_BUILD_DIR=build" export "SYMROOT=${SOURCE_ROOT}/../build/ios" -export "FLUTTER_FRAMEWORK_DIR=/Users/sakina/development/flutter/bin/cache/artifacts/engine/ios-release" +export "OTHER_LDFLAGS=$(inherited) -framework Flutter" +export "FLUTTER_FRAMEWORK_DIR=/Users/balvinderz/Downloads/flutter/bin/cache/artifacts/engine/ios" export "FLUTTER_BUILD_NAME=1.0.19" export "FLUTTER_BUILD_NUMBER=36" +export "DART_OBFUSCATION=false" +export "TRACK_WIDGET_CREATION=false" +export "TREE_SHAKE_ICONS=false" +export "PACKAGE_CONFIG=.packages" diff --git a/lib/screens/home.dart b/lib/screens/home.dart index 22fa6da..c3828e4 100644 --- a/lib/screens/home.dart +++ b/lib/screens/home.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'package:carousel_slider/carousel_slider.dart'; import 'package:flutter/material.dart'; +import 'package:google_fonts/google_fonts.dart'; import 'package:http/http.dart' as http; import 'package:ofypets_mobile_app/models/category.dart'; import 'package:ofypets_mobile_app/models/option_type.dart'; @@ -124,10 +125,11 @@ class _HomeScreenState extends State { width: 8.0, ), Text('Shop by Category', - style: TextStyle( - fontSize: 14, - fontWeight: FontWeight.normal, - fontFamily: fontFamily)), + style: GoogleFonts.robotoCondensed( + textStyle: TextStyle( + fontSize: 14, + fontWeight: FontWeight.normal, + ))), ], ), ), @@ -194,10 +196,11 @@ class _HomeScreenState extends State { width: 8.0, ), Text('Today\'s Deals', - style: TextStyle( - fontSize: 14, - fontWeight: FontWeight.normal, - fontFamily: fontFamily)), + style: GoogleFonts.robotoCondensed( + textStyle: TextStyle( + fontSize: 14, + fontWeight: FontWeight.normal, + ))), ], ), )) @@ -480,7 +483,7 @@ class _HomeScreenState extends State { 'api/v1/taxonomies?q[name_cont]=Landing_Banner&set=nested') .then((response) { responseBody = json.decode(response.body); - responseBody['taxonomies'][0]['root']['taxons'].forEach((banner) { + responseBody['taxonomies'][0]['root']['taxons']?.forEach((banner) { setState(() { banners.add(BannerImage( imageSlug: banner['meta_title'], imageUrl: banner['icon'])); diff --git a/lib/screens/product_detail.dart b/lib/screens/product_detail.dart index 742b194..8741592 100644 --- a/lib/screens/product_detail.dart +++ b/lib/screens/product_detail.dart @@ -1,4 +1,5 @@ import 'dart:convert'; +import 'package:google_fonts/google_fonts.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; @@ -28,7 +29,9 @@ import 'package:shared_preferences/shared_preferences.dart'; class ProductDetailScreen extends StatefulWidget { final Product product; + ProductDetailScreen(this.product); + @override State createState() { return _ProductDetailScreenState(); @@ -767,14 +770,14 @@ class _ProductDetailScreenState extends State children: [ Padding( padding: const EdgeInsets.only(left: 10.0), - child: Text( - 'By ${selectedProduct.name.split(' ')[0]}', - style: TextStyle( - fontSize: 17, - fontWeight: FontWeight.normal, - color: Colors.green, - fontFamily: fontFamily), - ), + child: Text('By ${selectedProduct.name.split(' ')[0]}', + style: GoogleFonts.robotoCondensed( + textStyle: TextStyle( + fontSize: 17, + fontWeight: FontWeight.normal, + color: Colors.green, + ), + )), ), Row( children: [ @@ -793,11 +796,12 @@ class _ProductDetailScreenState extends State padding: EdgeInsets.all(10), child: Text( selectedProduct.name, - style: TextStyle( - fontSize: 17, - letterSpacing: 0.5, - fontWeight: FontWeight.bold, - fontFamily: fontFamily), + style: GoogleFonts.robotoCondensed( + textStyle: TextStyle( + fontSize: 17, + letterSpacing: 0.5, + fontWeight: FontWeight.bold, + )), textAlign: TextAlign.start, ), ), @@ -809,13 +813,12 @@ class _ProductDetailScreenState extends State ? Container( alignment: Alignment.centerLeft, padding: EdgeInsets.all(10), - child: Text( - 'Size ', - style: TextStyle( - fontSize: 14, - fontFamily: fontFamily, - ), - ), + child: Text('Size ', + style: GoogleFonts.robotoCondensed( + textStyle: TextStyle( + fontSize: 14, + ), + )), ) : Container(), widget.product.hasVariants && @@ -831,7 +834,8 @@ class _ProductDetailScreenState extends State padding: EdgeInsets.all(10), child: Text( 'Quantity ', - style: TextStyle(fontSize: 14, fontFamily: fontFamily), + style: GoogleFonts.robotoCondensed( + textStyle: TextStyle(fontSize: 14)), ), ) : Container(), @@ -1131,13 +1135,12 @@ class _ProductDetailScreenState extends State Container( alignment: Alignment.centerLeft, padding: EdgeInsets.all(10), - child: Text( - key, - style: TextStyle( - fontSize: 17, - fontFamily: fontFamily, - ), - ), + child: Text(key, + style: GoogleFonts.robotoCondensed( + textStyle: TextStyle( + fontSize: 17, + ), + )), ), Container( alignment: Alignment.centerLeft, @@ -1152,12 +1155,13 @@ class _ProductDetailScreenState extends State decoration: TextDecoration.lineThrough)), TextSpan(text: ' '), TextSpan( - text: value, - style: TextStyle( - fontSize: 18, - color: Colors.red, - fontFamily: fontFamily, - fontWeight: FontWeight.bold)), + text: value, + style: GoogleFonts.robotoCondensed( + textStyle: TextStyle( + fontSize: 18, + color: Colors.red, + fontWeight: FontWeight.bold)), + ) ]), ) : discount @@ -1170,21 +1174,21 @@ class _ProductDetailScreenState extends State )), TextSpan( text: value, - style: TextStyle( - fontSize: 18, - color: Colors.red, - fontFamily: fontFamily, - fontWeight: FontWeight.bold)), + style: GoogleFonts.robotoCondensed( + textStyle: TextStyle( + fontSize: 18, + color: Colors.red, + fontWeight: FontWeight.bold))), ]), ) : Text( value, - style: TextStyle( + style: GoogleFonts.robotoCondensed( + textStyle: TextStyle( fontSize: 18, color: Colors.red, fontWeight: FontWeight.bold, - fontFamily: fontFamily, - ), + )), ), ), ], diff --git a/lib/utils/constants.dart b/lib/utils/constants.dart index da2a3ec..8cad836 100644 --- a/lib/utils/constants.dart +++ b/lib/utils/constants.dart @@ -12,7 +12,8 @@ final int ONE = 1; final int ZERO = 0; final int TWENTY = 20; -final String privacyPolicy = 'By placing this order, you agree to Ofypets.com’\s Privacy Policy and Terms of Use.'; +final String privacyPolicy = + 'By placing this order, you agree to Ofypets.com’\s Privacy Policy and Terms of Use.'; final returnPolicyHeading1 = 'Return Policy'; final String retunPolicyText1 = @@ -41,4 +42,3 @@ final String returnPolicyText8 = final String returnPolicyHeading9 = 'Shipping'; final String returnPolicyText9 = 'To return your product, you should mail your product to: 59 MN Nagar, Kolathur, Chennai, Tamil Nadu, INDIA 600099\n\nYou will be responsible for paying for your own shipping costs for returning your item. Shipping costs are non-refundable. If you receive a refund, the cost of return shipping will be deducted from your refund.\n\nDepending on where you live, the time it may take for your exchanged product to reach you, may vary. \n\nIf you are shipping an item over 1000 Rs, you should consider using a trackable shipping service or purchasing shipping insurance. We don’t guarantee that we will receive your returned item.'; -final fontFamily = 'RobotoCondensed'; diff --git a/lib/utils/drawer_homescreen.dart b/lib/utils/drawer_homescreen.dart index fa26dda..f313044 100644 --- a/lib/utils/drawer_homescreen.dart +++ b/lib/utils/drawer_homescreen.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; +import 'package:google_fonts/google_fonts.dart'; import 'package:http/http.dart' as http; import 'package:ofypets_mobile_app/scoped-models/main.dart'; import 'package:ofypets_mobile_app/screens/account.dart'; @@ -9,6 +10,7 @@ import 'package:ofypets_mobile_app/screens/favorites.dart'; import 'package:ofypets_mobile_app/screens/order_history.dart'; import 'package:ofypets_mobile_app/screens/retun_policy.dart'; import 'package:ofypets_mobile_app/utils/constants.dart'; +import 'package:package_info/package_info.dart'; import 'package:scoped_model/scoped_model.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -24,10 +26,14 @@ class HomeDrawer extends StatefulWidget { class _HomeDrawer extends State { int favCount = 0; + PackageInfo packageInfo ; + @override void initState() { super.initState(); getFavoritesCount(); + getAppVersion(); + } getFavoritesCount() async { @@ -41,7 +47,7 @@ class _HomeDrawer extends State { headers: headers) .then((response) { responseBody = json.decode(response.body); - responseBody['data'].forEach((favoriteObj) { + responseBody['data']?.forEach((favoriteObj) { setState(() { favCount++; }); @@ -317,7 +323,7 @@ class _HomeDrawer extends State { fontFamily: 'HolyFat', fontSize: 65, color: Colors.white), ), Text( - '1.0.0', + packageInfo == null ? '' : packageInfo.version, style: TextStyle(color: Colors.white, fontWeight: FontWeight.w300), ), @@ -394,6 +400,15 @@ class _HomeDrawer extends State { ), ); } + + Future getAppVersion() async { + packageInfo = await PackageInfo.fromPlatform(); + + setState(() { + + }); + + } } _sendMail(String email) async { diff --git a/pubspec.lock b/pubspec.lock index 6ce6330..624ca61 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -21,7 +21,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.5.0-nullsafety.1" back_button_interceptor: dependency: "direct main" description: @@ -35,7 +35,7 @@ packages: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "2.1.0-nullsafety.1" carousel_slider: dependency: "direct main" description: @@ -43,20 +43,34 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.3.0" + characters: + dependency: transitive + description: + name: characters + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0-nullsafety.3" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.2.0-nullsafety.1" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0-nullsafety.1" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.11" + version: "1.15.0-nullsafety.3" connectivity: dependency: "direct main" description: @@ -77,7 +91,7 @@ packages: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "2.0.6" + version: "2.1.5" csslib: dependency: transitive description: @@ -92,13 +106,34 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.2" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0-nullsafety.1" + ffi: + dependency: transitive + description: + name: ffi + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" + file: + dependency: transitive + description: + name: file + url: "https://pub.dartlang.org" + source: hosted + version: "5.2.1" flushbar: dependency: "direct main" description: name: flushbar url: "https://pub.dartlang.org" source: hosted - version: "1.9.0" + version: "1.10.4" flutter: dependency: "direct main" description: flutter @@ -160,6 +195,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.0" + google_fonts: + dependency: "direct main" + description: + name: google_fonts + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.1" html: dependency: transitive description: @@ -201,28 +243,63 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.5" + version: "0.12.10-nullsafety.1" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.7" + version: "1.3.0-nullsafety.4" package_info: - dependency: transitive + dependency: "direct main" description: name: package_info url: "https://pub.dartlang.org" source: hosted - version: "0.4.0+4" + version: "0.4.3" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.6.4" + version: "1.8.0-nullsafety.1" + path_provider: + dependency: transitive + description: + name: path_provider + url: "https://pub.dartlang.org" + source: hosted + version: "1.6.22" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.1+2" + path_provider_macos: + dependency: transitive + description: + name: path_provider_macos + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.4+4" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.4+1" pedantic: dependency: transitive description: @@ -237,13 +314,27 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.2.1" - quiver: + platform: + dependency: transitive + description: + name: platform + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.1" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" + process: dependency: transitive description: - name: quiver + name: process url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "3.0.13" scoped_model: dependency: "direct main" description: @@ -269,49 +360,49 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.5.5" + version: "1.8.0-nullsafety.2" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.3" + version: "1.10.0-nullsafety.4" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.0-nullsafety.1" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "1.1.0-nullsafety.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0-nullsafety.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.5" + version: "0.2.19-nullsafety.2" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.3.0-nullsafety.3" url_launcher: dependency: "direct main" description: @@ -325,7 +416,21 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.1.0-nullsafety.3" + win32: + dependency: transitive + description: + name: win32 + url: "https://pub.dartlang.org" + source: hosted + version: "1.7.3" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.2" xml: dependency: transitive description: @@ -341,5 +446,5 @@ packages: source: hosted version: "2.1.16" sdks: - dart: ">=2.2.2 <3.0.0" - flutter: ">=1.5.0 <2.0.0" + dart: ">=2.10.0-110 <=2.11.0-256.0.dev" + flutter: ">=1.17.0 <2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 31f2f8a..afee63b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -27,10 +27,11 @@ dependencies: shared_preferences: ^0.5.2+1 url_launcher: ^5.1.0 connectivity: ^0.4.4 - flushbar: ^1.8.2 + flushbar: ^1.10.2 get_it: ^1.0.3+2 back_button_interceptor: ^4.1.1 - + google_fonts: ^1.1.1 + package_info: ^0.4.3 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^0.1.2 @@ -84,12 +85,6 @@ flutter: fonts: - asset: fonts/Holyfat.ttf - asset: fonts/RobotoCondensed-Regular.ttf - - family: RobotoCondensed - fonts: - - asset: fonts/RobotoCondensed-Regular.ttf - - asset: fonts/RobotoCondensed-Light.ttf - - asset: fonts/RobotoCondensed-Bold.ttf - # - asset: fonts/Schyler-Italic.ttf # style: italic # - family: Trajan Pro