diff options
author | Scott Murray <scott.murray@konsulko.com> | 2023-12-31 16:24:51 -0500 |
---|---|---|
committer | Scott Murray <scott.murray@konsulko.com> | 2024-01-03 18:23:52 -0500 |
commit | 4742fde5c48726357cc8db06d237e9db6c3df608 (patch) | |
tree | dcca2b3e3c6cb3a4a46b7ae603f64fa9ce5a086c /lib/data/models | |
parent | fcd868bd73d35bd79074f3425317152565aeb275 (diff) |
Initial radio implementation
Notable changes:
- Add radio gRPC API protobuf definitation and generated files.
- Reworked existing single gRPC APIs library to split it into
per-API libraries to avoid name collision issues.
- Add radio gRPC client class and associated radio state class
and RiverPod providers.
- Split media controls and play list table classes into media
player and radio specific versions to facilitate customization
and wiring up their appropriate backends in a straightforward
fashion. Some potential rationalization of styling widgets
may be done as a follow up to avoid some duplication.
- Added radio configuration and presets loading. The presets
will be populated with the contents of a radio-presets.yaml
file from the configured location, the default location is
the /etc/xdg/AGL/ics-homescreen directory.
- Implemented FM radio player against the radio gRPC API.
For the sake of expediency, no attempt has been made to make
the player able to handle AM band support.
- Reworked media page navigation state so that active player is
restored when coming back to the page. Logic has been added to
start/stop the radio on navigating to or leaving the FM radio
sub-page. This will potentially be reworked before CES to work
with the pause/stop button present on the other pages.
- Started pruning down global exports.dart a bit to remove files
only used in a specific page/hierarchy, starting with media.
Bug-AGL: SPEC-5029
Change-Id: I1ae0aca4a7a8218e69e4286c863f01509a1cccb7
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'lib/data/models')
-rw-r--r-- | lib/data/models/audio_state.dart (renamed from lib/data/models/audio.dart) | 24 | ||||
-rw-r--r-- | lib/data/models/radio_state.dart | 100 |
2 files changed, 112 insertions, 12 deletions
diff --git a/lib/data/models/audio.dart b/lib/data/models/audio_state.dart index 65490f9..cfa550b 100644 --- a/lib/data/models/audio.dart +++ b/lib/data/models/audio_state.dart @@ -3,13 +3,13 @@ import 'dart:convert'; import 'package:flutter_ics_homescreen/export.dart'; @immutable -class Audio { +class AudioState { final double volume; final double balance; final double fade; final double treble; final double bass; - const Audio({ + const AudioState({ required this.volume, required this.balance, required this.fade, @@ -17,22 +17,21 @@ class Audio { required this.bass, }); - const Audio.initial() + const AudioState.initial() : volume = 5.0, balance = 5.0, fade = 5.0, treble = 5.0, bass = 5.0; - - Audio copyWith({ + AudioState copyWith({ double? volume, double? balance, double? fade, double? treble, double? bass, }) { - return Audio( + return AudioState( volume: volume ?? this.volume, balance: balance ?? this.balance, fade: fade ?? this.fade, @@ -51,8 +50,8 @@ class Audio { }; } - factory Audio.fromMap(Map<String, dynamic> map) { - return Audio( + factory AudioState.fromMap(Map<String, dynamic> map) { + return AudioState( volume: map['volume']?.toDouble() ?? 0.0, balance: map['balance']?.toDouble() ?? 0.0, fade: map['fade']?.toDouble() ?? 0.0, @@ -63,18 +62,19 @@ class Audio { String toJson() => json.encode(toMap()); - factory Audio.fromJson(String source) => Audio.fromMap(json.decode(source)); + factory AudioState.fromJson(String source) => + AudioState.fromMap(json.decode(source)); @override String toString() { - return 'Audio(volume: $volume, balance: $balance, fade: $fade, treble: $treble, bass: $bass)'; + return 'AudioState(volume: $volume, balance: $balance, fade: $fade, treble: $treble, bass: $bass)'; } @override bool operator ==(Object other) { if (identical(this, other)) return true; - - return other is Audio && + + return other is AudioState && other.volume == volume && other.balance == balance && other.fade == fade && diff --git a/lib/data/models/radio_state.dart b/lib/data/models/radio_state.dart new file mode 100644 index 0000000..dd307d9 --- /dev/null +++ b/lib/data/models/radio_state.dart @@ -0,0 +1,100 @@ +import 'dart:convert'; + +import 'package:flutter_ics_homescreen/export.dart'; + +@immutable +class RadioState { + final int freqMin; + final int freqMax; + final int freqStep; + final int freqCurrent; + final bool playing; + final bool scanning; + const RadioState( + {required this.freqMin, + required this.freqMax, + required this.freqStep, + required this.freqCurrent, + required this.playing, + required this.scanning}); + + const RadioState.initial() + : freqMin = 8790000, + freqMax = 1083000, + freqStep = 20000, + freqCurrent = 8790000, + playing = false, + scanning = false; + + RadioState copyWith( + {int? freqMin, + int? freqMax, + int? freqStep, + int? freqCurrent, + bool? playing, + bool? scanning}) { + return RadioState( + freqMin: freqMin ?? this.freqMin, + freqMax: freqMax ?? this.freqMax, + freqStep: freqStep ?? this.freqStep, + freqCurrent: freqCurrent ?? this.freqCurrent, + playing: playing ?? this.playing, + scanning: scanning ?? this.scanning, + ); + } + + Map<String, dynamic> toMap() { + return { + 'freqMin': freqMin, + 'freqMax': freqMax, + 'freqStep': freqStep, + 'freqCurrent': freqCurrent, + 'playing': playing, + 'scanning': scanning, + }; + } + + factory RadioState.fromMap(Map<String, dynamic> map) { + return RadioState( + freqMin: map['freqMin']?.toInt().toUnsigned() ?? 0, + freqMax: map['freqMax']?.toInt().toUnsigned() ?? 0, + freqStep: map['freqStep']?.toInt().toUnsigned() ?? 0, + freqCurrent: map['freqCurrent']?.toInt().toUnsigned() ?? 0, + playing: map['playing']?.toBool() ?? false, + scanning: map['scanning']?.toBool() ?? false, + ); + } + + String toJson() => json.encode(toMap()); + + factory RadioState.fromJson(String source) => + RadioState.fromMap(json.decode(source)); + + @override + String toString() { + return 'RadioState(freqMin: $freqMin, freqMax: $freqMax, freqStep: $freqStep, freqCurrent: $freqCurrent, playing: $playing, scanning: $scanning)'; + } + + @override + bool operator ==(Object other) { + if (identical(this, other)) return true; + + return other is RadioState && + other.freqMin == freqMin && + other.freqMax == freqMax && + other.freqStep == freqStep && + other.freqCurrent == freqCurrent && + other.playing == playing && + other.scanning == scanning; + } + + @override + int get hashCode { + return freqMin.hashCode ^ + freqMax.hashCode ^ + freqStep.hashCode ^ + freqCurrent.hashCode ^ + playing.hashCode ^ + scanning.hashCode; + } +} |