more intuitive saving and alarm queuing

ComputerElite · ComputerElite · commit 99fc0a8a6322 · 2025-01-03T21:37:42.000+01:00
diff --git a/README.md b/README.md
@@ -2,6 +2,21 @@
 An app for controling [OpenShock](https://openshock.org/) shockers and even setting alarms with custom tones.
 Based partly on https://github.com/mvarendorff/random-alarm/
 
+# Planned features
+- [ ] Grouping of shockers
+- [ ] (Un)Pausing of shockers
+- [ ] Alarm tones
+- [ ] Login with username/email and password
+- [ ] Random delay
+- [ ] (Big controls mode)
+- [ ] Renaming of shockers (global)
+- [ ] Change sharing limits
+- [ ] Redeem share codes
+- [ ] Create share codes
+- [ ] Viewing of logs
+- [ ] Linux support
+
+
 ## Getting Started
 
 This project is a starting point for a Flutter application.
diff --git a/lib/components/alarm_item.dart b/lib/components/alarm_item.dart
@@ -66,7 +66,7 @@ class AlarmItemState extends State<AlarmItem> {
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: <Widget>[
                             Text(alarm.name),
-                            EditAlarmTime(alarm: this.alarm),
+                            EditAlarmTime(alarm: this.alarm, manager: this.manager,),
                             DateRow(alarm: alarm)
                           ],
                         ),
@@ -79,6 +79,7 @@ class AlarmItemState extends State<AlarmItem> {
                             onChanged: (value) {
                             setState(() {
                               alarm.active = value;
+                              _save();
                             });
                           }),
                         ],)
diff --git a/lib/components/edit_alarm_time.dart b/lib/components/edit_alarm_time.dart
@@ -1,21 +1,25 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:shock_alarm_app/services/alarm_list_manager.dart';
 
 import '../stores/alarm_store.dart';
 
 class EditAlarmTime extends StatefulWidget {
   final ObservableAlarmBase alarm;
+  final AlarmListManager manager;
 
-  const EditAlarmTime({Key? key, required this.alarm}) : super(key: key);
+
+  const EditAlarmTime({Key? key, required this.alarm, required this.manager}) : super(key: key);
 
   @override
-  State<StatefulWidget> createState() => EditAlarmTimeState(alarm);
+  State<StatefulWidget> createState() => EditAlarmTimeState(alarm, manager);
 }
 
 class EditAlarmTimeState extends State<EditAlarmTime> {
   final ObservableAlarmBase alarm;
+  final AlarmListManager manager;
   
-  EditAlarmTimeState(this.alarm);
+  EditAlarmTimeState(this.alarm, this.manager);
 
   @override
   Widget build(BuildContext context) {
@@ -41,6 +45,7 @@ class EditAlarmTimeState extends State<EditAlarmTime> {
           setState(() {
             alarm.hour = time.hour;
             alarm.minute = time.minute;
+            manager.saveAlarm(alarm);
           });
         },
       ),
diff --git a/lib/components/token_item.dart b/lib/components/token_item.dart
@@ -77,7 +77,7 @@ class TokenItemState extends State<TokenItem> {
                         onChanged: (newToken) => token.token = newToken,
                       ),
                   Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                     children: <Widget>[
                       IconButton(
                         icon: Icon(Icons.delete),
diff --git a/lib/main.dart b/lib/main.dart
@@ -20,15 +20,23 @@ Future requestPermissions() async{
 }
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  //await AndroidAlarmManager.initialize();
-  //await AndroidAlarmManager.oneShot(Duration(seconds: 10), 0, alarmCallback, alarmClock: true);
+  await AndroidAlarmManager.initialize();
+  await requestPermissions();
 
-  //await requestPermissions();
   runApp(MyApp(null));
 }
 
 @pragma('vm:entry-point')
-void alarmCallback(int id) {
+void alarmCallback(int id) async {
+
+  AlarmListManager manager = AlarmListManager();
+  await manager.loadAllFromStorage();
+  manager.getAlarms().forEach((element) {
+    print("Checking alarm");
+    if(element.active && id ==element.id) {
+      element.trigger(manager, true);
+    }
+  });
   print("Woah");
 }
 
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
@@ -81,13 +81,14 @@ class HomeScreenState extends State<HomeScreen> {
 
   @override
   Widget build(BuildContext context) {
+    manager.context = context;
     return Column(
         children: <Widget>[
           Text(
             'Your alarms',
             style: TextStyle(fontSize: 28, color: Theme.of(context).textTheme.headlineMedium?.color),
           ),
-          Text("Alarms are currently not working",
+          Text("Alarms are currently semi working",
           style: TextStyle(fontSize: 20),),
           Flexible(
             child: Observer(
@@ -106,7 +107,7 @@ class HomeScreenState extends State<HomeScreen> {
             onPressed: () {
               TimeOfDay tod = TimeOfDay.fromDateTime(DateTime.now());
               final newAlarm = new ObservableAlarmBase(
-                  id: DateTime.now().millisecondsSinceEpoch,
+                  id: manager.getNewAlarmId(),
                   name: 'New Alarm',
                   hour: tod.hour,
                   minute: tod.minute,
diff --git a/lib/services/alarm_list_manager.dart b/lib/services/alarm_list_manager.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart';
 import 'package:shock_alarm_app/services/openshock.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart';
@@ -17,6 +18,8 @@ class AlarmListManager {
 
   Function? reloadAllMethod;
 
+  BuildContext? context;
+
 
   Future loadAllFromStorage() async {
     final SharedPreferences prefs = await SharedPreferences.getInstance();
@@ -49,6 +52,30 @@ class AlarmListManager {
     }
   }
 
+  void rescheduleAlarms() async {
+    for (var alarm in _alarms) {
+      if (alarm.active) {
+        await alarm.schedule(this);
+      }
+    }
+  }
+
+  int getNewAlarmId() {
+    int id = 0;
+    bool foundNew = true;
+    while (!foundNew) {
+      foundNew = true;
+      for (var alarm in _alarms) {
+        if (alarm.id == id) {
+          id++;
+          foundNew = false;
+          break;
+        }
+      }
+    }
+    return id;
+  }
+
   saveAlarm(ObservableAlarmBase alarm) async {
     final index =
         _alarms.indexWhere((findAlarm) => alarm.id == findAlarm.id);
@@ -58,14 +85,15 @@ class AlarmListManager {
     } else {
       _alarms[index] = alarm;
     }
-    final SharedPreferences prefs = await SharedPreferences.getInstance();
     rebuildAlarmShockers();
-    prefs.setString("alarms", jsonEncode(_alarms));
+    rescheduleAlarms();
+    saveAlarms();
   }
 
   Future updateShockerStore() async {
     List<Shocker> shockers = [];
-    for(var token in _tokens) {
+    List<Token> tokensCopy = this._tokens.toList(); // create a copy
+    for(var token in tokensCopy) {
       OpenShockClient client = OpenShockClient();
       token.name = await client.getNameForToken(token);
       List<Shocker> s = await client.GetShockersForToken(token);
@@ -78,8 +106,8 @@ class AlarmListManager {
     }
     this.shockers.clear();
     this.shockers.addAll(shockers);
-    final SharedPreferences prefs = await SharedPreferences.getInstance();
-    prefs.setString("shockers", jsonEncode(shockers));
+    saveShockers();
+    saveTokens();
     updateHubList();
     rebuildAlarmShockers();
     reloadAllMethod!();
@@ -92,8 +120,7 @@ class AlarmListManager {
     } else {
       _tokens[index] = token;
     }
-    final SharedPreferences prefs = await SharedPreferences.getInstance();
-    prefs.setString("tokens", jsonEncode(_tokens));
+    saveTokens();
     updateShockerStore();
     //await _storage.writeList(_tokens.tokens);
   }
@@ -125,24 +152,39 @@ class AlarmListManager {
     }
   }
 
-  getAlarms() {
+  List<ObservableAlarmBase> getAlarms() {
     return _alarms;
   }
 
   getTokens() {
     return _tokens;
   }
 
+  void saveShockers() async {
+    final SharedPreferences prefs = await SharedPreferences.getInstance();
+    prefs.setString("shockers", jsonEncode(shockers));
+  }
+
+  void saveAlarms() async {
+    final SharedPreferences prefs = await SharedPreferences.getInstance();
+    prefs.setString("alarms", jsonEncode(_alarms));
+  }
+
+  void saveTokens() async {
+    final SharedPreferences prefs = await SharedPreferences.getInstance();
+    prefs.setString("tokens", jsonEncode(_tokens));
+  }
+
   void deleteToken(Token token) {
     _tokens.removeWhere((findToken) => token.id == findToken.id);
-    //await _storage.writeList(_tokens.tokens);
+    saveTokens();
   }
 
   Token? getToken(int id) {
     return _tokens.firstWhere((findToken) => id == findToken.id);
   }
 
-  void sendShock(ControlType type, Shocker shocker, int currentIntensity, int currentDuration) {
+  void sendShock(ControlType type, Shocker shocker, int currentIntensity, int currentDuration, {String customName = "ShockAlarm"}) {
     Control control = Control();
     control.intensity = currentIntensity;
     control.duration = currentDuration;
@@ -154,7 +196,8 @@ class AlarmListManager {
       print("Token not found");
       return;
     }
+    print("Sending shock to ${shocker.name} with intensity $currentIntensity and duration $currentDuration");
     OpenShockClient client = OpenShockClient();
-    client.sendControls(t, [control]);
+    client.sendControls(t, [control], customName: customName);
   }
 }
diff --git a/lib/stores/alarm_store.dart b/lib/stores/alarm_store.dart
@@ -1,6 +1,9 @@
+import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart';
+import 'package:flutter/material.dart';
 import 'package:mobx/mobx.dart';
 import 'package:shock_alarm_app/services/alarm_list_manager.dart';
 import 'package:shock_alarm_app/services/openshock.dart';
+import '../main.dart';
 
 class Token with Store {
   Token(this.id, this.token, {this.server = "https://api.openshock.app", this.name=""});
@@ -85,15 +88,22 @@ class ObservableAlarmBase with Store {
     return [monday, tuesday, wednesday, thursday, friday, saturday, sunday];
   }
 
-  void trigger(AlarmListManager manager) {
+  void trigger(AlarmListManager manager, bool disableIfApplicable) {
     for (var shocker in shockers) {
       if (shocker.enabled) {
-        manager.sendShock(shocker.type!, shocker.shockerReference!, shocker.intensity, shocker.duration);
+        manager.sendShock(shocker.type!, shocker.shockerReference!, shocker.intensity, shocker.duration, customName: name);
+      }
+    }
+    if (disableIfApplicable) {
+      if(!shouldSchedulePerWeekday()) {
+        active = false;
+        manager.saveAlarm(this);
       }
     }
   }
 
   // Good enough for debugging for now
+  @override
   toString() {
     return "active: $active, name: $name, hour: $hour, minute: $minute, days: $days";
   }
@@ -135,4 +145,23 @@ class ObservableAlarmBase with Store {
     }
     return a;
   }
+
+  bool shouldSchedulePerWeekday() {
+    return days.any((element) {
+      return element == true;
+    });
+  }
+
+  schedule(AlarmListManager manager) async {
+    if (!shouldSchedulePerWeekday()) {
+      // Schedule for next occurrance 
+      DateTime now = DateTime.now();
+      DateTime nextOccurrance = DateTime(now.year, now.month, now.day, hour, minute);
+      if (nextOccurrance.isBefore(now)) {
+        nextOccurrance = nextOccurrance.add(Duration(days: 1));
+      }
+      ScaffoldMessenger.of(manager.context!).showSnackBar(SnackBar(content: Text("Scheduled alarm for ${nextOccurrance.toString()}")));
+      AndroidAlarmManager.oneShotAt(nextOccurrance, id, alarmCallback, exact: true, wakeup: true);
+    }
+  }
 }
