Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

gathered more icons

Browse source
This commit is contained in:
Thibault Deckers 2020-05-11 10:29:30 +09:00
parent e0d1e150bc
commit 5966d3b513
8 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/model/filters/album.dart
View file

@ -5,7 +5,6 @@ import 'package:aves/widgets/common/icons.dart';
import 'package:aves/widgets/common/image_providers/app_icon_image_provider.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart';
import 'package:outline_material_icons/outline_material_icons.dart';
import 'package:palette_generator/palette_generator.dart';
import 'package:path/path.dart';
@ -31,7 +30,7 @@ class AlbumFilter extends CollectionFilter {
@override
Widget iconBuilder(context, size) {
return IconUtils.getAlbumIcon(context: context, album: album, size: size) ?? Icon(OMIcons.photoAlbum, size: size);
return IconUtils.getAlbumIcon(context: context, album: album, size: size) ?? Icon(AIcons.album, size: size);
}
@override

6
lib/widgets/album/collection_drawer.dart
View file

@ -71,7 +71,7 @@ class _CollectionDrawerState extends State<CollectionDrawer> {
final allMediaEntry = _FilteredCollectionNavTile(
source: source,
leading: const Icon(OMIcons.photo),
leading: const Icon(AIcons.allMedia),
title: 'All media',
filter: null,
);
@ -101,7 +101,7 @@ class _CollectionDrawerState extends State<CollectionDrawer> {
title: uniqueName,
trailing: androidFileUtils.isOnRemovableStorage(album)
? const Icon(
OMIcons.sdStorage,
AIcons.removableStorage,
size: 16,
color: Colors.grey,
)
@ -182,7 +182,7 @@ class _CollectionDrawerState extends State<CollectionDrawer> {
top: false,
bottom: false,
child: ExpansionTile(
leading: const Icon(OMIcons.photoAlbum),
leading: const Icon(AIcons.album),
title: Row(
children: [
const Text('Albums'),

3
lib/widgets/album/grid/header_album.dart
View file

@ -2,7 +2,6 @@ import 'package:aves/utils/android_file_utils.dart';
import 'package:aves/widgets/album/grid/header_generic.dart';
import 'package:aves/widgets/common/icons.dart';
import 'package:flutter/material.dart';
import 'package:outline_material_icons/outline_material_icons.dart';
class AlbumSectionHeader extends StatelessWidget {
final String folderPath, albumName;
@ -31,7 +30,7 @@ class AlbumSectionHeader extends StatelessWidget {
title: albumName,
trailing: androidFileUtils.isOnRemovableStorage(folderPath)
? const Icon(
OMIcons.sdStorage,
AIcons.removableStorage,
size: 16,
color: Color(0xFF757575),
)

4
lib/widgets/album/search/search_delegate.dart
View file

@ -8,8 +8,8 @@ import 'package:aves/model/filters/query.dart';
import 'package:aves/model/filters/tag.dart';
import 'package:aves/model/mime_types.dart';
import 'package:aves/widgets/album/search/expandable_filter_row.dart';
import 'package:aves/widgets/common/icons.dart';
import 'package:flutter/material.dart';
import 'package:outline_material_icons/outline_material_icons.dart';
class ImageSearchDelegate extends SearchDelegate<CollectionFilter> {
final CollectionLens collection;
@ -39,7 +39,7 @@ class ImageSearchDelegate extends SearchDelegate<CollectionFilter> {
return [
if (query.isNotEmpty)
IconButton(
icon: const Icon(OMIcons.clear),
icon: const Icon(AIcons.clear),
onPressed: () {
query = '';
showSuggestions(context);

12
lib/widgets/common/icons.dart
View file

@ -7,18 +7,28 @@ import 'package:flutter/material.dart';
import 'package:outline_material_icons/outline_material_icons.dart';
class AIcons {
static const IconData allMedia = OMIcons.collections;
static const IconData image = OMIcons.photo;
static const IconData video = OMIcons.movie;
static const IconData album = OMIcons.photoAlbum;
static const IconData date = OMIcons.calendarToday;
static const IconData location = OMIcons.place;
static const IconData shooting = OMIcons.camera;
static const IconData removableStorage = OMIcons.sdStorage;
static const IconData tag = OMIcons.localOffer;
static const IconData video = OMIcons.movie;
static const IconData clear = OMIcons.clear;
static const IconData delete = OMIcons.delete;
static const IconData favourite = OMIcons.favoriteBorder;
static const IconData favouriteActive = OMIcons.favorite;
static const IconData openInNew = OMIcons.openInNew;
static const IconData print = OMIcons.print;
static const IconData rotateLeft = OMIcons.rotateLeft;
static const IconData rotateRight = OMIcons.rotateRight;
static const IconData share = OMIcons.share;
static const IconData zoomIn = OMIcons.add;
static const IconData zoomOut = OMIcons.remove;
static const IconData animated = Icons.slideshow;
static const IconData play = Icons.play_circle_outline;

7
lib/widgets/fullscreen/info/location_section.dart
View file

@ -9,7 +9,6 @@ import 'package:aves/widgets/common/icons.dart';
import 'package:aves/widgets/fullscreen/info/info_page.dart';
import 'package:flutter/material.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:outline_material_icons/outline_material_icons.dart';
class LocationSection extends StatefulWidget {
final CollectionLens collection;
@ -210,17 +209,17 @@ class ImageMapState extends State<ImageMap> with AutomaticKeepAliveClientMixin {
const SizedBox(width: 8),
Column(children: [
IconButton(
icon: const Icon(OMIcons.add),
icon: const Icon(AIcons.zoomIn),
onPressed: _controller == null ? null : () => _zoomBy(1),
tooltip: 'Zoom in',
),
IconButton(
icon: const Icon(OMIcons.remove),
icon: const Icon(AIcons.zoomOut),
onPressed: _controller == null ? null : () => _zoomBy(-1),
tooltip: 'Zoom out',
),
IconButton(
icon: const Icon(OMIcons.openInNew),
icon: const Icon(AIcons.openInNew),
onPressed: () => AndroidAppService.openMap(widget.geoUri),
tooltip: 'Show on map...',
),

3
lib/widgets/fullscreen/overlay/bottom.dart
View file

@ -10,7 +10,6 @@ import 'package:aves/widgets/common/fx/blurred.dart';
import 'package:aves/widgets/common/icons.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:outline_material_icons/outline_material_icons.dart';
import 'package:provider/provider.dart';
import 'package:tuple/tuple.dart';
@ -254,7 +253,7 @@ class _ShootingRow extends StatelessWidget {
Widget build(BuildContext context) {
return Row(
children: [
const Icon(OMIcons.camera, size: _iconSize),
const Icon(AIcons.shooting, size: _iconSize),
const SizedBox(width: _iconPadding),
Expanded(child: Text(details.aperture, strutStyle: Constants.overflowStrutStyle)),
Expanded(child: Text(details.exposureTime, strutStyle: Constants.overflowStrutStyle)),

4
lib/widgets/fullscreen/overlay/video.dart
View file

@ -4,10 +4,10 @@ import 'package:aves/model/image_entry.dart';
import 'package:aves/services/android_app_service.dart';
import 'package:aves/utils/time_utils.dart';
import 'package:aves/widgets/common/fx/blurred.dart';
import 'package:aves/widgets/common/icons.dart';
import 'package:aves/widgets/fullscreen/overlay/common.dart';
import 'package:flutter/material.dart';
import 'package:flutter_ijkplayer/flutter_ijkplayer.dart';
import 'package:outline_material_icons/outline_material_icons.dart';
import 'package:provider/provider.dart';
import 'package:tuple/tuple.dart';
@ -122,7 +122,7 @@ class VideoControlOverlayState extends State<VideoControlOverlay> with SingleTic
OverlayButton(
scale: scale,
child: IconButton(
icon: const Icon(OMIcons.openInNew),
icon: const Icon(AIcons.openInNew),
onPressed: () => AndroidAppService.open(entry.uri, entry.mimeTypeAnySubtype),
tooltip: 'Open',
),