Skip to content

Commit 56a6fff

Browse files
JamalianpourJamalianpour
committed
Remove Badge, Fix RTL
1 parent 7ce1dee commit 56a6fff

File tree

15 files changed

+175
-116
lines changed

15 files changed

+175
-116
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## [0.6.1]
2+
* **New Features**
3+
* add onTap event -> `SideMenuExpansionItem` [#85](https://github.com/Jamalianpour/easy_sidemenu/pull/85)
4+
5+
* Removed `Badge` dependencies and use Flutter builtin `Badge`
6+
* Fix RTL issues
7+
18
## [0.6.0]
29
* **New Features**
310
* Add expansion item -> `SideMenuExpansionItem`

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ You can see web demo here: [https://jamalianpour.github.io/easy_sidemenu](https:
3838

3939
```yaml
4040
dependencies:
41-
easy_sidemenu: ^0.6.0
41+
easy_sidemenu: ^0.6.1
4242
```
4343
4444
Run `flutter packages get` in the root directory of your app.
@@ -56,7 +56,7 @@ Now you can use `SideMenu` as a widget in your code.
5656
You must first define a list of items to display on `SideMenu`:
5757

5858
```dart
59-
List<SideMenuItem> items = [
59+
List items = [
6060
SideMenuItem(
6161
title: 'Dashboard',
6262
onTap: (index, _) {

‎example/lib/main.dart‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ class MyApp extends StatelessWidget {
1212
Widget build(BuildContext context) {
1313
return MaterialApp(
1414
title: 'easy_sidemenu Demo',
15-
theme: ThemeData(
16-
primarySwatch: Colors.blue,
17-
useMaterial3: false
18-
),
15+
theme: ThemeData(primarySwatch: Colors.blue, useMaterial3: false),
1916
home: const MyHomePage(title: 'easy_sidemenu Demo'),
2017
debugShowCheckedModeBanner: false,
2118
);
@@ -125,9 +122,8 @@ class _MyHomePageState extends State<MyHomePage> {
125122
SideMenuExpansionItem(
126123
title: "Expansion Item",
127124
icon: const Icon(Icons.kitchen),
128-
onTap: (index, _, isExpanded) => {
129-
print('$index, expanded $isExpanded')
130-
},
125+
onTap: (index, _, isExpanded) =>
126+
{print('$index, expanded $isExpanded')},
131127
children: [
132128
SideMenuItem(
133129
title: 'Expansion Item 1',
@@ -209,7 +205,9 @@ class _MyHomePageState extends State<MyHomePage> {
209205
),
210206
],
211207
),
212-
const VerticalDivider(width: 0,),
208+
const VerticalDivider(
209+
width: 0,
210+
),
213211
Expanded(
214212
child: PageView(
215213
controller: pageController,
@@ -288,4 +286,4 @@ class _MyHomePageState extends State<MyHomePage> {
288286
),
289287
);
290288
}
291-
}
289+
}

‎example/macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
isa = PBXProject;
183183
attributes = {
184184
LastSwiftUpdateCheck = 0920;
185-
LastUpgradeCheck = 1430;
185+
LastUpgradeCheck = 1510;
186186
ORGANIZATIONNAME = "";
187187
TargetAttributes = {
188188
33CC10EC2044A3C60003C045 = {

‎example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1430"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎example/macos/Runner/AppDelegate.swift‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
import Cocoa
22
import FlutterMacOS
33

4-
@NSApplicationMain
4+
@main
55
class AppDelegate: FlutterAppDelegate {
66
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
77
return true
88
}
9+
10+
override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
11+
return true
12+
}
913
}

‎example/pubspec.lock‎

Lines changed: 65 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ packages:
1313
dependency: transitive
1414
description:
1515
name: badges
16-
sha256: "6e7f3ec561ec08f47f912cfe349d4a1707afdc8dda271e17b046aa6d42c89e77"
16+
sha256: a7b6bbd60dce418df0db3058b53f9d083c22cdb5132a052145dc267494df0b84
1717
url: "https://pub.dev"
1818
source: hosted
19-
version: "3.1.1"
19+
version: "3.1.2"
2020
boolean_selector:
2121
dependency: transitive
2222
description:
@@ -45,25 +45,25 @@ packages:
4545
dependency: transitive
4646
description:
4747
name: collection
48-
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
48+
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
4949
url: "https://pub.dev"
5050
source: hosted
51-
version: "1.18.0"
51+
version: "1.19.0"
5252
cupertino_icons:
5353
dependency: "direct main"
5454
description:
5555
name: cupertino_icons
56-
sha256: "486b7bc707424572cdf7bd7e812a0c146de3fd47ecadf070254cc60383f21dd8"
56+
sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
5757
url: "https://pub.dev"
5858
source: hosted
59-
version: "1.0.3"
59+
version: "1.0.8"
6060
easy_sidemenu:
6161
dependency: "direct dev"
6262
description:
6363
path: ".."
6464
relative: true
6565
source: path
66-
version: "0.6.0"
66+
version: "0.6.1"
6767
fake_async:
6868
dependency: transitive
6969
description:
@@ -85,11 +85,48 @@ packages:
8585
url: "https://pub.dev"
8686
source: hosted
8787
version: "1.0.4"
88+
flutter_localizations:
89+
dependency: "direct main"
90+
description: flutter
91+
source: sdk
92+
version: "0.0.0"
8893
flutter_test:
8994
dependency: "direct dev"
9095
description: flutter
9196
source: sdk
9297
version: "0.0.0"
98+
intl:
99+
dependency: transitive
100+
description:
101+
name: intl
102+
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
103+
url: "https://pub.dev"
104+
source: hosted
105+
version: "0.19.0"
106+
leak_tracker:
107+
dependency: transitive
108+
description:
109+
name: leak_tracker
110+
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
111+
url: "https://pub.dev"
112+
source: hosted
113+
version: "10.0.7"
114+
leak_tracker_flutter_testing:
115+
dependency: transitive
116+
description:
117+
name: leak_tracker_flutter_testing
118+
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
119+
url: "https://pub.dev"
120+
source: hosted
121+
version: "3.0.8"
122+
leak_tracker_testing:
123+
dependency: transitive
124+
description:
125+
name: leak_tracker_testing
126+
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
127+
url: "https://pub.dev"
128+
source: hosted
129+
version: "3.0.1"
93130
lints:
94131
dependency: transitive
95132
description:
@@ -102,39 +139,39 @@ packages:
102139
dependency: transitive
103140
description:
104141
name: matcher
105-
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
142+
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
106143
url: "https://pub.dev"
107144
source: hosted
108-
version: "0.12.16"
145+
version: "0.12.16+1"
109146
material_color_utilities:
110147
dependency: transitive
111148
description:
112149
name: material_color_utilities
113-
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
150+
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
114151
url: "https://pub.dev"
115152
source: hosted
116-
version: "0.5.0"
153+
version: "0.11.1"
117154
meta:
118155
dependency: transitive
119156
description:
120157
name: meta
121-
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
158+
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
122159
url: "https://pub.dev"
123160
source: hosted
124-
version: "1.10.0"
161+
version: "1.15.0"
125162
path:
126163
dependency: transitive
127164
description:
128165
name: path
129-
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
166+
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
130167
url: "https://pub.dev"
131168
source: hosted
132-
version: "1.8.3"
169+
version: "1.9.0"
133170
sky_engine:
134171
dependency: transitive
135172
description: flutter
136173
source: sdk
137-
version: "0.0.99"
174+
version: "0.0.0"
138175
source_span:
139176
dependency: transitive
140177
description:
@@ -147,10 +184,10 @@ packages:
147184
dependency: transitive
148185
description:
149186
name: stack_trace
150-
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
187+
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
151188
url: "https://pub.dev"
152189
source: hosted
153-
version: "1.11.1"
190+
version: "1.12.0"
154191
stream_channel:
155192
dependency: transitive
156193
description:
@@ -163,10 +200,10 @@ packages:
163200
dependency: transitive
164201
description:
165202
name: string_scanner
166-
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
203+
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
167204
url: "https://pub.dev"
168205
source: hosted
169-
version: "1.2.0"
206+
version: "1.3.0"
170207
term_glyph:
171208
dependency: transitive
172209
description:
@@ -179,10 +216,10 @@ packages:
179216
dependency: transitive
180217
description:
181218
name: test_api
182-
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
219+
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
183220
url: "https://pub.dev"
184221
source: hosted
185-
version: "0.6.1"
222+
version: "0.7.3"
186223
vector_math:
187224
dependency: transitive
188225
description:
@@ -191,14 +228,14 @@ packages:
191228
url: "https://pub.dev"
192229
source: hosted
193230
version: "2.1.4"
194-
web:
231+
vm_service:
195232
dependency: transitive
196233
description:
197-
name: web
198-
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
234+
name: vm_service
235+
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
199236
url: "https://pub.dev"
200237
source: hosted
201-
version: "0.3.0"
238+
version: "14.3.0"
202239
sdks:
203-
dart: ">=3.2.0-194.0.dev <4.0.0"
204-
flutter: ">=1.17.0"
240+
dart: ">=3.4.0 <4.0.0"
241+
flutter: ">=3.18.0-18.0.pre.54"

‎example/pubspec.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ environment:
99
dependencies:
1010
flutter:
1111
sdk: flutter
12+
13+
flutter_localizations:
14+
sdk: flutter
15+
1216
cupertino_icons: ^1.0.2
1317

1418
dev_dependencies:

‎lib/src/global/global.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import 'package:flutter/widgets.dart';
66
class Global {
77
late SideMenuController controller;
88
late SideMenuStyle style;
9-
DisplayModeNotifier displayModeState = DisplayModeNotifier(SideMenuDisplayMode.auto);
9+
DisplayModeNotifier displayModeState =
10+
DisplayModeNotifier(SideMenuDisplayMode.auto);
1011
bool showTrailing = true;
1112
List<Function> itemsUpdate = [];
1213
List items = [];

‎lib/src/side_menu_expansion_item.dart‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ class SideMenuExpansionItem {
1212

1313
/// A function that will be called when tap on [SideMenuExpansionItem] corresponding
1414
/// to this [SideMenuExpansionItem]
15-
final void Function(int index, SideMenuController sideMenuController, bool isExpanded)? onTap;
15+
final void Function(
16+
int index, SideMenuController sideMenuController, bool isExpanded)? onTap;
1617

1718
/// A Icon to display before [title]
1819
final Icon? icon;
@@ -31,5 +32,5 @@ class SideMenuExpansionItem {
3132
required this.children,
3233
}) : assert(title != null || icon != null,
3334
'Title and icon should not be empty at the same time'),
34-
super();
35+
super();
3536
}

0 commit comments

Comments
 (0)