Skip to content

Commit d82b8d5

Browse files
committed
changes in drawer done
1 parent 4425a77 commit d82b8d5

File tree

3 files changed

+45
-42
lines changed

3 files changed

+45
-42
lines changed

lib/components/appbar/gf_appbar.dart

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -409,37 +409,37 @@ class _GFAppBarState extends State<GFAppBar> {
409409
}
410410

411411
searchBar = TextField(
412-
cursorColor: widget.searchBarColorTheme,
413-
style: widget.searchTextStyle,
414-
decoration: new InputDecoration(
415-
prefixIcon: new Icon(
416-
Icons.search,
412+
cursorColor: widget.searchBarColorTheme,
413+
style: widget.searchTextStyle,
414+
decoration: new InputDecoration(
415+
prefixIcon: new Icon(
416+
Icons.search,
417+
color: widget.searchBarColorTheme,
418+
size: 18.0,
419+
),
420+
suffixIcon: GFIconButton(
421+
icon: Icon(
422+
Icons.close,
417423
color: widget.searchBarColorTheme,
418-
size: 18.0,
419-
),
420-
suffixIcon: GFIconButton(
421-
icon: Icon(
422-
Icons.close,
423-
color: widget.searchBarColorTheme,
424-
size: 20.0,
425-
),
426-
type: GFButtonType.transparent,
427-
onPressed: () {
428-
setState(() {
429-
showSearchBar = !showSearchBar;
430-
});
431-
},
432-
),
433-
hintText: widget.searchHintText,
434-
hintStyle: widget.searchHintStyle,
435-
focusedBorder: UnderlineInputBorder(
436-
borderSide: BorderSide(width: 1, color: widget.searchBarColorTheme),
424+
size: 20.0,
437425
),
426+
type: GFButtonType.transparent,
427+
onPressed: () {
428+
setState(() {
429+
showSearchBar = !showSearchBar;
430+
});
431+
},
432+
),
433+
hintText: widget.searchHintText,
434+
hintStyle: widget.searchHintStyle,
435+
focusedBorder: UnderlineInputBorder(
436+
borderSide: BorderSide(width: 1, color: widget.searchBarColorTheme),
438437
),
439-
onTap: widget.onTap,
440-
onChanged: widget.onChanged,
441-
controller: widget.searchController,
442-
onSubmitted: widget.onSubmitted,
438+
),
439+
onTap: widget.onTap,
440+
onChanged: widget.onChanged,
441+
controller: widget.searchController,
442+
onSubmitted: widget.onSubmitted,
443443
);
444444

445445
if (!showSearchBar) {

lib/components/drawer/gf_drawer.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:flutter/foundation.dart';
22
import 'package:flutter/widgets.dart';
33
import 'package:flutter/material.dart';
4-
import 'package:getflutter/colors/gf_color.dart';
54

65
/// The possible alignments of a [GFDrawer].
76
enum GFDrawerAlignment {

lib/components/search_bar/gf_search_bar.dart

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -253,26 +253,30 @@ class MySingleChoiceSearchState<T> extends State<GFSearchBar<T>> {
253253
),
254254
content: _searchList.isNotEmpty
255255
? Column(
256-
mainAxisAlignment: MainAxisAlignment.end,
257-
crossAxisAlignment: CrossAxisAlignment.end,
258-
children: <Widget>[
259-
InkWell(
260-
child: Icon(Icons.close, size: 22.0,),
261-
onTap: onCloseOverlaySearchList,
262-
),
263-
Container(
256+
mainAxisAlignment: MainAxisAlignment.end,
257+
crossAxisAlignment: CrossAxisAlignment.end,
258+
children: <Widget>[
259+
InkWell(
260+
child: Icon(
261+
Icons.close,
262+
size: 22.0,
263+
),
264+
onTap: onCloseOverlaySearchList,
265+
),
266+
Container(
264267
height: overlaySearchListHeight,
265268
child: Scrollbar(
266269
child: ListView.separated(
267270
padding: const EdgeInsets.symmetric(vertical: 4),
268-
separatorBuilder: (context, index) => const Divider(
271+
separatorBuilder: (context, index) =>
272+
const Divider(
269273
height: 1,
270274
),
271275
itemBuilder: (context, index) => Material(
272276
color: Colors.transparent,
273277
child: InkWell(
274-
onTap: () =>
275-
onSearchListItemSelected(_searchList[index]),
278+
onTap: () => onSearchListItemSelected(
279+
_searchList[index]),
276280
child: widget.overlaySearchListItemBuilder(
277281
_searchList.elementAt(index),
278282
),
@@ -282,8 +286,8 @@ class MySingleChoiceSearchState<T> extends State<GFSearchBar<T>> {
282286
),
283287
),
284288
),
285-
],
286-
)
289+
],
290+
)
287291
: widget.noItemsFoundWidget != null
288292
? Center(
289293
child: widget.noItemsFoundWidget,

0 commit comments

Comments
 (0)