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

modify SearchResultWidget

Browse source
This commit is contained in:
ashilkn 2023-10-16 16:45:28 +05:30
parent a33eff40a8
commit 835102e0bf
1 changed files with 30 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
lib/ui/viewer/search/result/search_result_widget.dart
View file

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:photos/ente_theme_data.dart'; import 'package:photos/ente_theme_data.dart';
import 'package:photos/models/search/search_result.dart'; import 'package:photos/models/search/search_result.dart';
import "package:photos/models/search/search_types.dart"; import "package:photos/models/search/search_types.dart";
import "package:photos/theme/ente_theme.dart";
import 'package:photos/ui/viewer/search/result/search_result_page.dart'; import 'package:photos/ui/viewer/search/result/search_result_page.dart';
import 'package:photos/ui/viewer/search/result/search_thumbnail_widget.dart'; import 'package:photos/ui/viewer/search/result/search_thumbnail_widget.dart';
import 'package:photos/utils/navigation_util.dart'; import 'package:photos/utils/navigation_util.dart';
@ -21,10 +22,12 @@ class SearchResultWidget extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final heroTagPrefix = searchResult.heroTag(); final heroTagPrefix = searchResult.heroTag();
final textTheme = getEnteTextTheme(context);
return GestureDetector( return GestureDetector(
behavior: HitTestBehavior.opaque, behavior: HitTestBehavior.opaque,
child: Container( child: Container(
//todo: check and change color to figma
color: Theme.of(context).colorScheme.searchResultsColor, color: Theme.of(context).colorScheme.searchResultsColor,
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 12), padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 12),
@ -36,48 +39,35 @@ class SearchResultWidget extends StatelessWidget {
searchResult.previewThumbnail(), searchResult.previewThumbnail(),
heroTagPrefix, heroTagPrefix,
), ),
const SizedBox(width: 16), const SizedBox(width: 12),
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text(
_resultTypeName(searchResult.type()),
style: TextStyle(
fontSize: 12,
color: Theme.of(context).colorScheme.subTextColor,
),
),
const SizedBox(height: 6),
SizedBox( SizedBox(
width: 220, width: 220,
child: Text( child: Text(
searchResult.name(), searchResult.name(),
style: const TextStyle(fontSize: 18), style: textTheme.body,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
), ),
const SizedBox(height: 2), const SizedBox(height: 4),
Row(
children: [
Text(
_resultTypeName(searchResult.type()),
style: textTheme.smallMuted,
),
FutureBuilder<int>( FutureBuilder<int>(
future: resultCount ?? future: resultCount ??
Future.value(searchResult.resultFiles().length), Future.value(searchResult.resultFiles().length),
builder: (context, snapshot) { builder: (context, snapshot) {
if (snapshot.hasData && snapshot.data! > 0) { if (snapshot.hasData && snapshot.data! > 0) {
final noOfMemories = snapshot.data; final noOfMemories = snapshot.data;
return RichText(
text: TextSpan( return Text(
style: TextStyle( " \u2022 " + noOfMemories.toString(),
color: Theme.of(context) style: textTheme.smallMuted,
.colorScheme
.searchResultsCountTextColor,
),
children: [
TextSpan(text: noOfMemories.toString()),
TextSpan(
text:
noOfMemories != 1 ? ' memories' : ' memory',
),
],
),
); );
} else { } else {
return const SizedBox.shrink(); return const SizedBox.shrink();
@ -86,6 +76,9 @@ class SearchResultWidget extends StatelessWidget {
), ),
], ],
), ),
const SizedBox(height: 2),
],
),
const Spacer(), const Spacer(),
Icon( Icon(
Icons.chevron_right, Icons.chevron_right,