code refactoring
This commit is contained in:
parent
c1b4ad8e38
commit
834209ef80
|
@ -0,0 +1,80 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:photos/db/files_db.dart';
|
||||
import 'package:photos/ente_theme_data.dart';
|
||||
import 'package:photos/models/collection_items.dart';
|
||||
import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
|
||||
import 'package:photos/ui/viewer/gallery/collection_page.dart';
|
||||
import 'package:photos/utils/navigation_util.dart';
|
||||
|
||||
class CollectionSuggestionWidgetGenerator extends StatelessWidget {
|
||||
final CollectionWithThumbnail c;
|
||||
const CollectionSuggestionWidgetGenerator(this.c, {Key key})
|
||||
: super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return GestureDetector(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 12),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const Text(
|
||||
'Album',
|
||||
style: TextStyle(fontSize: 12),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
c.collection.name,
|
||||
style: const TextStyle(fontSize: 18),
|
||||
),
|
||||
FutureBuilder<int>(
|
||||
future: FilesDB.instance.collectionFileCount(
|
||||
c.collection.id,
|
||||
),
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.hasData && snapshot.data > 0) {
|
||||
int noOfMemories = snapshot.data;
|
||||
|
||||
return RichText(
|
||||
text: TextSpan(
|
||||
style: TextStyle(
|
||||
color:
|
||||
Theme.of(context).colorScheme.defaultTextColor,
|
||||
),
|
||||
children: [
|
||||
TextSpan(text: noOfMemories.toString()),
|
||||
TextSpan(
|
||||
text: noOfMemories != 1 ? ' memories' : ' memory',
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
} else {
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
Row(
|
||||
children: [
|
||||
SizedBox(
|
||||
height: 50,
|
||||
width: 50,
|
||||
child: ThumbnailWidget(c.thumbnail),
|
||||
),
|
||||
],
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
onTap: () {
|
||||
routeToPage(context, CollectionPage(c));
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
|
@ -1,88 +0,0 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:photos/db/files_db.dart';
|
||||
import 'package:photos/ente_theme_data.dart';
|
||||
import 'package:photos/models/collection_items.dart';
|
||||
import 'package:photos/ui/viewer/file/thumbnail_widget.dart';
|
||||
import 'package:photos/ui/viewer/gallery/collection_page.dart';
|
||||
import 'package:photos/utils/navigation_util.dart';
|
||||
|
||||
class CollectionSuggestionWidgets {
|
||||
final List<CollectionWithThumbnail> matchedCollections;
|
||||
final BuildContext context;
|
||||
CollectionSuggestionWidgets(this.matchedCollections, this.context);
|
||||
List<Widget> generateSuggestionWidgets() {
|
||||
List<Widget> collectionSuggestionWidgets = [];
|
||||
|
||||
for (CollectionWithThumbnail c in matchedCollections) {
|
||||
collectionSuggestionWidgets.add(
|
||||
GestureDetector(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 12),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const Text(
|
||||
'Album',
|
||||
style: TextStyle(fontSize: 12),
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
c.collection.name,
|
||||
style: const TextStyle(fontSize: 18),
|
||||
),
|
||||
FutureBuilder<int>(
|
||||
future: FilesDB.instance.collectionFileCount(
|
||||
c.collection.id,
|
||||
),
|
||||
builder: (context, snapshot) {
|
||||
if (snapshot.hasData && snapshot.data > 0) {
|
||||
int noOfMemories = snapshot.data;
|
||||
|
||||
return RichText(
|
||||
text: TextSpan(
|
||||
style: TextStyle(
|
||||
color: Theme.of(context)
|
||||
.colorScheme
|
||||
.defaultTextColor,
|
||||
),
|
||||
children: [
|
||||
TextSpan(text: noOfMemories.toString()),
|
||||
TextSpan(
|
||||
text: noOfMemories != 1
|
||||
? ' memories'
|
||||
: ' memory',
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
} else {
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
},
|
||||
),
|
||||
],
|
||||
),
|
||||
Row(
|
||||
children: [
|
||||
SizedBox(
|
||||
height: 50,
|
||||
width: 50,
|
||||
child: ThumbnailWidget(c.thumbnail),
|
||||
),
|
||||
],
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
onTap: () {
|
||||
routeToPage(context, CollectionPage(c));
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
return collectionSuggestionWidgets;
|
||||
}
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:photos/models/collection_items.dart';
|
||||
import 'package:photos/ui/viewer/search/collection_suggestion_widgets.dart';
|
||||
import 'package:photos/ui/viewer/search/collection_suggestion_widget_generator.dart';
|
||||
|
||||
class SearchResultsSuggestions extends StatelessWidget {
|
||||
final List<CollectionWithThumbnail> collectionsWithThumbnail;
|
||||
|
@ -11,11 +11,10 @@ class SearchResultsSuggestions extends StatelessWidget {
|
|||
@override
|
||||
Widget build(BuildContext context) {
|
||||
List<Widget> suggestions = [];
|
||||
// for (CollectionWithThumbnail c in collectionsWithThumbnail) {
|
||||
// suggestions.add{}
|
||||
// }
|
||||
suggestions = CollectionSuggestionWidgets(collectionsWithThumbnail, context)
|
||||
.generateSuggestionWidgets();
|
||||
for (CollectionWithThumbnail c in collectionsWithThumbnail) {
|
||||
suggestions.add(CollectionSuggestionWidgetGenerator(c));
|
||||
}
|
||||
|
||||
return Container(
|
||||
constraints:
|
||||
BoxConstraints(maxHeight: MediaQuery.of(context).size.height * 0.6),
|
||||
|
|
Loading…
Reference in a new issue