From 3e68fb3e976fcd8b1c1b5e90cb0dbbfa74eb6922 Mon Sep 17 00:00:00 2001 From: Jagandeep Brar Date: Mon, 3 May 2021 10:58:19 -0500 Subject: [PATCH] fix(Assets): Cleanup assets, add asset existence tests (#460) * feat(packages): Add coverage script, update spider asset paths * fix(Assets): Cleanup asset structure * fix(Assets): Update asset paths within codebase --- .../{blanks/audio.png => blank_audio.png} | Bin .../{blanks/platform.png => blank_device.png} | Bin .../{blanks/stream.png => blank_stream.png} | Bin .../{blanks/user.png => blank_user.png} | Bin .../{blanks/video.png => blank_video.png} | Bin .../splash.png => branding_full.png} | Bin .../icon_drawer.png => branding_logo.png} | Bin assets/images/{branding => icon}/icon.png | Bin .../{branding => icon}/icon_adaptive.png | Bin ...andsintown.png => service_bandsintown.png} | Bin .../discogs.png => service_discogs.png} | Bin .../{services/imdb.png => service_imdb.png} | Bin .../lastfm.png => service_lastfm.png} | Bin .../themoviedb.png => service_themoviedb.png} | Bin .../thetvdb.png => service_thetvdb.png} | Bin .../{services/trakt.png => service_trakt.png} | Bin .../tvmaze.png => service_tvmaze.png} | Bin .../youtube.png => service_youtube.png} | Bin derry.yaml | 2 + lib/core/assets.dart | 36 +++++++++--------- lib/core/ui/drawer/drawer_header.dart | 2 +- lib/modules/lidarr/routes/add_details.dart | 2 +- .../lidarr/widgets/details_album_tile.dart | 2 +- .../lidarr/widgets/details_overview.dart | 8 ++-- .../widgets/discovery_results_tile.dart | 2 +- .../widgets/search_results_tile.dart | 2 +- .../routes/catalogue/widgets/movie_tile.dart | 2 +- .../routes/missing/widgets/missing_tile.dart | 2 +- .../movie_details/widgets/cast_crew_tile.dart | 2 +- .../overview_movie_description_tile.dart | 2 +- .../widgets/overview_movie_links_section.dart | 8 ++-- .../upcoming/widgets/upcoming_tile.dart | 2 +- .../routes/account/pages/signed_out.dart | 2 +- .../widgets/search_results_tile.dart | 4 +- .../routes/missing/widgets/missing_tile.dart | 2 +- .../routes/series/widgets/series_tile.dart | 2 +- .../series_details/widgets/overview.dart | 10 ++--- .../upcoming/widgets/upcoming_tile.dart | 2 +- .../activity/widgets/activity_tile.dart | 2 +- .../routes/history/widgets/history_tile.dart | 2 +- .../widgets/user_stats_tile.dart | 2 +- .../widgets/metadata_header.dart | 2 +- .../recently_added/widgets/content_tile.dart | 2 +- .../search/widgets/search_result_tile.dart | 2 +- .../routes/statistics/widgets/media_tile.dart | 2 +- .../statistics/widgets/platform_tile.dart | 2 +- .../widgets/recently_watched_tile.dart | 2 +- .../statistics/widgets/stream_tile.dart | 2 +- .../routes/statistics/widgets/user_tile.dart | 2 +- .../routes/users/widgets/user_tile.dart | 2 +- spider.yaml | 5 +-- test/core/assets_test.dart | 30 +++++++++++++++ 52 files changed, 92 insertions(+), 63 deletions(-) rename assets/images/{blanks/audio.png => blank_audio.png} (100%) rename assets/images/{blanks/platform.png => blank_device.png} (100%) rename assets/images/{blanks/stream.png => blank_stream.png} (100%) rename assets/images/{blanks/user.png => blank_user.png} (100%) rename assets/images/{blanks/video.png => blank_video.png} (100%) rename assets/images/{branding/splash.png => branding_full.png} (100%) rename assets/images/{branding/icon_drawer.png => branding_logo.png} (100%) rename assets/images/{branding => icon}/icon.png (100%) rename assets/images/{branding => icon}/icon_adaptive.png (100%) rename assets/images/{services/bandsintown.png => service_bandsintown.png} (100%) rename assets/images/{services/discogs.png => service_discogs.png} (100%) rename assets/images/{services/imdb.png => service_imdb.png} (100%) rename assets/images/{services/lastfm.png => service_lastfm.png} (100%) rename assets/images/{services/themoviedb.png => service_themoviedb.png} (100%) rename assets/images/{services/thetvdb.png => service_thetvdb.png} (100%) rename assets/images/{services/trakt.png => service_trakt.png} (100%) rename assets/images/{services/tvmaze.png => service_tvmaze.png} (100%) rename assets/images/{services/youtube.png => service_youtube.png} (100%) create mode 100644 test/core/assets_test.dart diff --git a/assets/images/blanks/audio.png b/assets/images/blank_audio.png similarity index 100% rename from assets/images/blanks/audio.png rename to assets/images/blank_audio.png diff --git a/assets/images/blanks/platform.png b/assets/images/blank_device.png similarity index 100% rename from assets/images/blanks/platform.png rename to assets/images/blank_device.png diff --git a/assets/images/blanks/stream.png b/assets/images/blank_stream.png similarity index 100% rename from assets/images/blanks/stream.png rename to assets/images/blank_stream.png diff --git a/assets/images/blanks/user.png b/assets/images/blank_user.png similarity index 100% rename from assets/images/blanks/user.png rename to assets/images/blank_user.png diff --git a/assets/images/blanks/video.png b/assets/images/blank_video.png similarity index 100% rename from assets/images/blanks/video.png rename to assets/images/blank_video.png diff --git a/assets/images/branding/splash.png b/assets/images/branding_full.png similarity index 100% rename from assets/images/branding/splash.png rename to assets/images/branding_full.png diff --git a/assets/images/branding/icon_drawer.png b/assets/images/branding_logo.png similarity index 100% rename from assets/images/branding/icon_drawer.png rename to assets/images/branding_logo.png diff --git a/assets/images/branding/icon.png b/assets/images/icon/icon.png similarity index 100% rename from assets/images/branding/icon.png rename to assets/images/icon/icon.png diff --git a/assets/images/branding/icon_adaptive.png b/assets/images/icon/icon_adaptive.png similarity index 100% rename from assets/images/branding/icon_adaptive.png rename to assets/images/icon/icon_adaptive.png diff --git a/assets/images/services/bandsintown.png b/assets/images/service_bandsintown.png similarity index 100% rename from assets/images/services/bandsintown.png rename to assets/images/service_bandsintown.png diff --git a/assets/images/services/discogs.png b/assets/images/service_discogs.png similarity index 100% rename from assets/images/services/discogs.png rename to assets/images/service_discogs.png diff --git a/assets/images/services/imdb.png b/assets/images/service_imdb.png similarity index 100% rename from assets/images/services/imdb.png rename to assets/images/service_imdb.png diff --git a/assets/images/services/lastfm.png b/assets/images/service_lastfm.png similarity index 100% rename from assets/images/services/lastfm.png rename to assets/images/service_lastfm.png diff --git a/assets/images/services/themoviedb.png b/assets/images/service_themoviedb.png similarity index 100% rename from assets/images/services/themoviedb.png rename to assets/images/service_themoviedb.png diff --git a/assets/images/services/thetvdb.png b/assets/images/service_thetvdb.png similarity index 100% rename from assets/images/services/thetvdb.png rename to assets/images/service_thetvdb.png diff --git a/assets/images/services/trakt.png b/assets/images/service_trakt.png similarity index 100% rename from assets/images/services/trakt.png rename to assets/images/service_trakt.png diff --git a/assets/images/services/tvmaze.png b/assets/images/service_tvmaze.png similarity index 100% rename from assets/images/services/tvmaze.png rename to assets/images/service_tvmaze.png diff --git a/assets/images/services/youtube.png b/assets/images/service_youtube.png similarity index 100% rename from assets/images/services/youtube.png rename to assets/images/service_youtube.png diff --git a/derry.yaml b/derry.yaml index 5d55304a..82ceed77 100644 --- a/derry.yaml +++ b/derry.yaml @@ -33,7 +33,9 @@ cocoapods: - cd ./macos && pod setup - cd ./macos && pod install coverage: + create: flutter test --coverage upload: bash <(curl -s https://codecov.io/bash) generate: + assets: spider build runner: flutter packages pub run build_runner build --delete-conflicting-outputs localization: dart ./scripts/generate/localization.dart diff --git a/lib/core/assets.dart b/lib/core/assets.dart index 48b9955c..67347ff8 100644 --- a/lib/core/assets.dart +++ b/lib/core/assets.dart @@ -1,22 +1,22 @@ class LunaAssets { LunaAssets._(); - static const String user = 'assets/images/blanks/user.png'; - static const String platform = 'assets/images/blanks/platform.png'; - static const String stream = 'assets/images/blanks/stream.png'; - static const String video = 'assets/images/blanks/video.png'; - static const String audio = 'assets/images/blanks/audio.png'; - static const String icon = 'assets/images/branding/icon.png'; - static const String iconDrawer = 'assets/images/branding/icon_drawer.png'; - static const String iconAdaptive = 'assets/images/branding/icon_adaptive.png'; - static const String splash = 'assets/images/branding/splash.png'; - static const String trakt = 'assets/images/services/trakt.png'; - static const String bandsintown = 'assets/images/services/bandsintown.png'; - static const String lastfm = 'assets/images/services/lastfm.png'; - static const String thetvdb = 'assets/images/services/thetvdb.png'; - static const String imdb = 'assets/images/services/imdb.png'; - static const String tvmaze = 'assets/images/services/tvmaze.png'; - static const String discogs = 'assets/images/services/discogs.png'; - static const String youtube = 'assets/images/services/youtube.png'; - static const String themoviedb = 'assets/images/services/themoviedb.png'; + static const String brandingFull = 'assets/images/branding_full.png'; + static const String serviceTvmaze = 'assets/images/service_tvmaze.png'; + static const String blankDevice = 'assets/images/blank_device.png'; + static const String serviceThetvdb = 'assets/images/service_thetvdb.png'; + static const String blankAudio = 'assets/images/blank_audio.png'; + static const String brandingLogo = 'assets/images/branding_logo.png'; + static const String blankUser = 'assets/images/blank_user.png'; + static const String blankVideo = 'assets/images/blank_video.png'; + static const String blankStream = 'assets/images/blank_stream.png'; + static const String serviceBandsintown = + 'assets/images/service_bandsintown.png'; + static const String serviceThemoviedb = + 'assets/images/service_themoviedb.png'; + static const String serviceTrakt = 'assets/images/service_trakt.png'; + static const String serviceDiscogs = 'assets/images/service_discogs.png'; + static const String serviceLastfm = 'assets/images/service_lastfm.png'; + static const String serviceYoutube = 'assets/images/service_youtube.png'; + static const String serviceImdb = 'assets/images/service_imdb.png'; } diff --git a/lib/core/ui/drawer/drawer_header.dart b/lib/core/ui/drawer/drawer_header.dart index 52de9f59..cc99d329 100644 --- a/lib/core/ui/drawer/drawer_header.dart +++ b/lib/core/ui/drawer/drawer_header.dart @@ -60,7 +60,7 @@ class LunaDrawerHeader extends UserAccountsDrawerHeader { decoration: BoxDecoration( color: LunaColours.accent, image: DecorationImage( - image: AssetImage(LunaAssets.iconDrawer), + image: AssetImage(LunaAssets.brandingLogo), colorFilter: ColorFilter.mode( LunaColours.primary.withOpacity(0.15), BlendMode.dstATop), fit: BoxFit.cover, diff --git a/lib/modules/lidarr/routes/add_details.dart b/lib/modules/lidarr/routes/add_details.dart index 20c540a4..cc908819 100644 --- a/lib/modules/lidarr/routes/add_details.dart +++ b/lib/modules/lidarr/routes/add_details.dart @@ -161,7 +161,7 @@ class _State extends State with LunaScrollControllerMixin { ? 'No summary is available.' : _arguments.data.overview, uri: _arguments.data.posterURI ?? '', - fallbackImage: LunaAssets.user, + fallbackImage: LunaAssets.blankUser, squareImage: true, headers: Database.currentProfileObject.getLidarr()['headers'], ), diff --git a/lib/modules/lidarr/widgets/details_album_tile.dart b/lib/modules/lidarr/widgets/details_album_tile.dart index 08bf7b90..92a47356 100644 --- a/lib/modules/lidarr/widgets/details_album_tile.dart +++ b/lib/modules/lidarr/widgets/details_album_tile.dart @@ -30,7 +30,7 @@ class _State extends State { widget.data.albumCoverURI() != '' ? LunaNetworkImage( url: widget.data.albumCoverURI(), - placeholderAsset: LunaAssets.audio, + placeholderAsset: LunaAssets.blankAudio, headers: ((Database.currentProfileObject .getLidarr()['headers'] ?? {}) as Map) diff --git a/lib/modules/lidarr/widgets/details_overview.dart b/lib/modules/lidarr/widgets/details_overview.dart index 02b42877..d4ed8b12 100644 --- a/lib/modules/lidarr/widgets/details_overview.dart +++ b/lib/modules/lidarr/widgets/details_overview.dart @@ -31,7 +31,7 @@ class _State extends State ? 'No summary is available.' : widget?.data?.overview, uri: widget?.data?.posterURI() ?? '', - fallbackImage: LunaAssets.user, + fallbackImage: LunaAssets.blankUser, squareImage: true, headers: Database.currentProfileObject.getLidarr()['headers'], ), @@ -43,7 +43,7 @@ class _State extends State context: context, child: InkWell( child: Padding( - child: Image.asset(LunaAssets.bandsintown), + child: Image.asset(LunaAssets.serviceBandsintown), padding: EdgeInsets.all(12.0), ), borderRadius: BorderRadius.circular(LunaUI.BORDER_RADIUS), @@ -59,7 +59,7 @@ class _State extends State context: context, child: InkWell( child: Padding( - child: Image.asset(LunaAssets.discogs), + child: Image.asset(LunaAssets.serviceDiscogs), padding: EdgeInsets.all(12.0), ), borderRadius: BorderRadius.circular(LunaUI.BORDER_RADIUS), @@ -75,7 +75,7 @@ class _State extends State context: context, child: InkWell( child: Padding( - child: Image.asset(LunaAssets.lastfm), + child: Image.asset(LunaAssets.serviceLastfm), padding: EdgeInsets.all(12.0), ), borderRadius: BorderRadius.circular(LunaUI.BORDER_RADIUS), diff --git a/lib/modules/radarr/routes/add_movie/widgets/discovery_results_tile.dart b/lib/modules/radarr/routes/add_movie/widgets/discovery_results_tile.dart index fc73e7b4..aca58236 100644 --- a/lib/modules/radarr/routes/add_movie/widgets/discovery_results_tile.dart +++ b/lib/modules/radarr/routes/add_movie/widgets/discovery_results_tile.dart @@ -23,7 +23,7 @@ class _State extends State { backgroundUrl: widget.movie.remotePoster, posterUrl: widget.movie.remotePoster, posterHeaders: context.watch().headers, - posterPlaceholder: LunaAssets.video, + posterPlaceholder: LunaAssets.blankVideo, title: widget.movie.title, subtitle1: _subtitle1(), subtitle2: _subtitle2(), diff --git a/lib/modules/radarr/routes/add_movie/widgets/search_results_tile.dart b/lib/modules/radarr/routes/add_movie/widgets/search_results_tile.dart index b0df4fca..d442a18b 100644 --- a/lib/modules/radarr/routes/add_movie/widgets/search_results_tile.dart +++ b/lib/modules/radarr/routes/add_movie/widgets/search_results_tile.dart @@ -27,7 +27,7 @@ class _State extends State { backgroundUrl: widget.movie.remotePoster, posterUrl: widget.movie.remotePoster, posterHeaders: context.watch().headers, - posterPlaceholder: LunaAssets.video, + posterPlaceholder: LunaAssets.blankVideo, title: widget.movie.title, darken: widget.exists, titleColor: widget.isExcluded ? LunaColours.red : Colors.white, diff --git a/lib/modules/radarr/routes/catalogue/widgets/movie_tile.dart b/lib/modules/radarr/routes/catalogue/widgets/movie_tile.dart index a8731ebb..dbd7bb89 100644 --- a/lib/modules/radarr/routes/catalogue/widgets/movie_tile.dart +++ b/lib/modules/radarr/routes/catalogue/widgets/movie_tile.dart @@ -26,7 +26,7 @@ class _State extends State { context.read().getPosterURL(widget.movie.id), posterUrl: context.read().getPosterURL(widget.movie.id), posterHeaders: context.read().headers, - posterPlaceholder: LunaAssets.video, + posterPlaceholder: LunaAssets.blankVideo, darken: !widget.movie.monitored, title: widget.movie.title, subtitle1: _subtitle1(), diff --git a/lib/modules/radarr/routes/missing/widgets/missing_tile.dart b/lib/modules/radarr/routes/missing/widgets/missing_tile.dart index f1abbca5..39d68777 100644 --- a/lib/modules/radarr/routes/missing/widgets/missing_tile.dart +++ b/lib/modules/radarr/routes/missing/widgets/missing_tile.dart @@ -26,7 +26,7 @@ class _State extends State { context.read().getPosterURL(widget.movie.id), posterUrl: context.read().getPosterURL(widget.movie.id), posterHeaders: context.read().headers, - posterPlaceholder: LunaAssets.video, + posterPlaceholder: LunaAssets.blankVideo, darken: !widget.movie.monitored, title: widget.movie.title, subtitle1: _subtitle1(), diff --git a/lib/modules/radarr/routes/movie_details/widgets/cast_crew_tile.dart b/lib/modules/radarr/routes/movie_details/widgets/cast_crew_tile.dart index 0439160a..87c2382c 100644 --- a/lib/modules/radarr/routes/movie_details/widgets/cast_crew_tile.dart +++ b/lib/modules/radarr/routes/movie_details/widgets/cast_crew_tile.dart @@ -27,7 +27,7 @@ class RadarrMovieDetailsCastCrewTile extends StatelessWidget { } return LunaTwoLineCardWithPoster( title: credits.personName, - posterPlaceholder: LunaAssets.user, + posterPlaceholder: LunaAssets.blankUser, posterUrl: credits.images.isEmpty ? null : credits.images[0].url, posterHeaders: {}, subtitle1: TextSpan(text: position), diff --git a/lib/modules/radarr/routes/movie_details/widgets/overview_movie_description_tile.dart b/lib/modules/radarr/routes/movie_details/widgets/overview_movie_description_tile.dart index 798479b7..c623bf33 100644 --- a/lib/modules/radarr/routes/movie_details/widgets/overview_movie_description_tile.dart +++ b/lib/modules/radarr/routes/movie_details/widgets/overview_movie_description_tile.dart @@ -12,7 +12,7 @@ class RadarrMovieDetailsOverviewDescriptionTile extends StatelessWidget { Widget build(BuildContext context) { return LunaFourLineCardWithPoster( - posterPlaceholder: LunaAssets.video, + posterPlaceholder: LunaAssets.blankVideo, backgroundUrl: context.read().getFanartURL(movie.id), posterUrl: context.read().getPosterURL(movie.id), posterHeaders: context.read().headers, diff --git a/lib/modules/radarr/routes/movie_details/widgets/overview_movie_links_section.dart b/lib/modules/radarr/routes/movie_details/widgets/overview_movie_links_section.dart index bf9cb4a1..20b35898 100644 --- a/lib/modules/radarr/routes/movie_details/widgets/overview_movie_links_section.dart +++ b/lib/modules/radarr/routes/movie_details/widgets/overview_movie_links_section.dart @@ -19,7 +19,7 @@ class RadarrMovieDetailsOverviewLinksSection extends StatelessWidget { context: context, child: InkWell( child: Padding( - child: Image.asset(LunaAssets.imdb), + child: Image.asset(LunaAssets.serviceImdb), padding: EdgeInsets.all(12.0), ), borderRadius: BorderRadius.circular(LunaUI.BORDER_RADIUS), @@ -33,7 +33,7 @@ class RadarrMovieDetailsOverviewLinksSection extends StatelessWidget { context: context, child: InkWell( child: Padding( - child: Image.asset(LunaAssets.themoviedb), + child: Image.asset(LunaAssets.serviceThemoviedb), padding: EdgeInsets.all(12.0), ), borderRadius: BorderRadius.circular(LunaUI.BORDER_RADIUS), @@ -48,7 +48,7 @@ class RadarrMovieDetailsOverviewLinksSection extends StatelessWidget { context: context, child: InkWell( child: Padding( - child: Image.asset(LunaAssets.trakt), + child: Image.asset('assets/images/services/trakt.png'), padding: EdgeInsets.all(12.0), ), borderRadius: BorderRadius.circular(LunaUI.BORDER_RADIUS), @@ -63,7 +63,7 @@ class RadarrMovieDetailsOverviewLinksSection extends StatelessWidget { context: context, child: InkWell( child: Padding( - child: Image.asset(LunaAssets.youtube), + child: Image.asset(LunaAssets.serviceYoutube), padding: EdgeInsets.all(12.0), ), borderRadius: BorderRadius.circular(LunaUI.BORDER_RADIUS), diff --git a/lib/modules/radarr/routes/upcoming/widgets/upcoming_tile.dart b/lib/modules/radarr/routes/upcoming/widgets/upcoming_tile.dart index 270daa51..4acf4bfd 100644 --- a/lib/modules/radarr/routes/upcoming/widgets/upcoming_tile.dart +++ b/lib/modules/radarr/routes/upcoming/widgets/upcoming_tile.dart @@ -26,7 +26,7 @@ class _State extends State { context.read().getPosterURL(widget.movie.id), posterUrl: context.read().getPosterURL(widget.movie.id), posterHeaders: context.read().headers, - posterPlaceholder: LunaAssets.video, + posterPlaceholder: LunaAssets.blankVideo, darken: !widget.movie.monitored, title: widget.movie.title, subtitle1: _subtitle1(), diff --git a/lib/modules/settings/routes/account/pages/signed_out.dart b/lib/modules/settings/routes/account/pages/signed_out.dart index 042bc1bc..6faea81b 100644 --- a/lib/modules/settings/routes/account/pages/signed_out.dart +++ b/lib/modules/settings/routes/account/pages/signed_out.dart @@ -57,7 +57,7 @@ class _State extends State { Padding( child: Center( child: Image.asset( - LunaAssets.splash, + LunaAssets.brandingFull, width: 200.0, ), ), diff --git a/lib/modules/sonarr/routes/add_series/widgets/search_results_tile.dart b/lib/modules/sonarr/routes/add_series/widgets/search_results_tile.dart index 0e04100a..2faead14 100644 --- a/lib/modules/sonarr/routes/add_series/widgets/search_results_tile.dart +++ b/lib/modules/sonarr/routes/add_series/widgets/search_results_tile.dart @@ -52,14 +52,14 @@ class _State extends State { if (widget.series.remotePoster != null) return LunaNetworkImage( url: widget.series.remotePoster, - placeholderAsset: LunaAssets.video, + placeholderAsset: LunaAssets.blankVideo, height: _height, width: _width, headers: context.read().headers.cast(), ); return ClipRRect( child: Image.asset( - LunaAssets.video, + LunaAssets.blankVideo, width: _width, height: _height, ), diff --git a/lib/modules/sonarr/routes/missing/widgets/missing_tile.dart b/lib/modules/sonarr/routes/missing/widgets/missing_tile.dart index 0d90bd90..1c736c97 100644 --- a/lib/modules/sonarr/routes/missing/widgets/missing_tile.dart +++ b/lib/modules/sonarr/routes/missing/widgets/missing_tile.dart @@ -50,7 +50,7 @@ class _State extends State { Widget get _poster => LunaNetworkImage( url: Provider.of(context, listen: false) .getPosterURL(widget.record.seriesId), - placeholderAsset: LunaAssets.video, + placeholderAsset: LunaAssets.blankVideo, height: _height, width: _width, headers: Provider.of(context, listen: false) diff --git a/lib/modules/sonarr/routes/series/widgets/series_tile.dart b/lib/modules/sonarr/routes/series/widgets/series_tile.dart index a01fb765..ff460d76 100644 --- a/lib/modules/sonarr/routes/series/widgets/series_tile.dart +++ b/lib/modules/sonarr/routes/series/widgets/series_tile.dart @@ -52,7 +52,7 @@ class _State extends State { Widget get _poster => LunaNetworkImage( url: Provider.of(context, listen: false) .getPosterURL(widget.series.id), - placeholderAsset: LunaAssets.video, + placeholderAsset: LunaAssets.blankVideo, height: _height, width: _width, headers: Provider.of(context, listen: false) diff --git a/lib/modules/sonarr/routes/series_details/widgets/overview.dart b/lib/modules/sonarr/routes/series_details/widgets/overview.dart index f9731ab6..ccb364db 100644 --- a/lib/modules/sonarr/routes/series_details/widgets/overview.dart +++ b/lib/modules/sonarr/routes/series_details/widgets/overview.dart @@ -82,7 +82,7 @@ class SonarrSeriesDetailsOverview extends StatelessWidget { headers: Provider.of(context, listen: false) .headers .cast(), - placeholderAsset: LunaAssets.video, + placeholderAsset: LunaAssets.blankVideo, height: _height, width: _width, ), @@ -137,7 +137,7 @@ class SonarrSeriesDetailsOverview extends StatelessWidget { context: context, child: InkWell( child: Padding( - child: Image.asset(LunaAssets.imdb), + child: Image.asset(LunaAssets.serviceImdb), padding: EdgeInsets.all(12.0), ), borderRadius: BorderRadius.circular(LunaUI.BORDER_RADIUS), @@ -151,7 +151,7 @@ class SonarrSeriesDetailsOverview extends StatelessWidget { context: context, child: InkWell( child: Padding( - child: Image.asset(LunaAssets.trakt), + child: Image.asset(LunaAssets.serviceTrakt), padding: EdgeInsets.all(12.0), ), borderRadius: BorderRadius.circular(LunaUI.BORDER_RADIUS), @@ -166,7 +166,7 @@ class SonarrSeriesDetailsOverview extends StatelessWidget { context: context, child: InkWell( child: Padding( - child: Image.asset(LunaAssets.thetvdb), + child: Image.asset(LunaAssets.serviceThetvdb), padding: EdgeInsets.all(12.0), ), borderRadius: BorderRadius.circular(LunaUI.BORDER_RADIUS), @@ -181,7 +181,7 @@ class SonarrSeriesDetailsOverview extends StatelessWidget { context: context, child: InkWell( child: Padding( - child: Image.asset(LunaAssets.tvmaze), + child: Image.asset(LunaAssets.serviceTvmaze), padding: EdgeInsets.all(12.0), ), borderRadius: BorderRadius.circular(LunaUI.BORDER_RADIUS), diff --git a/lib/modules/sonarr/routes/upcoming/widgets/upcoming_tile.dart b/lib/modules/sonarr/routes/upcoming/widgets/upcoming_tile.dart index 93558459..017fad66 100644 --- a/lib/modules/sonarr/routes/upcoming/widgets/upcoming_tile.dart +++ b/lib/modules/sonarr/routes/upcoming/widgets/upcoming_tile.dart @@ -25,7 +25,7 @@ class _State extends State { posterUrl: context.read().getPosterURL(widget.record.seriesId), posterHeaders: context.read().headers, - posterPlaceholder: LunaAssets.video, + posterPlaceholder: LunaAssets.blankVideo, title: widget.record.series.title, subtitle1: _subtitle1(), subtitle2: _subtitle2(), diff --git a/lib/modules/tautulli/routes/activity/widgets/activity_tile.dart b/lib/modules/tautulli/routes/activity/widgets/activity_tile.dart index 32cbdba6..b123660f 100644 --- a/lib/modules/tautulli/routes/activity/widgets/activity_tile.dart +++ b/lib/modules/tautulli/routes/activity/widgets/activity_tile.dart @@ -19,7 +19,7 @@ class TautulliActivityTile extends StatelessWidget { title: session.lunaTitle, posterUrl: session.lunaArtworkPath(context), posterHeaders: context.read().headers, - posterPlaceholder: LunaAssets.video, + posterPlaceholder: LunaAssets.blankVideo, backgroundUrl: context.watch().getImageURLFromPath( session.art, width: MediaQuery.of(context).size.width.truncate(), diff --git a/lib/modules/tautulli/routes/history/widgets/history_tile.dart b/lib/modules/tautulli/routes/history/widgets/history_tile.dart index f43aac00..9a6ee6d1 100644 --- a/lib/modules/tautulli/routes/history/widgets/history_tile.dart +++ b/lib/modules/tautulli/routes/history/widgets/history_tile.dart @@ -44,7 +44,7 @@ class TautulliHistoryTile extends StatelessWidget { headers: context.watch().headers.cast(), height: _imageDimension, width: _imageDimension / 1.5, - placeholderAsset: LunaAssets.video, + placeholderAsset: LunaAssets.blankVideo, ); Widget get _details => Expanded( diff --git a/lib/modules/tautulli/routes/libraries_details/widgets/user_stats_tile.dart b/lib/modules/tautulli/routes/libraries_details/widgets/user_stats_tile.dart index a935b270..a399fdae 100644 --- a/lib/modules/tautulli/routes/libraries_details/widgets/user_stats_tile.dart +++ b/lib/modules/tautulli/routes/libraries_details/widgets/user_stats_tile.dart @@ -17,7 +17,7 @@ class TautulliLibrariesDetailsUserStatsTile extends StatelessWidget { context.watch().getImageURLFromPath(user.userThumb), posterHeaders: context.watch().headers.cast(), - posterPlaceholder: LunaAssets.user, + posterPlaceholder: LunaAssets.blankUser, title: user.friendlyName, customSubtitle1: _subtitle1(), customSubtitle2: _subtitle2(), diff --git a/lib/modules/tautulli/routes/media_details/widgets/metadata_header.dart b/lib/modules/tautulli/routes/media_details/widgets/metadata_header.dart index dc5ce122..cdb82287 100644 --- a/lib/modules/tautulli/routes/media_details/widgets/metadata_header.dart +++ b/lib/modules/tautulli/routes/media_details/widgets/metadata_header.dart @@ -64,7 +64,7 @@ class TautulliMediaDetailsMetadataHeaderTile extends StatelessWidget { Widget _poster(BuildContext context) { return LunaNetworkImage( url: context.watch().getImageURLFromPath(_posterLink), - placeholderAsset: LunaAssets.video, + placeholderAsset: LunaAssets.blankVideo, height: _height, width: _width, headers: context.watch().headers.cast(), diff --git a/lib/modules/tautulli/routes/recently_added/widgets/content_tile.dart b/lib/modules/tautulli/routes/recently_added/widgets/content_tile.dart index 8abd2309..033b185c 100644 --- a/lib/modules/tautulli/routes/recently_added/widgets/content_tile.dart +++ b/lib/modules/tautulli/routes/recently_added/widgets/content_tile.dart @@ -62,7 +62,7 @@ class TautulliRecentlyAddedContentTile extends StatelessWidget { return LunaNetworkImage( url: context.watch().getImageURLFromPath(_posterLink), headers: context.watch().headers.cast(), - placeholderAsset: LunaAssets.video, + placeholderAsset: LunaAssets.blankVideo, height: _imageDimension, width: _imageDimension / 1.5, ); diff --git a/lib/modules/tautulli/routes/search/widgets/search_result_tile.dart b/lib/modules/tautulli/routes/search/widgets/search_result_tile.dart index 177abe07..ae00100d 100644 --- a/lib/modules/tautulli/routes/search/widgets/search_result_tile.dart +++ b/lib/modules/tautulli/routes/search/widgets/search_result_tile.dart @@ -43,7 +43,7 @@ class TautulliSearchResultTile extends StatelessWidget { headers: context.watch().headers.cast(), height: _imageDimension, width: _imageDimension / 1.5, - placeholderAsset: LunaAssets.video, + placeholderAsset: LunaAssets.blankVideo, ); Widget get _details => Expanded( diff --git a/lib/modules/tautulli/routes/statistics/widgets/media_tile.dart b/lib/modules/tautulli/routes/statistics/widgets/media_tile.dart index 9d7d629e..2299bb29 100644 --- a/lib/modules/tautulli/routes/statistics/widgets/media_tile.dart +++ b/lib/modules/tautulli/routes/statistics/widgets/media_tile.dart @@ -44,7 +44,7 @@ class TautulliStatisticsMediaTile extends StatelessWidget { Widget _poster(BuildContext context) => LunaNetworkImage( url: context.watch().getImageURLFromPath(data['thumb']), headers: context.watch().headers.cast(), - placeholderAsset: LunaAssets.video, + placeholderAsset: LunaAssets.blankVideo, height: _imageDimension, width: _imageDimension / 1.5, ); diff --git a/lib/modules/tautulli/routes/statistics/widgets/platform_tile.dart b/lib/modules/tautulli/routes/statistics/widgets/platform_tile.dart index 14ee6fc8..e8541464 100644 --- a/lib/modules/tautulli/routes/statistics/widgets/platform_tile.dart +++ b/lib/modules/tautulli/routes/statistics/widgets/platform_tile.dart @@ -29,7 +29,7 @@ class TautulliStatisticsPlatformTile extends StatelessWidget { decoration: BoxDecoration( borderRadius: BorderRadius.circular(LunaUI.BORDER_RADIUS), image: DecorationImage( - image: AssetImage(LunaAssets.platform), + image: AssetImage(LunaAssets.blankDevice), fit: BoxFit.cover, ), ), diff --git a/lib/modules/tautulli/routes/statistics/widgets/recently_watched_tile.dart b/lib/modules/tautulli/routes/statistics/widgets/recently_watched_tile.dart index ef37c639..8fa2925e 100644 --- a/lib/modules/tautulli/routes/statistics/widgets/recently_watched_tile.dart +++ b/lib/modules/tautulli/routes/statistics/widgets/recently_watched_tile.dart @@ -42,7 +42,7 @@ class TautulliStatisticsRecentlyWatchedTile extends StatelessWidget { Widget _poster(BuildContext context) => LunaNetworkImage( url: context.watch().getImageURLFromPath(data['thumb']), headers: context.watch().headers.cast(), - placeholderAsset: LunaAssets.video, + placeholderAsset: LunaAssets.blankVideo, height: _imageDimension, width: _imageDimension / 1.5, ); diff --git a/lib/modules/tautulli/routes/statistics/widgets/stream_tile.dart b/lib/modules/tautulli/routes/statistics/widgets/stream_tile.dart index 3df8b8d9..1d090803 100644 --- a/lib/modules/tautulli/routes/statistics/widgets/stream_tile.dart +++ b/lib/modules/tautulli/routes/statistics/widgets/stream_tile.dart @@ -29,7 +29,7 @@ class TautulliStatisticsStreamTile extends StatelessWidget { decoration: BoxDecoration( borderRadius: BorderRadius.circular(LunaUI.BORDER_RADIUS), image: DecorationImage( - image: AssetImage(LunaAssets.stream), + image: AssetImage(LunaAssets.blankStream), fit: BoxFit.cover, ), ), diff --git a/lib/modules/tautulli/routes/statistics/widgets/user_tile.dart b/lib/modules/tautulli/routes/statistics/widgets/user_tile.dart index 43352ff6..9790b233 100644 --- a/lib/modules/tautulli/routes/statistics/widgets/user_tile.dart +++ b/lib/modules/tautulli/routes/statistics/widgets/user_tile.dart @@ -32,7 +32,7 @@ class TautulliStatisticsUserTile extends StatelessWidget { .watch() .getImageURLFromPath(data['user_thumb']), headers: context.watch().headers.cast(), - placeholderAsset: LunaAssets.user, + placeholderAsset: LunaAssets.blankUser, height: _imageDimension, width: _imageDimension / 1.5, ); diff --git a/lib/modules/tautulli/routes/users/widgets/user_tile.dart b/lib/modules/tautulli/routes/users/widgets/user_tile.dart index a37249c6..d9b8aa09 100644 --- a/lib/modules/tautulli/routes/users/widgets/user_tile.dart +++ b/lib/modules/tautulli/routes/users/widgets/user_tile.dart @@ -43,7 +43,7 @@ class TautulliUserTile extends StatelessWidget { Widget _userThumb(BuildContext context) => LunaNetworkImage( url: user.userThumb, - placeholderAsset: LunaAssets.user, + placeholderAsset: LunaAssets.blankUser, height: _imageDimension, width: _imageDimension, ); diff --git a/spider.yaml b/spider.yaml index 6e89bcd9..009bdfbc 100644 --- a/spider.yaml +++ b/spider.yaml @@ -16,10 +16,7 @@ use_part_of: false package: core groups: - - paths: - - assets/images/blanks - - assets/images/branding - - assets/images/services + - path: assets/images class_name: LunaAssets file_name: assets types: [ .png, .jpg, .jpeg, .webp, .webm, .bmp ] diff --git a/test/core/assets_test.dart b/test/core/assets_test.dart new file mode 100644 index 00000000..564f2e66 --- /dev/null +++ b/test/core/assets_test.dart @@ -0,0 +1,30 @@ +import 'dart:io'; +import 'package:lunasea/core/assets.dart'; +import 'package:test/test.dart'; + +void main() { + group('LunaAssets', () { + test('Blanks: Assets Exist', () { + expect(File(LunaAssets.blankAudio).existsSync(), true); + expect(File(LunaAssets.blankDevice).existsSync(), true); + expect(File(LunaAssets.blankStream).existsSync(), true); + expect(File(LunaAssets.blankUser).existsSync(), true); + expect(File(LunaAssets.blankVideo).existsSync(), true); + }); + test('Branding: Assets Exist', () { + expect(File(LunaAssets.brandingFull).existsSync(), true); + expect(File(LunaAssets.brandingLogo).existsSync(), true); + }); + test('Services: Assets Exist', () { + expect(File(LunaAssets.serviceBandsintown).existsSync(), true); + expect(File(LunaAssets.serviceDiscogs).existsSync(), true); + expect(File(LunaAssets.serviceImdb).existsSync(), true); + expect(File(LunaAssets.serviceLastfm).existsSync(), true); + expect(File(LunaAssets.serviceThemoviedb).existsSync(), true); + expect(File(LunaAssets.serviceThetvdb).existsSync(), true); + expect(File(LunaAssets.serviceTrakt).existsSync(), true); + expect(File(LunaAssets.serviceTvmaze).existsSync(), true); + expect(File(LunaAssets.serviceYoutube).existsSync(), true); + }); + }); +}