Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .fvmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"flutter": "3.32.8"
"flutter": "3.35.0"
}
8 changes: 4 additions & 4 deletions lib/app/connectivity_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import '../common/data/audio_type.dart';
import '../common/view/snackbars.dart';
import '../extensions/connectivity_x.dart';
import '../l10n/l10n.dart';
import '../player/player_model.dart';
import '../player/player_service.dart';
import '../radio/radio_model.dart';
import '../settings/settings_model.dart';

class ConnectivityModel extends SafeChangeNotifier {
Expand Down Expand Up @@ -69,18 +69,18 @@ void onConnectivityChangedHandler(
void Function() cancel,
) {
final l10n = context.l10n;
final dataSafeMode = di<PlayerModel>().dataSafeMode;
final dataSafeMode = di<RadioModel>().dataSafeMode;
final notifyDataSafeMode = di<SettingsModel>().notifyDataSafeMode;
if (!res.hasData || !context.mounted || !notifyDataSafeMode) {
return;
}

if (!dataSafeMode && di<Connectivity>().isNotWifiNorEthernet(res.data)) {
di<PlayerModel>().setDataSafeMode(true);
di<RadioModel>().setDataSafeMode(true);
showSnackBar(context: context, content: Text(l10n.dataSafeModeEnabled));
} else if (dataSafeMode &&
!di<Connectivity>().isNotWifiNorEthernet(res.data)) {
di<PlayerModel>().setDataSafeMode(false);
di<RadioModel>().setDataSafeMode(false);
showSnackBar(context: context, content: Text(l10n.dataSafeModeDisabled));
}
}
31 changes: 18 additions & 13 deletions lib/app/view/musicpod.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,23 @@ class _MusicPodState extends State<MusicPod> {
}

@override
Widget build(BuildContext context) => FutureBuilder(
future: _allReady,
builder: (context, snapshot) => snapshot.hasError
? SplashScreen(body: Center(child: Text(snapshot.error.toString())))
: snapshot.hasData
? isLinux
? GtkApplication(
onCommandLine: (args) =>
di<PlayerService>().playPath(args.firstOrNull),
child: const YaruMusicPodApp(),
)
: const MaterialMusicPodApp()
: const SplashScreen(),
Widget build(BuildContext context) => ValueListenableBuilder(
valueListenable: appRestartNotifier,
builder: (context, value, child) {
return FutureBuilder(
future: _allReady,
builder: (context, snapshot) => snapshot.hasError
? SplashScreen(body: Center(child: Text(snapshot.error.toString())))
: snapshot.hasData
? isLinux
? GtkApplication(
onCommandLine: (args) =>
di<PlayerService>().playPath(args.firstOrNull),
child: const YaruMusicPodApp(),
)
: const MaterialMusicPodApp()
: const SplashScreen(),
);
},
);
}
4 changes: 2 additions & 2 deletions lib/common/view/data_safe_mode_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:watch_it/watch_it.dart';
import '../../app/connectivity_model.dart';
import '../../extensions/connectivity_x.dart';
import '../../l10n/l10n.dart';
import '../../player/player_model.dart';
import '../../radio/radio_model.dart';
import '../../settings/settings_model.dart';
import 'confirm.dart';

Expand Down Expand Up @@ -33,7 +33,7 @@ class DataSafeModeDialog extends StatelessWidget with WatchItMixin {
? l10n.isBackInWifiDialogBody
: l10n.isMaybeLowBandwidthDialogBody,
),
onConfirm: () => di<PlayerModel>().setDataSafeMode(!isEthernetOrWifi),
onConfirm: () => di<RadioModel>().setDataSafeMode(!isEthernetOrWifi),
cancelLabel: l10n.stopToNotifyAboutDataSafeMode,
onCancel: () {
di<SettingsModel>().setNotifyDataSafeMode(false);
Expand Down
Loading