Merge pull request #20 from shiburagi/Version-1.0.0

Feat: 3D effect & elevation config
shiburagi · Jun 10, 2020 · 7ee7249 · 7ee7249
2 parents 76637b3 + 8d90086
commit 7ee7249
Show file tree

Hide file tree

Showing 12 changed files with 191 additions and 152 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.0.3
+* Reuse controller when scaffold config update
+* Add elevation & corner radius config on SideDrawer
+* Add more example
+* **Bug fixed**
+
 # 1.0.2
 * 3D-effect
 

diff --git a/README.md b/README.md
@@ -17,15 +17,23 @@ https://github.com/matthew-carroll/flutter_ui_challenge_zoom_menu
 ### Todo
 - [x] Radius Parameter
 - [x] Right Menu View 
-- [ ] 3D effect
+- [x] 3D effect
 - [ ] Material design drawer's behavior
 
 ### NEW UPDATES
-* Floating action button with location and animator
-* Bottom navigation bar
-* Extended body
-* AndroidX support  
-
+---
+**Version 1.0**
+- Elevation Config
+- 3D effect
+- Multi-Drawer
+- Right Drawer
+---
+**Version 0.0**
+- Floating action button with location and animator
+- Bottom navigation bar
+- Extended body
+- AndroidX support  
+---
 
 ## Table of contents
 - [Usage](#usage)
@@ -205,9 +213,7 @@ DrawerScaffold(
 
 ## Preview
 
-### Android
-
-<img src="https://github.com/shiburagi/Drawer-Behavior-Flutter/blob/preview/preview-android-1.png?raw=true" width="400px"/>
+<img src="https://github.com/shiburagi/Drawer-Behavior-Flutter/blob/preview/preview-ios-1.png?raw=true" width="400px"/>
 
 ```dart
 new DrawerScaffold(
@@ -216,19 +222,19 @@ new DrawerScaffold(
       percentage: 0.6,
       ...
     )
-  ]  ...
+  ]
+  ...
 );
 ```
 ---
 
-<img src="https://github.com/shiburagi/Drawer-Behavior-Flutter/blob/preview/preview-android-2.png?raw=true" width="400px"/>
+<img src="https://github.com/shiburagi/Drawer-Behavior-Flutter/blob/preview/preview_ios_scale_right.png?raw=true" width="400px"/>
 
 ```dart
 new DrawerScaffold(
-  headerView: headerView(context),
   drawers: [
     SideDrawer(
-      percentage: 0.6,
+      direction:Direction.right
       ...
     )
   ]
@@ -237,14 +243,13 @@ new DrawerScaffold(
 ```
 ---
 
-### IOS
-<img src="https://github.com/shiburagi/Drawer-Behavior-Flutter/blob/preview/preview-ios-1.png?raw=true" width="400px"/>
+<img src="https://github.com/shiburagi/Drawer-Behavior-Flutter/blob/preview/preview_ios_3d.png?raw=true" width="400px"/>
 
 ```dart
 new DrawerScaffold(
   drawers: [
     SideDrawer(
-      percentage: 0.6,
+      degree: 45,
       ...
     )
   ]
@@ -304,17 +309,26 @@ new DrawerScaffold(
 DrawerScaffoldController controller;
 List<SideDrawer> drawers;
 ScreenBuilder builder;
-bool enableGestures;
+bool enableGestures; // default: true
 AppBar appBar;
-double cornerRadius;
+double cornerRadius; // default: 16
 Widget floatingActionButton;
 Widget bottomNavigationBar;
 FloatingActionButtonLocation floatingActionButtonLocation;
 FloatingActionButtonAnimator floatingActionButtonAnimator;
+List<BoxShadow> contentShadow;
+Widget bottomSheet;
+bool extendBodyBehindAppBar;
+List<Widget> persistentFooterButtons;
+bool primary;
+bool resizeToAvoidBottomInset;
+bool resizeToAvoidBottomPadding;
 ```
 *SideDrawer*
 ```dart
-double percentage;
+double percentage; // default: 0.8
+double elevation; // default: 4
+double cornerRadius;
 double degree; // 15-45 degree
 Menu menu;
 String selectedItemId;

diff --git a/example/ios/Flutter/Debug.xcconfig b/example/ios/Flutter/Debug.xcconfig
@@ -1,2 +1 @@
-#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
diff --git a/example/ios/Flutter/Release.xcconfig b/example/ios/Flutter/Release.xcconfig
@@ -1,2 +1 @@
-#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
diff --git a/example/ios/Podfile b/example/ios/Podfile
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -2,6 +2,7 @@ import 'package:drawerbehavior_example/pages/drawer_3d.dart';
 import 'package:drawerbehavior_example/pages/drawer_custom_item.dart';
 import 'package:drawerbehavior_example/pages/drawer_scale.dart';
 import 'package:drawerbehavior_example/pages/drawer_scale_icon.dart';
+import 'package:drawerbehavior_example/pages/drawer_scale_left_3d_right_slide_.dart';
 import 'package:drawerbehavior_example/pages/drawer_scale_left_right.dart';
 import 'package:drawerbehavior_example/pages/drawer_scale_left_right_inverse.dart';
 import 'package:drawerbehavior_example/pages/drawer_scale_no_animation.dart';
@@ -83,6 +84,10 @@ class _MyAppState extends State<MyApp> {
                     text: "Left & Right (Inverse)",
                     navigate: "/drawer11",
                     color: Theme.of(context).accentColor),
+                createButton(context,
+                    text: "Left(3D) & Right(Slide)",
+                    navigate: "/drawer13",
+                    color: Theme.of(context).accentColor),
                 createButton(context,
                     text: "Right",
                     navigate: "/drawer10",
@@ -123,6 +128,7 @@ class _MyAppState extends State<MyApp> {
         "/drawer10": (context) => DrawerRight(),
         "/drawer11": (context) => DrawerLeftAndRightInverse(),
         "/drawer12": (context) => Drawer3d(),
+        "/drawer13": (context) => DrawerLeft3DAndRightSlide(),
 
       },
     );

diff --git a/example/lib/pages/drawer_3d.dart b/example/lib/pages/drawer_3d.dart
@@ -20,11 +20,12 @@ class _Drawer3dState extends State<Drawer3d> {
   Widget build(BuildContext context) {
     return DrawerScaffold(
       appBar: AppBar(
-          title: Text("Drawer - Scale"),
+          title: Text("Drawer - 3D"),
           actions: [IconButton(icon: Icon(Icons.add), onPressed: () {})]),
       drawers: [
         SideDrawer(
-          degree:180,
+          percentage: 0.8,
+          degree: 45,
           menu: menu,
           direction: Direction.left,
           animation: true,
@@ -35,7 +36,20 @@ class _Drawer3dState extends State<Drawer3d> {
               selectedMenuItemId = itemId;
             });
           },
-        )
+        ),
+        SideDrawer(
+          degree: 45,
+          menu: menu,
+          direction: Direction.right,
+          animation: true,
+          color: Theme.of(context).primaryColor,
+          selectedItemId: selectedMenuItemId,
+          onMenuItemSelected: (itemId) {
+            setState(() {
+              selectedMenuItemId = itemId;
+            });
+          },
+        ),
       ],
       builder: (context, id) => IndexedStack(
         index: id,

diff --git a/example/lib/pages/drawer_scale_left_3d_right_slide_.dart b/example/lib/pages/drawer_scale_left_3d_right_slide_.dart
@@ -0,0 +1,72 @@
+import 'package:drawerbehavior/drawerbehavior.dart';
+import 'package:drawerbehavior_example/menus/main.dart';
+import 'package:flutter/material.dart';
+
+class DrawerLeft3DAndRightSlide extends StatefulWidget {
+  @override
+  _DrawerLeft3DAndRightSlideState createState() =>
+      _DrawerLeft3DAndRightSlideState();
+}
+
+class _DrawerLeft3DAndRightSlideState extends State<DrawerLeft3DAndRightSlide> {
+  int selectedMenuItemId;
+  DrawerScaffoldController controller = DrawerScaffoldController();
+  @override
+  void initState() {
+    selectedMenuItemId = menu.items[0].id;
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return DrawerScaffold(
+      controller: controller,
+      appBar: AppBar(title: Text("Drawer - Left(3D) & Right(Slide)"), actions: [
+        IconButton(
+            icon: Icon(Icons.notifications_none),
+            onPressed: () {
+              controller.toggle(Direction.right);
+            })
+      ]),
+      drawers: [
+        SideDrawer(
+          percentage: 0.6,
+          degree: 45,
+          menu: menu,
+          direction: Direction.left,
+          animation: true,
+          color: Theme.of(context).primaryColor,
+          selectedItemId: selectedMenuItemId,
+          onMenuItemSelected: (itemId) {
+            setState(() {
+              selectedMenuItemId = itemId;
+            });
+          },
+        ),
+        SideDrawer(
+          cornerRadius: 0,
+          menu: menu,
+          percentage: 1.0,
+          direction: Direction.right,
+          animation: true,
+          selectorColor: Colors.white,
+          color: Theme.of(context).accentColor,
+          selectedItemId: selectedMenuItemId,
+          onMenuItemSelected: (itemId) {
+            setState(() {
+              selectedMenuItemId = itemId;
+            });
+          },
+        ),
+      ],
+      builder: (context, id) => IndexedStack(
+        index: id,
+        children: menu.items
+            .map((e) => Center(
+                  child: Text("Page~${e.title}"),
+                ))
+            .toList(),
+      ),
+    );
+  }
+}
diff --git a/example/lib/pages/drawer_scale_right.dart b/example/lib/pages/drawer_scale_right.dart
@@ -33,8 +33,7 @@ class _DrawerRightState extends State<DrawerRight> {
           menu: menu,
           direction: Direction.right,
           animation: true,
-          selectorColor: Colors.white,
-          color: Theme.of(context).accentColor,
+          color: Theme.of(context).primaryColor,
           selectedItemId: selectedMenuItemId,
           onMenuItemSelected: (itemId) {
             setState(() {
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
		#include "Generated.xcconfig"