beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

code refactor

Browse source
This commit is contained in:
ashilkn 2022-07-28 13:22:20 +05:30
parent 72f3c70804
commit b06fb763f0
1 changed files with 68 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
lib/ui/viewer/search/search_widget.dart
View file

@ -7,6 +7,7 @@ import 'package:photos/services/collections_service.dart';
import 'package:photos/ui/viewer/search/search_results_suggestions.dart'; import 'package:photos/ui/viewer/search/search_results_suggestions.dart';
class SearchIconWidget extends StatefulWidget { class SearchIconWidget extends StatefulWidget {
final String searchQuery = '';
const SearchIconWidget({Key key}) : super(key: key); const SearchIconWidget({Key key}) : super(key: key);
@override @override
@ -14,6 +15,7 @@ class SearchIconWidget extends StatefulWidget {
} }
class _SearchIconWidgetState extends State<SearchIconWidget> { class _SearchIconWidgetState extends State<SearchIconWidget> {
final ValueNotifier<String> _searchQuery = ValueNotifier('');
bool showSearchWidget; bool showSearchWidget;
@override @override
void initState() { void initState() {
@ -23,8 +25,11 @@ class _SearchIconWidgetState extends State<SearchIconWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
List<CollectionWithThumbnail> matchedCollections;
List<File> matchedFiles;
//when false - show the search icon, when true - show the textfield for search
return showSearchWidget return showSearchWidget
? Searchwidget(showSearchWidget) ? searchWidget(matchedCollections, matchedFiles)
: IconButton( : IconButton(
onPressed: () { onPressed: () {
setState( setState(
@ -36,33 +41,19 @@ class _SearchIconWidgetState extends State<SearchIconWidget> {
icon: const Icon(Icons.search), icon: const Icon(Icons.search),
); );
} }
}
// ignore: must_be_immutable Widget searchWidget(
class Searchwidget extends StatefulWidget { List<CollectionWithThumbnail> matchedCollections,
bool openSearch; List<File> matchedFiles,
final String searchQuery = ''; ) {
Searchwidget(this.openSearch, {Key key}) : super(key: key); return Column(
@override
State<Searchwidget> createState() => _SearchwidgetState();
}
class _SearchwidgetState extends State<Searchwidget> {
final ValueNotifier<String> _searchQ = ValueNotifier('');
@override
Widget build(BuildContext context) {
List<CollectionWithThumbnail> matchedCollections;
List<File> matchedFiles;
return widget.openSearch
? Column(
children: [ children: [
Row( Row(
children: [ children: [
const SizedBox(width: 12), const SizedBox(width: 12),
Flexible( Flexible(
child: Container( child: Container(
color: color: Theme.of(context).colorScheme.defaultBackgroundColor,
Theme.of(context).colorScheme.defaultBackgroundColor,
child: TextFormField( child: TextFormField(
style: Theme.of(context).textTheme.subtitle1, style: Theme.of(context).textTheme.subtitle1,
decoration: InputDecoration( decoration: InputDecoration(
@ -80,9 +71,9 @@ class _SearchwidgetState extends State<Searchwidget> {
onChanged: (value) async { onChanged: (value) async {
matchedCollections = await CollectionsService.instance matchedCollections = await CollectionsService.instance
.getFilteredCollectionsWithThumbnail(value); .getFilteredCollectionsWithThumbnail(value);
matchedFiles = await FilesDB.instance matchedFiles =
.getFilesOnFileNameSearch(value); await FilesDB.instance.getFilesOnFileNameSearch(value);
_searchQ.value = value; _searchQuery.value = value;
}, },
autofocus: true, autofocus: true,
), ),
@ -91,7 +82,7 @@ class _SearchwidgetState extends State<Searchwidget> {
IconButton( IconButton(
onPressed: () { onPressed: () {
setState(() { setState(() {
widget.openSearch = !widget.openSearch; showSearchWidget = !showSearchWidget;
}); });
}, },
icon: const Icon(Icons.close), icon: const Icon(Icons.close),
@ -100,7 +91,7 @@ class _SearchwidgetState extends State<Searchwidget> {
), ),
const SizedBox(height: 20), const SizedBox(height: 20),
ValueListenableBuilder( ValueListenableBuilder(
valueListenable: _searchQ, valueListenable: _searchQuery,
builder: ( builder: (
BuildContext context, BuildContext context,
String newQuery, String newQuery,
@ -115,7 +106,6 @@ class _SearchwidgetState extends State<Searchwidget> {
}, },
), ),
], ],
) );
: const SearchIconWidget();
} }
} }