From 81c72420ac1a31a9f0ebf6de9d8dd2bf50fe96ab Mon Sep 17 00:00:00 2001 From: Thada Pipatcharoenkij Date: Thu, 25 Apr 2024 12:23:38 +0700 Subject: [PATCH] 0.0.4 --- .../lib/examples/custom_shimmer_gradient.dart | 2 +- example/lib/examples/list_view_custom.dart | 2 +- example/lib/examples/list_view_default.dart | 2 +- example/lib/examples/rtl.dart | 2 +- example/lib/examples/skeleton_theme.dart | 2 +- example/lib/examples/theme_modes.dart | 2 +- example/pubspec.lock | 141 ++++++++++++------ lib/src/widgets.dart | 4 +- pubspec.lock | 136 +++++++++++------ pubspec.yaml | 6 +- 10 files changed, 192 insertions(+), 107 deletions(-) diff --git a/example/lib/examples/custom_shimmer_gradient.dart b/example/lib/examples/custom_shimmer_gradient.dart index 3cbeea8..68c99cc 100644 --- a/example/lib/examples/custom_shimmer_gradient.dart +++ b/example/lib/examples/custom_shimmer_gradient.dart @@ -115,7 +115,7 @@ class _CustomShimmerGradientExamplePageState randomText(), style: Theme.of(context) .textTheme - .headline6! + .headlineLarge! .copyWith(fontSize: 16), maxLines: 1, ), diff --git a/example/lib/examples/list_view_custom.dart b/example/lib/examples/list_view_custom.dart index 934be80..c0255c3 100644 --- a/example/lib/examples/list_view_custom.dart +++ b/example/lib/examples/list_view_custom.dart @@ -96,7 +96,7 @@ class _ListViewExample2PageState extends State { randomText(), style: Theme.of(context) .textTheme - .headline6! + .headlineLarge! .copyWith(fontSize: 16), maxLines: 1, ), diff --git a/example/lib/examples/list_view_default.dart b/example/lib/examples/list_view_default.dart index fa89f74..0c00b56 100644 --- a/example/lib/examples/list_view_default.dart +++ b/example/lib/examples/list_view_default.dart @@ -56,7 +56,7 @@ class _ListViewExample1PageState extends State { children: [ Text( "Lorem ipsum dolor sit amet.", - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.headlineLarge, maxLines: 1, overflow: TextOverflow.ellipsis, ), diff --git a/example/lib/examples/rtl.dart b/example/lib/examples/rtl.dart index bc5cad3..57e3bc1 100644 --- a/example/lib/examples/rtl.dart +++ b/example/lib/examples/rtl.dart @@ -99,7 +99,7 @@ class _RtlExamplePageState extends State { randomText(), style: Theme.of(context) .textTheme - .headline6! + .headlineLarge! .copyWith(fontSize: 16, fontWeight: FontWeight.w600), maxLines: 1, ), diff --git a/example/lib/examples/skeleton_theme.dart b/example/lib/examples/skeleton_theme.dart index 89a7fd3..e1efb54 100644 --- a/example/lib/examples/skeleton_theme.dart +++ b/example/lib/examples/skeleton_theme.dart @@ -78,7 +78,7 @@ class _SkeletonThemeExamplePageState extends State { Expanded( child: Text( "Lorem ipsum dolor sit amet.", - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.headlineLarge, maxLines: 1, overflow: TextOverflow.ellipsis, ), diff --git a/example/lib/examples/theme_modes.dart b/example/lib/examples/theme_modes.dart index 6f52cfc..6fb314d 100644 --- a/example/lib/examples/theme_modes.dart +++ b/example/lib/examples/theme_modes.dart @@ -150,7 +150,7 @@ class _ThemeModesExamplePageState extends State { children: [ Text( "Lorem ipsum dolor sit amet.", - style: Theme.of(context).textTheme.headline6, + style: Theme.of(context).textTheme.headlineLarge, maxLines: 1, overflow: TextOverflow.ellipsis, ), diff --git a/example/pubspec.lock b/example/pubspec.lock index 64fe131..08491ac 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,58 +5,58 @@ packages: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.6.1" + version: "2.11.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" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "1.1.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" + version: "1.3.0" 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" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.18.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: "486b7bc707424572cdf7bd7e812a0c146de3fd47ecadf070254cc60383f21dd8" + url: "https://pub.dev" source: hosted version: "1.0.3" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -67,34 +67,69 @@ packages: description: flutter source: sdk version: "0.0.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + url: "https://pub.dev" + source: hosted + version: "10.0.5" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + url: "https://pub.dev" + source: hosted + version: "3.0.5" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + url: "https://pub.dev" + source: hosted + version: "0.12.16+1" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + url: "https://pub.dev" source: hosted - version: "0.12.10" + version: "0.11.1" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b" + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.14.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.0" skeletons: dependency: "direct main" description: path: ".." relative: true source: path - version: "0.0.2" + version: "0.0.3" sky_engine: dependency: transitive description: flutter @@ -104,58 +139,66 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.2" 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" 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: "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794" + url: "https://pub.dev" source: hosted - version: "0.3.0" - typed_data: + version: "0.7.1" + vector_math: dependency: transitive description: - name: typed_data - url: "https://pub.dartlang.org" + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "1.3.0" - vector_math: + version: "2.1.4" + vm_service: dependency: transitive description: - name: vector_math - url: "https://pub.dartlang.org" + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "14.2.1" sdks: - dart: ">=2.12.0 <3.0.0" - flutter: ">=1.17.0" + dart: ">=3.3.0 <3.22.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/lib/src/widgets.dart b/lib/src/widgets.dart index a3f58fe..1b932cb 100644 --- a/lib/src/widgets.dart +++ b/lib/src/widgets.dart @@ -53,7 +53,7 @@ class SkeletonAvatar extends StatelessWidget { style.maxHeight ?? constraints.maxHeight) : style.height, decoration: BoxDecoration( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).scaffoldBackgroundColor, shape: style.shape, borderRadius: style.shape != BoxShape.circle ? style.borderRadius : null, @@ -97,7 +97,7 @@ class SkeletonLine extends StatelessWidget { : style.width, height: style.height, decoration: BoxDecoration( - color: Theme.of(context).backgroundColor, + color: Theme.of(context).scaffoldBackgroundColor, borderRadius: style.borderRadius, ), ); diff --git a/pubspec.lock b/pubspec.lock index 010beab..6f99658 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,51 +5,50 @@ packages: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.6.1" + version: "2.11.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" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "1.1.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.0" + version: "1.3.0" 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" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + url: "https://pub.dev" source: hosted - version: "1.15.0" + version: "1.18.0" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -60,27 +59,62 @@ packages: description: flutter source: sdk version: "0.0.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + url: "https://pub.dev" + source: hosted + version: "10.0.5" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + url: "https://pub.dev" + source: hosted + version: "3.0.5" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev" + source: hosted + version: "3.0.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + url: "https://pub.dev" + source: hosted + version: "0.12.16+1" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + url: "https://pub.dev" source: hosted - version: "0.12.10" + version: "0.11.1" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b" + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.14.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.0" sky_engine: dependency: transitive description: flutter @@ -90,58 +124,66 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.2" 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" 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: "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794" + url: "https://pub.dev" source: hosted - version: "0.3.0" - typed_data: + version: "0.7.1" + vector_math: dependency: transitive description: - name: typed_data - url: "https://pub.dartlang.org" + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "1.3.0" - vector_math: + version: "2.1.4" + vm_service: dependency: transitive description: - name: vector_math - url: "https://pub.dartlang.org" + name: vm_service + sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "14.2.1" sdks: - dart: ">=2.12.0 <3.0.0" - flutter: ">=1.17.0" + dart: ">=3.3.0 <3.22.0" + flutter: ">=3.18.0-18.0.pre.54" diff --git a/pubspec.yaml b/pubspec.yaml index f2d5f92..cbf07c5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,11 +1,11 @@ name: skeletons description: A Flutter package for building custom skeleton widgets to mimic the page's layout while loading. -version: 0.0.3 +version: 0.0.4 homepage: https://github.com/badjio/skeletons/ environment: - sdk: ">=2.12.0 <3.0.0" - flutter: ">=1.17.0" + sdk: ">=2.12.0 <3.22.0" + flutter: ">=3.0.0" dependencies: flutter: