diff --git a/lib/theme/icons.dart b/lib/theme/icons.dart index df80978eb..f03f482cb 100644 --- a/lib/theme/icons.dart +++ b/lib/theme/icons.dart @@ -30,7 +30,8 @@ class AIcons { static const display = Icons.light_mode_outlined; static const error = Icons.error_outline; static const folder = Icons.folder_outlined; - static const grid = Icons.grid_on_outlined; + static const geoBounds = Icons.public_outlined; + static final github = MdiIcons.github; static const home = Icons.home_outlined; // as of Flutter v3.16.3, @@ -39,13 +40,15 @@ class AIcons { static const important = IconData(labelImportantOutlineCodePoint, fontFamily: materialIconsFontFamily, matchTextDirection: true); static const language = Icons.translate_outlined; + static final legal = MdiIcons.scaleBalance; static const location = Icons.place_outlined; static const locationUnlocated = Icons.location_off_outlined; static const country = Icons.flag_outlined; static const state = Icons.flag_outlined; static const place = Icons.place_outlined; - static const mainStorage = Icons.smartphone_outlined; static const mimeType = Icons.code_outlined; + static const name = Icons.abc_outlined; + static const newTier = Icons.fiber_new_outlined; static const opacity = Icons.opacity; static const palette = Icons.palette_outlined; static final privacy = MdiIcons.shieldAccountOutline; @@ -54,15 +57,20 @@ class AIcons { static final ratingRejected = MdiIcons.starMinusOutline; static final ratingUnrated = MdiIcons.starOffOutline; static const raw = Icons.raw_on_outlined; - static const shooting = Icons.camera_outlined; - static const removableStorage = Icons.sd_storage_outlined; static const sensorControlEnabled = Icons.explore_outlined; static const sensorControlDisabled = Icons.explore_off_outlined; static const settings = Icons.settings_outlined; + static const shooting = Icons.camera_outlined; static const size = Icons.data_usage_outlined; - static const text = Icons.format_quote_outlined; + static const storageCard = Icons.sd_storage_outlined; + static const storageMain = Icons.smartphone_outlined; + static const streamVideo = Icons.movie_outlined; + static const streamAudio = Icons.audiotrack_outlined; + static const streamText = Icons.closed_caption_outlined; static const tag = Icons.local_offer_outlined; static final tagUntagged = MdiIcons.tagOffOutline; + static const text = Icons.format_quote_outlined; + static const thumbnails = Icons.grid_on_outlined; static const volumeMin = Icons.volume_mute_outlined; static const volumeMax = Icons.volume_up_outlined; @@ -100,7 +108,6 @@ class AIcons { static const favouriteActive = Icons.favorite; static final filter = MdiIcons.filterOutline; static final filterOff = MdiIcons.filterOffOutline; - static const geoBounds = Icons.public_outlined; static const goUp = Icons.arrow_upward_outlined; static const hide = Icons.visibility_off_outlined; static const info = Icons.info_outlined; @@ -110,8 +117,7 @@ class AIcons { static final move = MdiIcons.fileMoveOutline; static const mute = Icons.volume_off_outlined; static const unmute = Icons.volume_up_outlined; - static const name = Icons.abc_outlined; - static const newTier = Icons.fiber_new_outlined; + static const rename = Icons.abc_outlined; static const openOutside = Icons.open_in_new_outlined; static final openVideo = MdiIcons.moviePlayOutline; static const pin = Icons.push_pin_outlined; @@ -133,20 +139,17 @@ class AIcons { static const rotateScreen = Icons.screen_rotation_outlined; static const search = Icons.search_outlined; static const select = Icons.select_all_outlined; + static const selectStreams = Icons.translate_outlined; static const setAs = Icons.wallpaper_outlined; + static final setBoundEnd = MdiIcons.rayEnd; + static final setBoundStart = MdiIcons.rayStart; static final setCover = MdiIcons.imageEditOutline; - static final setEnd = MdiIcons.rayEnd; - static final setStart = MdiIcons.rayStart; static const share = Icons.share_outlined; static const show = Icons.visibility_outlined; static final showFullscreen = MdiIcons.arrowExpand; static const slideshow = Icons.slideshow_outlined; static const speed = Icons.speed_outlined; static const stats = Icons.donut_small_outlined; - static const streams = Icons.translate_outlined; - static const streamVideo = Icons.movie_outlined; - static const streamAudio = Icons.audiotrack_outlined; - static const streamText = Icons.closed_caption_outlined; static const vaultLock = Icons.lock_outline; static const vaultAdd = Icons.enhanced_encryption_outlined; static final vaultConfigure = MdiIcons.shieldLockOutline; @@ -190,9 +193,6 @@ class AIcons { static const selected = Icons.check_circle_outline; static const unselected = Icons.radio_button_unchecked; - static final github = MdiIcons.github; - static final legal = MdiIcons.scaleBalance; - // Material Icons references to make constant instances of `IconData` // as non-constant instances of `IconData` prevent icon font tree shaking static const labelImportantOutlineCodePoint = 0xe362; diff --git a/lib/view/src/actions/chip_set.dart b/lib/view/src/actions/chip_set.dart index bf2ab7768..0e95ccfbc 100644 --- a/lib/view/src/actions/chip_set.dart +++ b/lib/view/src/actions/chip_set.dart @@ -67,7 +67,7 @@ extension ExtraChipSetActionView on ChipSetAction { ChipSetAction.showCountryStates => AIcons.state, ChipSetAction.showCollection => AIcons.allCollection, // selecting (single filter) - ChipSetAction.rename => AIcons.name, + ChipSetAction.rename => AIcons.rename, ChipSetAction.setCover => AIcons.setCover, ChipSetAction.configureVault => AIcons.vaultConfigure, }; diff --git a/lib/view/src/actions/entry.dart b/lib/view/src/actions/entry.dart index 465644f2f..1c6809511 100644 --- a/lib/view/src/actions/entry.dart +++ b/lib/view/src/actions/entry.dart @@ -90,7 +90,7 @@ extension ExtraEntryActionView on EntryAction { EntryAction.restore => AIcons.restore, EntryAction.convert => AIcons.convert, EntryAction.print => AIcons.print, - EntryAction.rename => AIcons.name, + EntryAction.rename => AIcons.rename, EntryAction.copy => AIcons.copy, EntryAction.move => AIcons.move, EntryAction.share => AIcons.share, @@ -109,7 +109,7 @@ extension ExtraEntryActionView on EntryAction { EntryAction.videoToggleMute => // different data depending on toggle state AIcons.mute, - EntryAction.videoSelectStreams => AIcons.streams, + EntryAction.videoSelectStreams => AIcons.selectStreams, EntryAction.videoSetSpeed => AIcons.speed, EntryAction.videoABRepeat => AIcons.repeat, EntryAction.videoSettings => AIcons.videoSettings, diff --git a/lib/view/src/actions/entry_set.dart b/lib/view/src/actions/entry_set.dart index 28dbfd77a..d9105e0e2 100644 --- a/lib/view/src/actions/entry_set.dart +++ b/lib/view/src/actions/entry_set.dart @@ -76,7 +76,7 @@ extension ExtraEntrySetActionView on EntrySetAction { EntrySetAction.restore => AIcons.restore, EntrySetAction.copy => AIcons.copy, EntrySetAction.move => AIcons.move, - EntrySetAction.rename => AIcons.name, + EntrySetAction.rename => AIcons.rename, EntrySetAction.convert => AIcons.convert, EntrySetAction.toggleFavourite => // different data depending on toggle state diff --git a/lib/view/src/source/group.dart b/lib/view/src/source/group.dart index 45e04767c..d9abaf867 100644 --- a/lib/view/src/source/group.dart +++ b/lib/view/src/source/group.dart @@ -39,7 +39,7 @@ extension ExtraAlbumChipGroupFactorView on AlbumChipGroupFactor { return switch (this) { AlbumChipGroupFactor.importance => AIcons.important, AlbumChipGroupFactor.mimeType => AIcons.mimeType, - AlbumChipGroupFactor.volume => AIcons.removableStorage, + AlbumChipGroupFactor.volume => AIcons.storageCard, AlbumChipGroupFactor.none => AIcons.clear, }; } diff --git a/lib/widgets/collection/grid/headers/album.dart b/lib/widgets/collection/grid/headers/album.dart index d73692831..1a9e43d6e 100644 --- a/lib/widgets/collection/grid/headers/album.dart +++ b/lib/widgets/collection/grid/headers/album.dart @@ -39,7 +39,7 @@ class AlbumSectionHeader extends StatelessWidget { title: albumName ?? context.l10n.sectionUnknown, trailing: _directory != null && androidFileUtils.isOnRemovableStorage(_directory) ? const Icon( - AIcons.removableStorage, + AIcons.storageCard, size: 16, color: Color(0xFF757575), ) diff --git a/lib/widgets/filter_grids/common/covered_filter_chip.dart b/lib/widgets/filter_grids/common/covered_filter_chip.dart index c16ed1fb8..4bfda58ad 100644 --- a/lib/widgets/filter_grids/common/covered_filter_chip.dart +++ b/lib/widgets/filter_grids/common/covered_filter_chip.dart @@ -194,7 +194,7 @@ class CoveredFilterChip extends StatelessWidget { padding: EdgeInsetsDirectional.only(end: padding), duration: ADurations.chipDecorationAnimation, child: Icon( - AIcons.removableStorage, + AIcons.storageCard, color: _detailColor(context), size: iconSize, ), diff --git a/lib/widgets/filter_grids/common/list_details.dart b/lib/widgets/filter_grids/common/list_details.dart index 1124afaac..ad16a15f8 100644 --- a/lib/widgets/filter_grids/common/list_details.dart +++ b/lib/widgets/filter_grids/common/list_details.dart @@ -120,7 +120,7 @@ class FilterListDetails extends StatelessWidget { List leadingIcons = [ if (pinned) const Icon(AIcons.pin), - if (removableStorage) const Icon(AIcons.removableStorage), + if (removableStorage) const Icon(AIcons.storageCard), ]; Widget? leading; diff --git a/lib/widgets/filter_grids/common/section_keys.dart b/lib/widgets/filter_grids/common/section_keys.dart index abca16740..507dcc57c 100644 --- a/lib/widgets/filter_grids/common/section_keys.dart +++ b/lib/widgets/filter_grids/common/section_keys.dart @@ -62,5 +62,5 @@ class StorageVolumeSectionKey extends ChipSectionKey { StorageVolumeSectionKey(BuildContext context, this.volume) : super(title: volume?.getDescription(context) ?? context.l10n.sectionUnknown); @override - Widget? get leading => (volume?.isRemovable ?? false) ? const Icon(AIcons.removableStorage) : null; + Widget? get leading => (volume?.isRemovable ?? false) ? const Icon(AIcons.storageCard) : null; } diff --git a/lib/widgets/navigation/drawer/collection_nav_tile.dart b/lib/widgets/navigation/drawer/collection_nav_tile.dart index e0a5029f9..18f51d3b7 100644 --- a/lib/widgets/navigation/drawer/collection_nav_tile.dart +++ b/lib/widgets/navigation/drawer/collection_nav_tile.dart @@ -87,7 +87,7 @@ class AlbumNavTile extends StatelessWidget { title: DrawerFilterTitle(filter: filter), trailing: androidFileUtils.isOnRemovableStorage(album) ? const Icon( - AIcons.removableStorage, + AIcons.storageCard, size: 16, ) : null, diff --git a/lib/widgets/settings/privacy/file_picker/file_picker_page.dart b/lib/widgets/settings/privacy/file_picker/file_picker_page.dart index 668f3d2d8..6dc2942c8 100644 --- a/lib/widgets/settings/privacy/file_picker/file_picker_page.dart +++ b/lib/widgets/settings/privacy/file_picker/file_picker_page.dart @@ -165,7 +165,7 @@ class _FilePickerPageState extends State { ), ), ...volumes.map((v) { - final icon = v.isRemovable ? AIcons.removableStorage : AIcons.mainStorage; + final icon = v.isRemovable ? AIcons.storageCard : AIcons.storageMain; return ListTile( leading: Icon(icon), title: Text(v.getDescription(context)), diff --git a/lib/widgets/settings/thumbnails/thumbnails.dart b/lib/widgets/settings/thumbnails/thumbnails.dart index b74f55dce..361b41b93 100644 --- a/lib/widgets/settings/thumbnails/thumbnails.dart +++ b/lib/widgets/settings/thumbnails/thumbnails.dart @@ -18,7 +18,7 @@ class ThumbnailsSection extends SettingsSection { @override Widget icon(BuildContext context) => SettingsTileLeading( - icon: AIcons.grid, + icon: AIcons.thumbnails, color: context.select((v) => v.thumbnails), ); diff --git a/lib/widgets/viewer/overlay/video/ab_repeat.dart b/lib/widgets/viewer/overlay/video/ab_repeat.dart index 4aaf184d4..4b7ee76a9 100644 --- a/lib/widgets/viewer/overlay/video/ab_repeat.dart +++ b/lib/widgets/viewer/overlay/video/ab_repeat.dart @@ -38,13 +38,13 @@ class _VideoABRepeatOverlayState extends State { Widget boundButton; if (abRepeat.start == null) { boundButton = IconButton( - icon: Icon(AIcons.setStart), + icon: Icon(AIcons.setBoundStart), onPressed: controller?.setABRepeatStart, tooltip: l10n.videoRepeatActionSetStart, ); } else if (abRepeat.end == null) { boundButton = IconButton( - icon: Icon(AIcons.setEnd), + icon: Icon(AIcons.setBoundEnd), onPressed: controller?.setABRepeatEnd, tooltip: l10n.videoRepeatActionSetEnd, );