Merge pull request #20 from gustavorw/dev

2.0.1+2
Flutterando · Aug 8, 2022 · fe5a36a · fe5a36a
2 parents e12a003 + 15542dd
commit fe5a36a
Show file tree

Hide file tree

Showing 12 changed files with 649 additions and 369 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [2.0.1] - 29/07/2022.
+###  Changed
+* Refactor: Asuka is now a singleton.
+### Removed
+* Removed imports with prefix asuka.
+### Added
+* Fix flutter version
 ## [1.0.4] - 22/07/2020.
 
 * Fix bug in Channel Stable

diff --git a/README.md b/README.md
@@ -14,12 +14,12 @@ dependencies:
 now, add in your MaterialApp:
 
 ```dart
-import 'package:asuka/asuka.dart' as asuka;
+import 'package:asuka/asuka.dart';
 
 MaterialApp(
-    builder: asuka.builder,
+    builder: Asuka.builder,
     navigatorObservers: [
-       asuka.asukaHeroController //if u don`t add this Hero will not work
+       Asuka.asukaHeroController //if u don`t add this Hero will not work
     ],
 );
 
@@ -32,10 +32,10 @@ THAT'S IT!
 ### Snackbars
 
 ```dart
-import 'package:asuka/asuka.dart' as asuka;
+import 'package:asuka/asuka.dart';
 
 //use same Scaffold documetation
-asuka.showSnackBar(SnackBar(
+Asuka.showSnackBar(SnackBar(
     content: Text("Hello World"),
 ));
 
@@ -55,7 +55,7 @@ AsukaSnackbar.message("message").show();
 ### Overlay
 
 ```dart
-import 'package:asuka/asuka.dart' as asuka;
+import 'package:asuka/asuka.dart';
 
 var entry = OverlayEntry(
     builder: (context) {
@@ -65,7 +65,7 @@ var entry = OverlayEntry(
   },
 );
 
-asuka.addOverlay(entry);
+Asuka.addOverlay(entry);
 
 //after
 entry.remove();
@@ -75,20 +75,20 @@ entry.remove();
 ### BottomSheet
 
 ```dart
-import 'package:asuka/asuka.dart' as asuka;
+import 'package:asuka/asuka.dart';
 
 //use same Scaffold documetation
-asuka.showBottomSheet((context) => Container());
+Asuka.showBottomSheet((context) => Container());
 
 ```
 
 ### Dialogs
 
 ```dart
-import 'package:asuka/asuka.dart' as asuka;
+import 'package:asuka/asuka.dart';
 
 //use same Material documetation
-asuka.showDialog(
+Asuka.showDialog(
     builder: (context) => AlertDialog(),
 );
 

diff --git a/example/integration_test/asuka_integration_test.dart b/example/integration_test/asuka_integration_test.dart
@@ -1,5 +1,4 @@
-import 'package:asuka/asuka.dart' as asuka;
-import 'package:asuka/snackbars/asuka_snack_bar.dart';
+import 'package:asuka/asuka.dart';
 import 'package:example/src/home.controller.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -15,7 +14,7 @@ void main() {
     (tester) async {
       const String content = 'test';
       await tester.pumpWidget(
-        showSnackbar(asuka.AsukaSnackbar.warning('test'), 'Warning'),
+        showSnackbar(AsukaSnackbar.warning('test'), 'Warning'),
       );
 
       // Create the Finders.
@@ -31,7 +30,7 @@ void main() {
     (tester) async {
       const String content = 'test';
       await tester.pumpWidget(
-        showSnackbar(asuka.AsukaSnackbar.success('test'), 'Success'),
+        showSnackbar(AsukaSnackbar.success('test'), 'Success'),
       );
 
       // Create the Finders.
@@ -47,7 +46,7 @@ void main() {
     (tester) async {
       const String content = 'test';
       await tester.pumpWidget(
-        showSnackbar(asuka.AsukaSnackbar.alert('test'), 'Alert'),
+        showSnackbar(AsukaSnackbar.alert('test'), 'Alert'),
       );
 
       // Create the Finders.
@@ -63,7 +62,7 @@ void main() {
     (tester) async {
       const String content = 'test';
       await tester.pumpWidget(
-        showSnackbar(asuka.AsukaSnackbar.info('test'), 'Info'),
+        showSnackbar(AsukaSnackbar.info('test'), 'Info'),
       );
 
       // Create the Finders.
@@ -78,8 +77,8 @@ void main() {
     'AsukaSnackbar.message appears',
     (tester) async {
       const String content = 'test';
-      await tester.pumpWidget(
-          showSnackbar(asuka.AsukaSnackbar.message('test'), 'Message'));
+      await tester
+          .pumpWidget(showSnackbar(AsukaSnackbar.message('test'), 'Message'));
 
       // Create the Finders.
       final btnFinder = find.text('Message');
@@ -96,7 +95,7 @@ void main() {
       const String content = 'New Snackbar';
       await tester.pumpWidget(
         MaterialApp(
-          builder: asuka.builder,
+          builder: Asuka.builder,
           home: Scaffold(
             backgroundColor: Color.fromARGB(255, 230, 227, 227),
             body: Builder(
@@ -106,7 +105,7 @@ void main() {
                     style: ElevatedButton.styleFrom(primary: Colors.grey[900]),
                     onPressed: () {
                       controller.onClickSnackbar;
-                      asuka.showSnackBar(
+                      Asuka.showSnackBar(
                         const SnackBar(
                           content: Text('New Snackbar'),
                         ),
@@ -136,7 +135,7 @@ void main() {
       const String content = 'Dialog';
       await tester.pumpWidget(
         MaterialApp(
-          builder: asuka.builder,
+          builder: Asuka.builder,
           home: Scaffold(
             backgroundColor: Color.fromARGB(255, 230, 227, 227),
             body: Builder(
@@ -146,7 +145,7 @@ void main() {
                     style: ElevatedButton.styleFrom(primary: Colors.grey[900]),
                     onPressed: () {
                       controller.onClickDialog;
-                      asuka.showDialog(
+                      Asuka.showDialog(
                         builder: (context) => AlertDialog(
                           title: const Text('Dialog'),
                           content: const Text('This is a custom Dialog '),
@@ -185,7 +184,7 @@ void main() {
       const String content = 'Cancel';
       await tester.pumpWidget(
         MaterialApp(
-          builder: asuka.builder,
+          builder: Asuka.builder,
           home: Scaffold(
             backgroundColor: Color.fromARGB(255, 230, 227, 227),
             body: Builder(
@@ -195,7 +194,7 @@ void main() {
                     style: ElevatedButton.styleFrom(primary: Colors.grey[900]),
                     onPressed: () {
                       controller.onClickBottomSheet;
-                      asuka.showBottomSheet(
+                      Asuka.showBottomSheet(
                         (context) {
                           return Material(
                             elevation: 7,
@@ -247,7 +246,7 @@ void main() {
       const String content = 'Cancel';
       await tester.pumpWidget(
         MaterialApp(
-          builder: asuka.builder,
+          builder: Asuka.builder,
           home: Scaffold(
             backgroundColor: Color.fromARGB(255, 230, 227, 227),
             body: Builder(
@@ -257,7 +256,7 @@ void main() {
                     style: ElevatedButton.styleFrom(primary: Colors.grey[900]),
                     onPressed: () {
                       controller.onClickModalBottomSheet;
-                      asuka.showModalBottomSheet(
+                      Asuka.showModalBottomSheet(
                         builder: (context) => Material(
                           borderRadius: const BorderRadius.only(
                             topLeft: Radius.circular(16),
@@ -309,7 +308,7 @@ void main() {
 
 MaterialApp showSnackbar(AsukaSnackbar asukaSnackbar, String buttonText) {
   return MaterialApp(
-    builder: asuka.builder,
+    builder: Asuka.builder,
     home: Scaffold(
       backgroundColor: Color.fromARGB(255, 230, 227, 227),
       body: Builder(

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -1,6 +1,6 @@
 import 'package:example/src/home_page.dart';
 import 'package:flutter/material.dart';
-import 'package:asuka/asuka.dart' as asuka;
+import 'package:asuka/asuka.dart';
 
 import 'src/second/second_page.dart';
 
@@ -17,11 +17,9 @@ class MyApp extends StatelessWidget {
         primarySwatch: Colors.red,
         visualDensity: VisualDensity.adaptivePlatformDensity,
       ),
-      builder: asuka.builder,
+      builder: Asuka.builder,
       initialRoute: '/',
-      navigatorObservers: [
-        asuka.asukaHeroController
-      ],
+      navigatorObservers: [Asuka.asukaHeroController],
       routes: {
         '/': (_) => HomePage(title: 'Asuka'),
         '/second': (_) => SecondPage(title: 'Second page'),

diff --git a/example/lib/src/home.controller.dart b/example/lib/src/home.controller.dart
@@ -1,13 +1,13 @@
-import 'package:asuka/asuka.dart' as asuka;
+import 'package:asuka/asuka.dart';
 import 'package:flutter/material.dart';
 
 class HomeController {
   void onClickSnackbar() {
-    asuka.showSnackBar(SnackBar(content: Text('New snackBar!!!')));
+    Asuka.showSnackBar(SnackBar(content: Text('New snackBar!!!')));
   }
 
   void onClickDialog() {
-    asuka.showDialog(
+    Asuka.showDialog(
       builder: (context) => AlertDialog(
         title: Text('My Dialog'),
         content: Text('This is Dialog Content'),
@@ -30,7 +30,7 @@ class HomeController {
   }
 
   void onClickBottomSheet() {
-    asuka.showBottomSheet((context) {
+    Asuka.showBottomSheet((context) {
       return Material(
         elevation: 7,
         child: SizedBox(
@@ -55,7 +55,7 @@ class HomeController {
   }
 
   void onClickModalBottomSheet() {
-    asuka.showModalBottomSheet(
+    Asuka.showModalBottomSheet(
       builder: (context) => Material(
         borderRadius: BorderRadius.only(
           topLeft: Radius.circular(16),

diff --git a/example/lib/src/home_page.dart b/example/lib/src/home_page.dart
@@ -1,6 +1,5 @@
+import 'package:asuka/snackbars/asuka_snack_bar.dart';
 import 'package:flutter/material.dart';
-
-import 'package:asuka/asuka.dart';
 import 'home.controller.dart';
 import 'second/second_page.dart';
 
@@ -31,10 +30,11 @@ class _HomePageState extends State<HomePage> {
             child: Text('Second Page'),
             onPressed: () {
               Navigator.push(
-                  context,
-                  MaterialPageRoute(
-                    builder: (context) => SecondPage(),
-                  ));
+                context,
+                MaterialPageRoute(
+                  builder: (context) => SecondPage(),
+                ),
+              );
             },
           ),
           SizedBox(height: 10),
@@ -89,7 +89,9 @@ class _HomePageState extends State<HomePage> {
               Hero(
                 tag: "HeroTag",
                 child: Container(
-                  decoration: BoxDecoration(borderRadius: BorderRadius.circular(100), color: Colors.red),
+                  decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(100),
+                      color: Colors.red),
                   width: 50,
                   height: 50,
                 ),

diff --git a/lib/asuka.dart b/lib/asuka.dart
@@ -2,3 +2,4 @@ library asuka;
 
 export 'src/asuka_singleton.dart';
 export 'snackbars/asuka_snack_bar.dart';
+export 'package:asuka/src/asuka_singleton_deprecated.dart';
diff --git a/lib/snackbars/asuka_snack_bar.dart b/lib/snackbars/asuka_snack_bar.dart
@@ -1,4 +1,4 @@
-import 'package:asuka/asuka.dart' as asuka;
+import 'package:asuka/asuka.dart';
 import 'package:flutter/material.dart';
 
 ///Defines the layout and behavior of a [AsukaSnackbar].
@@ -68,7 +68,7 @@ class AsukaSnackbar extends SnackBar {
               if (action == null)
                 InkWell(
                   child: Icon(Icons.close, color: Colors.white),
-                  onTap: asuka.hideCurrentSnackBar, //
+                  onTap: Asuka.hideCurrentSnackBar, //
                 )
             ],
           ),
@@ -111,5 +111,5 @@ class AsukaSnackbar extends SnackBar {
 
   void call() => show();
 
-  void show() => asuka.showSnackBar(this);
+  void show() => Asuka.showSnackBar(this);
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@ library asuka;

		export 'src/asuka_singleton.dart';
		export 'snackbars/asuka_snack_bar.dart';
		export 'package:asuka/src/asuka_singleton_deprecated.dart';