Skip to content

Commit 71f06e2

Browse files
FrezyxFrezyx
authored
Merge pull request #44 from Frezyx/dev
Release version 1.1.0
2 parents f1106ed + aa729b4 commit 71f06e2

19 files changed

+206
-147
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
## 1.0.0 - 12-04-2021
1+
## 1.1.0 - 25-04-2021
2+
3+
* Simplify package using with default themes
4+
* Make bottomBarTheme, mainActionButtonTheme optional
5+
6+
## 1.0.1 - 25-04-2021
27

38
* Provide key value to super class in BottomBarWithSheet widget
49

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
```yaml
1919
dependencies:
20-
bottom_bar_with_sheet: ^1.0.1
20+
bottom_bar_with_sheet: ^1.1.0
2121
```
2222
2323
### Add import package
@@ -38,7 +38,7 @@ Scaffold(
3838
selectedIndex: 0,
3939
sheetChild: Center(child: Text("Place for your another content")),
4040
bottomBarTheme: BottomBarTheme(
41-
mainButtonPosition: MainButtonPosition.Middle,
41+
mainButtonPosition: MainButtonPosition.middle,
4242
selectedItemBackgroundColor: const Color(0xFF2B65E3),
4343
),
4444
mainActionButtonTheme: MainActionButtonTheme(
@@ -100,7 +100,7 @@ Scaffold(
100100
| itemTextStyle | Color | unselected item text style |
101101
| selectedItemBackgroundColor | Color | selected item icon color |
102102
| selectedItemIconSize | double | size of item icon when item is pressed |
103-
| mainButtonPosition | enum | filed that response for the position of MainActionButton position this field have 3 possible values: MainButtonPosition.Left, MainButtonPosition.Right , MainButtonPosition.Center |
103+
| mainButtonPosition | enum | filed that response for the position of MainActionButton position this field have 3 possible values: MainButtonPosition.left, MainButtonPosition.right , MainButtonPosition.Center |
104104

105105
## Attributes of MainActionButtonTheme
106106

‎example/lib/examples/custom_main_action_button.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class _MyHomePageState extends State<MyHomePage> {
3131
bottomBarTheme: BottomBarTheme(
3232
height: 70,
3333
heightClosed: 100,
34-
mainButtonPosition: MainButtonPosition.Middle,
34+
mainButtonPosition: MainButtonPosition.middle,
3535
),
3636
mainActionButtonTheme: MainActionButtonTheme(
3737
icon: null,

‎example/lib/examples/future/v1.0.0-beta-preview.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class _MyHomePageState extends State<MyHomePage> {
5858
curve: Curves.easeOutExpo,
5959
duration: Duration(seconds: 1),
6060
bottomBarTheme: BottomBarTheme(
61-
mainButtonPosition: MainButtonPosition.Middle,
61+
mainButtonPosition: MainButtonPosition.middle,
6262
selectedItemIconColor: Colors.blue,
6363
selectedItemBackgroundColor: Colors.transparent,
6464
selectedItemIconSize: 20,

‎example/lib/examples/left_button.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class _MyHomePageState extends State<MyHomePage> {
5353
heightClosed: 70,
5454
heightOpened: 300,
5555
backgroundColor: Colors.grey[900],
56-
mainButtonPosition: MainButtonPosition.Left,
56+
mainButtonPosition: MainButtonPosition.left,
5757
selectedItemBackgroundColor: Colors.transparent,
5858
selectedItemIconColor: Colors.green,
5959
itemIconColor: Colors.white,

‎example/lib/examples/right_button.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class _MyHomePageState extends State<MyHomePage> {
5555
heightClosed: 80,
5656
heightOpened: 500,
5757
backgroundColor: Colors.white,
58-
mainButtonPosition: MainButtonPosition.Right,
58+
mainButtonPosition: MainButtonPosition.right,
5959
selectedItemBackgroundColor: Colors.orange,
6060
selectedItemIconColor: Colors.white,
6161
itemIconColor: Colors.grey[500],

‎example/lib/examples/use_cases/tasks_app.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class _MyHomePageState extends State<MyHomePage> {
9797
height: 70,
9898
heightClosed: 80,
9999
heightOpened: 300,
100-
mainButtonPosition: MainButtonPosition.Middle,
100+
mainButtonPosition: MainButtonPosition.middle,
101101
selectedItemIconSize: 20,
102102
decoration: BoxDecoration(
103103
boxShadow: [

‎example/lib/examples/without_background_bar_items_example.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class _MyHomePageState extends State<MyHomePage> {
2727
backgroundColor: Colors.grey[100],
2828
appBar: AppBar(
2929
backgroundColor: Colors.purple,
30-
title: Text('bottom_bar_with_sheet v1.0.1',
30+
title: Text('bottom_bar_with_sheet v1.1.0',
3131
style: TextStyle(color: Colors.white)),
3232
),
3333
body: Center(child: Text("Place for your content")),
@@ -43,7 +43,7 @@ class _MyHomePageState extends State<MyHomePage> {
4343
selectedItemBackgroundColor: Colors.purple,
4444
height: 70,
4545
heightClosed: 80,
46-
mainButtonPosition: MainButtonPosition.Middle,
46+
mainButtonPosition: MainButtonPosition.middle,
4747
selectedItemIconSize: 20,
4848
decoration: BoxDecoration(
4949
boxShadow: [

‎example/lib/main.dart‎

Lines changed: 81 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ class MyApp extends StatelessWidget {
88
Widget build(BuildContext context) {
99
return MaterialApp(
1010
debugShowCheckedModeBanner: false,
11+
theme: ThemeData(
12+
iconTheme: IconThemeData(
13+
color: Colors.blue,
14+
),
15+
),
1116
home: MyHomePage(),
1217
);
1318
}
@@ -47,20 +52,6 @@ class _MyHomePageState extends State<MyHomePage> {
4752
),
4853
),
4954
),
50-
bottomBarTheme: BottomBarTheme(
51-
mainButtonPosition: MainButtonPosition.Middle,
52-
selectedItemBackgroundColor: Colors.white,
53-
selectedItemIconColor: Colors.blue,
54-
selectedItemIconSize: 20,
55-
),
56-
mainActionButtonTheme: MainActionButtonTheme(
57-
size: 55,
58-
icon: Icon(
59-
Icons.add,
60-
color: Colors.white,
61-
size: 35,
62-
),
63-
),
6455
onSelectItem: (index) => setState(() => _selectedIndex = index),
6556
items: [
6657
BottomBarWithSheetItem(icon: Icons.people),
@@ -72,3 +63,79 @@ class _MyHomePageState extends State<MyHomePage> {
7263
);
7364
}
7465
}
66+
67+
// import 'package:bottom_bar_with_sheet/bottom_bar_with_sheet.dart';
68+
// import 'package:flutter/material.dart';
69+
70+
// void main() => runApp(MyApp());
71+
72+
// class MyApp extends StatelessWidget {
73+
// @override
74+
// Widget build(BuildContext context) {
75+
// return MaterialApp(
76+
// debugShowCheckedModeBanner: false,
77+
// home: MyHomePage(),
78+
// );
79+
// }
80+
// }
81+
82+
// class MyHomePage extends StatefulWidget {
83+
// @override
84+
// _MyHomePageState createState() => _MyHomePageState();
85+
// }
86+
87+
// class _MyHomePageState extends State<MyHomePage> {
88+
// int _selectedIndex = 0;
89+
90+
// @override
91+
// Widget build(BuildContext context) {
92+
// return Scaffold(
93+
// backgroundColor: Colors.blue,
94+
// body: Center(
95+
// child: Text(
96+
// "Place for your content",
97+
// style: TextStyle(
98+
// color: Colors.white,
99+
// fontSize: 20,
100+
// fontWeight: FontWeight.w900,
101+
// ),
102+
// ),
103+
// ),
104+
// bottomNavigationBar: BottomBarWithSheet(
105+
// selectedIndex: _selectedIndex,
106+
// sheetChild: Center(
107+
// child: Text(
108+
// "Another content",
109+
// style: TextStyle(
110+
// color: Colors.grey[600],
111+
// fontSize: 20,
112+
// fontWeight: FontWeight.w900,
113+
// ),
114+
// ),
115+
// ),
116+
// bottomBarTheme: BottomBarTheme(
117+
// mainButtonPosition: MainButtonPosition.middle,
118+
// selectedItemBackgroundColor: Colors.white,
119+
// selectedItemIconColor: Colors.blue,
120+
// selectedItemIconSize: 20,
121+
// ),
122+
// mainActionButtonTheme: MainActionButtonTheme(
123+
// size: 55,
124+
// icon: Icon(
125+
// Icons.add,
126+
// color: Colors.white,
127+
// size: 35,
128+
// ),
129+
// ),
130+
// onSelectItem: (index) => setState(() => _selectedIndex = index),
131+
// items: [
132+
// BottomBarWithSheetItem(icon: Icons.people),
133+
// BottomBarWithSheetItem(icon: Icons.shopping_cart),
134+
// BottomBarWithSheetItem(icon: Icons.settings),
135+
// BottomBarWithSheetItem(icon: Icons.favorite),
136+
// ],
137+
// ),
138+
// );
139+
// }
140+
// }
141+
//

‎example/pubspec.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ packages:
2121
path: ".."
2222
relative: true
2323
source: path
24-
version: "1.0.1"
24+
version: "1.1.0"
2525
characters:
2626
dependency: transitive
2727
description:

0 commit comments

Comments
 (0)