diff --git a/.gitignore b/.gitignore index 85ad862..5a203a2 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,7 @@ .pub-cache/ .pub/ /build/ +assets/secrets.json # Web related lib/generated_plugin_registrant.dart diff --git a/lib/app/screens/home_screen.dart b/lib/app/screens/home_screen.dart index 077aa42..3af19ba 100644 --- a/lib/app/screens/home_screen.dart +++ b/lib/app/screens/home_screen.dart @@ -70,18 +70,18 @@ class _HomeScreenState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( - height: setContainerHeight(290), + height: setContainerHeight(307), decoration: BoxDecoration( color: isThemeChange.mTheme == false ? Colors.white - : Colors.grey[900], + : Colors.grey.shade900, borderRadius: const BorderRadius.only( bottomLeft: Radius.circular(33), bottomRight: Radius.circular(33), ), ), child: Container( - height: setContainerHeight(290), + height: setContainerHeight(307), child: Column( children: [ Container( diff --git a/lib/custom_theme.dart b/lib/custom_theme.dart index 9812c39..e4bbe9e 100644 --- a/lib/custom_theme.dart +++ b/lib/custom_theme.dart @@ -1,70 +1,77 @@ import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:wp_blog_app/const_values.dart'; ThemeData buildLightTheme() => ThemeData.light().copyWith( cardColor: Colors.white, - backgroundColor: Colors.grey[100], - accentColor: Colors.grey[800], + hoverColor: Colors.grey[800], scaffoldBackgroundColor: Colors.white, - iconTheme: IconThemeData( + iconTheme: const IconThemeData( color: defaultBlack, ), - cardTheme: CardTheme( + cardTheme: const CardTheme( color: Colors.white, ), - dialogTheme: DialogTheme( + dialogTheme: const DialogTheme( backgroundColor: defaultWhite, ), dividerColor: defaultWhite, appBarTheme: AppBarTheme( centerTitle: true, - brightness: Brightness.dark, elevation: 0.0, color: defaultWhite, - textTheme: TextTheme( - headline6: TextStyle( + iconTheme: IconThemeData( + color: Colors.grey[900], + ), systemOverlayStyle: SystemUiOverlayStyle.light, toolbarTextStyle: const TextTheme( + titleLarge: TextStyle( fontSize: 20, fontWeight: FontWeight.bold, color: Colors.black, ), - ), - iconTheme: IconThemeData( - color: Colors.grey[900], - ), + ).bodyMedium, titleTextStyle: const TextTheme( + titleLarge: TextStyle( + fontSize: 20, + fontWeight: FontWeight.bold, + color: Colors.black, + ), + ).titleLarge, ), - textTheme: Typography.blackCupertino, + textTheme: Typography.blackCupertino, colorScheme: ColorScheme(primary: Colors.grey.shade50, brightness: Brightness.dark, onPrimary: Colors.grey.shade50, secondary: Colors.black, onSecondary: Colors.black12, error: Colors.red.shade50, onError:Colors.red.shade100, onBackground: Colors.blueGrey, surface: Colors.green.shade100, onSurface: Colors.green.shade50, background: Colors.grey.shade900), ); ThemeData buildDarkTheme() => ThemeData.dark().copyWith( cardColor: Colors.grey[850], - backgroundColor: Colors.grey[900], - accentColor: Colors.grey[400], + hoverColor: Colors.grey[400], scaffoldBackgroundColor: darkColor, dividerColor: defaultBlack, - iconTheme: IconThemeData( + iconTheme: const IconThemeData( color: defaultWhite, ), cardTheme: CardTheme( color: cardColor, ), - dialogTheme: DialogTheme( + dialogTheme: const DialogTheme( backgroundColor: defaultBlack, ), appBarTheme: AppBarTheme( centerTitle: true, - brightness: Brightness.dark, elevation: 0.0, - textTheme: TextTheme( - headline6: TextStyle( + color: Colors.grey[900], + iconTheme: IconThemeData( + color: Colors.grey[400], + ), toolbarTextStyle: const TextTheme( + titleLarge: TextStyle( fontSize: 20, fontWeight: FontWeight.bold, color: Colors.white, ), - ), - color: Colors.grey[900], - iconTheme: IconThemeData( - color: Colors.grey[400], - ), + ).bodyMedium, titleTextStyle: const TextTheme( + titleLarge: TextStyle( + fontSize: 20, + fontWeight: FontWeight.bold, + color: Colors.white, + ), + ).titleLarge, systemOverlayStyle: SystemUiOverlayStyle.light, ), - textTheme: Typography.whiteCupertino, + textTheme: Typography.whiteCupertino, colorScheme: ColorScheme(primary: Colors.grey.shade50, brightness: Brightness.dark, onPrimary: Colors.grey.shade50, secondary: Colors.black, onSecondary: Colors.black12, error: Colors.red.shade50, onError:Colors.red.shade100, onBackground: Colors.blueGrey, surface: Colors.green.shade100, onSurface: Colors.green.shade50, background: Colors.grey.shade900), ); diff --git a/lib/models/posts.g.dart b/lib/models/posts.g.dart index 76b21ff..06395f8 100644 --- a/lib/models/posts.g.dart +++ b/lib/models/posts.g.dart @@ -17,11 +17,11 @@ class PostsAdapter extends TypeAdapter { for (var i = 0; i < numOfFields; i++) reader.readByte(): reader.read(), }; return Posts( - title: fields[1] as String, - image: fields[2] as String, - contents: fields[3] as String, - time: fields[4] as String, - authur: fields[5] as String, + title: fields[1]==null?"Error":fields[1] as String, + image: fields[2]==null?"":fields[2] as String, + contents: fields[3]==null?"":fields[3] as String, + time: fields[4]==null?"":fields[4] as String, + authur: fields[5]==null?"admin":fields[5] as String, )..isDark = fields[0] as bool; } diff --git a/lib/size_config.dart b/lib/size_config.dart index 6c04f6c..40af9bd 100644 --- a/lib/size_config.dart +++ b/lib/size_config.dart @@ -1,16 +1,16 @@ -import 'package:flutter/rendering.dart'; +import 'package:flutter/foundation.dart'; import 'package:flutter/widgets.dart'; class SizeConfig { - static double? _screenWidth; - static double? _screenHeight; - static double? _blockWidth = 0; - static double? _blockHeight = 0; + static double? _screenWidth=392.7; + static double? _screenHeight=309.2; + static double? _blockWidth = 30; + static double? _blockHeight = 30; - static double? textMultiplier; - static double? imageSizeMultiplier; - static double? heightMultiplier; - static double? widthMultiplier; + static double? textMultiplier=1; + static double? imageSizeMultiplier=1; + static double? heightMultiplier=1; + static double? widthMultiplier=1; static bool isPortrait = true; static bool isMobilePortrait = false; @@ -38,7 +38,9 @@ class SizeConfig { heightMultiplier = _blockHeight; widthMultiplier = _blockWidth; - print(_blockWidth); - print(_blockHeight); + if (kDebugMode) { + print(_blockWidth); + print(_blockHeight); + } } } diff --git a/lib/wp_api.dart b/lib/wp_api.dart index 6f2d0b2..1dd6b87 100644 --- a/lib/wp_api.dart +++ b/lib/wp_api.dart @@ -1,4 +1,5 @@ -import 'package:flutter/material.dart'; + +import 'package:flutter/foundation.dart'; import 'package:html/parser.dart'; import 'package:http/http.dart' as http; import 'dart:convert'; @@ -22,10 +23,10 @@ class WpApi { List posts = []; try { var response = await http.get( - Uri.parse("$api/posts?_embed&per_page=20"), + Uri.parse("${api}posts?_embed&per_page=20"), headers: headers, ); - + if (response.statusCode == 200) { var convertDataToJson = json.decode(response.body); convertDataToJson.forEach((post) { String title = _parseHtmlString(post['title']['rendered']); @@ -40,88 +41,100 @@ class WpApi { var imageUrl = post['_embedded']['wp:featuredmedia'] != null ? post['_embedded']['wp:featuredmedia'][0]['source_url'] - : ''; + : 'https://www.naijatechguy.com/wp-content/uploads/2019/02/ntg2019-1.png'; posts.add(Posts( title: title, image: imageUrl, contents: content, time: time, + authur: "admin" )); }); + } else { + if (kDebugMode) { + print("posts?_embed&per_page=20 web service error code:${response.statusCode}"); + } + } } catch (e) { - print(e.toString()); - throw (e); + if (kDebugMode) { + print(e.toString()); + } + rethrow; } return posts; } - // call for all Game articles + // call for all Game articles 467 Future> fetchListPosts() async { var response = await http.get( - Uri.parse(listApi + "posts?_embed&categories=467"), + Uri.parse("${listApi}posts?_embed&categories=467"), headers: headers, ); var convertDataToJson = jsonDecode(response.body); List posts = []; - + if (response.statusCode == 200) { convertDataToJson.forEach((post) { String title = _parseHtmlString(post['title']['rendered']); var content = _parseHtmlString(post['content']['rendered']); var time = post['date']; - var imageUrl = post['_embedded']['wp:featuredmedia'] != null - ? post['_embedded']['wp:featuredmedia'][0]['source_url'] - : Image.network( - 'assets/images/img_error.jpg', - fit: BoxFit.cover, - width: 100, - height: 90, - ); + var imageUrl; + if (post['_embedded']['wp:featuredmedia'] != null) { + imageUrl = post['_embedded']['wp:featuredmedia'][0]['source_url']; + } else { + imageUrl = "https://www.naijatechguy.com/wp-content/uploads/2019/02/ntg2019-1.png"; + } posts.add( - Posts(title: title, image: imageUrl, contents: content, time: time)); + Posts(title: title, image: imageUrl, contents: content, time: time,authur:"admin")); }); - + } else { + if (kDebugMode) { + print("posts?_embed&categories=467 web service error code:${response.statusCode}"); + } + } return posts; } // api call for categories sections Future> fetchOtherCategories(int cartCode) async { var response = await http.get( - Uri.parse(listApi + "posts?_embed&categories=$cartCode"), + Uri.parse("${listApi}posts?_embed&categories=$cartCode"), headers: headers, ); - - var convertDataToJson = jsonDecode(response.body); - List posts = []; + if (response.statusCode == 200) { + var convertDataToJson = jsonDecode(response.body); - convertDataToJson.forEach((post) { - String title = _parseHtmlString(post['title']['rendered']); + convertDataToJson.forEach((post) async { + String title = _parseHtmlString(post['title']['rendered']); - var content = _parseHtmlString(post['content']['rendered']); - var time = post['date']; + var content = _parseHtmlString(post['content']['rendered']); + var time = post['date']; - var imageUrl = post['_embedded']['wp:featuredmedia'] != null - ? post['_embedded']['wp:featuredmedia'][0]['source_url'] - : Image.network( - 'assets/images/img_error.jpg', - fit: BoxFit.cover, - width: 100, - height: 90, - ); + var imageUrl; + if (post['_embedded']['wp:featuredmedia'] != null) { + imageUrl = post['_embedded']['wp:featuredmedia'][0]['source_url']; + } else { + imageUrl = "https://www.naijatechguy.com/wp-content/uploads/2019/02/ntg2019-1.png"; + } - // var time = post['date']; + // var time = post['date']; - posts.add( - Posts(title: title, image: imageUrl, contents: content, time: time)); - }); + posts.add( + Posts(title: title, image: imageUrl, contents: content, time: time,authur:"admin")); + }); + } else { + if (kDebugMode) { + print("posts?_embed&categories=$cartCode web service error code:${response.statusCode}"); + } + } - return posts; + return posts; } } diff --git a/pubspec.lock b/pubspec.lock index 7247b60..31fd38d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,240 +5,266 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - url: "https://pub.dartlang.org" + sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a + url: "https://pub.dev" source: hosted - version: "40.0.0" + version: "61.0.0" analyzer: dependency: transitive description: name: analyzer - url: "https://pub.dartlang.org" + sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562 + url: "https://pub.dev" source: hosted - version: "4.1.0" + version: "5.13.0" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.4.2" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.8.2" + version: "2.11.0" auto_size_text_pk: dependency: "direct main" description: name: auto_size_text_pk - url: "https://pub.dartlang.org" + sha256: ced55de5336fa7f438c1f5a9aa234e25d7a120c1d40d376a7cdc2af28cdb6995 + url: "https://pub.dev" source: hosted version: "3.0.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" bottom_navy_bar: dependency: "direct main" description: name: bottom_navy_bar - url: "https://pub.dartlang.org" + sha256: b30d9a566909b9a56f366b9e8abe0c24ef8939e4b464d1cad5ded6a1e2dcfca1 + url: "https://pub.dev" source: hosted version: "6.0.0" build: dependency: transitive description: name: build - url: "https://pub.dartlang.org" + sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" + url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.4.1" build_config: dependency: transitive description: name: build_config - url: "https://pub.dartlang.org" + sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.1" build_daemon: dependency: transitive description: name: build_daemon - url: "https://pub.dartlang.org" + sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65" + url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "4.0.0" build_resolvers: dependency: transitive description: name: build_resolvers - url: "https://pub.dartlang.org" + sha256: "6c4dd11d05d056e76320b828a1db0fc01ccd376922526f8e9d6c796a5adbac20" + url: "https://pub.dev" source: hosted - version: "2.0.9" + version: "2.2.1" build_runner: dependency: "direct dev" description: name: build_runner - url: "https://pub.dartlang.org" + sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b" + url: "https://pub.dev" source: hosted - version: "2.1.11" + version: "2.4.6" build_runner_core: dependency: transitive description: name: build_runner_core - url: "https://pub.dartlang.org" + sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41" + url: "https://pub.dev" source: hosted - version: "7.2.3" + version: "7.2.10" built_collection: dependency: transitive description: name: built_collection - url: "https://pub.dartlang.org" + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" source: hosted version: "5.1.1" built_value: dependency: transitive description: name: built_value - url: "https://pub.dartlang.org" + sha256: "598a2a682e2a7a90f08ba39c0aaa9374c5112340f0a2e275f61b59389543d166" + url: "https://pub.dev" source: hosted - version: "8.3.2" + version: "8.6.1" cached_network_image: dependency: "direct main" description: name: cached_network_image - url: "https://pub.dartlang.org" + sha256: fd3d0dc1d451f9a252b32d95d3f0c3c487bc41a75eba2e6097cb0b9c71491b15 + url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.3" cached_network_image_platform_interface: dependency: transitive description: name: cached_network_image_platform_interface - url: "https://pub.dartlang.org" + sha256: bb2b8403b4ccdc60ef5f25c70dead1f3d32d24b9d6117cfc087f496b178594a7 + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "2.0.0" cached_network_image_web: dependency: transitive description: name: cached_network_image_web - url: "https://pub.dartlang.org" + sha256: b8eb814ebfcb4dea049680f8c1ffb2df399e4d03bf7a352c775e26fa06e02fa0 + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.2" change_app_package_name: dependency: "direct dev" description: name: change_app_package_name - url: "https://pub.dartlang.org" + sha256: f9ebaf68a4b5a68c581492579bb68273c523ef325fbf9ce2f1b57fb136ad023b + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.0" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "1.3.0" checked_yaml: dependency: transitive description: name: checked_yaml - url: "https://pub.dartlang.org" + sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff + url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.3" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" code_builder: dependency: transitive description: name: code_builder - url: "https://pub.dartlang.org" + sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189" + url: "https://pub.dev" source: hosted - version: "4.1.0" + version: "4.5.0" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.1" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.1.1" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" csslib: dependency: transitive description: name: csslib - url: "https://pub.dartlang.org" + sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb" + url: "https://pub.dev" source: hosted - version: "0.17.1" + version: "1.0.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.5" dart_style: dependency: transitive description: name: dart_style - url: "https://pub.dartlang.org" + sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55" + url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.2" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.3.1" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99 + url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "2.0.2" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" source: hosted - version: "6.1.2" + version: "6.1.4" fixnum: dependency: transitive description: name: fixnum - url: "https://pub.dartlang.org" + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.1.0" flutter: dependency: "direct main" description: flutter @@ -248,37 +274,42 @@ packages: dependency: transitive description: name: flutter_blurhash - url: "https://pub.dartlang.org" + sha256: "05001537bd3fac7644fa6558b09ec8c0a3f2eba78c0765f88912882b1331a5c6" + url: "https://pub.dev" source: hosted version: "0.7.0" flutter_cache_manager: dependency: transitive description: name: flutter_cache_manager - url: "https://pub.dartlang.org" + sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba" + url: "https://pub.dev" source: hosted - version: "3.3.0" + version: "3.3.1" flutter_device_type: dependency: "direct main" description: name: flutter_device_type - url: "https://pub.dartlang.org" + sha256: "8f41f2271733f615957924dd1dcd10ef90848bb86b603ae20578f91591b900f3" + url: "https://pub.dev" source: hosted version: "0.4.0" flutter_lints: dependency: "direct dev" description: name: flutter_lints - url: "https://pub.dartlang.org" + sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4" + url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "2.0.2" flutter_screenutil: dependency: "direct main" description: name: flutter_screenutil - url: "https://pub.dartlang.org" + sha256: "1b61f8c4cbf965104b6ca7160880ff1af6755aad7fec70b58444245132453745" + url: "https://pub.dev" source: hosted - version: "5.5.3+2" + version: "5.8.4" flutter_test: dependency: "direct dev" description: flutter @@ -293,387 +324,410 @@ packages: dependency: "direct main" description: name: fluttertoast - url: "https://pub.dartlang.org" + sha256: "474f7d506230897a3cd28c965ec21c5328ae5605fc9c400cd330e9e9d6ac175c" + url: "https://pub.dev" source: hosted - version: "8.0.9" + version: "8.2.2" frontend_server_client: dependency: transitive description: name: frontend_server_client - url: "https://pub.dartlang.org" + sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "3.2.0" glob: dependency: transitive description: name: glob - url: "https://pub.dartlang.org" + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.2" graphs: dependency: transitive description: name: graphs - url: "https://pub.dartlang.org" + sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.3.1" hive: dependency: "direct main" description: name: hive - url: "https://pub.dartlang.org" + sha256: "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941" + url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.3" hive_flutter: dependency: "direct main" description: name: hive_flutter - url: "https://pub.dartlang.org" + sha256: dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc + url: "https://pub.dev" source: hosted version: "1.1.0" hive_generator: dependency: "direct dev" description: name: hive_generator - url: "https://pub.dartlang.org" + sha256: "65998cc4d2cd9680a3d9709d893d2f6bb15e6c1f92626c3f1fa650b4b3281521" + url: "https://pub.dev" source: hosted - version: "1.1.3" + version: "2.0.0" html: dependency: "direct main" description: name: html - url: "https://pub.dartlang.org" + sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" + url: "https://pub.dev" source: hosted - version: "0.15.0" + version: "0.15.4" http: dependency: "direct main" description: name: http - url: "https://pub.dartlang.org" + sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + url: "https://pub.dev" source: hosted - version: "0.13.4" + version: "1.1.0" http_multi_server: dependency: transitive description: name: http_multi_server - url: "https://pub.dartlang.org" + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.1" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "4.0.2" intl: dependency: "direct main" description: name: intl - url: "https://pub.dartlang.org" + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.18.1" io: dependency: transitive description: name: io - url: "https://pub.dartlang.org" + sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.0.4" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.7" json_annotation: dependency: transitive description: name: json_annotation - url: "https://pub.dartlang.org" + sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.8.1" launch_review: dependency: "direct main" description: name: launch_review - url: "https://pub.dartlang.org" + sha256: "04cdaf752033cefd53bc0fa9c22105801ef53791a93d8b6cdd00fcb3c1c1604b" + url: "https://pub.dev" source: hosted version: "3.0.1" lints: dependency: transitive description: name: lints - url: "https://pub.dartlang.org" + sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.1" logging: dependency: transitive description: name: logging - url: "https://pub.dartlang.org" + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.2.0" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + url: "https://pub.dev" source: hosted - version: "0.12.11" + version: "0.12.15" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + url: "https://pub.dev" source: hosted - version: "0.1.4" + version: "0.2.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.9.1" mime: dependency: transitive description: name: mime - url: "https://pub.dartlang.org" + sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + url: "https://pub.dev" source: hosted - version: "1.0.2" + version: "1.0.4" nested: dependency: transitive description: name: nested - url: "https://pub.dartlang.org" + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" source: hosted version: "1.0.0" octo_image: dependency: transitive description: name: octo_image - url: "https://pub.dartlang.org" + sha256: "107f3ed1330006a3bea63615e81cf637433f5135a52466c7caa0e7152bca9143" + url: "https://pub.dev" source: hosted version: "1.0.2" package_config: dependency: transitive description: name: package_config - url: "https://pub.dartlang.org" + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.8.3" path_provider: dependency: "direct main" description: name: path_provider - url: "https://pub.dartlang.org" + sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2" + url: "https://pub.dev" source: hosted - version: "2.0.10" + version: "2.0.15" path_provider_android: dependency: transitive description: name: path_provider_android - url: "https://pub.dartlang.org" + sha256: "2cec049d282c7f13c594b4a73976b0b4f2d7a1838a6dd5aaf7bd9719196bee86" + url: "https://pub.dev" source: hosted - version: "2.0.14" - path_provider_ios: + version: "2.0.27" + path_provider_foundation: dependency: transitive description: - name: path_provider_ios - url: "https://pub.dartlang.org" + name: path_provider_foundation + sha256: "916731ccbdce44d545414dd9961f26ba5fbaa74bcbb55237d8e65a623a8c7297" + url: "https://pub.dev" source: hosted - version: "2.0.9" + version: "2.2.4" path_provider_linux: dependency: transitive description: name: path_provider_linux - url: "https://pub.dartlang.org" + sha256: ffbb8cc9ed2c9ec0e4b7a541e56fd79b138e8f47d2fb86815f15358a349b3b57 + url: "https://pub.dev" source: hosted - version: "2.1.6" - path_provider_macos: - dependency: transitive - description: - name: path_provider_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.6" + version: "2.1.11" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - url: "https://pub.dartlang.org" + sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec" + url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "2.0.6" path_provider_windows: dependency: transitive description: name: path_provider_windows - url: "https://pub.dartlang.org" + sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96" + url: "https://pub.dev" source: hosted - version: "2.0.6" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.11.1" + version: "2.1.7" platform: dependency: transitive description: name: platform - url: "https://pub.dartlang.org" + sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + url: "https://pub.dev" source: hosted version: "3.1.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" pool: dependency: transitive description: name: pool - url: "https://pub.dartlang.org" + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" source: hosted - version: "1.5.0" - process: - dependency: transitive - description: - name: process - url: "https://pub.dartlang.org" - source: hosted - version: "4.2.4" + version: "1.5.1" provider: dependency: "direct main" description: name: provider - url: "https://pub.dartlang.org" + sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f + url: "https://pub.dev" source: hosted - version: "6.0.3" + version: "6.0.5" pub_semver: dependency: transitive description: name: pub_semver - url: "https://pub.dartlang.org" + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.4" pubspec_parse: dependency: transitive description: name: pubspec_parse - url: "https://pub.dartlang.org" + sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367 + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.3" pull_to_refresh: dependency: "direct main" description: name: pull_to_refresh - url: "https://pub.dartlang.org" + sha256: bbadd5a931837b57739cf08736bea63167e284e71fb23b218c8c9a6e042aad12 + url: "https://pub.dev" source: hosted version: "2.0.0" rxdart: dependency: transitive description: name: rxdart - url: "https://pub.dartlang.org" + sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb" + url: "https://pub.dev" source: hosted - version: "0.27.3" + version: "0.27.7" share: dependency: "direct main" description: name: share - url: "https://pub.dartlang.org" + sha256: "97e6403f564ed1051a01534c2fc919cb6e40ea55e60a18ec23cee6e0ce19f4be" + url: "https://pub.dev" source: hosted version: "2.0.4" shared_preferences: dependency: "direct main" description: name: shared_preferences - url: "https://pub.dartlang.org" + sha256: "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1" + url: "https://pub.dev" source: hosted - version: "2.0.15" + version: "2.2.0" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - url: "https://pub.dartlang.org" + sha256: fe8401ec5b6dcd739a0fe9588802069e608c3fdbfd3c3c93e546cf2f90438076 + url: "https://pub.dev" source: hosted - version: "2.0.12" - shared_preferences_ios: + version: "2.2.0" + shared_preferences_foundation: dependency: transitive description: - name: shared_preferences_ios - url: "https://pub.dartlang.org" + name: shared_preferences_foundation + sha256: f39696b83e844923b642ce9dd4bd31736c17e697f6731a5adf445b1274cf3cd4 + url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.3.2" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.1" - shared_preferences_macos: - dependency: transitive - description: - name: shared_preferences_macos - url: "https://pub.dartlang.org" + sha256: "71d6806d1449b0a9d4e85e0c7a917771e672a3d5dc61149cc9fac871115018e1" + url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "2.3.0" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - url: "https://pub.dartlang.org" + sha256: "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1" + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.3.0" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - url: "https://pub.dartlang.org" + sha256: "7347b194fb0bbeb4058e6a4e87ee70350b6b2b90f8ac5f8bd5b3a01548f6d33a" + url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "2.2.0" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - url: "https://pub.dartlang.org" + sha256: f95e6a43162bce43c9c3405f3eb6f39e5b5d11f65fab19196cf8225e2777624d + url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.3.0" shelf: dependency: transitive description: name: shelf - url: "https://pub.dartlang.org" + sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.1" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - url: "https://pub.dartlang.org" + sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.0.4" shimmer: dependency: "direct main" description: name: shimmer - url: "https://pub.dartlang.org" + sha256: "5f88c883a22e9f9f299e5ba0e4f7e6054857224976a5d9f839d4ebdc94a14ac9" + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "3.0.0" sky_engine: dependency: transitive description: flutter @@ -683,149 +737,170 @@ packages: dependency: transitive description: name: source_gen - url: "https://pub.dartlang.org" + sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16 + url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.4.0" source_helper: dependency: transitive description: name: source_helper - url: "https://pub.dartlang.org" + sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd" + url: "https://pub.dev" source: hosted - version: "1.3.2" + version: "1.3.4" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.9.1" sqflite: dependency: transitive description: name: sqflite - url: "https://pub.dartlang.org" + sha256: b4d6710e1200e96845747e37338ea8a819a12b51689a3bcf31eff0003b37a0b9 + url: "https://pub.dev" source: hosted - version: "2.0.2+1" + version: "2.2.8+4" sqflite_common: dependency: transitive description: name: sqflite_common - url: "https://pub.dartlang.org" + sha256: "8f7603f3f8f126740bc55c4ca2d1027aab4b74a1267a3e31ce51fe40e3b65b8f" + url: "https://pub.dev" source: hosted - version: "2.2.1+1" + version: "2.4.5+1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" stream_transform: dependency: transitive description: name: stream_transform - url: "https://pub.dartlang.org" + sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" synchronized: dependency: transitive description: name: synchronized - url: "https://pub.dartlang.org" + sha256: "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60" + url: "https://pub.dev" source: hosted - version: "3.0.0+2" + version: "3.1.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb + url: "https://pub.dev" source: hosted - version: "0.4.9" + version: "0.5.1" timing: dependency: transitive description: name: timing - url: "https://pub.dartlang.org" + sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.0.1" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" uuid: dependency: transitive description: name: uuid - url: "https://pub.dartlang.org" + sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313" + url: "https://pub.dev" source: hosted - version: "3.0.6" + version: "3.0.7" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" watcher: dependency: transitive description: name: watcher - url: "https://pub.dartlang.org" + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "1.1.0" web_socket_channel: dependency: transitive description: name: web_socket_channel - url: "https://pub.dartlang.org" + sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b + url: "https://pub.dev" source: hosted - version: "2.2.0" + version: "2.4.0" win32: dependency: transitive description: name: win32 - url: "https://pub.dartlang.org" + sha256: dfdf0136e0aa7a1b474ea133e67cb0154a0acd2599c4f3ada3b49d38d38793ee + url: "https://pub.dev" source: hosted - version: "2.6.1" + version: "5.0.5" xdg_directories: dependency: transitive description: name: xdg_directories - url: "https://pub.dartlang.org" + sha256: e0b1147eec179d3911f1f19b59206448f78195ca1d20514134e10641b7d7fbff + url: "https://pub.dev" source: hosted - version: "0.2.0+1" + version: "1.0.1" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" sdks: - dart: ">=2.17.0 <3.0.0" - flutter: ">=3.0.0" + dart: ">=3.0.0 <4.0.0" + flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index 8a15e81..b4a1f9f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,7 +11,7 @@ description: A new Flutter project. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 0.13.5 +version: 0.13.6 environment: sdk: ">=2.12.0 <3.0.0" @@ -21,31 +21,31 @@ dependencies: sdk: flutter auto_size_text_pk: ^3.0.0 bottom_navy_bar: ^6.0.0 - cached_network_image: ^3.2.1 - cupertino_icons: ^1.0.4 + cached_network_image: ^3.2.3 + cupertino_icons: ^1.0.5 flutter_device_type: ^0.4.0 - hive: ^2.2.1 + hive: ^2.2.3 hive_flutter: ^1.1.0 - html: ^0.15.0 - http: ^0.13.4 - intl: ^0.17.0 + html: ^0.15.4 + http: ^1.1.0 + intl: ^0.18.1 launch_review: ^3.0.1 - path_provider: ^2.0.10 - provider: ^6.0.3 + path_provider: ^2.0.15 + provider: ^6.0.5 share: ^2.0.4 - shared_preferences: ^2.0.15 - shimmer: ^2.0.0 - fluttertoast: ^8.0.9 - flutter_screenutil: ^5.5.3+2 + shared_preferences: ^2.2.0 + shimmer: ^3.0.0 + fluttertoast: ^8.2.2 + flutter_screenutil: ^5.8.4 pull_to_refresh: ^2.0.0 dev_dependencies: flutter_test: sdk: flutter - build_runner: ^2.1.11 - change_app_package_name: ^1.0.0 - hive_generator: ^1.1.3 - flutter_lints: ^2.0.1 + build_runner: ^2.4.6 + change_app_package_name: ^1.1.0 + hive_generator: ^2.0.0 + flutter_lints: ^2.0.2 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec @@ -57,8 +57,10 @@ flutter: uses-material-design: true # To add assets to your application, add an assets section, like this: assets: + - assets/ - assets/images/ - assets/logo/ + # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. # For details regarding adding assets from package dependencies, see