16 Commits
Author SHA1 Message Date
me 05f1b68d3f Add root certificate for Let's Encrypt in order to access Open Meteo on older devices. 2026-09-29 13:31:25 -07:00
me 0bc20a6e08 config, add cert path to assets. 2026-09-29 13:30:42 -07:00
me a661cfabbb main, put more variables in the cache, load them directly into their vars rather than having intermediates. 2026-09-29 13:30:13 -07:00
me 0e481f13cc main, swap the switch with text rather than disabling, allows giving a better error message. 2026-09-29 13:29:24 -07:00
me 436c96285c main, fix cert issues on older versions of Android (before Let's Encrypt existed). 2026-09-29 13:24:02 -07:00
me dd9d15172c main, handle the time being invalid better. 2026-09-29 13:23:28 -07:00
me 42d4992b6b icon, fix notification icon, may have chosen trim last time. 2026-09-29 12:30:28 -07:00
me f20bd99da4 icon, add another accidentally deleted XML. 2026-09-29 12:30:08 -07:00
me 79578de1f7 icon, untrim and ensure they are PNG. 2026-09-29 11:57:23 -07:00
me 183634dee5 main, disable the slide switch if the time is missing, stop the alarm if the time is completely backed out. 2026-09-29 11:57:09 -07:00
me 2606116c62 manifest, allow internet access. 2026-09-29 10:55:27 -07:00
me 424176a529 Add launch background XML's back in, 2026-09-29 10:50:59 -07:00
me 13a00917f9 icon, remove the old versions which were lingering and install version 03. 2026-09-29 08:25:00 -07:00
me 76ef8a7131 icon, modify to be circular and add an inversed monochrome version. 2026-09-29 08:24:36 -07:00
me 8b466229e1 compile, exclude the v from the version number. 2026-09-28 11:05:29 -07:00
me b62eff80c9 Increment version. 2026-09-28 11:05:17 -07:00
56 changed files with 111 additions and 35 deletions

No files matched your search

+3
View File
@@ -27,6 +27,9 @@
<uses-permission android:name="android.permission.WAKE_LOCK"/> <uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/> <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
<!-- Allow internet to work. -->
<uses-permission android:name="android.permission.INTERNET"/>
<application <application
android:label="Sunset Alarm" android:label="Sunset Alarm"
android:name="${applicationName}" android:name="${applicationName}"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 B

After

Width:  |  Height:  |  Size: 431 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 173 B

After

Width:  |  Height:  |  Size: 306 B

@@ -10,3 +10,4 @@
android:src="@mipmap/launch_image" /> android:src="@mipmap/launch_image" />
</item> --> </item> -->
</layer-list> </layer-list>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 284 B

After

Width:  |  Height:  |  Size: 574 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 443 B

After

Width:  |  Height:  |  Size: 842 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 565 B

After

Width:  |  Height:  |  Size: 1.2 KiB

@@ -10,3 +10,4 @@
android:src="@mipmap/launch_image" /> android:src="@mipmap/launch_image" />
</item> --> </item> -->
</layer-list> </layer-list>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background"/> <background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/> <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<monochrome android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
</adaptive-icon> </adaptive-icon>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background"/> <background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/> <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<monochrome android:drawable="@mipmap/ic_launcher_foreground"/> <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
</adaptive-icon> </adaptive-icon>
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 816 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 456 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 626 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 334 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1022 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 586 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 946 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#FFFFFF</color>
</resources>
+1 -1
View File
@@ -32,7 +32,7 @@ version=""
for i in `grep version $app_details`; do for i in `grep version $app_details`; do
version="$i" version="$i"
done done
version="v${version// /_}" version="${version// /_}"
if [[ -z $name || -z $version ]]; then if [[ -z $name || -z $version ]]; then
echo "ERROR: Could not retrieve name or version. name='$name' version='$version'" echo "ERROR: Could not retrieve name or version. name='$name' version='$version'"
+63 -29
View File
@@ -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 {
@@ -327,18 +342,26 @@ class _HomeScreenState extends State<HomeScreen> {
if (value) { if (value) {
await _scheduleAlarm(); await _scheduleAlarm();
} else { } else {
_alarmTimer?.cancel(); _stopAlarm();
if (!Platform.isLinux) {
// Notification Method
if (ANDROID_USE_NOTIF) await _notifications.cancel(id: _alarmId);
// Alarm Method
if (ANDROID_USE_ALARM) await Alarm.stop(_alarmId);
}
_showSnack('Alarm Cancelled');
} }
} }
Future<void> _stopAlarm() async {
if (Platform.isLinux) {
_alarmTimer?.cancel();
} else if (Platform.isAndroid) {
// Notification Method
if (ANDROID_USE_NOTIF) {
await _notifications.cancel(id: _alarmId);
}
// Alarm Method
if (ANDROID_USE_ALARM) {
await Alarm.stop(_alarmId);
}
}
_showSnack('Alarm Cancelled');
}
void _showSnack(String msg) { void _showSnack(String msg) {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(msg))); ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(msg)));
} }
@@ -354,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';
} }
@@ -361,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
} }
@@ -462,6 +487,9 @@ class _HomeScreenState extends State<HomeScreen> {
), ),
), ),
onChanged: (v) { onChanged: (v) {
if (v == "") {
_stopAlarm();
}
final val = _validateTime(v); final val = _validateTime(v);
if (val == null) { if (val == null) {
_savePrefs(); _savePrefs();
@@ -532,17 +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' ),
: '', subtitle: Text(
), _validTime
value: _alarmEnabled, ? _alarmEnabled
onChanged: _toggleAlarm, ? '${_minutesBefore} Minute${_plural} Before @ $_alarmDisplayTime'
), : ""
: "Add Time",
),
value: _alarmEnabled,
onChanged: _toggleAlarm,
)
: Center(child: Text("Sunset Time Invalid")),
), ),
], ],
), ),
@@ -0,0 +1,31 @@
-----BEGIN CERTIFICATE-----
MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
-----END CERTIFICATE-----
Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.
+3 -1
View File
@@ -1,7 +1,7 @@
name: sunset_alarm name: sunset_alarm
description: "Set an alarm to go off a specified time before sunset." description: "Set an alarm to go off a specified time before sunset."
publish_to: 'none' publish_to: 'none'
version: 1.0.0 version: 1.0.1
environment: environment:
sdk: ^3.7.2 sdk: ^3.7.2
@@ -23,3 +23,5 @@ dev_dependencies:
flutter: flutter:
uses-material-design: true uses-material-design: true
assets:
- media/certs/