diff --git a/lib/core.dart b/lib/core.dart index 93d19e6c..78d1a1c7 100644 --- a/lib/core.dart +++ b/lib/core.dart @@ -1,14 +1,15 @@ -export './core/constants.dart'; -export './core/configuration.dart'; -export './core/data.dart'; -export './core/database.dart'; -export './core/dialogs.dart'; -export './core/extensions.dart'; -export './core/in_app_purchases.dart'; -export './core/logger.dart'; -export './core/module_flags.dart'; -export './core/providers.dart'; -export './core/routes.dart'; -export './core/sorter.dart'; -export './core/theme.dart'; -export './core/ui.dart'; +export 'core/constants.dart'; +export 'core/configuration.dart'; +export 'core/data.dart'; +export 'core/database.dart'; +export 'core/dialogs.dart'; +export 'core/extensions.dart'; +export 'core/in_app_purchases.dart'; +export 'core/logger.dart'; +export 'core/module_flags.dart'; +export 'core/providers.dart'; +export 'core/routes.dart'; +export 'core/sorter.dart'; +export 'core/theme.dart'; +export 'core/ui.dart'; +export 'core/uuid.dart'; \ No newline at end of file diff --git a/lib/core/configuration.dart b/lib/core/configuration.dart index 2371fe6f..3f21a26c 100644 --- a/lib/core/configuration.dart +++ b/lib/core/configuration.dart @@ -1,4 +1,4 @@ -export './configuration/export.dart'; -export './configuration/import.dart'; -export './configuration/encryption.dart'; -export './configuration/filesystem.dart'; +export 'configuration/export.dart'; +export 'configuration/import.dart'; +export 'configuration/encryption.dart'; +export 'configuration/filesystem.dart'; diff --git a/lib/core/constants.dart b/lib/core/constants.dart index 5a42a504..db6da456 100644 --- a/lib/core/constants.dart +++ b/lib/core/constants.dart @@ -1,5 +1,13 @@ import 'package:flutter/material.dart'; -import 'package:lunasea/modules.dart'; +import 'package:lunasea/modules.dart' show + LidarrConstants, + RadarrConstants, + SonarrConstants, + NZBGetConstants, + SABnzbdConstants, + SearchConstants, + SettingsConstants, + WakeOnLANConstants; class Constants { Constants._(); diff --git a/lib/core/data.dart b/lib/core/data.dart index 8e0d64c6..acb5aaaf 100644 --- a/lib/core/data.dart +++ b/lib/core/data.dart @@ -1,2 +1,2 @@ -export './data/api.dart'; -export './data/future_container.dart'; +export 'data/api.dart'; +export 'data/future_container.dart'; diff --git a/lib/core/database.dart b/lib/core/database.dart index c92719f1..88aa827a 100644 --- a/lib/core/database.dart +++ b/lib/core/database.dart @@ -1,2 +1,2 @@ -export './database/database.dart'; -export './database/adapters.dart'; +export 'database/database.dart'; +export 'database/adapters.dart'; diff --git a/lib/core/database/adapters.dart b/lib/core/database/adapters.dart index 59d845c7..b7ee04c5 100644 --- a/lib/core/database/adapters.dart +++ b/lib/core/database/adapters.dart @@ -1,3 +1,3 @@ -export './adapters/indexer.dart'; -export './adapters/lunasea.dart'; -export './adapters/profile.dart'; +export 'adapters/indexer.dart'; +export 'adapters/lunasea.dart'; +export 'adapters/profile.dart'; diff --git a/lib/core/database/adapters/lunasea.dart b/lib/core/database/adapters/lunasea.dart index 57c2dce9..2aaf5af8 100644 --- a/lib/core/database/adapters/lunasea.dart +++ b/lib/core/database/adapters/lunasea.dart @@ -12,6 +12,7 @@ class LunaSeaDatabase { enum LunaSeaDatabaseValue { ENABLED_PROFILE, ENABLED_SENTRY, + CLIENT_IDENTIFIER, THEME_AMOLED, THEME_AMOLED_BORDER, SELECTED_BROWSER, @@ -25,6 +26,7 @@ extension LunaSeaDatabaseValueExtension on LunaSeaDatabaseValue { case LunaSeaDatabaseValue.THEME_AMOLED: return 'LUNASEA_THEME_AMOLED'; case LunaSeaDatabaseValue.THEME_AMOLED_BORDER: return 'LUNASEA_THEME_AMOLED_BORDER'; case LunaSeaDatabaseValue.SELECTED_BROWSER: return 'LUNASEA_SELECTED_BROWSER'; + case LunaSeaDatabaseValue.CLIENT_IDENTIFIER: return 'LUNASEA_CLIENT_IDENTIFIER'; } throw Exception('key not found'); } @@ -37,6 +39,7 @@ extension LunaSeaDatabaseValueExtension on LunaSeaDatabaseValue { case LunaSeaDatabaseValue.THEME_AMOLED: return _box.get(this.key, defaultValue: false); case LunaSeaDatabaseValue.THEME_AMOLED_BORDER: return _box.get(this.key, defaultValue: false); case LunaSeaDatabaseValue.ENABLED_SENTRY: return _box.get(this.key, defaultValue: true); + case LunaSeaDatabaseValue.CLIENT_IDENTIFIER: return _box.get(this.key, defaultValue: null); } throw Exception('data not found'); } diff --git a/lib/core/database/database.dart b/lib/core/database/database.dart index 464d8895..98bc985a 100644 --- a/lib/core/database/database.dart +++ b/lib/core/database/database.dart @@ -1,8 +1,16 @@ // Imports import 'package:hive/hive.dart'; import 'package:hive_flutter/hive_flutter.dart'; -import 'package:lunasea/modules.dart'; import './adapters.dart'; +import 'package:lunasea/modules.dart' show + HomeDatabase, + SearchDatabase, + SettingsDatabase, + LidarrDatabase, + RadarrDatabase, + SonarrDatabase, + NZBGetDatabase, + SABnzbdDatabase; // Exports export 'package:hive/hive.dart'; export 'package:hive_flutter/hive_flutter.dart'; diff --git a/lib/core/extensions.dart b/lib/core/extensions.dart index 9bf4cde5..6f63f1bd 100644 --- a/lib/core/extensions.dart +++ b/lib/core/extensions.dart @@ -1,6 +1,6 @@ -export './extensions/integer.dart'; -export './extensions/datetime.dart'; -export './extensions/double.dart'; -export './extensions/in_app_purchases.dart'; -export './extensions/flog.dart'; -export './extensions/string.dart'; +export 'extensions/integer.dart'; +export 'extensions/datetime.dart'; +export 'extensions/double.dart'; +export 'extensions/in_app_purchases.dart'; +export 'extensions/flog.dart'; +export 'extensions/string.dart'; diff --git a/lib/core/extensions/double.dart b/lib/core/extensions/double.dart index 0e1f2a8e..49341792 100644 --- a/lib/core/extensions/double.dart +++ b/lib/core/extensions/double.dart @@ -1 +1 @@ -export './double/time.dart'; +export 'double/time.dart'; diff --git a/lib/core/extensions/flog.dart b/lib/core/extensions/flog.dart index 1dcc86de..a164105c 100644 --- a/lib/core/extensions/flog.dart +++ b/lib/core/extensions/flog.dart @@ -1 +1 @@ -export './flog/log_level.dart'; +export 'flog/log_level.dart'; diff --git a/lib/core/extensions/integer.dart b/lib/core/extensions/integer.dart index 400188db..c789d032 100644 --- a/lib/core/extensions/integer.dart +++ b/lib/core/extensions/integer.dart @@ -1,2 +1,2 @@ -export './integer/bytes.dart'; -export './integer/time.dart'; +export 'integer/bytes.dart'; +export 'integer/time.dart'; diff --git a/lib/core/extensions/string.dart b/lib/core/extensions/string.dart index 68085a3b..fdf34b8a 100644 --- a/lib/core/extensions/string.dart +++ b/lib/core/extensions/string.dart @@ -1,3 +1,3 @@ -export './string/language.dart'; -export './string/links.dart'; -export './string/slugs.dart'; +export 'string/language.dart'; +export 'string/links.dart'; +export 'string/slugs.dart'; diff --git a/lib/core/providers.dart b/lib/core/providers.dart index c6a55421..007121fa 100644 --- a/lib/core/providers.dart +++ b/lib/core/providers.dart @@ -4,7 +4,15 @@ export 'package:provider/provider.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:lunasea/core.dart'; -import 'package:lunasea/modules.dart'; +import 'package:lunasea/modules.dart' show + HomeModel, + LidarrModel, + NZBGetModel, + RadarrGlobalState, + SABnzbdModel, + SearchModel, + SettingsModel, + SonarrModel; class Providers { Providers._(); diff --git a/lib/core/ui.dart b/lib/core/ui.dart index f1528755..1948c396 100644 --- a/lib/core/ui.dart +++ b/lib/core/ui.dart @@ -1,20 +1,20 @@ -export './ui/button.dart'; -export './ui/card.dart'; -export './ui/colors.dart'; -export './ui/containers.dart'; -export './ui/description_block.dart'; -export './ui/dialogs.dart'; -export './ui/divider.dart'; -export './ui/expandable.dart'; -export './ui/floating_action_button.dart'; -export './ui/icon.dart'; -export './ui/input_bar.dart'; -export './ui/listview.dart'; -export './ui/messages.dart'; -export './ui/navigation.dart'; -export './ui/refresh_indicator.dart'; -export './ui/rive.dart'; -export './ui/shape.dart'; -export './ui/snackbar.dart'; -export './ui/sticky_header.dart'; -export './ui/text.dart'; +export 'ui/button.dart'; +export 'ui/card.dart'; +export 'ui/colors.dart'; +export 'ui/containers.dart'; +export 'ui/description_block.dart'; +export 'ui/dialogs.dart'; +export 'ui/divider.dart'; +export 'ui/expandable.dart'; +export 'ui/floating_action_button.dart'; +export 'ui/icon.dart'; +export 'ui/input_bar.dart'; +export 'ui/listview.dart'; +export 'ui/messages.dart'; +export 'ui/navigation.dart'; +export 'ui/refresh_indicator.dart'; +export 'ui/rive.dart'; +export 'ui/shape.dart'; +export 'ui/snackbar.dart'; +export 'ui/sticky_header.dart'; +export 'ui/text.dart'; diff --git a/lib/core/ui/button.dart b/lib/core/ui/button.dart index ed6aafa6..f4f488d7 100644 --- a/lib/core/ui/button.dart +++ b/lib/core/ui/button.dart @@ -1,2 +1,2 @@ -export './button/button.dart'; -export './button/button_slim.dart'; +export 'button/button.dart'; +export 'button/button_slim.dart'; diff --git a/lib/core/ui/card.dart b/lib/core/ui/card.dart index 2494e38b..d69fa7b8 100644 --- a/lib/core/ui/card.dart +++ b/lib/core/ui/card.dart @@ -1,3 +1,3 @@ -export './card/card.dart'; -export './card/card_tile.dart'; -export './card/card_background.dart'; +export 'card/card.dart'; +export 'card/card_tile.dart'; +export 'card/card_background.dart'; diff --git a/lib/core/ui/containers.dart b/lib/core/ui/containers.dart index c10a8b7f..f4b62f99 100644 --- a/lib/core/ui/containers.dart +++ b/lib/core/ui/containers.dart @@ -1 +1 @@ -export './containers/row.dart'; +export 'containers/row.dart'; diff --git a/lib/core/ui/floating_action_button.dart b/lib/core/ui/floating_action_button.dart index 9c58e2e9..c19a3b46 100644 --- a/lib/core/ui/floating_action_button.dart +++ b/lib/core/ui/floating_action_button.dart @@ -1,3 +1,3 @@ -export './floating_action_button/floating_action_button.dart'; -export './floating_action_button/floating_action_button_animated.dart'; -export './floating_action_button/floating_action_button_extended.dart'; +export 'floating_action_button/floating_action_button.dart'; +export 'floating_action_button/floating_action_button_animated.dart'; +export 'floating_action_button/floating_action_button_extended.dart'; diff --git a/lib/core/ui/icon.dart b/lib/core/ui/icon.dart index 0f0ad2e8..bfb7ad60 100644 --- a/lib/core/ui/icon.dart +++ b/lib/core/ui/icon.dart @@ -1,3 +1,3 @@ -export './icon/icon.dart'; -export './icon/icon_button.dart'; -export './icon/icon_custom.dart'; +export 'icon/icon.dart'; +export 'icon/icon_button.dart'; +export 'icon/icon_custom.dart'; diff --git a/lib/core/ui/listview.dart b/lib/core/ui/listview.dart index 90adfdb8..931efd73 100644 --- a/lib/core/ui/listview.dart +++ b/lib/core/ui/listview.dart @@ -1,4 +1,4 @@ -export './listview/listview.dart'; -export './listview/listview_builder.dart'; -export './listview/listview_reorderable.dart'; -export './listview/listview_stickyheader.dart'; +export 'listview/listview.dart'; +export 'listview/listview_builder.dart'; +export 'listview/listview_reorderable.dart'; +export 'listview/listview_stickyheader.dart'; diff --git a/lib/core/ui/messages.dart b/lib/core/ui/messages.dart index 13800746..de3a63e3 100644 --- a/lib/core/ui/messages.dart +++ b/lib/core/ui/messages.dart @@ -1,5 +1,5 @@ -export './messages/error_message.dart'; -export './messages/generic.dart'; -export './messages/loading.dart'; -export './messages/not_enabled.dart'; -export './messages/typewriter.dart'; +export 'messages/error_message.dart'; +export 'messages/generic.dart'; +export 'messages/loading.dart'; +export 'messages/not_enabled.dart'; +export 'messages/typewriter.dart'; diff --git a/lib/core/ui/navigation.dart b/lib/core/ui/navigation.dart index 8beb6c4b..3f65172f 100644 --- a/lib/core/ui/navigation.dart +++ b/lib/core/ui/navigation.dart @@ -1,4 +1,4 @@ -export './navigation/appbar.dart'; -export './navigation/appbar_dropdown.dart'; -export './navigation/drawer.dart'; -export './navigation/bottom_navigation_bar.dart'; +export 'navigation/appbar.dart'; +export 'navigation/appbar_dropdown.dart'; +export 'navigation/drawer.dart'; +export 'navigation/bottom_navigation_bar.dart'; diff --git a/lib/core/ui/text.dart b/lib/core/ui/text.dart index e8c0ba52..271a8863 100644 --- a/lib/core/ui/text.dart +++ b/lib/core/ui/text.dart @@ -1,4 +1,4 @@ -export './text/header.dart'; -export './text/text_highlighted.dart'; -export './text/text_title.dart'; -export './text/text_subtitle.dart'; +export 'text/header.dart'; +export 'text/text_highlighted.dart'; +export 'text/text_title.dart'; +export 'text/text_subtitle.dart'; diff --git a/lib/core/uuid.dart b/lib/core/uuid.dart new file mode 100644 index 00000000..b6d1978f --- /dev/null +++ b/lib/core/uuid.dart @@ -0,0 +1,6 @@ +import 'package:uuid/uuid.dart'; + +class UUID { + static final _generator = Uuid(); + static String get uuid => _generator.v4(); +} diff --git a/lib/modules.dart b/lib/modules.dart index 43100b34..4c5d5efa 100644 --- a/lib/modules.dart +++ b/lib/modules.dart @@ -1,9 +1,9 @@ -export './modules/home.dart'; -export './modules/lidarr.dart'; -export './modules/nzbget.dart'; -export './modules/radarr.dart'; -export './modules/sabnzbd.dart'; -export './modules/search.dart'; -export './modules/settings.dart'; -export './modules/sonarr.dart'; -export './modules/wake_on_lan.dart'; +export 'modules/home.dart'; +export 'modules/lidarr.dart'; +export 'modules/nzbget.dart'; +export 'modules/radarr.dart'; +export 'modules/sabnzbd.dart'; +export 'modules/search.dart'; +export 'modules/settings.dart'; +export 'modules/sonarr.dart'; +export 'modules/wake_on_lan.dart'; diff --git a/lib/modules/home.dart b/lib/modules/home.dart index ab979c4d..c2e9259c 100644 --- a/lib/modules/home.dart +++ b/lib/modules/home.dart @@ -1,3 +1,3 @@ -export './home/core.dart'; -export './home/routes.dart'; -export './home/widgets.dart'; +export 'home/core.dart'; +export 'home/routes.dart'; +export 'home/widgets.dart'; diff --git a/lib/modules/home/core.dart b/lib/modules/home/core.dart index 9071336f..9c3ee1d8 100644 --- a/lib/modules/home/core.dart +++ b/lib/modules/home/core.dart @@ -1,5 +1,5 @@ -export './core/api.dart'; -export './core/adapters.dart'; -export './core/database.dart'; -export './core/state_global.dart'; -export './core/dialogs.dart'; +export 'core/api.dart'; +export 'core/adapters.dart'; +export 'core/database.dart'; +export 'core/state_global.dart'; +export 'core/dialogs.dart'; diff --git a/lib/modules/home/core/adapters.dart b/lib/modules/home/core/adapters.dart index e2a835aa..fca84a3b 100644 --- a/lib/modules/home/core/adapters.dart +++ b/lib/modules/home/core/adapters.dart @@ -1,2 +1,2 @@ -export './adapters/calendar_starting_day.dart'; -export './adapters/calendar_starting_size.dart'; +export 'adapters/calendar_starting_day.dart'; +export 'adapters/calendar_starting_size.dart'; diff --git a/lib/modules/home/core/api.dart b/lib/modules/home/core/api.dart index af20fb4e..1d50e48f 100644 --- a/lib/modules/home/core/api.dart +++ b/lib/modules/home/core/api.dart @@ -1,2 +1,2 @@ -export './api/api.dart'; -export './api/data.dart'; +export 'api/api.dart'; +export 'api/data.dart'; diff --git a/lib/modules/home/core/api/data.dart b/lib/modules/home/core/api/data.dart index a360f384..fd11174f 100644 --- a/lib/modules/home/core/api/data.dart +++ b/lib/modules/home/core/api/data.dart @@ -1,3 +1,3 @@ -export './data/lidarr.dart'; -export './data/radarr.dart'; -export './data/sonarr.dart'; +export 'data/lidarr.dart'; +export 'data/radarr.dart'; +export 'data/sonarr.dart'; diff --git a/lib/modules/home/routes.dart b/lib/modules/home/routes.dart index f2e0476d..13ee4ef9 100644 --- a/lib/modules/home/routes.dart +++ b/lib/modules/home/routes.dart @@ -1,3 +1,3 @@ -export './routes/calendar.dart'; -export './routes/quick_access.dart'; -export './routes/home.dart'; +export 'routes/calendar.dart'; +export 'routes/quick_access.dart'; +export 'routes/home.dart'; diff --git a/lib/modules/home/widgets.dart b/lib/modules/home/widgets.dart index b6ecd649..72b05bd2 100644 --- a/lib/modules/home/widgets.dart +++ b/lib/modules/home/widgets.dart @@ -1,3 +1,3 @@ -export './widgets/calendar.dart'; -export './widgets/summary_tile.dart'; -export './widgets/navigation_bar.dart'; +export 'widgets/calendar.dart'; +export 'widgets/summary_tile.dart'; +export 'widgets/navigation_bar.dart'; diff --git a/lib/modules/lidarr.dart b/lib/modules/lidarr.dart index 81b2f14d..d58afac7 100644 --- a/lib/modules/lidarr.dart +++ b/lib/modules/lidarr.dart @@ -1,3 +1,3 @@ -export './lidarr/core.dart'; -export './lidarr/routes.dart'; -export './lidarr/widgets.dart'; +export 'lidarr/core.dart'; +export 'lidarr/routes.dart'; +export 'lidarr/widgets.dart'; diff --git a/lib/modules/lidarr/core.dart b/lib/modules/lidarr/core.dart index fe0c46bb..86fb2adc 100644 --- a/lib/modules/lidarr/core.dart +++ b/lib/modules/lidarr/core.dart @@ -1,6 +1,6 @@ -export './core/api.dart'; -export './core/constants.dart'; -export './core/database.dart'; -export './core/dialogs.dart'; -export './core/state_global.dart'; -export './core/sorting.dart'; +export 'core/api.dart'; +export 'core/constants.dart'; +export 'core/database.dart'; +export 'core/dialogs.dart'; +export 'core/state_global.dart'; +export 'core/sorting.dart'; diff --git a/lib/modules/lidarr/core/api.dart b/lib/modules/lidarr/core/api.dart index af20fb4e..1d50e48f 100644 --- a/lib/modules/lidarr/core/api.dart +++ b/lib/modules/lidarr/core/api.dart @@ -1,2 +1,2 @@ -export './api/api.dart'; -export './api/data.dart'; +export 'api/api.dart'; +export 'api/data.dart'; diff --git a/lib/modules/lidarr/core/api/data.dart b/lib/modules/lidarr/core/api/data.dart index 264d4585..1bcee865 100644 --- a/lib/modules/lidarr/core/api/data.dart +++ b/lib/modules/lidarr/core/api/data.dart @@ -1,10 +1,10 @@ -export './data/album.dart'; -export './data/catalogue.dart'; -export './data/history.dart'; -export './data/metadata.dart'; -export './data/missing.dart'; -export './data/release.dart'; -export './data/rootfolder.dart'; -export './data/search.dart'; -export './data/track.dart'; -export './data/qualityprofile.dart'; +export 'data/album.dart'; +export 'data/catalogue.dart'; +export 'data/history.dart'; +export 'data/metadata.dart'; +export 'data/missing.dart'; +export 'data/release.dart'; +export 'data/rootfolder.dart'; +export 'data/search.dart'; +export 'data/track.dart'; +export 'data/qualityprofile.dart'; diff --git a/lib/modules/lidarr/core/sorting.dart b/lib/modules/lidarr/core/sorting.dart index 210d2047..e058f21e 100644 --- a/lib/modules/lidarr/core/sorting.dart +++ b/lib/modules/lidarr/core/sorting.dart @@ -1,2 +1,2 @@ -export './sorting/catalogue.dart'; -export './sorting/releases.dart'; +export 'sorting/catalogue.dart'; +export 'sorting/releases.dart'; diff --git a/lib/modules/lidarr/routes.dart b/lib/modules/lidarr/routes.dart index f334712d..ab52790c 100644 --- a/lib/modules/lidarr/routes.dart +++ b/lib/modules/lidarr/routes.dart @@ -1,10 +1,10 @@ -export './routes/lidarr.dart'; -export './routes/catalogue.dart'; -export './routes/history.dart'; -export './routes/missing.dart'; -export './routes/add_search.dart'; -export './routes/add_details.dart'; -export './routes/edit_artist.dart'; -export './routes/details_album.dart'; -export './routes/details_artist.dart'; -export './routes/search_results.dart'; +export 'routes/lidarr.dart'; +export 'routes/catalogue.dart'; +export 'routes/history.dart'; +export 'routes/missing.dart'; +export 'routes/add_search.dart'; +export 'routes/add_details.dart'; +export 'routes/edit_artist.dart'; +export 'routes/details_album.dart'; +export 'routes/details_artist.dart'; +export 'routes/search_results.dart'; diff --git a/lib/modules/lidarr/routes/details_artist.dart b/lib/modules/lidarr/routes/details_artist.dart index 7a413aef..7149de9d 100644 --- a/lib/modules/lidarr/routes/details_artist.dart +++ b/lib/modules/lidarr/routes/details_artist.dart @@ -37,14 +37,16 @@ class _State extends State { } Future _fetch() async { - setState(() => _error = false); + if(mounted) setState(() => _error = false); if(_arguments != null) await LidarrAPI.from(Database.currentProfileObject).getArtist(_arguments.artistID) .then((data) { if(mounted) setState(() { _arguments.data = data; _error = false; }); - }).catchError((_) => setState(() => _error = true)); + }).catchError((_) { + if(mounted) setState(() => _error = true); + }); } @override diff --git a/lib/modules/lidarr/widgets.dart b/lib/modules/lidarr/widgets.dart index dacc09d6..f9c2157e 100644 --- a/lib/modules/lidarr/widgets.dart +++ b/lib/modules/lidarr/widgets.dart @@ -1,20 +1,20 @@ -export './widgets/catalogue_tile.dart'; -export './widgets/history_tile.dart'; -export './widgets/missing_tile.dart'; -export './widgets/catalogue_search_bar.dart'; -export './widgets/catalogue_sorting_button.dart'; -export './widgets/catalogue_hide_button.dart'; -export './widgets/details_edit_button.dart'; -export './widgets/details_hide_button.dart'; -export './widgets/details_album_list.dart'; -export './widgets/details_album_tile.dart'; -export './widgets/details_album_track_tile.dart'; -export './widgets/details_overview.dart'; -export './widgets/search_result_tile.dart'; -export './widgets/add_search_bar.dart'; -export './widgets/add_search_result_tile.dart'; -export './widgets/navigation_bar.dart'; -export './widgets/artist_navigation_bar.dart'; -export './widgets/releases_hide_button.dart'; -export './widgets/releases_search_bar.dart'; -export './widgets/releases_sorting_button.dart'; +export 'widgets/catalogue_tile.dart'; +export 'widgets/history_tile.dart'; +export 'widgets/missing_tile.dart'; +export 'widgets/catalogue_search_bar.dart'; +export 'widgets/catalogue_sorting_button.dart'; +export 'widgets/catalogue_hide_button.dart'; +export 'widgets/details_edit_button.dart'; +export 'widgets/details_hide_button.dart'; +export 'widgets/details_album_list.dart'; +export 'widgets/details_album_tile.dart'; +export 'widgets/details_album_track_tile.dart'; +export 'widgets/details_overview.dart'; +export 'widgets/search_result_tile.dart'; +export 'widgets/add_search_bar.dart'; +export 'widgets/add_search_result_tile.dart'; +export 'widgets/navigation_bar.dart'; +export 'widgets/artist_navigation_bar.dart'; +export 'widgets/releases_hide_button.dart'; +export 'widgets/releases_search_bar.dart'; +export 'widgets/releases_sorting_button.dart'; diff --git a/lib/modules/nzbget.dart b/lib/modules/nzbget.dart index d17af3c3..f0822b9a 100644 --- a/lib/modules/nzbget.dart +++ b/lib/modules/nzbget.dart @@ -1,3 +1,3 @@ -export './nzbget/core.dart'; -export './nzbget/routes.dart'; -export './nzbget/widgets.dart'; +export 'nzbget/core.dart'; +export 'nzbget/routes.dart'; +export 'nzbget/widgets.dart'; diff --git a/lib/modules/nzbget/core.dart b/lib/modules/nzbget/core.dart index a3299b27..e1155fe7 100644 --- a/lib/modules/nzbget/core.dart +++ b/lib/modules/nzbget/core.dart @@ -1,5 +1,5 @@ -export './core/api.dart'; -export './core/constants.dart'; -export './core/database.dart'; -export './core/dialogs.dart'; -export './core/state_global.dart'; +export 'core/api.dart'; +export 'core/constants.dart'; +export 'core/database.dart'; +export 'core/dialogs.dart'; +export 'core/state_global.dart'; diff --git a/lib/modules/nzbget/core/api.dart b/lib/modules/nzbget/core/api.dart index af20fb4e..1d50e48f 100644 --- a/lib/modules/nzbget/core/api.dart +++ b/lib/modules/nzbget/core/api.dart @@ -1,2 +1,2 @@ -export './api/api.dart'; -export './api/data.dart'; +export 'api/api.dart'; +export 'api/data.dart'; diff --git a/lib/modules/nzbget/core/api/data.dart b/lib/modules/nzbget/core/api/data.dart index 95d39ab8..5e592c1a 100644 --- a/lib/modules/nzbget/core/api/data.dart +++ b/lib/modules/nzbget/core/api/data.dart @@ -1,8 +1,8 @@ -export './data/category.dart'; -export './data/history.dart'; -export './data/log.dart'; -export './data/priority.dart'; -export './data/queue.dart'; -export './data/sort.dart'; -export './data/statistics.dart'; -export './data/status.dart'; +export 'data/category.dart'; +export 'data/history.dart'; +export 'data/log.dart'; +export 'data/priority.dart'; +export 'data/queue.dart'; +export 'data/sort.dart'; +export 'data/statistics.dart'; +export 'data/status.dart'; diff --git a/lib/modules/nzbget/routes.dart b/lib/modules/nzbget/routes.dart index aa6757b3..3946a146 100644 --- a/lib/modules/nzbget/routes.dart +++ b/lib/modules/nzbget/routes.dart @@ -1,4 +1,4 @@ -export './routes/nzbget.dart'; -export './routes/history.dart'; -export './routes/queue.dart'; -export './routes/statistics.dart'; +export 'routes/nzbget.dart'; +export 'routes/history.dart'; +export 'routes/queue.dart'; +export 'routes/statistics.dart'; diff --git a/lib/modules/nzbget/widgets.dart b/lib/modules/nzbget/widgets.dart index 4b82cf84..d0cfc214 100644 --- a/lib/modules/nzbget/widgets.dart +++ b/lib/modules/nzbget/widgets.dart @@ -1,8 +1,8 @@ -export './widgets/app_bar_stats.dart'; -export './widgets/history_tile.dart'; -export './widgets/history_hide_button.dart'; -export './widgets/history_search_bar.dart'; -export './widgets/log_tile.dart'; -export './widgets/queue_tile.dart'; -export './widgets/queue_fab.dart'; -export './widgets/navigation_bar.dart'; +export 'widgets/app_bar_stats.dart'; +export 'widgets/history_tile.dart'; +export 'widgets/history_hide_button.dart'; +export 'widgets/history_search_bar.dart'; +export 'widgets/log_tile.dart'; +export 'widgets/queue_tile.dart'; +export 'widgets/queue_fab.dart'; +export 'widgets/navigation_bar.dart'; diff --git a/lib/modules/radarr.dart b/lib/modules/radarr.dart index c91e28a4..e23bd399 100644 --- a/lib/modules/radarr.dart +++ b/lib/modules/radarr.dart @@ -1,3 +1,3 @@ -export './radarr/core.dart'; -export './radarr/routes.dart'; -export './radarr/widgets.dart'; +export 'radarr/core.dart'; +export 'radarr/routes.dart'; +export 'radarr/widgets.dart'; diff --git a/lib/modules/radarr/core/api.dart b/lib/modules/radarr/core/api.dart index af20fb4e..1d50e48f 100644 --- a/lib/modules/radarr/core/api.dart +++ b/lib/modules/radarr/core/api.dart @@ -1,2 +1,2 @@ -export './api/api.dart'; -export './api/data.dart'; +export 'api/api.dart'; +export 'api/data.dart'; diff --git a/lib/modules/radarr/core/api/data.dart b/lib/modules/radarr/core/api/data.dart index a1ecb33c..1c3c2505 100644 --- a/lib/modules/radarr/core/api/data.dart +++ b/lib/modules/radarr/core/api/data.dart @@ -1,9 +1,9 @@ -export './data/availability.dart'; -export './data/catalogue.dart'; -export './data/history.dart'; -export './data/missing.dart'; -export './data/qualityprofile.dart'; -export './data/release.dart'; -export './data/rootfolder.dart'; -export './data/search.dart'; -export './data/upcoming.dart'; +export 'data/availability.dart'; +export 'data/catalogue.dart'; +export 'data/history.dart'; +export 'data/missing.dart'; +export 'data/qualityprofile.dart'; +export 'data/release.dart'; +export 'data/rootfolder.dart'; +export 'data/search.dart'; +export 'data/upcoming.dart'; diff --git a/lib/modules/radarr/core/api/data/search.dart b/lib/modules/radarr/core/api/data/search.dart index 24fa0cad..47b031b6 100644 --- a/lib/modules/radarr/core/api/data/search.dart +++ b/lib/modules/radarr/core/api/data/search.dart @@ -49,6 +49,6 @@ class RadarrSearchData { String get formattedStatus { RadarrAvailability _result = RadarrConstants.MINIMUM_AVAILBILITIES.firstWhere((availability) => availability.id == status, orElse: () => null); - return _result.name ?? 'Unknown Status'; + return _result?.name ?? 'Unknown Status'; } } \ No newline at end of file diff --git a/lib/modules/radarr/core/sorting.dart b/lib/modules/radarr/core/sorting.dart index 210d2047..e058f21e 100644 --- a/lib/modules/radarr/core/sorting.dart +++ b/lib/modules/radarr/core/sorting.dart @@ -1,2 +1,2 @@ -export './sorting/catalogue.dart'; -export './sorting/releases.dart'; +export 'sorting/catalogue.dart'; +export 'sorting/releases.dart'; diff --git a/lib/modules/radarr/core/state.dart b/lib/modules/radarr/core/state.dart index d43c5062..8493db5e 100644 --- a/lib/modules/radarr/core/state.dart +++ b/lib/modules/radarr/core/state.dart @@ -1 +1 @@ -export './state/global.dart'; +export 'state/global.dart'; diff --git a/lib/modules/radarr/routes.dart b/lib/modules/radarr/routes.dart index a629638b..e139e5ef 100644 --- a/lib/modules/radarr/routes.dart +++ b/lib/modules/radarr/routes.dart @@ -1,10 +1,10 @@ -export './routes/radarr.dart'; -export './routes/catalogue.dart'; -export './routes/history.dart'; -export './routes/missing.dart'; -export './routes/upcoming.dart'; -export './routes/add_search.dart'; -export './routes/add_details.dart'; -export './routes/details_movie.dart'; -export './routes/edit_movie.dart'; -export './routes/search_results.dart'; +export 'routes/radarr.dart'; +export 'routes/catalogue.dart'; +export 'routes/history.dart'; +export 'routes/missing.dart'; +export 'routes/upcoming.dart'; +export 'routes/add_search.dart'; +export 'routes/add_details.dart'; +export 'routes/details_movie.dart'; +export 'routes/edit_movie.dart'; +export 'routes/search_results.dart'; diff --git a/lib/modules/radarr/routes/details_movie.dart b/lib/modules/radarr/routes/details_movie.dart index 7fb0a656..f88c1fa6 100644 --- a/lib/modules/radarr/routes/details_movie.dart +++ b/lib/modules/radarr/routes/details_movie.dart @@ -37,13 +37,17 @@ class _State extends State { } Future _fetch() async { - setState(() => _error = false); + if(mounted) setState(() => _error = false); if(_arguments != null) await RadarrAPI.from(Database.currentProfileObject).getMovie(_arguments.movieID) - .then((data) => setState(() { - _arguments.data = data; - _error = false; - })) - .catchError((_) => setState(() => _error = true)); + .then((data) { + if(mounted) setState(() { + _arguments.data = data; + _error = false; + }); + }) + .catchError((_) { + if(mounted) setState(() => _error = true); + }); } @override diff --git a/lib/modules/radarr/widgets.dart b/lib/modules/radarr/widgets.dart index 1ba9ba6c..ce1ddae4 100644 --- a/lib/modules/radarr/widgets.dart +++ b/lib/modules/radarr/widgets.dart @@ -1,20 +1,20 @@ -export './widgets/catalogue_hide_button.dart'; -export './widgets/catalogue_search_bar.dart'; -export './widgets/catalogue_sorting_button.dart'; -export './widgets/catalogue_tile.dart'; -export './widgets/history_tile.dart'; -export './widgets/missing_tile.dart'; -export './widgets/upcoming_tile.dart'; -export './widgets/details_edit_button.dart'; -export './widgets/details_overview.dart'; -export './widgets/details_search.dart'; -export './widgets/details_search_tile.dart'; -export './widgets/details_overview.dart'; -export './widgets/add_search_bar.dart'; -export './widgets/add_search_result_tile.dart'; -export './widgets/navigation_bar.dart'; -export './widgets/movie_navigation_bar.dart'; -export './widgets/releases_sorting_button.dart'; -export './widgets/releases_hide_button.dart'; -export './widgets/releases_search_bar.dart'; -export './widgets/details_file_tile.dart'; +export 'widgets/catalogue_hide_button.dart'; +export 'widgets/catalogue_search_bar.dart'; +export 'widgets/catalogue_sorting_button.dart'; +export 'widgets/catalogue_tile.dart'; +export 'widgets/history_tile.dart'; +export 'widgets/missing_tile.dart'; +export 'widgets/upcoming_tile.dart'; +export 'widgets/details_edit_button.dart'; +export 'widgets/details_overview.dart'; +export 'widgets/details_search.dart'; +export 'widgets/details_search_tile.dart'; +export 'widgets/details_overview.dart'; +export 'widgets/add_search_bar.dart'; +export 'widgets/add_search_result_tile.dart'; +export 'widgets/navigation_bar.dart'; +export 'widgets/movie_navigation_bar.dart'; +export 'widgets/releases_sorting_button.dart'; +export 'widgets/releases_hide_button.dart'; +export 'widgets/releases_search_bar.dart'; +export 'widgets/details_file_tile.dart'; diff --git a/lib/modules/sabnzbd.dart b/lib/modules/sabnzbd.dart index cc67eead..e3b0d63a 100644 --- a/lib/modules/sabnzbd.dart +++ b/lib/modules/sabnzbd.dart @@ -1,3 +1,3 @@ -export './sabnzbd/core.dart'; -export './sabnzbd/routes.dart'; -export './sabnzbd/widgets.dart'; +export 'sabnzbd/core.dart'; +export 'sabnzbd/routes.dart'; +export 'sabnzbd/widgets.dart'; diff --git a/lib/modules/sabnzbd/core.dart b/lib/modules/sabnzbd/core.dart index a3299b27..e1155fe7 100644 --- a/lib/modules/sabnzbd/core.dart +++ b/lib/modules/sabnzbd/core.dart @@ -1,5 +1,5 @@ -export './core/api.dart'; -export './core/constants.dart'; -export './core/database.dart'; -export './core/dialogs.dart'; -export './core/state_global.dart'; +export 'core/api.dart'; +export 'core/constants.dart'; +export 'core/database.dart'; +export 'core/dialogs.dart'; +export 'core/state_global.dart'; diff --git a/lib/modules/sabnzbd/core/api.dart b/lib/modules/sabnzbd/core/api.dart index af20fb4e..1d50e48f 100644 --- a/lib/modules/sabnzbd/core/api.dart +++ b/lib/modules/sabnzbd/core/api.dart @@ -1,2 +1,2 @@ -export './api/api.dart'; -export './api/data.dart'; +export 'api/api.dart'; +export 'api/data.dart'; diff --git a/lib/modules/sabnzbd/core/api/data.dart b/lib/modules/sabnzbd/core/api/data.dart index 51078abc..1926d9b5 100644 --- a/lib/modules/sabnzbd/core/api/data.dart +++ b/lib/modules/sabnzbd/core/api/data.dart @@ -1,6 +1,6 @@ -export './data/category.dart'; -export './data/history.dart'; -export './data/queue.dart'; -export './data/statistics.dart'; -export './data/statistics_server.dart'; -export './data/status.dart'; +export 'data/category.dart'; +export 'data/history.dart'; +export 'data/queue.dart'; +export 'data/statistics.dart'; +export 'data/statistics_server.dart'; +export 'data/status.dart'; diff --git a/lib/modules/sabnzbd/widgets.dart b/lib/modules/sabnzbd/widgets.dart index 0970c8e7..0667ec6d 100644 --- a/lib/modules/sabnzbd/widgets.dart +++ b/lib/modules/sabnzbd/widgets.dart @@ -1,7 +1,7 @@ -export './widgets/app_bar_stats.dart'; -export './widgets/navigation_bar.dart'; -export './widgets/history_tile.dart'; -export './widgets/history_hide_button.dart'; -export './widgets/history_search_bar.dart'; -export './widgets/queue_fab.dart'; -export './widgets/queue_tile.dart'; +export 'widgets/app_bar_stats.dart'; +export 'widgets/navigation_bar.dart'; +export 'widgets/history_tile.dart'; +export 'widgets/history_hide_button.dart'; +export 'widgets/history_search_bar.dart'; +export 'widgets/queue_fab.dart'; +export 'widgets/queue_tile.dart'; diff --git a/lib/modules/search.dart b/lib/modules/search.dart index a7c2f82e..f7b141ed 100644 --- a/lib/modules/search.dart +++ b/lib/modules/search.dart @@ -1,3 +1,3 @@ -export './search/core.dart'; -export './search/routes.dart'; -export './search/widgets.dart'; +export 'search/core.dart'; +export 'search/routes.dart'; +export 'search/widgets.dart'; diff --git a/lib/modules/search/core.dart b/lib/modules/search/core.dart index f68cc0fc..80320e6d 100644 --- a/lib/modules/search/core.dart +++ b/lib/modules/search/core.dart @@ -1,6 +1,6 @@ -export './core/api.dart'; -export './core/constants.dart'; -export './core/database.dart'; -export './core/dialogs.dart'; -export './core/sorting.dart'; -export './core/state_global.dart'; +export 'core/api.dart'; +export 'core/constants.dart'; +export 'core/database.dart'; +export 'core/dialogs.dart'; +export 'core/sorting.dart'; +export 'core/state_global.dart'; diff --git a/lib/modules/search/core/api.dart b/lib/modules/search/core/api.dart index af20fb4e..1d50e48f 100644 --- a/lib/modules/search/core/api.dart +++ b/lib/modules/search/core/api.dart @@ -1,2 +1,2 @@ -export './api/api.dart'; -export './api/data.dart'; +export 'api/api.dart'; +export 'api/data.dart'; diff --git a/lib/modules/search/core/api/data.dart b/lib/modules/search/core/api/data.dart index 4916d566..e8974d16 100644 --- a/lib/modules/search/core/api/data.dart +++ b/lib/modules/search/core/api/data.dart @@ -1,3 +1,3 @@ -export './data/category.dart'; -export './data/subcategory.dart'; -export './data/result.dart'; +export 'data/category.dart'; +export 'data/subcategory.dart'; +export 'data/result.dart'; diff --git a/lib/modules/search/routes.dart b/lib/modules/search/routes.dart index 20166123..29be8f7b 100644 --- a/lib/modules/search/routes.dart +++ b/lib/modules/search/routes.dart @@ -1,5 +1,5 @@ -export './routes/indexers.dart'; -export './routes/categories.dart'; -export './routes/subcategories.dart'; -export './routes/results.dart'; -export './routes/search.dart'; +export 'routes/indexers.dart'; +export 'routes/categories.dart'; +export 'routes/subcategories.dart'; +export 'routes/results.dart'; +export 'routes/search.dart'; diff --git a/lib/modules/search/widgets.dart b/lib/modules/search/widgets.dart index 04c54a8c..ea3fc1cd 100644 --- a/lib/modules/search/widgets.dart +++ b/lib/modules/search/widgets.dart @@ -1,9 +1,9 @@ -export './widgets/download_button.dart'; -export './widgets/category_tile.dart'; -export './widgets/result_tile.dart'; -export './widgets/indexer_tile.dart'; -export './widgets/search_bar.dart'; -export './widgets/subcategory_tile.dart'; -export './widgets/result_search_bar.dart'; -export './widgets/result_sorting_button.dart'; +export 'widgets/download_button.dart'; +export 'widgets/category_tile.dart'; +export 'widgets/result_tile.dart'; +export 'widgets/indexer_tile.dart'; +export 'widgets/search_bar.dart'; +export 'widgets/subcategory_tile.dart'; +export 'widgets/result_search_bar.dart'; +export 'widgets/result_sorting_button.dart'; diff --git a/lib/modules/settings.dart b/lib/modules/settings.dart index a2e517e6..f22c413c 100644 --- a/lib/modules/settings.dart +++ b/lib/modules/settings.dart @@ -1,3 +1,3 @@ -export './settings/core.dart'; -export './settings/routes.dart'; -export './settings/widgets.dart'; +export 'settings/core.dart'; +export 'settings/routes.dart'; +export 'settings/widgets.dart'; diff --git a/lib/modules/settings/core.dart b/lib/modules/settings/core.dart index a3299b27..e1155fe7 100644 --- a/lib/modules/settings/core.dart +++ b/lib/modules/settings/core.dart @@ -1,5 +1,5 @@ -export './core/api.dart'; -export './core/constants.dart'; -export './core/database.dart'; -export './core/dialogs.dart'; -export './core/state_global.dart'; +export 'core/api.dart'; +export 'core/constants.dart'; +export 'core/database.dart'; +export 'core/dialogs.dart'; +export 'core/state_global.dart'; diff --git a/lib/modules/settings/routes.dart b/lib/modules/settings/routes.dart index fc262623..6ea7d57c 100644 --- a/lib/modules/settings/routes.dart +++ b/lib/modules/settings/routes.dart @@ -1,23 +1,24 @@ -export './routes/settings.dart'; -export './routes/general.dart'; -export './routes/system.dart'; -export './routes/modules.dart'; +export 'routes/settings.dart'; +export 'routes/general.dart'; +export 'routes/system.dart'; +export 'routes/modules.dart'; // Modules -export './routes/modules/automation_lidarr.dart'; -export './routes/modules/automation_radarr.dart'; -export './routes/modules/automation_sonarr.dart'; -export './routes/modules/clients_nzbget.dart'; -export './routes/modules/clients_sabnzbd.dart'; +export 'routes/modules/automation_lidarr.dart'; +export 'routes/modules/automation_radarr.dart'; +export 'routes/modules/automation_sonarr.dart'; +export 'routes/modules/clients_nzbget.dart'; +export 'routes/modules/clients_sabnzbd.dart'; +export 'routes/modules/monitoring_tautulli.dart'; export 'routes/modules/general_home.dart'; -export './routes/modules/general_lunasea.dart'; -export './routes/modules/general_search.dart'; -export './routes/modules/general_search_add.dart'; -export './routes/modules/general_search_edit.dart'; -export './routes/modules/general_wake_on_lan.dart'; +export 'routes/modules/general_lunasea.dart'; +export 'routes/modules/general_search.dart'; +export 'routes/modules/general_search_add.dart'; +export 'routes/modules/general_search_edit.dart'; +export 'routes/modules/general_wake_on_lan.dart'; // Logs -export './routes/logs/logs_details.dart'; -export './routes/logs/logs_types.dart'; -export './routes/logs/logs_view.dart'; +export 'routes/logs/logs_details.dart'; +export 'routes/logs/logs_types.dart'; +export 'routes/logs/logs_view.dart'; // System -export './routes/system/resources_donations.dart'; -export './routes/system/resources_donations_thankyou.dart'; +export 'routes/system/resources_donations.dart'; +export 'routes/system/resources_donations_thankyou.dart'; diff --git a/lib/modules/settings/routes/modules.dart b/lib/modules/settings/routes/modules.dart index d7999456..935f17e1 100644 --- a/lib/modules/settings/routes/modules.dart +++ b/lib/modules/settings/routes/modules.dart @@ -154,7 +154,7 @@ class _State extends State with AutomaticKeepAliveClientMixin { icon: CustomIcons.monitoring, color: LSColors.list(9), ), - //onTap: () async => Navigator.of(context).pushNamed(SettingsModulesTautulli.ROUTE_NAME), + onTap: () async => Navigator.of(context).pushNamed(SettingsModulesTautulli.ROUTE_NAME), ), ]; } diff --git a/lib/modules/settings/routes/modules/automation_lidarr.dart b/lib/modules/settings/routes/modules/automation_lidarr.dart index 4ecc008f..3dea68d4 100644 --- a/lib/modules/settings/routes/modules/automation_lidarr.dart +++ b/lib/modules/settings/routes/modules/automation_lidarr.dart @@ -1,2 +1,2 @@ -export './automation_lidarr/automation_lidarr.dart'; -export './automation_lidarr/automation_lidarr_headers.dart'; +export 'automation_lidarr/automation_lidarr.dart'; +export 'automation_lidarr/automation_lidarr_headers.dart'; diff --git a/lib/modules/settings/routes/modules/automation_radarr.dart b/lib/modules/settings/routes/modules/automation_radarr.dart index e7e55a4d..261736a0 100644 --- a/lib/modules/settings/routes/modules/automation_radarr.dart +++ b/lib/modules/settings/routes/modules/automation_radarr.dart @@ -1,2 +1,2 @@ -export './automation_radarr/automation_radarr.dart'; -export './automation_radarr/automation_radarr_headers.dart'; +export 'automation_radarr/automation_radarr.dart'; +export 'automation_radarr/automation_radarr_headers.dart'; diff --git a/lib/modules/settings/routes/modules/automation_sonarr.dart b/lib/modules/settings/routes/modules/automation_sonarr.dart index 9846d25c..6fe10550 100644 --- a/lib/modules/settings/routes/modules/automation_sonarr.dart +++ b/lib/modules/settings/routes/modules/automation_sonarr.dart @@ -1,2 +1,2 @@ -export './automation_sonarr/automation_sonarr.dart'; -export './automation_sonarr/automation_sonarr_headers.dart'; +export 'automation_sonarr/automation_sonarr.dart'; +export 'automation_sonarr/automation_sonarr_headers.dart'; diff --git a/lib/modules/settings/routes/modules/clients_nzbget.dart b/lib/modules/settings/routes/modules/clients_nzbget.dart index 1990d8df..61ac060f 100644 --- a/lib/modules/settings/routes/modules/clients_nzbget.dart +++ b/lib/modules/settings/routes/modules/clients_nzbget.dart @@ -1,2 +1,2 @@ -export './clients_nzbget/clients_nzbget.dart'; -export './clients_nzbget/clients_nzbget_headers.dart'; +export 'clients_nzbget/clients_nzbget.dart'; +export 'clients_nzbget/clients_nzbget_headers.dart'; diff --git a/lib/modules/settings/routes/modules/clients_sabnzbd.dart b/lib/modules/settings/routes/modules/clients_sabnzbd.dart index f5add9aa..2b6aed77 100644 --- a/lib/modules/settings/routes/modules/clients_sabnzbd.dart +++ b/lib/modules/settings/routes/modules/clients_sabnzbd.dart @@ -1,2 +1,2 @@ -export './clients_sabnzbd/clients_sabnzbd.dart'; -export './clients_sabnzbd/clients_sabnzbd_headers.dart'; +export 'clients_sabnzbd/clients_sabnzbd.dart'; +export 'clients_sabnzbd/clients_sabnzbd_headers.dart'; diff --git a/lib/modules/settings/routes/modules/monitoring_tautulli.dart b/lib/modules/settings/routes/modules/monitoring_tautulli.dart new file mode 100644 index 00000000..4233509a --- /dev/null +++ b/lib/modules/settings/routes/modules/monitoring_tautulli.dart @@ -0,0 +1 @@ +export 'monitoring_tautulli/monitoring_tautulli.dart'; diff --git a/lib/modules/settings/routes/modules/monitoring_tautulli/monitoring_tautulli.dart b/lib/modules/settings/routes/modules/monitoring_tautulli/monitoring_tautulli.dart new file mode 100644 index 00000000..96458275 --- /dev/null +++ b/lib/modules/settings/routes/modules/monitoring_tautulli/monitoring_tautulli.dart @@ -0,0 +1,24 @@ +import 'package:flutter/material.dart'; +import 'package:lunasea/core.dart'; + +class SettingsModulesTautulli extends StatefulWidget { + static const ROUTE_NAME = '/settings/modules/tautulli'; + + @override + State createState() => _State(); +} + +class _State extends State { + final _scaffoldKey = GlobalKey(); + + @override + Widget build(BuildContext context) => Scaffold( + key: _scaffoldKey, + body: _body, + appBar: _appBar, + ); + + Widget get _appBar => LSAppBar(title: 'Tautulli'); + + Widget get _body => LSGenericMessage(text: "Coming Soon!"); +} diff --git a/lib/modules/settings/widgets.dart b/lib/modules/settings/widgets.dart index e303c6f0..002cdbb1 100644 --- a/lib/modules/settings/widgets.dart +++ b/lib/modules/settings/widgets.dart @@ -1,4 +1,4 @@ -export './widgets/general.dart'; -export './widgets/modules.dart'; -export './widgets/navigation_bar.dart'; -export './widgets/system.dart'; +export 'widgets/general.dart'; +export 'widgets/modules.dart'; +export 'widgets/navigation_bar.dart'; +export 'widgets/system.dart'; diff --git a/lib/modules/settings/widgets/general.dart b/lib/modules/settings/widgets/general.dart index 3b2420c9..5ebfbda5 100644 --- a/lib/modules/settings/widgets/general.dart +++ b/lib/modules/settings/widgets/general.dart @@ -1,3 +1,3 @@ -export './general/configuration.dart'; -export './general/logs.dart'; -export './general/profile.dart'; +export 'general/configuration.dart'; +export 'general/logs.dart'; +export 'general/profile.dart'; diff --git a/lib/modules/settings/widgets/general/configuration.dart b/lib/modules/settings/widgets/general/configuration.dart index 9248f609..61195c15 100644 --- a/lib/modules/settings/widgets/general/configuration.dart +++ b/lib/modules/settings/widgets/general/configuration.dart @@ -1,2 +1,2 @@ -export './configuration/backup.dart'; -export './configuration/restore.dart'; +export 'configuration/backup.dart'; +export 'configuration/restore.dart'; diff --git a/lib/modules/settings/widgets/general/logs.dart b/lib/modules/settings/widgets/general/logs.dart index 5c6e670c..1b35196d 100644 --- a/lib/modules/settings/widgets/general/logs.dart +++ b/lib/modules/settings/widgets/general/logs.dart @@ -1,3 +1,3 @@ -export './logs/clear_tile.dart'; -export './logs/export_tile.dart'; -export './logs/view_tile.dart'; +export 'logs/clear_tile.dart'; +export 'logs/export_tile.dart'; +export 'logs/view_tile.dart'; diff --git a/lib/modules/settings/widgets/general/profile.dart b/lib/modules/settings/widgets/general/profile.dart index 7ab83522..4401785c 100644 --- a/lib/modules/settings/widgets/general/profile.dart +++ b/lib/modules/settings/widgets/general/profile.dart @@ -1,4 +1,4 @@ -export './profile/add_tile.dart'; -export './profile/delete_tile.dart'; -export './profile/enabled_tile.dart'; -export './profile/rename_tile.dart'; +export 'profile/add_tile.dart'; +export 'profile/delete_tile.dart'; +export 'profile/enabled_tile.dart'; +export 'profile/rename_tile.dart'; diff --git a/lib/modules/settings/widgets/modules.dart b/lib/modules/settings/widgets/modules.dart index 79274cac..5c1dc82f 100644 --- a/lib/modules/settings/widgets/modules.dart +++ b/lib/modules/settings/widgets/modules.dart @@ -1,2 +1,2 @@ -export './modules/calendar.dart'; -export './modules/lunasea.dart'; +export 'modules/calendar.dart'; +export 'modules/lunasea.dart'; diff --git a/lib/modules/settings/widgets/modules/calendar.dart b/lib/modules/settings/widgets/modules/calendar.dart index 91e97620..f29e187f 100644 --- a/lib/modules/settings/widgets/modules/calendar.dart +++ b/lib/modules/settings/widgets/modules/calendar.dart @@ -1,6 +1,6 @@ -export './home/start_date_tile.dart'; -export './home/start_size_tile.dart'; -export './home/enable_lidarr.dart'; -export './home/enable_radarr.dart'; -export './home/enable_sonarr.dart'; -export './home/default_page.dart'; +export 'home/start_date_tile.dart'; +export 'home/start_size_tile.dart'; +export 'home/enable_lidarr.dart'; +export 'home/enable_radarr.dart'; +export 'home/enable_sonarr.dart'; +export 'home/default_page.dart'; diff --git a/lib/modules/settings/widgets/modules/lunasea.dart b/lib/modules/settings/widgets/modules/lunasea.dart index 47382275..5fa1d1b1 100644 --- a/lib/modules/settings/widgets/modules/lunasea.dart +++ b/lib/modules/settings/widgets/modules/lunasea.dart @@ -1,3 +1,3 @@ -export './lunasea/amoled_tile.dart'; -export './lunasea/amoled_border_tile.dart'; -export './lunasea/browser_tile.dart'; +export 'lunasea/amoled_tile.dart'; +export 'lunasea/amoled_border_tile.dart'; +export 'lunasea/browser_tile.dart'; diff --git a/lib/modules/settings/widgets/system.dart b/lib/modules/settings/widgets/system.dart index 4d915e55..1ae562a6 100644 --- a/lib/modules/settings/widgets/system.dart +++ b/lib/modules/settings/widgets/system.dart @@ -1,2 +1,2 @@ -export './system/clear_configuration_tile.dart'; -export './system/clear_image_cache_tile.dart'; +export 'system/clear_configuration_tile.dart'; +export 'system/clear_image_cache_tile.dart'; diff --git a/lib/modules/sonarr.dart b/lib/modules/sonarr.dart index e818cfcc..88cae875 100644 --- a/lib/modules/sonarr.dart +++ b/lib/modules/sonarr.dart @@ -1,3 +1,3 @@ -export './sonarr/core.dart'; -export './sonarr/routes.dart'; -export './sonarr/widgets.dart'; +export 'sonarr/core.dart'; +export 'sonarr/routes.dart'; +export 'sonarr/widgets.dart'; diff --git a/lib/modules/sonarr/core.dart b/lib/modules/sonarr/core.dart index fe0c46bb..86fb2adc 100644 --- a/lib/modules/sonarr/core.dart +++ b/lib/modules/sonarr/core.dart @@ -1,6 +1,6 @@ -export './core/api.dart'; -export './core/constants.dart'; -export './core/database.dart'; -export './core/dialogs.dart'; -export './core/state_global.dart'; -export './core/sorting.dart'; +export 'core/api.dart'; +export 'core/constants.dart'; +export 'core/database.dart'; +export 'core/dialogs.dart'; +export 'core/state_global.dart'; +export 'core/sorting.dart'; diff --git a/lib/modules/sonarr/core/api.dart b/lib/modules/sonarr/core/api.dart index af20fb4e..1d50e48f 100644 --- a/lib/modules/sonarr/core/api.dart +++ b/lib/modules/sonarr/core/api.dart @@ -1,2 +1,2 @@ -export './api/api.dart'; -export './api/data.dart'; +export 'api/api.dart'; +export 'api/data.dart'; diff --git a/lib/modules/sonarr/core/api/data.dart b/lib/modules/sonarr/core/api/data.dart index 4538009b..da02b0b4 100644 --- a/lib/modules/sonarr/core/api/data.dart +++ b/lib/modules/sonarr/core/api/data.dart @@ -1,12 +1,12 @@ -export './data/catalogue.dart'; -export './data/episode.dart'; -export './data/history.dart'; -export './data/missing.dart'; -export './data/queue.dart'; -export './data/qualityprofile.dart'; -export './data/release.dart'; -export './data/rootfolder.dart'; -export './data/search.dart'; -export './data/seriestype.dart'; -export './data/upcoming.dart'; -export './data/monitor_status.dart'; +export 'data/catalogue.dart'; +export 'data/episode.dart'; +export 'data/history.dart'; +export 'data/missing.dart'; +export 'data/queue.dart'; +export 'data/qualityprofile.dart'; +export 'data/release.dart'; +export 'data/rootfolder.dart'; +export 'data/search.dart'; +export 'data/seriestype.dart'; +export 'data/upcoming.dart'; +export 'data/monitor_status.dart'; diff --git a/lib/modules/sonarr/core/sorting.dart b/lib/modules/sonarr/core/sorting.dart index 210d2047..e058f21e 100644 --- a/lib/modules/sonarr/core/sorting.dart +++ b/lib/modules/sonarr/core/sorting.dart @@ -1,2 +1,2 @@ -export './sorting/catalogue.dart'; -export './sorting/releases.dart'; +export 'sorting/catalogue.dart'; +export 'sorting/releases.dart'; diff --git a/lib/modules/sonarr/routes.dart b/lib/modules/sonarr/routes.dart index 7c28b682..107caf21 100644 --- a/lib/modules/sonarr/routes.dart +++ b/lib/modules/sonarr/routes.dart @@ -1,11 +1,11 @@ -export './routes/sonarr.dart'; -export './routes/catalogue.dart'; -export './routes/history.dart'; -export './routes/missing.dart'; -export './routes/upcoming.dart'; -export './routes/add_details.dart'; -export './routes/add_search.dart'; -export './routes/details_season.dart'; -export './routes/details_series.dart'; -export './routes/edit_series.dart'; -export './routes/search_results.dart'; +export 'routes/sonarr.dart'; +export 'routes/catalogue.dart'; +export 'routes/history.dart'; +export 'routes/missing.dart'; +export 'routes/upcoming.dart'; +export 'routes/add_details.dart'; +export 'routes/add_search.dart'; +export 'routes/details_season.dart'; +export 'routes/details_series.dart'; +export 'routes/edit_series.dart'; +export 'routes/search_results.dart'; diff --git a/lib/modules/sonarr/routes/details_series.dart b/lib/modules/sonarr/routes/details_series.dart index 6d1445d9..f07f0a5b 100644 --- a/lib/modules/sonarr/routes/details_series.dart +++ b/lib/modules/sonarr/routes/details_series.dart @@ -37,13 +37,17 @@ class _State extends State { } Future _fetch() async { - setState(() => _error = false); + if(mounted) setState(() => _error = false); if(_arguments != null) await SonarrAPI.from(Database.currentProfileObject).getSeries(_arguments.seriesID) - .then((data) => setState(() { - _arguments.data = data; - _error = false; - })) - .catchError((_) => setState(() => _error = true)); + .then((data) { + if(mounted) setState(() { + _arguments.data = data; + _error = false; + }); + }) + .catchError((_) { + if(mounted) setState(() => _error = true); + }); } @override diff --git a/lib/modules/sonarr/widgets.dart b/lib/modules/sonarr/widgets.dart index aedf79ac..54205ca8 100644 --- a/lib/modules/sonarr/widgets.dart +++ b/lib/modules/sonarr/widgets.dart @@ -1,20 +1,20 @@ -export './widgets/catalogue_tile.dart'; -export './widgets/catalogue_search_bar.dart'; -export './widgets/catalogue_sorting_button.dart'; -export './widgets/catalogue_hide_button.dart'; -export './widgets/missing_tile.dart'; -export './widgets/history_tile.dart'; -export './widgets/upcoming_tile.dart'; -export './widgets/details_overview.dart'; -export './widgets/details_season_list.dart'; -export './widgets/details_season_list_tile.dart'; -export './widgets/details_edit_button.dart'; -export './widgets/add_search_bar.dart'; -export './widgets/add_search_result_tile.dart'; -export './widgets/episode_tile.dart'; -export './widgets/search_result_tile.dart'; -export './widgets/releases_hide_button.dart'; -export './widgets/releases_search_bar.dart'; -export './widgets/releases_sorting_button.dart'; -export './widgets/navigation_bar.dart'; -export './widgets/series_navigation_bar.dart'; +export 'widgets/catalogue_tile.dart'; +export 'widgets/catalogue_search_bar.dart'; +export 'widgets/catalogue_sorting_button.dart'; +export 'widgets/catalogue_hide_button.dart'; +export 'widgets/missing_tile.dart'; +export 'widgets/history_tile.dart'; +export 'widgets/upcoming_tile.dart'; +export 'widgets/details_overview.dart'; +export 'widgets/details_season_list.dart'; +export 'widgets/details_season_list_tile.dart'; +export 'widgets/details_edit_button.dart'; +export 'widgets/add_search_bar.dart'; +export 'widgets/add_search_result_tile.dart'; +export 'widgets/episode_tile.dart'; +export 'widgets/search_result_tile.dart'; +export 'widgets/releases_hide_button.dart'; +export 'widgets/releases_search_bar.dart'; +export 'widgets/releases_sorting_button.dart'; +export 'widgets/navigation_bar.dart'; +export 'widgets/series_navigation_bar.dart'; diff --git a/lib/modules/wake_on_lan.dart b/lib/modules/wake_on_lan.dart index d7f4ffce..f597c766 100644 --- a/lib/modules/wake_on_lan.dart +++ b/lib/modules/wake_on_lan.dart @@ -1 +1 @@ -export './wake_on_lan/core.dart'; +export 'wake_on_lan/core.dart'; diff --git a/lib/modules/wake_on_lan/core.dart b/lib/modules/wake_on_lan/core.dart index 07b28742..98beff81 100644 --- a/lib/modules/wake_on_lan/core.dart +++ b/lib/modules/wake_on_lan/core.dart @@ -1,2 +1,2 @@ -export './core/api.dart'; -export './core/constants.dart'; +export 'core/api.dart'; +export 'core/constants.dart'; diff --git a/pubspec.lock b/pubspec.lock index b08a2855..a176f614 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -920,7 +920,7 @@ packages: source: hosted version: "3.4.2" uuid: - dependency: transitive + dependency: "direct main" description: name: uuid url: "https://pub.dartlang.org" diff --git a/pubspec.yaml b/pubspec.yaml index 11289e34..a7b2fcd0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: lunasea description: Self Hosted Manager -version: 3.2.0+320002 +version: 3.2.0+320003 publish_to: 'none' environment: sdk: ">=2.7.0 <3.0.0" @@ -38,6 +38,7 @@ dependencies: table_calendar: ^2.2.3 tuple: ^1.0.3 url_launcher: ^5.5.0 + uuid: ^2.2.0 xml_parser: ^0.1.2 # LunaTools Packages wake_on_lan: ^1.1.1