🔖 Release 1.0.1

iqfareez · Jan 26, 2023 · 6c5962c · 6c5962c
1 parent 05c8830
commit 6c5962c
Show file tree

Hide file tree

Showing 9 changed files with 108 additions and 79 deletions.
diff --git a/.github/workflows/firebase-hosting-merge.yml → .github/workflows/firebase-hosting-push.yml b/.github/workflows/firebase-hosting-merge.yml → .github/workflows/firebase-hosting-push.yml
@@ -1,7 +1,7 @@
 # This file was auto-generated by the Firebase CLI
 # https://github.com/firebase/firebase-tools
 
-name: Deploy to Firebase Hosting on merge
+name: Deploy to Firebase Hosting on push
 "on":
   push:
     branches:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
-## 1.0.0
+## 1.0.1 (27 January 2023)
+
+- :pencil2: Flutter 3.7 ready. Fixed few deprecated members.
+- :lipstick: Demo app now `useMaterial3:  true`.
+- :memo: Update README.md.
+
+## 1.0.0 (26 June 2022)
 
 - :tada: Initial release. Comes with classic, pastel and solid admonitions.
diff --git a/README.md b/README.md
@@ -1,20 +1,17 @@
-<!--
-This README describes the package. If you publish this package to pub.dev,
-this README's contents appear on the landing page for your package.
+![Pub Points](https://img.shields.io/pub/points/admonitions)
+![Pub Likes](https://img.shields.io/pub/likes/admonitions)
+![lints](https://img.shields.io/badge/style-flutter__lints-yellow)
 
-For information about how to write a good package README, see the guide for
-[writing package pages](https://dart.dev/guides/libraries/writing-package-pages).
-
-For general information about developing packages, see the Dart guide for
-[creating packages](https://dart.dev/guides/libraries/create-library-packages)
-and the Flutter guide for
-[developing packages and plugins](https://flutter.dev/developing-packages).
--->
+# admonitions
 
 A nice-looking banner-like widget to display messages, warnings, info etc.
 
 Inspired by [**Docusaurus's admonitions**](https://docusaurus.io/docs/markdown-features/admonitions)
 
+![admonitions flutter](https://user-images.githubusercontent.com/60868965/214950213-adc2e4aa-28a2-4686-9562-463e341e97db.png)
+
+Try out the live demo here: :sparkles: **https://flutter-admonitions.web.app** :sparkles:
+
 ## Features
 
 Comes with **three (3)** available styles:
@@ -23,10 +20,6 @@ Comes with **three (3)** available styles:
 - Pastel
 - Classic
 
-## Demo
-
-Try the live demo here: :sparkles: **https://flutter-admonitions.web.app** :sparkles:
-
 ## Example
 
 View **example** section, or visit GitHub and navigate to `/example` folder.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -16,8 +16,13 @@ class _MyAppState extends State<MyApp> {
   Widget build(BuildContext context) {
     return MaterialApp(
       title: 'Flutter Admonition Demo',
+      theme: ThemeData.light(
+        useMaterial3: true,
+      ),
       themeMode: _theme,
-      darkTheme: ThemeData.dark(),
+      darkTheme: ThemeData.dark(
+        useMaterial3: true,
+      ),
       home: Scaffold(
           appBar: AppBar(
             title: const Text('Admonition Demo'),
@@ -54,7 +59,7 @@ class MyHomePage extends StatelessWidget {
           children: [
             Text(
               'Solid Admonition',
-              style: Theme.of(context).textTheme.headline5,
+              style: Theme.of(context).textTheme.headlineSmall,
             ),
             const SolidAdmonition.note(
               text: '(Note) You might read this, you might not.',
@@ -78,7 +83,7 @@ class MyHomePage extends StatelessWidget {
             const Divider(),
             Text(
               'Pastel Admonition',
-              style: Theme.of(context).textTheme.headline5,
+              style: Theme.of(context).textTheme.headlineSmall,
             ),
             const PastelAdmonition.note(
               text: '(Note) You might read this, you might not.',
@@ -102,15 +107,16 @@ class MyHomePage extends StatelessWidget {
             const Divider(),
             Text(
               '...with actions',
-              style: Theme.of(context).textTheme.headline6,
+              style: Theme.of(context).textTheme.titleLarge,
             ),
             PastelAdmonition.caution(
               text: '(Caution) I hope you read this. With action button below.',
               actions: [
                 TextButton(
                     style: TextButton.styleFrom(
+                      foregroundColor:
+                          Theme.of(context).textTheme.bodyLarge!.color,
                       tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                      primary: Theme.of(context).textTheme.bodyLarge!.color,
                       textStyle: const TextStyle(fontWeight: FontWeight.w600),
                     ),
                     onPressed: () {
@@ -123,8 +129,9 @@ class MyHomePage extends StatelessWidget {
                     child: const Text('Action 1')),
                 TextButton(
                     style: TextButton.styleFrom(
+                      foregroundColor:
+                          Theme.of(context).textTheme.bodyLarge!.color,
                       tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                      primary: Theme.of(context).textTheme.bodyLarge!.color,
                       textStyle: const TextStyle(fontWeight: FontWeight.w600),
                     ),
                     onPressed: () {
@@ -140,7 +147,7 @@ class MyHomePage extends StatelessWidget {
             const Divider(),
             Text(
               'Classic Admonitions',
-              style: Theme.of(context).textTheme.headline6,
+              style: Theme.of(context).textTheme.titleLarge,
             ),
             const ClassicAdmonition.note(
               text: '(Note) You might read this, you might not.',

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -7,63 +7,63 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.0"
+    version: "1.0.1"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      url: "https://pub.dev"
     source: hosted
-    version: "2.8.2"
+    version: "2.10.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"
-    source: hosted
-    version: "1.2.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
+      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.2.1"
   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: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.17.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"
   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"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -73,7 +73,8 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      url: "https://pub.dartlang.org"
+      sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
   flutter_test:
@@ -85,44 +86,58 @@ packages:
     dependency: transitive
     description:
       name: font_awesome_flutter
-      url: "https://pub.dartlang.org"
+      sha256: "875dbb9ec1ad30d68102019ceb682760d06c72747c1c5b7885781b95f88569cc"
+      url: "https://pub.dev"
     source: hosted
-    version: "10.1.0"
+    version: "10.3.0"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.5"
   lints:
     dependency: transitive
     description:
       name: lints
-      url: "https://pub.dartlang.org"
+      sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.1"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.11"
+    version: "0.12.13"
   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: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -132,51 +147,58 @@ packages:
     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"
   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"
   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: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      url: "https://pub.dev"
     source: hosted
-    version: "0.4.9"
+    version: "0.4.16"
   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"
 sdks:
-  dart: ">=2.17.0-0 <3.0.0"
+  dart: ">=2.18.0 <4.0.0"
   flutter: ">=1.17.0"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # 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: 1.0.0+1
+version: 1.0.1+2
 
 environment:
   sdk: ">=2.16.2 <3.0.0"

diff --git a/lib/src/classic.dart b/lib/src/classic.dart
@@ -137,7 +137,7 @@ class ClassicAdmonition extends StatelessWidget {
                       DefaultTextStyle(
                           style: TextStyle(
                               color: primaryColor ??
-                                  Theme.of(context).textTheme.bodyText1!.color),
+                                  Theme.of(context).textTheme.bodyLarge!.color),
                           child: Flexible(child: Text(text!)))
                     else
                       child!

diff --git a/lib/src/pastel.dart b/lib/src/pastel.dart
@@ -127,7 +127,7 @@ class PastelAdmonition extends StatelessWidget {
                 DefaultTextStyle(
                     style: TextStyle(
                         color: primaryColor ??
-                            Theme.of(context).textTheme.bodyText1!.color),
+                            Theme.of(context).textTheme.bodyLarge!.color),
                     child: Flexible(child: Text(text!)))
               else
                 child!