summaryrefslogtreecommitdiffstats
path: root/lib/presentation/screens
diff options
context:
space:
mode:
authorLisandro Pérez Meyer <lpmeyer@ics.com>2023-11-17 09:17:29 -0300
committerLisandro Perez Meyer <lpmeyer@ics.com>2023-11-17 14:11:43 +0000
commit0016d533a9fc601aa65f69a050c60c8d6158ed36 (patch)
tree6fd0765f9d1006a2bddd142caf1d7c0a9d5482cf /lib/presentation/screens
parent4d77bab5a0f698943d1abf74482eecef7cc95f08 (diff)
Disable value animation at start up % update FuelLevel path.
Also: - Remove some warnings. - Improvements of hvac temp buttons. Original from: Dominik Wawrzonek <dwawrzonek@ics.com> Bug-AGL: SPEC-4971 Change-Id: Ic10e9ec5ec79f79f63d951469924325f29ea3fa7 Signed-off-by: Lisandro Pérez Meyer <lpmeyer@ics.com>
Diffstat (limited to 'lib/presentation/screens')
-rw-r--r--lib/presentation/screens/hvac/hvac_content.dart12
-rw-r--r--lib/presentation/screens/hvac/widgets/temperature_control.dart96
2 files changed, 88 insertions, 20 deletions
diff --git a/lib/presentation/screens/hvac/hvac_content.dart b/lib/presentation/screens/hvac/hvac_content.dart
index f79ec14..73fd439 100644
--- a/lib/presentation/screens/hvac/hvac_content.dart
+++ b/lib/presentation/screens/hvac/hvac_content.dart
@@ -58,6 +58,8 @@ class HVACState extends ConsumerState<HVAC> {
isRearDefrostSelected = vehicle.isRearDefrosterActive;
isRecirculationSelected = vehicle.isRecirculationActive;
Size size = MediaQuery.sizeOf(context);
+ temperatureLeft = vehicle.driverTemperature;
+ temperatureRight = vehicle.passengerTemperature;
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -153,8 +155,14 @@ class HVACState extends ConsumerState<HVAC> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
- TemperatureControl(temperature: temperatureLeft),
- TemperatureControl(temperature: temperatureRight)
+ TemperatureControl(
+ temperature: temperatureLeft,
+ side: Side.left,
+ ),
+ TemperatureControl(
+ temperature: temperatureRight,
+ side: Side.right,
+ )
],
),
const SizedBox(
diff --git a/lib/presentation/screens/hvac/widgets/temperature_control.dart b/lib/presentation/screens/hvac/widgets/temperature_control.dart
index df83840..77d6dbc 100644
--- a/lib/presentation/screens/hvac/widgets/temperature_control.dart
+++ b/lib/presentation/screens/hvac/widgets/temperature_control.dart
@@ -1,14 +1,21 @@
+import 'dart:async';
+
import 'package:flutter_ics_homescreen/export.dart';
-class TemperatureControl extends StatefulWidget {
- const TemperatureControl({super.key, required this.temperature});
+enum Side { left, right }
+
+class TemperatureControl extends ConsumerStatefulWidget {
+ const TemperatureControl(
+ {super.key, required this.temperature, required this.side});
final int temperature;
+ final Side side;
@override
- State<TemperatureControl> createState() => _TemperatureControlState();
+ TemperatureControlState createState() => TemperatureControlState();
}
-class _TemperatureControlState extends State<TemperatureControl> {
+class TemperatureControlState extends ConsumerState<TemperatureControl> {
+ late Timer tempButtonTimer;
int temperature = 0;
bool isUpButtonHighlighted = false;
bool isDownButtonHighlighted = false;
@@ -21,19 +28,40 @@ class _TemperatureControlState extends State<TemperatureControl> {
});
}
- onPressed({required String type}) {
+ onPressed({required String type, required Side side}) {
setState(() {
if (type == "add") {
temperature = temperature + 1;
} else if (type == "subtract") {
temperature = temperature - 1;
}
+ // limit the temperature to 60-100F
+ if (temperature <= 15) {
+ temperature = 15;
+ } else if (temperature >= 38) {
+ temperature = 38;
+ }
+ if (widget.side == Side.left) {
+ ref
+ .read(vehicleProvider.notifier)
+ .setTemperature(side: Side.left, value: temperature);
+ } else {
+ ref
+ .read(vehicleProvider.notifier)
+ .setTemperature(side: Side.right, value: temperature);
+ }
});
}
@override
Widget build(BuildContext context) {
- double iconSize = 32;
+ //final temperature = ref.watch(vehicleProvider.select((vehicle) => vehicle));
+ // final outsideTemperature = ref
+ // .watch(vehicleProvider.select((vehicle) => vehicle.outsideTemperature));
+ final tempUnit =
+ ref.watch(unitStateProvider.select((unit) => unit.temperatureUnit));
+
+ //double iconSize = 32;
double height = MediaQuery.sizeOf(context).height * 0.0417;
double width = MediaQuery.sizeOf(context).width * 0.2112;
@@ -41,15 +69,29 @@ class _TemperatureControlState extends State<TemperatureControl> {
children: [
Material(
color: Colors.transparent,
- child: InkWell(
- onHighlightChanged: (value) {
- setState(() {
- isUpButtonHighlighted = value;
+ child: GestureDetector(
+ onTapDown: (value) {
+ isUpButtonHighlighted = !isUpButtonHighlighted;
+ onPressed(type: "add", side: widget.side);
+ },
+ onTapUp: (detail) {
+ isUpButtonHighlighted = !isUpButtonHighlighted;
+ setState(() {});
+ },
+ onLongPress: () {
+ tempButtonTimer =
+ Timer.periodic(const Duration(milliseconds: 500), (timer) {
+ onPressed(type: "add", side: widget.side);
});
},
- onTap: () {
- onPressed(type: "add");
+ onLongPressEnd: (details) {
+ setState(() {
+ isUpButtonHighlighted = !isUpButtonHighlighted;
+
+ tempButtonTimer.cancel();
+ });
},
+
child: SizedBox(
height: height,
width: width,
@@ -120,21 +162,39 @@ class _TemperatureControlState extends State<TemperatureControl> {
Padding(
padding: const EdgeInsets.symmetric(vertical: 10),
child: Text(
- "$temperature°C",
+ tempUnit == TemperatureUnit.celsius
+ ? '$temperature°C'
+ : '${((temperature * 9 / 5) + 32).toStringAsFixed(0)}°F', //converting from celsius. Step F unit = 2
style: GoogleFonts.brunoAce(fontSize: 44, height: 1.25),
),
),
Material(
color: Colors.transparent,
- child: InkWell(
- onHighlightChanged: (value) {
+ child: GestureDetector(
+ onTapDown: (value) {
+ isDownButtonHighlighted = !isDownButtonHighlighted;
+ onPressed(type: "subtract", side: widget.side);
+ },
+ onTapUp: (detail) {
+
setState(() {
- isDownButtonHighlighted = value;
+ isDownButtonHighlighted = !isDownButtonHighlighted;
});
},
- onTap: () {
- onPressed(type: "subtract");
+ onLongPress: () {
+ tempButtonTimer =
+ Timer.periodic(const Duration(milliseconds: 500), (timer) {
+ onPressed(type: "subtract", side: widget.side);
+ });
},
+ onLongPressEnd: (details) {
+ setState(() {
+ isDownButtonHighlighted = !isDownButtonHighlighted;
+
+ tempButtonTimer.cancel();
+ });
+ },
+
child: SizedBox(
height: height,
width: width,