Skip to content

Persit the firmware update popup #2015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
beastoin merged 1 commit into from
Mar 14, 2025
Merged

Persit the firmware update popup #2015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 app/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ android {

// ----- END flavorDimensions (autogenerated by flutter_flavorizr) -----

compileSdkVersion 34
compileSdkVersion 35

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
Expand Down
14 changes: 0 additions & 14 deletions app/lib/providers/device_provider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,37 +353,23 @@ class DeviceProvider extends ChangeNotifier implements IDeviceServiceSubsciption
return;
}

bool dontShowAgain = false;

showDialog(
context: context,
builder: (context) => ConfirmationDialog(
title: 'Firmware Update Available',
description:
'A new firmware update (${_latestFirmwareVersion}) is available for your Omi device. Would you like to update now?',
checkboxText: "Don't show me again",
checkboxValue: dontShowAgain,
onCheckboxChanged: (value) {
dontShowAgain = value ?? false;
},
confirmText: 'Update',
cancelText: 'Later',
onConfirm: () {
if (dontShowAgain) {
SharedPreferencesUtil().showFirmwareUpdateDialog = false;
}
Navigator.of(context).pop();
// Navigate to firmware update page
Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => FirmwareUpdate(device: pairedDevice),
),
);
},
onCancel: () {
if (dontShowAgain) {
SharedPreferencesUtil().showFirmwareUpdateDialog = false;
}
Navigator.of(context).pop();
},
),
Expand Down
132 changes: 68 additions & 64 deletions app/lib/widgets/confirmation_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import 'package:flutter/material.dart';
class ConfirmationDialog extends StatefulWidget {
final String title;
final String description;
final String checkboxText;
final bool checkboxValue;
final void Function(bool value) onCheckboxChanged;
final String? checkboxText;
final bool? checkboxValue;
final void Function(bool value)? onCheckboxChanged;
final String? cancelText;
final String? confirmText;
final void Function() onConfirm;
Expand All @@ -18,9 +18,9 @@ class ConfirmationDialog extends StatefulWidget {
super.key,
required this.title,
required this.description,
required this.checkboxText,
required this.checkboxValue,
required this.onCheckboxChanged,
this.checkboxText,
this.checkboxValue,
this.onCheckboxChanged,
this.cancelText,
this.confirmText,
required this.onConfirm,
Expand All @@ -32,22 +32,22 @@ class ConfirmationDialog extends StatefulWidget {
}

class _ConfirmationDialogState extends State<ConfirmationDialog> {
late bool _checkboxValue;
bool _checkboxValue = false;

@override
void initState() {
super.initState();
_checkboxValue = widget.checkboxValue;
_checkboxValue = widget.checkboxValue ?? false;
}

void _updateCheckboxValue(bool? value) {
debugPrint("checked option ${value ?? false}");
debugPrint("checked ${_checkboxValue}");
if (value != null) {
setState(() {
_checkboxValue = value;
});
widget.onCheckboxChanged(value);
if (widget.onCheckboxChanged != null) {
widget.onCheckboxChanged!(value);
}
}
}

Expand Down Expand Up @@ -79,42 +79,44 @@ class _ConfirmationDialogState extends State<ConfirmationDialog> {
fontSize: 14,
),
),
const SizedBox(height: 20),
Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Theme(
data: Theme.of(context).copyWith(
checkboxTheme: CheckboxThemeData(
fillColor: MaterialStateProperty.resolveWith<Color>(
(Set<MaterialState> states) {
if (states.contains(MaterialState.selected)) {
return Colors.deepPurple;
}
return Colors.grey.shade700;
},
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(4),
if (widget.checkboxText != null && widget.checkboxText!.isNotEmpty) ...[
const SizedBox(height: 20),
Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Theme(
data: Theme.of(context).copyWith(
checkboxTheme: CheckboxThemeData(
fillColor: MaterialStateProperty.resolveWith<Color>(
(Set<MaterialState> states) {
if (states.contains(MaterialState.selected)) {
return Colors.deepPurple;
}
return Colors.grey.shade700;
},
),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(4),
),
),
),
child: Checkbox(
value: _checkboxValue,
onChanged: _updateCheckboxValue,
),
),
child: Checkbox(
value: _checkboxValue,
onChanged: _updateCheckboxValue,
),
),
const SizedBox(width: 8),
Text(
widget.checkboxText,
style: TextStyle(
color: Colors.grey.shade300,
fontSize: 14,
const SizedBox(width: 8),
Text(
widget.checkboxText!,
style: TextStyle(
color: Colors.grey.shade300,
fontSize: 14,
),
),
),
],
),
],
),
],
],
),
actions: [
Expand Down Expand Up @@ -163,34 +165,36 @@ class _ConfirmationDialogState extends State<ConfirmationDialog> {
color: Colors.grey.shade200,
),
),
const SizedBox(height: 20),
Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
CupertinoCheckbox(
value: _checkboxValue,
onChanged: _updateCheckboxValue,
activeColor: Colors.deepPurple,
),
const SizedBox(width: 8),
Text(
widget.checkboxText,
style: TextStyle(
fontSize: 14,
color: Colors.grey.shade300,
if (widget.checkboxText != null && widget.checkboxText!.isNotEmpty) ...[
const SizedBox(height: 20),
Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
CupertinoCheckbox(
value: _checkboxValue,
onChanged: _updateCheckboxValue,
activeColor: Colors.deepPurple,
),
),
],
),
const SizedBox(width: 8),
Text(
widget.checkboxText!,
style: TextStyle(
fontSize: 14,
color: Colors.grey.shade300,
),
),
],
),
],
],
),
actions: [
CupertinoDialogAction(
onPressed: widget.onCancel,
isDestructiveAction: false,
child: Text(
widget.cancelText ?? "Cancel",
widget.cancelText ?? "Cancel",
style: TextStyle(
fontSize: 16,
color: Colors.grey.shade300,
Expand All @@ -201,7 +205,7 @@ class _ConfirmationDialogState extends State<ConfirmationDialog> {
onPressed: widget.onConfirm,
isDefaultAction: true,
child: Text(
widget.confirmText ?? "Confirm",
widget.confirmText ?? "Confirm",
style: const TextStyle(
fontSize: 16,
color: Colors.deepPurple,
Expand Down