1.0.1 #3

Merged
me merged 22 commits from dev into main 2026-09-29 17:54:06 -07:00
59 changed files with 176 additions and 45 deletions

No files matched your search

+24 -2
View File
@@ -15,8 +15,6 @@ android {
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion
compileOptions {
isCoreLibraryDesugaringEnabled = true
targetCompatibility = JavaVersion.VERSION_17
@@ -77,3 +75,27 @@ dependencies {
flutter {
source = "../.."
}
/// To use this, first be in $PROJ/android/, then run: ./gradlew printFlutterVariables
tasks.register("printFlutterVariables") {
description = "Print Local Flutter Variables"
doLast {
// android //
// compileSdk = flutter.compileSdkVersion
println("compileSdk: ${android.compileSdk}")
println("compileSdkVersion: ${android.compileSdkVersion}")
// ndkVersion = flutter.ndkVersion
println("ndkVersion: ${android.ndkVersion}")
// android.defaultConfig //
// minSdk = flutter.minSdkVersion
println("minSdk: ${android.defaultConfig.minSdk}")
// targetSdk = flutter.targetSdkVersion
println("targetSdk: ${android.defaultConfig.targetSdk}")
println("targetSdkVersion: ${android.defaultConfig.targetSdkVersion}")
// versionCode = flutter.versionCode
println("versionCode: ${android.defaultConfig.versionCode}")
// versionName = flutter.versionName
println("versionName: ${android.defaultConfig.versionName}")
}
}
+3
View File
@@ -27,6 +27,9 @@
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
<!-- Allow internet to work. -->
<uses-permission android:name="android.permission.INTERNET"/>
<application
android:label="Sunset Alarm"
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" />
</item> -->
</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" />
</item> -->
</layer-list>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<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"/>
<monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
<monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
</adaptive-icon>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<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"/>
<monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
<monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
</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
@@ -1,7 +1,7 @@
#Sat Sep 12 19:36:23 MST 2026
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip
#distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
+1 -1
View File
@@ -32,7 +32,7 @@ version=""
for i in `grep version $app_details`; do
version="$i"
done
version="v${version// /_}"
version="${version// /_}"
if [[ -z $name || -z $version ]]; then
echo "ERROR: Could not retrieve name or version. name='$name' version='$version'"
+3
View File
@@ -0,0 +1,3 @@
description: This file stores settings for Dart & Flutter DevTools.
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
extensions:
+100 -36
View File
@@ -12,9 +12,16 @@ import 'package:alarm/alarm.dart';
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:
/// - Add other languages (Spanish, Croatian)
/// v1.1.0
/// - Move the switchtile back to its own row so that it handles titles better.
/// v1.2.0
/// - Change sunset grabber to checkbox and retrieve it each alarm or open.
/// v2.0.0
/// - Add sunrise section and change app name to Sunshine Alarm?
@@ -22,6 +29,14 @@ import 'dart:convert';
void main() async {
WidgetsFlutterBinding.ensureInitialized();
final certData = await rootBundle.load(
'media/certs/open-meteo-com_isrg-root-x1.pem',
);
SecurityContext.defaultContext.setTrustedCertificatesBytes(
certData.buffer.asUint8List(),
);
tz.initializeTimeZones();
await Alarm.init();
runApp(const SunsetAlarmApp());
@@ -66,8 +81,8 @@ class HomeScreen extends StatefulWidget {
class _HomeScreenState extends State<HomeScreen> {
final _latController = TextEditingController();
final _lngController = TextEditingController();
final _sunsetController = TextEditingController();
final _minutesController = TextEditingController(text: '30');
final _sunsetController = TextEditingController(text: "18:00");
final _minutesController = TextEditingController(text: "30");
final FlutterLocalNotificationsPlugin _notifications =
FlutterLocalNotificationsPlugin();
@@ -79,6 +94,7 @@ class _HomeScreenState extends State<HomeScreen> {
String? _sunsetErrorText;
String? _minuteErrorText;
bool _validTime = false;
static const _alarmId = 1001;
@@ -107,15 +123,20 @@ class _HomeScreenState extends State<HomeScreen> {
Future<void> _loadPrefs() async {
final prefs = await SharedPreferences.getInstance();
setState(() {
final lat = prefs.getDouble('lat');
final lng = prefs.getDouble('lng');
final sunset = prefs.getString('sunset_time');
_alarmEnabled = prefs.getBool('alarm_enabled') ?? false;
final lat = prefs.getDouble('lat').toString();
final lng = prefs.getDouble('lng').toString();
final sun = prefs.getString('sunset_time');
_latController.text = (lat == "null") ? "" : lat;
_lngController.text = (lng == "null") ? "" : lng;
_sunsetController.text = sun ?? "";
_minutesBefore = prefs.getInt('minutes_before') ?? 30;
if (lat != null) _latController.text = lat.toString();
if (lng != null) _lngController.text = lng.toString();
if (sunset != null) _sunsetController.text = sunset;
_minutesController.text = '$_minutesBefore';
_minutesController.text = _minutesBefore.toString();
_alarmEnabled = prefs.getBool('alarm_enabled') ?? false;
_validTime = prefs.getBool('valid_time') ?? false;
_calcPlural();
});
if (_alarmEnabled && _sunsetController.text.isNotEmpty) {
_scheduleAlarm();
@@ -133,6 +154,7 @@ class _HomeScreenState extends State<HomeScreen> {
}
await prefs.setBool('alarm_enabled', _alarmEnabled);
await prefs.setInt('minutes_before', _minutesBefore);
await prefs.setBool('valid_time', _validTime);
}
Future<void> _getGpsLocation() async {
@@ -193,7 +215,10 @@ class _HomeScreenState extends State<HomeScreen> {
} catch (e) {
_showSnack('Network Error: $e');
} finally {
setState(() => _loading = false);
setState(() {
_loading = false;
_validTime = true;
});
}
if (_alarmEnabled) {
@@ -247,8 +272,7 @@ class _HomeScreenState extends State<HomeScreen> {
);
} else if (Platform.isAndroid) {
// Get the Notifications permission:
final android =
_notifications
final android = _notifications
.resolvePlatformSpecificImplementation<
AndroidFlutterLocalNotificationsPlugin
>();
@@ -327,17 +351,25 @@ class _HomeScreenState extends State<HomeScreen> {
if (value) {
await _scheduleAlarm();
} else {
_alarmTimer?.cancel();
if (!Platform.isLinux) {
// Notification Method
if (ANDROID_USE_NOTIF) await _notifications.cancel(id: _alarmId);
_stopAlarm();
}
}
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);
if (ANDROID_USE_ALARM) {
await Alarm.stop(_alarmId);
}
}
_showSnack('Alarm Cancelled');
}
}
void _showSnack(String msg) {
ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(msg)));
@@ -354,6 +386,9 @@ class _HomeScreenState extends State<HomeScreen> {
}
String? _validateTime(String? value) {
setState(() {
_validTime = false;
});
if (value == null || !RegExp(r'^\d{2}:\d{2}$').hasMatch(value)) {
return 'Use HH:MM Format';
}
@@ -361,9 +396,18 @@ class _HomeScreenState extends State<HomeScreen> {
final m = int.parse(value.substring(3, 5));
if (h > 23) return 'Hour Must Be 0–23';
if (m > 59) return 'Minute Must Be 0–59';
setState(() {
_validTime = true;
});
return null; // valid
}
void _calcPlural() {
setState(() {
_plural = (_minutesBefore == 1) ? '' : 's';
});
}
@override
Widget build(BuildContext context) {
return Scaffold(
@@ -449,8 +493,7 @@ class _HomeScreenState extends State<HomeScreen> {
'${picked.hour.toString().padLeft(2, '0')}:'
'${picked.minute.toString().padLeft(2, '0')}';
setState(
() =>
_sunsetErrorText = _validateTime(
() => _sunsetErrorText = _validateTime(
_sunsetController.text,
),
);
@@ -462,6 +505,9 @@ class _HomeScreenState extends State<HomeScreen> {
),
),
onChanged: (v) {
if (v == "") {
_stopAlarm();
}
final val = _validateTime(v);
if (val == null) {
_savePrefs();
@@ -477,8 +523,7 @@ class _HomeScreenState extends State<HomeScreen> {
),
const SizedBox(width: 8),
IconButton.filledTonal(
icon:
_loading
icon: _loading
? const SizedBox(
width: 20,
height: 20,
@@ -507,6 +552,7 @@ class _HomeScreenState extends State<HomeScreen> {
children: [
if (!_alarmEnabled)
Expanded(
flex: 1, // _validTime ? 3 : 2,
child: TextField(
controller: _minutesController,
keyboardType: TextInputType.number,
@@ -524,24 +570,44 @@ class _HomeScreenState extends State<HomeScreen> {
} else {
_minuteErrorText = 'Invalid Minute Value';
}
_plural = (_minutesBefore == 1) ? '' : 's';
_calcPlural();
});
},
),
),
//Expanded(
// flex: 3,
// child: Center(
// child:
// _validTime ? Text("") : Text("Sunset Time Needed") ,
// ),
//),
// --- Toggle ---
Expanded(
flex: 1, //_validTime ? 2 : 5,
child: SwitchListTile(
//title: const Text('Enable Sunset Alarm'),
title: Text(_alarmEnabled ? 'Sunset Alarm Enabled' : ''),
subtitle: Text(
_alarmEnabled
? '${_minutesBefore} Minute${_plural} Before @ $_alarmDisplayTime'
: '',
title: Center(
child: Text(
_validTime
? _alarmEnabled
? "Sunset Alarm Enabled"
: "" //"Enable"
: "", // "Disabled",
),
value: _alarmEnabled,
onChanged: _toggleAlarm,
),
subtitle: Center(
child: Text(
_validTime
? _alarmEnabled
? "${_minutesBefore} Minute${_plural} Before @ $_alarmDisplayTime"
: "" //"Sunset Alarm"
: "", //"Enter Valid Time",
),
),
value: _validTime ? _alarmEnabled : false,
onChanged: _validTime ? _toggleAlarm : null,
),
),
],
@@ -573,8 +639,7 @@ final _plugin = FlutterLocalNotificationsPlugin();
Future<void> requestPermissions() async {
if (Platform.isAndroid) {
final android =
_plugin
final android = _plugin
.resolvePlatformSpecificImplementation<
AndroidFlutterLocalNotificationsPlugin
>();
@@ -587,8 +652,7 @@ Future<void> requestPermissions() async {
}
}
final android =
_plugin
final android = _plugin
.resolvePlatformSpecificImplementation<
AndroidFlutterLocalNotificationsPlugin
>();
@@ -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
description: "Set an alarm to go off a specified time before sunset."
publish_to: 'none'
version: 1.0.0
version: 1.0.1
environment:
sdk: ^3.7.2
@@ -23,3 +23,5 @@ dev_dependencies:
flutter:
uses-material-design: true
assets:
- media/certs/