Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
05f1b68d3f | ||
|
|
0bc20a6e08 | ||
|
|
a661cfabbb | ||
|
|
0e481f13cc | ||
|
|
436c96285c | ||
|
|
dd9d15172c |
No files matched your search
+43
-25
@@ -12,6 +12,11 @@ import 'package:alarm/alarm.dart';
|
|||||||
|
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
|
|
||||||
|
// For trusting Let's Encrypt on older devices (SDK 24, Android 7)
|
||||||
|
//import 'dart:io';
|
||||||
|
//import 'package:http/http.dart' as http;
|
||||||
|
import 'package:flutter/services.dart' show rootBundle;
|
||||||
|
|
||||||
/// TBD:
|
/// TBD:
|
||||||
/// - Add other languages (Spanish, Croatian)
|
/// - Add other languages (Spanish, Croatian)
|
||||||
/// v1.1.0
|
/// v1.1.0
|
||||||
@@ -22,6 +27,14 @@ import 'dart:convert';
|
|||||||
|
|
||||||
void main() async {
|
void main() async {
|
||||||
WidgetsFlutterBinding.ensureInitialized();
|
WidgetsFlutterBinding.ensureInitialized();
|
||||||
|
|
||||||
|
final certData = await rootBundle.load(
|
||||||
|
'media/certs/open-meteo-com_isrg-root-x1.pem',
|
||||||
|
);
|
||||||
|
SecurityContext.defaultContext.setTrustedCertificatesBytes(
|
||||||
|
certData.buffer.asUint8List(),
|
||||||
|
);
|
||||||
|
|
||||||
tz.initializeTimeZones();
|
tz.initializeTimeZones();
|
||||||
await Alarm.init();
|
await Alarm.init();
|
||||||
runApp(const SunsetAlarmApp());
|
runApp(const SunsetAlarmApp());
|
||||||
@@ -66,8 +79,8 @@ class HomeScreen extends StatefulWidget {
|
|||||||
class _HomeScreenState extends State<HomeScreen> {
|
class _HomeScreenState extends State<HomeScreen> {
|
||||||
final _latController = TextEditingController();
|
final _latController = TextEditingController();
|
||||||
final _lngController = TextEditingController();
|
final _lngController = TextEditingController();
|
||||||
final _sunsetController = TextEditingController();
|
final _sunsetController = TextEditingController(text: "18:00");
|
||||||
final _minutesController = TextEditingController(text: '30');
|
final _minutesController = TextEditingController(text: "30");
|
||||||
|
|
||||||
final FlutterLocalNotificationsPlugin _notifications =
|
final FlutterLocalNotificationsPlugin _notifications =
|
||||||
FlutterLocalNotificationsPlugin();
|
FlutterLocalNotificationsPlugin();
|
||||||
@@ -79,6 +92,7 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
|
|
||||||
String? _sunsetErrorText;
|
String? _sunsetErrorText;
|
||||||
String? _minuteErrorText;
|
String? _minuteErrorText;
|
||||||
|
bool _validTime = false;
|
||||||
|
|
||||||
static const _alarmId = 1001;
|
static const _alarmId = 1001;
|
||||||
|
|
||||||
@@ -107,15 +121,14 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
Future<void> _loadPrefs() async {
|
Future<void> _loadPrefs() async {
|
||||||
final prefs = await SharedPreferences.getInstance();
|
final prefs = await SharedPreferences.getInstance();
|
||||||
setState(() {
|
setState(() {
|
||||||
final lat = prefs.getDouble('lat');
|
_latController.text = prefs.getDouble('lat').toString();
|
||||||
final lng = prefs.getDouble('lng');
|
_lngController.text = prefs.getDouble('lng').toString();
|
||||||
final sunset = prefs.getString('sunset_time');
|
_sunsetController.text = prefs.getString('sunset_time').toString();
|
||||||
_alarmEnabled = prefs.getBool('alarm_enabled') ?? false;
|
_alarmEnabled = prefs.getBool('alarm_enabled') ?? false;
|
||||||
_minutesBefore = prefs.getInt('minutes_before') ?? 30;
|
_minutesBefore = prefs.getInt('minutes_before') ?? 30;
|
||||||
if (lat != null) _latController.text = lat.toString();
|
_minutesController.text = _minutesBefore.toString();
|
||||||
if (lng != null) _lngController.text = lng.toString();
|
_plural = prefs.getString('plural').toString();
|
||||||
if (sunset != null) _sunsetController.text = sunset;
|
_validTime = prefs.getBool('valid_time') ?? false;
|
||||||
_minutesController.text = '$_minutesBefore';
|
|
||||||
});
|
});
|
||||||
if (_alarmEnabled && _sunsetController.text.isNotEmpty) {
|
if (_alarmEnabled && _sunsetController.text.isNotEmpty) {
|
||||||
_scheduleAlarm();
|
_scheduleAlarm();
|
||||||
@@ -133,6 +146,8 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
}
|
}
|
||||||
await prefs.setBool('alarm_enabled', _alarmEnabled);
|
await prefs.setBool('alarm_enabled', _alarmEnabled);
|
||||||
await prefs.setInt('minutes_before', _minutesBefore);
|
await prefs.setInt('minutes_before', _minutesBefore);
|
||||||
|
await prefs.setString('plural', _plural);
|
||||||
|
await prefs.setBool('valid_time', _validTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _getGpsLocation() async {
|
Future<void> _getGpsLocation() async {
|
||||||
@@ -362,6 +377,7 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
String? _validateTime(String? value) {
|
String? _validateTime(String? value) {
|
||||||
|
_validTime = false;
|
||||||
if (value == null || !RegExp(r'^\d{2}:\d{2}$').hasMatch(value)) {
|
if (value == null || !RegExp(r'^\d{2}:\d{2}$').hasMatch(value)) {
|
||||||
return 'Use HH:MM Format';
|
return 'Use HH:MM Format';
|
||||||
}
|
}
|
||||||
@@ -369,6 +385,7 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
final m = int.parse(value.substring(3, 5));
|
final m = int.parse(value.substring(3, 5));
|
||||||
if (h > 23) return 'Hour Must Be 0–23';
|
if (h > 23) return 'Hour Must Be 0–23';
|
||||||
if (m > 59) return 'Minute Must Be 0–59';
|
if (m > 59) return 'Minute Must Be 0–59';
|
||||||
|
_validTime = true;
|
||||||
return null; // valid
|
return null; // valid
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -543,22 +560,23 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
|
|
||||||
// --- Toggle ---
|
// --- Toggle ---
|
||||||
Expanded(
|
Expanded(
|
||||||
child: SwitchListTile(
|
child:
|
||||||
//title: const Text('Enable Sunset Alarm'),
|
_validTime
|
||||||
title: Text(_alarmEnabled ? 'Sunset Alarm Enabled' : ''),
|
? SwitchListTile(
|
||||||
subtitle: Text(
|
title: Text(
|
||||||
_alarmEnabled
|
_alarmEnabled ? 'Sunset Alarm Enabled' : "",
|
||||||
? '${_minutesBefore} Minute${_plural} Before @ $_alarmDisplayTime'
|
),
|
||||||
: (_sunsetController.text == ""
|
subtitle: Text(
|
||||||
? "Time Missing"
|
_validTime
|
||||||
: ""),
|
? _alarmEnabled
|
||||||
),
|
? '${_minutesBefore} Minute${_plural} Before @ $_alarmDisplayTime'
|
||||||
value:
|
: ""
|
||||||
_sunsetController.text != "" ? _alarmEnabled : false,
|
: "Add Time",
|
||||||
// If _isDataLoaded is false, onChanged is null, disabling the switch
|
),
|
||||||
onChanged:
|
value: _alarmEnabled,
|
||||||
_sunsetController.text != "" ? _toggleAlarm : null,
|
onChanged: _toggleAlarm,
|
||||||
),
|
)
|
||||||
|
: Center(child: Text("Sunset Time Invalid")),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
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
|
||||||
|
-----END CERTIFICATE-----
|
||||||
@@ -23,3 +23,5 @@ dev_dependencies:
|
|||||||
|
|
||||||
flutter:
|
flutter:
|
||||||
uses-material-design: true
|
uses-material-design: true
|
||||||
|
assets:
|
||||||
|
- media/certs/
|
||||||
Reference in new issue
Block a user