From cf450732ce67504a4fba26c504aa8384cdb6897d Mon Sep 17 00:00:00 2001 From: Gyorgio88 Date: Wed, 29 Apr 2020 02:29:15 +0200 Subject: [PATCH] rollback issue #33 --- CHANGELOG.md | 5 +++++ README.md | 4 ++-- .../executionHistory/executionHistory.bin | Bin 1532586 -> 1532586 bytes .../.gradle/5.6.2/fileHashes/fileHashes.bin | Bin 195351 -> 195351 bytes example/lib/example_3.dart | 2 +- lib/inner_drawer.dart | 14 ++++++++------ pubspec.yaml | 2 +- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37e15c2..ae5b9c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [0.5.5+3] - 2020-04-29. + +* Rollback issue #33. +* Fixed some problems. + ## [0.5.5+2] - 2020-04-28. * general improvements. diff --git a/README.md b/README.md index 88aa733..c39a363 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # flutter_inner_drawer -[![pub package](https://img.shields.io/badge/pub-0.5.5+2-orange.svg)](https://pub.dartlang.org/packages/flutter_inner_drawer) +[![pub package](https://img.shields.io/badge/pub-0.5.5+3-orange.svg)](https://pub.dartlang.org/packages/flutter_inner_drawer) [![Awesome Flutter](https://img.shields.io/badge/Awesome-Flutter-blue.svg?longCache=true&style=flat-square)](https://github.com/Solido/awesome-flutter#drawers) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/dnag88) @@ -10,7 +10,7 @@ Inner Drawer is an easy way to create an internal side section (left/right) wher Add this to your package's pubspec.yaml file: ```dart dependencies: - flutter_inner_drawer: "^0.5.5+2" + flutter_inner_drawer: "^0.5.5+3" ``` ## Demo
diff --git a/example/android/.gradle/5.6.2/executionHistory/executionHistory.bin b/example/android/.gradle/5.6.2/executionHistory/executionHistory.bin index bb1c68a29742786627b2a0096f0eff3a6674ba42..cf692523cdbb61535ed98cf5f68f920951a1ad3f 100644 GIT binary patch delta 980 zcmajcT}YEr7zc3A*;meY`EEMjzD8l0fnPH}(x5bLIYv;q5Rx>f(#nf)njaG_-5@I| zMaU;>EZs$s^CAs9YNe=|m{dqqW|*3NXh^AKVXf?>ciV*res}-pJpaRK=uK(pO}TSG z?Hit%T^MeNNY~}-v+_@!KAx-3h{%Y{GM)%`TRQ9PW`mj-)Mz0>CRB0v@~kqhE%Bgt zN!jZ~)D2CCa5SU^VRzDT23e7`*oL|mf`;D;)HAy;D@QIN2o1*jp{*2sm)(4E%;Hz4 zCiO!qhxX4`8+yDvZY@I+5SY-Uta+B1yZEJOt0J&uyYbP)o8?3(QJT@t2C4Jxb$9qUk{hBN4u$Yi{WGWu7 zPgwCg-4xKJkt9NGjHHCjSKw;l$|E)ytHzOJv>Hp?U7kT4*Kq)!?QUFqyC(Qans{|; zLLa9!ksWpTq=!oynutIPX*TS?^k@>@h_ynO;c`nerg#*e5>P@)M6IISDKW7$dpK+> zmgk3oGM4KjWl78j*YZHiZvtAv41pSM4N>ZtMxIL@GM&jJOIR+=2#N~-f$75?QR$nf zu0egaNDHy4oEL1&Vf=25=P-PBqB5%^daQbjFw(K`(o!@-X7d?e#Qroq&r_W5PSWJw z@BDhH#s_ZS&ULanAeDVCB_ QGRlkcrsSl@=<|8TCNukTgjT24FH5gW#JWUkFGsR&MAXG$`J6Fg3#`A{j~#wab5jBSEG9S zAaw!J(xn9;ulg)lFavGwT&$4;m~1<_SC#k9>}L z|9_nj6T^Rx=Wih+XTznt)WMVyMc_#z;&YwM@lpfY%Vy38wp!-3mXg2s=90U@#};s8 zGs<>%N<#;BRYJN6?OgvSj%r6rj?=KAu@ezk1UA8yz#+I1HW9c49&YS(Uoved&)Nl2 zxnu}eo~A!L%L9?$4n#r^K}nJ=SgNMmSx!25Rzs)o8B_bimWbl8g&kA3joPxGesDj} zO$qWei3qmk(}9m{`81meeOmbDnK(8OkL-D#Tcpdza|N_N#Z(mz`}GZ-6#ILB(%fyf zEQ76{p8#^Tgoc$uT7(TnbP&bVe7ll0VLa3_%8g4F?|#KM^cT~FwR3^T8pHBb) diff --git a/example/android/.gradle/5.6.2/fileHashes/fileHashes.bin b/example/android/.gradle/5.6.2/fileHashes/fileHashes.bin index 913a32d3f7c687e8808f80665214cea6ad2828d1..f0244e4b1ed716c9c3acfd9d5c5cad4aaa43b992 100644 GIT binary patch delta 536 zcmbRKjeGhx?uIRlt9caIT*bGQ&Jz;f85AH=+j#vy0|R5>VPAs;1~A}UJAJJnqw4ez zJdA+~HH#Pz{?xs7o7LlkU7x|-UXap55-NKkN>evaPvm8EQCN04evaw_kL?R@xc&+L z`)(0Ll`1zxmB_cr57ULG-{5654BGUO=Tq0KDm7W1TBFJ%k8eV(mM(*+^!p5?^^Adp zCJ-xvu)rSe9qi2MU(Xgi`gQQe)=gm$9ogMLNg$Y`K0TU`QH|xWZ+7DJ^XyD|5Edf` zQ{8k^enuk&gOqRk=l>QztRX7;m0?G@6GVH)2asmQiC=z9fB1w^czOc|lQ2kU()Nw~ zj6IA%W={2VM?prAaXHgr1_N0@gLPSfft533x-pzN`E9Ti$Tks>>iN@s`5C2f*qd_} ztGzkrrvvSU7<^&+MIng27bouymf9{W%$Vg0G}y3fdv^rmqBRoY36;}jyVXy>3E5|n zr2KLg#7B9brn|B-)hT>0JYOo?aVX5Ic=!Hij9DoV*}`Wadzr)zt(^Xtl?fDFMGV_{ J*_gP#0ss&Sym$Zr delta 531 zcmbRKjeGhx?uIRlt9cY^F7_3OaJMTjtBc*V`fuHN1_s8$gI5GI7{GvY?ew*RjH=T= z@Gu4{6n>5Up77%3)kWqPUMH_l5dkaRyZ&Q<`~LN=I^q0`T^GwFjF zj2ujL(@psqjTFj^ch)zzSs!!SdRV&Ea^C@nWp}ZPfUOKgi&~U0|%1`NaOa6 z{ER(}EC;Wch)j1BWYhz(#G%Fl89-xoS%Cp%A~D?<#+01=HdqQ|mk3C)@^oK*MkyS& znuK7p)g){>&{l}K5z{XUL2QkfygOKGyR0x{mMhR)A@l9s5sZu0NGw{jbeUPD$q%&$ zJ(F_kKFdM8W2!aXm6fSZp{e||+=1hMqDoTtQYJ3g`xhc>z7=FGlh_%)>5o~N)PTmB MpV-dJ#>Dj%0F6w%Pyhe` diff --git a/example/lib/example_3.dart b/example/lib/example_3.dart index 832067d..16a49ed 100644 --- a/example/lib/example_3.dart +++ b/example/lib/example_3.dart @@ -125,7 +125,7 @@ class _ExampleThreeState extends State { if (a) { myFocusNode2.requestFocus(); } else { - //myFocusNode.requestFocus(); + myFocusNode.requestFocus(); } }, ); diff --git a/lib/inner_drawer.dart b/lib/inner_drawer.dart index 46c7347..c7ebb57 100644 --- a/lib/inner_drawer.dart +++ b/lib/inner_drawer.dart @@ -180,6 +180,7 @@ class InnerDrawerState extends State void dispose() { _historyEntry?.remove(); _controller.dispose(); + _focusScopeNode.dispose(); super.dispose(); } @@ -253,18 +254,18 @@ class InnerDrawerState extends State //_ensureHistoryEntry(); } - //final GlobalKey _drawerKey = GlobalKey(); + final GlobalKey _drawerKey = GlobalKey(); double get _width { return _initWidth; } /// get width of screen after initState - void _updateWidth(BuildContext context) { + void _updateWidth() { WidgetsBinding.instance.addPostFrameCallback((_) { - //final RenderBox box = _drawerKey.currentContext.findRenderObject(); - final RenderBox box = context.findRenderObject(); - if (box != null && box.size != null) + final RenderBox box = _drawerKey.currentContext.findRenderObject(); + //final RenderBox box = context.findRenderObject(); + if (box != null && box.size != null && box.size.width > 300) setState(() { _initWidth = box.size.width; }); @@ -509,6 +510,7 @@ class InnerDrawerState extends State assert(widget.borderRadius >= 0); Widget container = Container( + key: _drawerKey, decoration: BoxDecoration( borderRadius: BorderRadius.circular( widget.borderRadius * (1 - _controller.value)), @@ -561,7 +563,7 @@ class InnerDrawerState extends State /// initialize the correct width if (_initWidth == 400 || MediaQuery.of(context).orientation != _orientation) { - _updateWidth(context); + _updateWidth(); _orientation = MediaQuery.of(context).orientation; } diff --git a/pubspec.yaml b/pubspec.yaml index f2dc4b8..57b1d33 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_inner_drawer description: Inner Drawer is an easy way to create an internal side section (left/right) where you can insert a list menu or other. -version: 0.5.5+2 +version: 0.5.5+3 author: Antonino Di Natale homepage: https://github.com/Dn-a/flutter_inner_drawer