Merge pull request #50 from Frezyx/fix-issues

Release version 2.0.1
Frezyx · Aug 24, 2021 · 9fd8daa · 9fd8daa
2 parents ee7764b + d008003
commit 9fd8daa
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.0.1
+  - **FIX**: Fix tap zone of bar item
+  - **FIX**: Fix icon size passing from custom theme
 ## 2.0.0
 
  - **BREAKING**: Implement BottomBarWithSheetController for working with items selection!

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@
 
 ```yaml
 dependencies:
-  bottom_bar_with_sheet: ^2.0.0
+  bottom_bar_with_sheet: ^2.0.1
 ```
 
 ### Add import package

diff --git a/example/lib/examples/without_background_bar_items_example.dart b/example/lib/examples/without_background_bar_items_example.dart
@@ -27,7 +27,7 @@ class _MyHomePageState extends State<MyHomePage> {
       backgroundColor: Colors.grey[100],
       appBar: AppBar(
         backgroundColor: Colors.purple,
-        title: Text('bottom_bar_with_sheet v2.0.0',
+        title: Text('bottom_bar_with_sheet v2.0.1',
             style: TextStyle(color: Colors.white)),
       ),
       body: Center(child: Text("Place for your content")),

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -21,7 +21,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.0.0"
+    version: "2.0.1"
   characters:
     dependency: transitive
     description:

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: 2.0.0+1
+version: 2.0.1+1
 
 environment:
   sdk: ">=2.7.0 <3.0.0"

diff --git a/lib/src/theme/bottom_bar_with_sheet_theme.dart b/lib/src/theme/bottom_bar_with_sheet_theme.dart
@@ -67,7 +67,7 @@ class BottomBarTheme {
     this.itemTextStyle,
     this.mainButtonPosition = MainButtonPosition.middle,
     this.decoration,
-    this.itemIconSize = 20,
-    this.selectedItemIconSize = 17,
+    this.itemIconSize = 22,
+    this.selectedItemIconSize = 24,
   });
 }
diff --git a/lib/src/widgets/bottom_bar_body.dart b/lib/src/widgets/bottom_bar_body.dart
diff --git a/lib/src/widgets/bottom_bar_with_sheet_item.dart b/lib/src/widgets/bottom_bar_with_sheet_item.dart
@@ -37,6 +37,7 @@ class BottomBarWithSheetItemWidget extends StatelessWidget {
       Icon(
         model.icon,
         color: isSelected ? theme.selectedItemIconColor : theme.itemIconColor,
+        size: isSelected ? theme.selectedItemIconSize : theme.itemIconSize,
       ),
     ];
 

diff --git a/lib/src/widgets/bottom_bar_with_sheet_item_controller.dart b/lib/src/widgets/bottom_bar_with_sheet_item_controller.dart
@@ -43,7 +43,11 @@ class _BottmBarItemControllerState extends State<BottmBarItemController> {
   @override
   Widget build(BuildContext context) {
     return Expanded(
-      child: GestureDetector(
+      child: InkWell(
+        focusColor: Colors.transparent,
+        hoverColor: Colors.transparent,
+        splashColor: Colors.transparent,
+        highlightColor: Colors.transparent,
         onTap: () => widget.controller.selectItem(widget.index),
         child: BottomBarWithSheetItemWidget(
           model: widget.model,

diff --git a/lib/src/widgets/main_action_button.dart b/lib/src/widgets/main_action_button.dart
@@ -7,10 +7,10 @@ class MainActionButton extends StatelessWidget {
     Key? key,
     required this.onTap,
     required this.mainActionButtonTheme,
-    this.button,
     required this.arrowAnimation,
     required this.arrowAnimationController,
     required this.enable,
+    this.button,
   }) : super(key: key);
 
   final Function() onTap;

diff --git a/lib/src/widgets/typed_view.dart b/lib/src/widgets/typed_view.dart
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: bottom_bar_with_sheet
 description: This package help you to create bottom bar with FloatingActionButton which buld BottomSheet widget on every page.
-version: 2.0.0
+version: 2.0.1
 author: youngfrezyx@gmail.com
 homepage: https://github.com/Frezyx/bottom_bar_with_sheet