From 731d50935b77cc046006d694d034cb515ce6bc49 Mon Sep 17 00:00:00 2001 From: xijieyin Date: Fri, 3 Jun 2022 22:29:19 +0800 Subject: [PATCH] fix: remove unused null check --- lib/home/audioplayer.dart | 37 +++---- lib/home/home.dart | 113 +++++++++++----------- lib/home/import_opml.dart | 54 ++++++----- lib/home/pocast_discovery.dart | 2 +- lib/home/search_podcast.dart | 6 +- lib/main.dart | 6 +- lib/playlists/playlist_home.dart | 2 +- lib/playlists/playlist_page.dart | 14 +-- lib/settings/history.dart | 4 +- lib/settings/play_setting.dart | 2 +- lib/settings/popup_menu.dart | 2 +- lib/state/setting_state.dart | 2 +- lib/type/search_api/index_episode.g.dart | 4 +- lib/type/search_api/index_podcast.g.dart | 4 +- lib/type/search_api/itunes_podcast.g.dart | 4 +- lib/util/open_container.dart | 10 +- lib/widgets/custom_dropdown.dart | 6 +- lib/widgets/custom_time_picker.dart | 13 ++- lib/widgets/dismissible_container.dart | 4 +- lib/widgets/episodegrid.dart | 14 +-- lib/widgets/muiliselect_bar.dart | 12 +-- 21 files changed, 162 insertions(+), 153 deletions(-) diff --git a/lib/home/audioplayer.dart b/lib/home/audioplayer.dart index e613019..b244154 100644 --- a/lib/home/audioplayer.dart +++ b/lib/home/audioplayer.dart @@ -116,12 +116,12 @@ class PlayerWidget extends StatelessWidget { const TextStyle(color: Color(0xFFFF0000))) : data.item1 ? Text( - s!.buffering, + s.buffering, style: TextStyle(color: context.accentColor), ) : Text( - s!.timeLeft((data.item2).toInt().toTime), + s.timeLeft((data.item2).toInt().toTime), maxLines: 2, ), ); @@ -282,26 +282,27 @@ class LastPosition extends StatelessWidget { children: [ Selector( selector: (_, audio) => audio.skipSilence, - builder: (_, data, __) => FlatButton( + builder: (_, data, __) => TextButton( child: Row( children: [ Icon(Icons.flash_on, size: 18), SizedBox(width: 5), - Text(s!.skipSilence), + Text(s.skipSilence), ], ), - color: data! ? context.accentColor : Colors.transparent, - padding: EdgeInsets.symmetric(horizontal: 10), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(100.0), - side: BorderSide( - color: data - ? context.accentColor - : Theme.of(context) - .colorScheme - .onSurface - .withOpacity(0.12))), - textColor: data ? Colors.white : null, + style: TextButton.styleFrom( + primary: + data! ? context.accentColor : Colors.transparent, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(100.0), + side: BorderSide( + color: data + ? context.accentColor + : Theme.of(context) + .colorScheme + .onSurface + .withOpacity(0.12))), + ), onPressed: () => audio.setSkipSilence(skipSilence: !data))), SizedBox(width: 10), @@ -312,7 +313,7 @@ class LastPosition extends StatelessWidget { children: [ Icon(Icons.volume_up, size: 18), SizedBox(width: 5), - Text(s!.boostVolume), + Text(s.boostVolume), ], ), color: data! ? context.accentColor : Colors.transparent, @@ -757,7 +758,7 @@ class SleepModeState extends State width: 120, child: Center( child: Text( - s!.endOfEpisode, + s.endOfEpisode, style: TextStyle( color: (move > 0 ? Colors.white diff --git a/lib/home/home.dart b/lib/home/home.dart index 32ac7ff..48f7842 100644 --- a/lib/home/home.dart +++ b/lib/home/home.dart @@ -661,56 +661,57 @@ class _RecentUpdateState extends State<_RecentUpdate> // final audio = context.read(); final s = context.s; return FutureBuilder( - future: _getUpdateCounts(_group!), - initialData: 0, - builder: (context, snapshot) { - return snapshot.data != 0 - ? Material( - color: Colors.transparent, - child: Row( - children: [ - IconButton( - tooltip: s!.removeNewMark, - icon: SizedBox( - height: 20, - width: 20, - child: CustomPaint( - painter: RemoveNewFlagPainter( - context.textTheme.bodyText1!.color, - Colors.red))), - onPressed: () async { - _removeNewMark(_group!); - if (mounted) { - setState(() {}); - } - }), - // IconButton( - // tooltip: s.addNewEpisodeTooltip, - // icon: SizedBox( - // height: 15, - // width: 20, - // child: CustomPaint( - // painter: AddToPlaylistPainter( - // context.textTheme.bodyText1.color, - // Colors.red))), - // onPressed: () async { - // await audio.addNewEpisode(_group); - // if (mounted) { - // setState(() {}); - // } - // Fluttertoast.showToast( - // msg: _groupName == 'All' - // ? s.addNewEpisodeAll(snapshot.data) - // : s.addEpisodeGroup( - // _groupName, snapshot.data), - // gravity: ToastGravity.BOTTOM, - // ); - // }), - ], - ), - ) - : Center(); - }); + future: _getUpdateCounts(_group!), + initialData: 0, + builder: (context, snapshot) { + return snapshot.data != 0 + ? Material( + color: Colors.transparent, + child: Row( + children: [ + IconButton( + tooltip: s.removeNewMark, + icon: SizedBox( + height: 20, + width: 20, + child: CustomPaint( + painter: RemoveNewFlagPainter( + context.textTheme.bodyText1!.color, + Colors.red))), + onPressed: () async { + _removeNewMark(_group!); + if (mounted) { + setState(() {}); + } + }), + // IconButton( + // tooltip: s.addNewEpisodeTooltip, + // icon: SizedBox( + // height: 15, + // width: 20, + // child: CustomPaint( + // painter: AddToPlaylistPainter( + // context.textTheme.bodyText1.color, + // Colors.red))), + // onPressed: () async { + // await audio.addNewEpisode(_group); + // if (mounted) { + // setState(() {}); + // } + // Fluttertoast.showToast( + // msg: _groupName == 'All' + // ? s.addNewEpisodeAll(snapshot.data) + // : s.addEpisodeGroup( + // _groupName, snapshot.data), + // gravity: ToastGravity.BOTTOM, + // ); + // }), + ], + ), + ) + : Center(); + }, + ); } @override @@ -736,7 +737,7 @@ class _RecentUpdateState extends State<_RecentUpdate> Padding( padding: EdgeInsets.symmetric(vertical: 10)), Text( - s!.noEpisodeRecent, + s.noEpisodeRecent, style: TextStyle(color: Colors.grey[500]), ) ], @@ -820,7 +821,7 @@ class _RecentUpdateState extends State<_RecentUpdate> onPressed: () { _updateRssItem(); Fluttertoast.showToast( - msg: s!.refreshStarted, + msg: s.refreshStarted, gravity: ToastGravity.BOTTOM, ); @@ -830,7 +831,7 @@ class _RecentUpdateState extends State<_RecentUpdate> Material( color: Colors.transparent, child: IconButton( - tooltip: s!.hideListenedSetting, + tooltip: s.hideListenedSetting, icon: SizedBox( width: 30, height: 15, @@ -980,7 +981,7 @@ class _MyFavoriteState extends State<_MyFavorite> Padding( padding: EdgeInsets.symmetric(vertical: 10)), Text( - s!.noEpisodeFavorite, + s.noEpisodeFavorite, style: TextStyle(color: Colors.grey[500]), ) ], @@ -1049,7 +1050,7 @@ class _MyFavoriteState extends State<_MyFavorite> BorderRadius.all( Radius.circular(10))), elevation: 1, - tooltip: s!.homeSubMenuSortBy, + tooltip: s.homeSubMenuSortBy, child: Container( height: 50, padding: EdgeInsets.symmetric( @@ -1235,7 +1236,7 @@ class _MyDownloadState extends State<_MyDownload> children: [ Container( padding: EdgeInsets.symmetric(horizontal: 20), - child: Text(s!.downloaded)), + child: Text(s.downloaded)), Spacer(), Material( color: Colors.transparent, diff --git a/lib/home/import_opml.dart b/lib/home/import_opml.dart index b2c8d29..9e7e2a1 100644 --- a/lib/home/import_opml.dart +++ b/lib/home/import_opml.dart @@ -14,28 +14,29 @@ class Import extends StatelessWidget { return Container( color: context.primaryColorDark, child: Column( - mainAxisAlignment: MainAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: [ - SizedBox(height: 2.0, child: LinearProgressIndicator()), - Container( - padding: EdgeInsets.symmetric(horizontal: 20.0), - height: 20.0, - alignment: Alignment.centerLeft, - child: Text(text), - ), - ]), + mainAxisAlignment: MainAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: [ + SizedBox(height: 2.0, child: LinearProgressIndicator()), + Container( + padding: EdgeInsets.symmetric(horizontal: 20.0), + height: 20.0, + alignment: Alignment.centerLeft, + child: Text(text), + ), + ], + ), ); } _autoDownloadNew(BuildContext context) async { final dbHelper = DBHelper(); - var downloader = Provider.of(context, listen: false); - var result = await Connectivity().checkConnectivity(); - var autoDownloadStorage = KeyValueStorage(autoDownloadNetworkKey); - var autoDownloadNetwork = await autoDownloadStorage.getInt(); + final downloader = Provider.of(context, listen: false); + final result = await Connectivity().checkConnectivity(); + final autoDownloadStorage = KeyValueStorage(autoDownloadNetworkKey); + final autoDownloadNetwork = await autoDownloadStorage.getInt(); if (autoDownloadNetwork == 1) { - var episodes = await dbHelper.getNewEpisodes('all'); + final episodes = await dbHelper.getNewEpisodes('all'); // For safety if (episodes.length < 100 && episodes.length > 0) { for (var episode in episodes) { @@ -56,26 +57,27 @@ class Import extends StatelessWidget { @override Widget build(BuildContext context) { final s = context.s; - var groupList = Provider.of(context, listen: false); + final groupList = Provider.of(context, listen: false); return Column( children: [ Consumer( builder: (_, subscribeWorker, __) { - var item = subscribeWorker.currentSubscribeItem; + final item = subscribeWorker.currentSubscribeItem; switch (item.subscribeState) { case SubscribeState.start: return importColumn( - s!.notificationSubscribe(item.title!), context); + s.notificationSubscribe(item.title!), context); case SubscribeState.subscribe: - return importColumn(s!.notificaitonFatch(item.title!), context); + return importColumn(s.notificaitonFatch(item.title!), context); case SubscribeState.fetch: - return importColumn(s!.notificationSuccess(item.title!), context); + return importColumn( + s.notificationSuccess(item.title!), context); case SubscribeState.exist: return importColumn( - s!.notificationSubscribeExisted(item.title!), context); + s.notificationSubscribeExisted(item.title!), context); case SubscribeState.error: return importColumn( - s!.notificationNetworkError(item.title!), context); + s.notificationNetworkError(item.title!), context); default: return Center(); } @@ -83,17 +85,17 @@ class Import extends StatelessWidget { ), Consumer( builder: (context, refreshWorker, child) { - var item = refreshWorker.currentRefreshItem; + final item = refreshWorker.currentRefreshItem; if (refreshWorker.complete) { groupList.updateGroups(); _autoDownloadNew(context); } switch (item.refreshState) { case RefreshState.fetch: - return importColumn(s!.notificationUpdate(item.title), context); + return importColumn(s.notificationUpdate(item.title), context); case RefreshState.error: return importColumn( - s!.notificationUpdateError(item.title), context); + s.notificationUpdateError(item.title), context); default: return Center(); } diff --git a/lib/home/pocast_discovery.dart b/lib/home/pocast_discovery.dart index e9ab269..5ea68f6 100644 --- a/lib/home/pocast_discovery.dart +++ b/lib/home/pocast_discovery.dart @@ -158,7 +158,7 @@ class DiscoveryPageState extends State { borderRadius: BorderRadius.circular(10), color: context.primaryColor, border: - Border.all(color: context.textColor!.withOpacity(0.1), width: 1)), + Border.all(color: context.textColor.withOpacity(0.1), width: 1)), width: 120, margin: EdgeInsets.fromLTRB(10, 10, 0, 10), child: Material( diff --git a/lib/home/search_podcast.dart b/lib/home/search_podcast.dart index 7662ab9..f0cda76 100644 --- a/lib/home/search_podcast.dart +++ b/lib/home/search_podcast.dart @@ -1188,7 +1188,7 @@ class _SearchResultDetailState extends State indicatorWeight: 3, indicatorSize: TabBarIndicatorSize.label, tabs: [ - Text(s!.homeToprightMenuAbout), + Text(s.homeToprightMenuAbout), Row( mainAxisSize: MainAxisSize.min, children: [ @@ -1273,7 +1273,7 @@ class SubscribeButton extends StatelessWidget { side: BorderSide(color: context.accentColor)), onSurface: context.accentColor.withOpacity(0.5), ), - child: Text(s!.subscribe, + child: Text(s.subscribe, style: TextStyle(color: context.accentColor)), onPressed: () { Fluttertoast.showToast( @@ -1298,7 +1298,7 @@ class SubscribeButton extends StatelessWidget { // disabledTextColor: Colors.grey[500], // disabledBorderColor: Colors.grey[500], ), - child: Text(s!.subscribe), + child: Text(s.subscribe), onPressed: () {}), ); }, diff --git a/lib/main.dart b/lib/main.dart index fb1fb1d..6b159a1 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -43,10 +43,7 @@ Future main() async { child: MyApp(), ), ); - var systemUiOverlayStyle = SystemUiOverlayStyle( - statusBarColor: Colors.transparent, - systemNavigationBarColor: Colors.transparent); - SystemChrome.setSystemUIOverlayStyle(systemUiOverlayStyle); + await SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge); await SystemChrome.setPreferredOrientations( [DeviceOrientation.portraitUp, DeviceOrientation.portraitDown]); } @@ -80,7 +77,6 @@ class MyApp extends StatelessWidget { ), ); }, - //child: FeatureDiscovery(child: Home()), ); } } diff --git a/lib/playlists/playlist_home.dart b/lib/playlists/playlist_home.dart index 28ddcfa..c62eb13 100644 --- a/lib/playlists/playlist_home.dart +++ b/lib/playlists/playlist_home.dart @@ -845,7 +845,7 @@ class __PlaylistsState extends State<_Playlists> { color: context.primaryColorDark, child: Center(child: Icon(Icons.add)), ), - title: Text(s!.createNewPlaylist), + title: Text(s.createNewPlaylist), ); }), ); diff --git a/lib/playlists/playlist_page.dart b/lib/playlists/playlist_page.dart index da43bb9..a85ec83 100644 --- a/lib/playlists/playlist_page.dart +++ b/lib/playlists/playlist_page.dart @@ -327,7 +327,7 @@ class __PlaylistSettingState extends State<_PlaylistSetting> { children: [ Icon(Icons.clear_all_outlined, size: 18), SizedBox(width: 20), - Text(s!.clearAll, style: textStyle), + Text(s.clearAll, style: textStyle), ], ), ), @@ -342,8 +342,8 @@ class __PlaylistSettingState extends State<_PlaylistSetting> { onPressed: () => setState(() { _clearConfirm = false; }), - child: Text(s!.cancel, - style: TextStyle(color: Colors.grey[600])), + child: + Text(s.cancel, style: TextStyle(color: Colors.grey[600])), ), FlatButton( splashColor: Colors.red.withAlpha(70), @@ -368,7 +368,7 @@ class __PlaylistSettingState extends State<_PlaylistSetting> { children: [ Icon(Icons.delete, color: Colors.red, size: 18), SizedBox(width: 20), - Text(s!.remove, + Text(s.remove, style: textStyle!.copyWith( color: Colors.red, fontWeight: FontWeight.bold)), ], @@ -385,8 +385,8 @@ class __PlaylistSettingState extends State<_PlaylistSetting> { onPressed: () => setState(() { _removeConfirm = false; }), - child: Text(s!.cancel, - style: TextStyle(color: Colors.grey[600])), + child: + Text(s.cancel, style: TextStyle(color: Colors.grey[600])), ), FlatButton( splashColor: Colors.red.withAlpha(70), @@ -408,7 +408,7 @@ class __PlaylistSettingState extends State<_PlaylistSetting> { children: [ Icon(Icons.info_outline, size: 16, color: context.textColor!.withAlpha(90)), - Text(s!.defaultQueueReminder, + Text(s.defaultQueueReminder, style: TextStyle(color: context.textColor!.withAlpha(90))), ], ), diff --git a/lib/settings/history.dart b/lib/settings/history.dart index ea27850..3cd553d 100644 --- a/lib/settings/history.dart +++ b/lib/settings/history.dart @@ -174,7 +174,7 @@ class _PlayedHistoryState extends State labelStyle: context.textTheme.headline6, tabs: [ Tab( - child: Text(s!.listen), + child: Text(s.listen), ), Tab( child: Text(s.subscribe), @@ -343,7 +343,7 @@ class _PlayedHistoryState extends State ], ), subtitle: _status - ? Text(s!.daysAgo(DateTime.now() + ? Text(s.daysAgo(DateTime.now() .difference( snapshot.data![index].subDate) .inDays)) diff --git a/lib/settings/play_setting.dart b/lib/settings/play_setting.dart index aef2334..afb5ded 100644 --- a/lib/settings/play_setting.dart +++ b/lib/settings/play_setting.dart @@ -171,7 +171,7 @@ class _PlaySettingState extends State { topLeft: Radius.circular(5)), ), padding: const EdgeInsets.all(8.0), - child: Text(s!.from(data.item1!.toTime)), + child: Text(s.from(data.item1!.toTime)), ), ), ), diff --git a/lib/settings/popup_menu.dart b/lib/settings/popup_menu.dart index f4da0d5..369ab62 100644 --- a/lib/settings/popup_menu.dart +++ b/lib/settings/popup_menu.dart @@ -134,7 +134,7 @@ class _PopupMenuSettingState extends State { height: 30.0, padding: EdgeInsets.symmetric(horizontal: 80), alignment: Alignment.centerLeft, - child: Text(s!.settingsPopupMenu, + child: Text(s.settingsPopupMenu, style: Theme.of(context) .textTheme .bodyText1! diff --git a/lib/state/setting_state.dart b/lib/state/setting_state.dart index cdf0214..56d66aa 100644 --- a/lib/state/setting_state.dart +++ b/lib/state/setting_state.dart @@ -602,7 +602,7 @@ class SettingState extends ChangeNotifier { } Future _saveShowNotesFonts() async { - await _showNotesFontStorage.saveInt(_showNotesFontIndex!); + await _showNotesFontStorage.saveInt(_showNotesFontIndex); } Future backup() async { diff --git a/lib/type/search_api/index_episode.g.dart b/lib/type/search_api/index_episode.g.dart index e1b588a..fe0edfc 100644 --- a/lib/type/search_api/index_episode.g.dart +++ b/lib/type/search_api/index_episode.g.dart @@ -9,7 +9,7 @@ part of 'index_episode.dart'; IndexEpisodeResult

_$IndexEpisodeResultFromJson

( Map json) { return IndexEpisodeResult

( - items: (json['items'] as List?)?.map(_ConvertP

().fromJson)?.toList(), + items: (json['items'] as List?)?.map(_ConvertP

().fromJson).toList(), status: json['status'] as String?, count: json['count'] as int?, ); @@ -18,7 +18,7 @@ IndexEpisodeResult

_$IndexEpisodeResultFromJson

( Map _$IndexEpisodeResultToJson

( IndexEpisodeResult

instance) => { - 'items': instance.items?.map(_ConvertP

().toJson)?.toList(), + 'items': instance.items?.map(_ConvertP

().toJson).toList(), 'status': instance.status, 'count': instance.count, }; diff --git a/lib/type/search_api/index_podcast.g.dart b/lib/type/search_api/index_podcast.g.dart index de38a47..acf005c 100644 --- a/lib/type/search_api/index_podcast.g.dart +++ b/lib/type/search_api/index_podcast.g.dart @@ -9,7 +9,7 @@ part of 'index_podcast.dart'; PodcastIndexSearchResult

_$PodcastIndexSearchResultFromJson

( Map json) { return PodcastIndexSearchResult

( - feeds: (json['feeds'] as List?)?.map(_ConvertP

().fromJson)?.toList(), + feeds: (json['feeds'] as List?)?.map(_ConvertP

().fromJson).toList(), status: json['status'] as String?, count: json['count'] as int?, ); @@ -18,7 +18,7 @@ PodcastIndexSearchResult

_$PodcastIndexSearchResultFromJson

( Map _$PodcastIndexSearchResultToJson

( PodcastIndexSearchResult

instance) => { - 'feeds': instance.feeds?.map(_ConvertP

().toJson)?.toList(), + 'feeds': instance.feeds?.map(_ConvertP

().toJson).toList(), 'status': instance.status, 'count': instance.count, }; diff --git a/lib/type/search_api/itunes_podcast.g.dart b/lib/type/search_api/itunes_podcast.g.dart index 091a7a3..8367288 100644 --- a/lib/type/search_api/itunes_podcast.g.dart +++ b/lib/type/search_api/itunes_podcast.g.dart @@ -10,14 +10,14 @@ ItunesSearchResult

_$ItunesSearchResultFromJson

( Map json) { return ItunesSearchResult

( resultCount: json['resultCount'] as int?, - results: (json['results'] as List?)?.map(_ConvertP

().fromJson)?.toList(), + results: (json['results'] as List?)?.map(_ConvertP

().fromJson).toList(), ); } Map _$ItunesSearchResultToJson

( ItunesSearchResult

instance) => { - 'results': instance.results?.map(_ConvertP

().toJson)?.toList(), + 'results': instance.results?.map(_ConvertP

().toJson).toList(), 'resultCount': instance.resultCount, }; diff --git a/lib/util/open_container.dart b/lib/util/open_container.dart index f13ab36..c5abf61 100644 --- a/lib/util/open_container.dart +++ b/lib/util/open_container.dart @@ -258,7 +258,6 @@ class _OpenContainerRoute extends ModalRoute { ], ); } - return null; // unreachable } static _FlippableTweenSequence? _getClosedOpacityTween( @@ -273,7 +272,6 @@ class _OpenContainerRoute extends ModalRoute { ), ], ); - break; case ContainerTransitionType.fadeThrough: return _FlippableTweenSequence( >[ @@ -287,9 +285,7 @@ class _OpenContainerRoute extends ModalRoute { ), ], ); - break; } - return null; // unreachable } static _FlippableTweenSequence? _getOpenOpacityTween( @@ -421,7 +417,7 @@ class _OpenContainerRoute extends ModalRoute { } if (delayForSourceRoute) { - SchedulerBinding.instance! + SchedulerBinding.instance .addPostFrameCallback(takeMeasurementsInSourceRoute); } else { takeMeasurementsInSourceRoute(); @@ -460,6 +456,8 @@ class _OpenContainerRoute extends ModalRoute { case AnimationStatus.reverse: isInProgress = true; break; + default: + break; } switch (_lastAnimationStatus) { case AnimationStatus.completed: @@ -470,6 +468,8 @@ class _OpenContainerRoute extends ModalRoute { case AnimationStatus.reverse: wasInProgress = true; break; + default: + break; } return wasInProgress && isInProgress; } diff --git a/lib/widgets/custom_dropdown.dart b/lib/widgets/custom_dropdown.dart index 051e2a0..0157353 100644 --- a/lib/widgets/custom_dropdown.dart +++ b/lib/widgets/custom_dropdown.dart @@ -1126,16 +1126,16 @@ class _MyDropdownButtonState extends State> // ActivateAction.key: _createAction, // }; focusNode!.addListener(_handleFocusChanged); - final focusManager = WidgetsBinding.instance!.focusManager; + final focusManager = WidgetsBinding.instance.focusManager; _focusHighlightMode = focusManager.highlightMode; focusManager.addHighlightModeListener(_handleFocusHighlightModeChange); } @override void dispose() { - WidgetsBinding.instance!.removeObserver(this); + WidgetsBinding.instance.removeObserver(this); _removeDropdownRoute(); - WidgetsBinding.instance!.focusManager + WidgetsBinding.instance.focusManager .removeHighlightModeListener(_handleFocusHighlightModeChange); focusNode!.removeListener(_handleFocusChanged); _internalNode?.dispose(); diff --git a/lib/widgets/custom_time_picker.dart b/lib/widgets/custom_time_picker.dart index b0b5f8f..fa25bba 100644 --- a/lib/widgets/custom_time_picker.dart +++ b/lib/widgets/custom_time_picker.dart @@ -224,7 +224,8 @@ class _HourMinuteControl extends StatelessWidget { final backgroundColor = timePickerTheme.hourMinuteColor ?? MaterialStateColor.resolveWith((states) { return states.contains(MaterialState.selected) - ? themeData.colorScheme.secondary.withOpacity(isDark ? 0.24 : 0.12) + ? themeData.colorScheme.secondary + .withOpacity(isDark ? 0.24 : 0.12) : themeData.colorScheme.onSurface.withOpacity(0.12); }); final style = @@ -743,6 +744,8 @@ class _RenderInputPadding extends RenderShiftedBox { newPosition += const Offset(-1.0, 0.0); } break; + default: + break; } return result.addWithRawTransform( @@ -783,7 +786,7 @@ class _DialPainter extends CustomPainter { required this.theta, required this.textDirection, required this.selectedValue, - }) : super(repaint: PaintingBinding.instance!.systemFonts); + }) : super(repaint: PaintingBinding.instance.systemFonts); final List<_TappableLabel>? primaryLabels; final List<_TappableLabel>? secondaryLabels; @@ -1734,6 +1737,8 @@ class _TimePickerDialogState extends State<_TimePickerDialog> { _formKey.currentState!.save(); _entryMode = TimePickerEntryMode.dial; break; + default: + break; } }); } @@ -1837,6 +1842,8 @@ class _TimePickerDialogState extends State<_TimePickerDialog> { timePickerWidth = _kTimePickerWidthPortrait; timePickerHeight = _kTimePickerHeightInput; break; + default: + break; } return Size(timePickerWidth, timePickerHeight * textScaleFactor); } @@ -1980,6 +1987,8 @@ class _TimePickerDialogState extends State<_TimePickerDialog> { ), ); break; + default: + break; } final dialogSize = _dialogSize(context); diff --git a/lib/widgets/dismissible_container.dart b/lib/widgets/dismissible_container.dart index 96fdc13..dea42d6 100644 --- a/lib/widgets/dismissible_container.dart +++ b/lib/widgets/dismissible_container.dart @@ -88,7 +88,7 @@ class _DismissibleContainerState extends State { Scaffold.of(context).showSnackBar(SnackBar( behavior: SnackBarBehavior.floating, backgroundColor: Colors.grey[800], - content: Text(s!.toastRemovePlaylist, + content: Text(s.toastRemovePlaylist, style: TextStyle(color: Colors.white)), action: SnackBarAction( textColor: context.accentColor, @@ -194,7 +194,7 @@ class EpisodeCard extends StatelessWidget { episodeTag( episode.duration == 0 ? '' - : s!.minsCount(episode.duration! ~/ 60), + : s.minsCount(episode.duration! ~/ 60), Colors.cyan[300]), if (episode.enclosureLength != null) episodeTag( diff --git a/lib/widgets/episodegrid.dart b/lib/widgets/episodegrid.dart index f27aed8..d5f8849 100644 --- a/lib/widgets/episodegrid.dart +++ b/lib/widgets/episodegrid.dart @@ -161,7 +161,7 @@ class EpisodeGrid extends StatelessWidget { title: Text(s.cellularConfirm), content: Text(s.cellularConfirmDes), actions: [ - FlatButton( + TextButton( onPressed: () { Navigator.of(context).pop(); }, @@ -170,7 +170,7 @@ class EpisodeGrid extends StatelessWidget { style: TextStyle(color: Colors.grey[600]), ), ), - FlatButton( + TextButton( onPressed: () { ifUseData = true; Navigator.of(context).pop(); @@ -673,11 +673,11 @@ class EpisodeGrid extends StatelessWidget { title: Text( data.item1 != episodes![index] || !data.item4 - ? s!.play - : s!.playing), + ? s.play + : s.playing), trailingIcon: Icon( LineIcons.playCircle, - color: Theme.of(context).accentColor, + color: context.accentColor, ), onPressed: () { if (data.item1 != episodes![index] || @@ -756,7 +756,7 @@ class EpisodeGrid extends StatelessWidget { title: isListened > 0 ? Text(s.markNotListened, style: TextStyle( - color: context.textColor! + color: context.textColor .withOpacity(0.5))) : Text( s.markListened, @@ -799,7 +799,7 @@ class EpisodeGrid extends StatelessWidget { title: isDownloaded ? Text(s.downloaded, style: TextStyle( - color: context.textColor! + color: context.textColor .withOpacity(0.5))) : Text(s.download), trailingIcon: Icon(LineIcons.download, diff --git a/lib/widgets/muiliselect_bar.dart b/lib/widgets/muiliselect_bar.dart index f2e2d4c..ef9e361 100644 --- a/lib/widgets/muiliselect_bar.dart +++ b/lib/widgets/muiliselect_bar.dart @@ -413,13 +413,13 @@ class _MultiSelectMenuBarState extends State { if (!_liked) { await _saveLiked(); Fluttertoast.showToast( - msg: s!.liked, + msg: s.liked, gravity: ToastGravity.BOTTOM, ); } else { await _setUnliked(); Fluttertoast.showToast( - msg: s!.unliked, + msg: s.unliked, gravity: ToastGravity.BOTTOM, ); } @@ -479,7 +479,7 @@ class _MultiSelectMenuBarState extends State { for (var episode in widget.selectedList!) { audio.addToPlaylist(episode); Fluttertoast.showToast( - msg: s!.toastAddPlaylist, + msg: s.toastAddPlaylist, gravity: ToastGravity.BOTTOM, ); } @@ -488,7 +488,7 @@ class _MultiSelectMenuBarState extends State { for (var episode in widget.selectedList!) { audio.delFromPlaylist(episode); Fluttertoast.showToast( - msg: s!.toastRemovePlaylist, + msg: s.toastRemovePlaylist, gravity: ToastGravity.BOTTOM, ); } @@ -511,13 +511,13 @@ class _MultiSelectMenuBarState extends State { if (!_marked) { await _markListened(); Fluttertoast.showToast( - msg: s!.markListened, + msg: s.markListened, gravity: ToastGravity.BOTTOM, ); } else { await _markNotListened(); Fluttertoast.showToast( - msg: s!.markNotListened, + msg: s.markNotListened, gravity: ToastGravity.BOTTOM, ); }