minor fixes

This commit is contained in:
Thibault Deckers 2019-12-24 11:10:02 +09:00
parent e2f9377045
commit bfe2b4d319
4 changed files with 111 additions and 87 deletions

View file

@ -6,6 +6,7 @@ import 'package:aves/widgets/album/filtered_collection_page.dart';
import 'package:aves/widgets/common/icons.dart'; import 'package:aves/widgets/common/icons.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:provider/provider.dart';
class AllCollectionDrawer extends StatelessWidget { class AllCollectionDrawer extends StatelessWidget {
final ImageCollection collection; final ImageCollection collection;
@ -17,8 +18,10 @@ class AllCollectionDrawer extends StatelessWidget {
final albums = collection.sortedAlbums; final albums = collection.sortedAlbums;
final tags = collection.sortedTags; final tags = collection.sortedTags;
return Drawer( return Drawer(
child: ListView( child: Selector<MediaQueryData, double>(
padding: EdgeInsets.only(bottom: window.viewInsets.bottom), selector: (c, mq) => mq.viewInsets.bottom,
builder: (c, mqViewInsetsBottom, child) => ListView(
padding: EdgeInsets.only(bottom: mqViewInsetsBottom),
children: [ children: [
DrawerHeader( DrawerHeader(
decoration: BoxDecoration( decoration: BoxDecoration(
@ -81,32 +84,48 @@ class AllCollectionDrawer extends StatelessWidget {
), ),
), ),
), ),
_buildFilteredCollectionNavTile( _FilteredCollectionNavTile(
context: context, collection: collection,
leading: Icon(Icons.video_library), leading: Icon(Icons.video_library),
title: 'Videos', title: 'Videos',
filter: (entry) => entry.isVideo, filter: (entry) => entry.isVideo,
), ),
const Divider(), const Divider(),
...albums.map((album) => _buildFilteredCollectionNavTile( ...albums.map((album) => _FilteredCollectionNavTile(
context: context, collection: collection,
leading: IconUtils.getAlbumIcon(context, album) ?? Icon(Icons.photo_album), leading: IconUtils.getAlbumIcon(context, album) ?? Icon(Icons.photo_album),
title: collection.getUniqueAlbumName(album, albums), title: collection.getUniqueAlbumName(album, albums),
filter: (entry) => entry.directory == album, filter: (entry) => entry.directory == album,
)), )),
const Divider(), const Divider(),
...tags.map((tag) => _buildFilteredCollectionNavTile( ...tags.map((tag) => _FilteredCollectionNavTile(
context: context, collection: collection,
leading: Icon(Icons.label), leading: Icon(Icons.label),
title: tag, title: tag,
filter: (entry) => entry.xmpSubjects.contains(tag), filter: (entry) => entry.xmpSubjects.contains(tag),
)), )),
], ],
), ),
),
); );
} }
}
Widget _buildFilteredCollectionNavTile({BuildContext context, Widget leading, String title, bool Function(ImageEntry) filter}) { class _FilteredCollectionNavTile extends StatelessWidget {
final ImageCollection collection;
final Widget leading;
final String title;
final bool Function(ImageEntry) filter;
const _FilteredCollectionNavTile({
@required this.collection,
@required this.leading,
@required this.title,
@required this.filter,
});
@override
Widget build(BuildContext context) {
return SafeArea( return SafeArea(
top: false, top: false,
bottom: false, bottom: false,

View file

@ -6,6 +6,7 @@ import 'package:aves/utils/android_file_utils.dart';
import 'package:aves/widgets/common/app_icon.dart'; import 'package:aves/widgets/common/app_icon.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:path/path.dart'; import 'package:path/path.dart';
import 'package:provider/provider.dart';
class VideoIcon extends StatelessWidget { class VideoIcon extends StatelessWidget {
final ImageEntry entry; final ImageEntry entry;
@ -103,10 +104,13 @@ class IconUtils {
final parts = albumDirectory.split(separator); final parts = albumDirectory.split(separator);
if (albumDirectory.startsWith(androidFileUtils.externalStorage) && appNameMap.keys.contains(parts.last)) { if (albumDirectory.startsWith(androidFileUtils.externalStorage) && appNameMap.keys.contains(parts.last)) {
final packageName = appNameMap[parts.last]; final packageName = appNameMap[parts.last];
return AppIcon( return Selector<MediaQueryData, double>(
selector: (c, mq) => mq.devicePixelRatio,
builder: (c, devicePixelRatio, child) => AppIcon(
packageName: packageName, packageName: packageName,
size: IconTheme.of(context).size, size: IconTheme.of(context).size,
devicePixelRatio: window.devicePixelRatio, devicePixelRatio: devicePixelRatio,
),
); );
} }
return null; return null;

View file

@ -43,9 +43,9 @@ class MetadataSectionState extends State<MetadataSection> {
builder: (c, mqWidth, child) => FutureBuilder( builder: (c, mqWidth, child) => FutureBuilder(
future: _metadataLoader, future: _metadataLoader,
builder: (futureContext, AsyncSnapshot<Map> snapshot) { builder: (futureContext, AsyncSnapshot<Map> snapshot) {
final metadataMap = snapshot.data.cast<String, Map>();
if (snapshot.hasError) return Text(snapshot.error.toString()); if (snapshot.hasError) return Text(snapshot.error.toString());
if (snapshot.connectionState != ConnectionState.done) return const SizedBox.shrink(); if (snapshot.connectionState != ConnectionState.done) return const SizedBox.shrink();
final metadataMap = snapshot.data.cast<String, Map>();
final directoryNames = metadataMap.keys.toList()..sort(); final directoryNames = metadataMap.keys.toList()..sort();
Widget content; Widget content;

View file

@ -133,7 +133,8 @@ class _FullscreenBottomOverlayContent extends StatelessWidget {
) )
], ],
), ),
overflow: TextOverflow.ellipsis, softWrap: false,
overflow: TextOverflow.fade,
maxLines: 1, maxLines: 1,
child: Selector<MediaQueryData, Orientation>( child: Selector<MediaQueryData, Orientation>(
selector: (c, mq) => mq.orientation, selector: (c, mq) => mq.orientation,