more haptics uwu

Author: ComputerElite

fastlane/metadata/android/en-US/changelogs/42.txt

@@ -5,4 +5,5 @@
 - Fixed shock confirmation not correctly working in non grouped shocker view
 - Make sure vibration warning uses vibration level of vibrate slider
 - Updated shock confirmation handling on random intensity and duration to actually be accurate
-- Fix a few things with the action/cofirm logic on the non grouped shocker view as I totally forgot that view existed
+- Fix a few things with the action/cofirm logic on the non grouped shocker view as I totally forgot that view existed
+- Various other small bugfixes

lib/components/haptic_switch.dart

@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+import 'package:shock_alarm_app/services/vibrations.dart';
+
+class HapticSwitch extends StatelessWidget {
+  final bool value;
+  final ValueChanged<bool> onChanged;
+  final Key? switchKey;
+
+  const HapticSwitch({
+    required this.value,
+    required this.onChanged,
+    this.switchKey,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Switch(
+      key: switchKey,
+      value: value,
+      onChanged: (value) {
+        ShockAlarmVibrations.switchChanged(value);
+        this.onChanged(value);
+      },
+    );
+  }
+}

lib/components/shock_disclamer.dart

@@ -14,7 +14,6 @@ class ShockDisclaimer extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    // TODO: implement build
     ThemeData t = Theme.of(context);
     return AlertDialog.adaptive(
         title: Row(

lib/screens/alarms/alarm_item.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:shock_alarm_app/components/haptic_switch.dart';
 import 'package:shock_alarm_app/components/padded_card.dart';
 import 'package:shock_alarm_app/screens/shockers/shocker_item.dart';
 import 'package:shock_alarm_app/dialogs/info_dialog.dart';
@@ -124,7 +125,7 @@ class AlarmItemState extends State<AlarmItem> {
                       icon: Icon(expanded
                           ? Icons.arrow_upward_rounded
                           : Icons.arrow_downward_rounded)),
-                  Switch(
+                  HapticSwitch(
                       value: alarm.active,
                       onChanged: (value) {
                         setState(() {
@@ -149,7 +150,7 @@ class AlarmItemState extends State<AlarmItem> {
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
                     Text("Repeat alarm tone"),
-                    Switch(
+                    HapticSwitch(
                       value: alarm.repeatAlarmsTone,
                       onChanged: (value) {
                         setState(() {
@@ -279,7 +280,7 @@ class AlarmShockerWidgetState extends State<AlarmShockerWidget> {
                                     : "This shocker was paused by the owner. The alarm will not trigger this shocker when it's paused even when you enable it in this menu. It needs to be unpaused so it can be triggered.");
                           },
                         ),
-                      Switch(
+                      HapticSwitch(
                         value: alarmShocker.enabled,
                         onChanged: enable,
                       ),

lib/screens/settings/account/api_token_edit_dialog.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:shock_alarm_app/components/haptic_switch.dart';
 import 'package:shock_alarm_app/components/predefined_spacing.dart';
 import 'package:shock_alarm_app/components/qr_card.dart';
 import 'package:shock_alarm_app/dialogs/error_dialog.dart';
@@ -40,7 +41,7 @@ class _ApiTokenEditDialogState extends State<ApiTokenEditDialog> {
           for (var permission in availableApiTokenPermissions)
             Row(
               children: [
-                Switch(
+                HapticSwitch(
                     value: widget.apiToken.permissions.contains(permission),
                     onChanged: (value) {
                       if (value) {

lib/screens/settings/confirm_shock_dialog.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
+import 'package:shock_alarm_app/components/haptic_switch.dart';
 import 'package:shock_alarm_app/dialogs/info_dialog.dart';
 import 'package:shock_alarm_app/screens/shockers/shocker_item.dart';
 import 'package:shock_alarm_app/services/alarm_list_manager.dart';
@@ -69,7 +70,7 @@ class _ConfirmShockDialogState extends State<ConfirmShockDialog> {
                       icon: Icon(Icons.info)),
                 ],
               ),
-              Switch(
+              HapticSwitch(
                   value: AlarmListManager.getInstance()
                       .settings
                       .enforceHardLimitInsteadOfShock,

lib/screens/settings/settings_screen.dart

@@ -4,6 +4,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:shock_alarm_app/components/haptic_switch.dart';
 import 'package:shock_alarm_app/components/padded_card.dart';
 import 'package:shock_alarm_app/components/constrained_container.dart';
 import 'package:shock_alarm_app/components/predefined_spacing.dart';
@@ -751,7 +752,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Text("Show option for random delay"),
-            Switch(
+            HapticSwitch(
                 value: widget.manager.settings.showRandomDelay,
                 key: ValueKey("showRandomDelay"),
                 onChanged: (value) {
@@ -766,7 +767,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Text("Use grouped shocker controlling"),
-            Switch(
+            HapticSwitch(
                 value: widget.manager.settings.useGroupedShockerSelection,
                 key: ValueKey("useGroupedShockerSelection"),
                 onChanged: (value) {
@@ -781,7 +782,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Text("Use range slider for random delay"),
-            Switch(
+            HapticSwitch(
                 value: widget.manager.settings.useRangeSliderForRandomDelay,
                 key: ValueKey("useRangeSliderForRandomDelay"),
                 onChanged: (value) {
@@ -797,7 +798,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Text("Use range slider for intensity"),
-            Switch(
+            HapticSwitch(
                 value: widget.manager.settings.useRangeSliderForIntensity,
                 key: ValueKey("useRangeSliderForIntensity"),
                 onChanged: (value) {
@@ -812,7 +813,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Text("Use range slider for duration"),
-            Switch(
+            HapticSwitch(
                 value: widget.manager.settings.useRangeSliderForDuration,
                 key: ValueKey("useRangeSliderForDuration"),
                 onChanged: (value) {
@@ -840,7 +841,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                     icon: Icon(Icons.info))
               ],
             ),
-            Switch(
+            HapticSwitch(
                 value: widget.manager.settings.confirmShock,
                 key: ValueKey("confirmShock"),
                 onChanged: (value) {
@@ -855,7 +856,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Text("Allow choosing tones for controls"),
-            Switch(
+            HapticSwitch(
                 value: widget.manager.settings.allowTonesForControls,
                 key: ValueKey("allowTonesForControls"),
                 onChanged: (value) {
@@ -870,7 +871,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Text("Seperate slider for vibrate and shock intensity"),
-            Switch(
+            HapticSwitch(
                 value: widget.manager.settings.useSeperateSliders,
                 key: ValueKey("useSeperateSliders"),
                 onChanged: (value) {
@@ -895,7 +896,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                     icon: Icon(Icons.info))
               ],
             ),
-            Switch(
+            HapticSwitch(
                 value: widget.manager.settings.lerpIntensity,
                 key: ValueKey("lerpIntensity"),
                 onChanged: (value) {
@@ -910,7 +911,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Text("Send logs for live control (workaround)"),
-            Switch(
+            HapticSwitch(
                 value: widget.manager.settings.liveControlsLogWorkaround,
                 key: ValueKey("liveControlsLogWorkaround"),
                 onChanged: (value) {
@@ -935,7 +936,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                     icon: Icon(Icons.info))
               ],
             ),
-            Switch(
+            HapticSwitch(
                 value: widget.manager.settings.allowMultiServerLogin,
                 key: ValueKey("allowMultiServerLogin"),
                 onChanged: (value) {
@@ -960,7 +961,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                     icon: Icon(Icons.info))
               ],
             ),
-            Switch(
+            HapticSwitch(
                 value: widget.manager.settings.useAlarmServer,
                 key: ValueKey("useAlarmServer"),
                 onChanged: (value) {
@@ -988,7 +989,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
                     icon: Icon(Icons.info))
               ],
             ),
-            Switch(
+            HapticSwitch(
                 value: widget.manager.settings.increaseMaxDuration,
                 key: ValueKey("increaseMaxDuration"),
                 onChanged: (value) {
@@ -999,11 +1000,26 @@ class _SettingsScreenState extends State<SettingsScreen> {
                 })
           ],
         ),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Text("Enable ui haptic feedback"),
+            HapticSwitch(
+                value: widget.manager.settings.enableUiVibrations,
+                key: ValueKey("enableUiVibrations"),
+                onChanged: (value) {
+                  setState(() {
+                    widget.manager.settings.enableUiVibrations = value;
+                    widget.manager.saveSettings();
+                  });
+                })
+          ],
+        ),
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Text("Show hub firmware version"),
-            Switch(
+            HapticSwitch(
                 value: widget.manager.settings.showFirmwareVersion,
                 key: ValueKey("showFirmwareVersion"),
                 onChanged: (value) {
@@ -1018,7 +1034,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Text("Disable hub filtering"),
-            Switch(
+            HapticSwitch(
                 value: widget.manager.settings.disableHubFiltering,
                 key: ValueKey("disableHubFiltering"),
                 onChanged: (value) {
@@ -1033,7 +1049,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
             Text("Use http instead of ws for shocking"),
-            Switch(
+            HapticSwitch(
                 value: widget.manager.settings.useHttpShocking,
                 key: ValueKey("useHttpShocking"),
                 onChanged: (value) {

lib/screens/settings/token_item.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:shock_alarm_app/components/haptic_switch.dart';
 import 'package:shock_alarm_app/components/padded_card.dart';
 import 'package:shock_alarm_app/dialogs/error_dialog.dart';
 import 'account/account_edit.dart';
@@ -177,7 +178,7 @@ class TokenItemState extends State<TokenItem> {
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: <Widget>[
                     Text("Is session"),
-                    Switch(
+                    HapticSwitch(
                       value: token.type == TokenType.session,
                       onChanged: (value) {
                         setState(() {

lib/screens/shares/shares.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:shock_alarm_app/components/haptic_switch.dart';
 import 'package:shock_alarm_app/components/padded_card.dart';
 import 'package:shock_alarm_app/components/constrained_container.dart';
 import 'package:shock_alarm_app/components/desktop_mobile_refresh_indicator.dart';
@@ -439,7 +440,7 @@ class ShockerShareEntryPermissionEditorState
                 icon: Icon(Icons.info))
           ],
         ),
-        Switch(
+        HapticSwitch(
             value: value,
             onChanged: (v) {
               setState(() {

lib/screens/shockers/hub_item.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:shock_alarm_app/components/haptic_switch.dart';
 import 'package:shock_alarm_app/components/predefined_spacing.dart';
 import 'package:shock_alarm_app/dialogs/delete_dialog.dart';
 import 'package:shock_alarm_app/components/qr_card.dart';
@@ -219,7 +220,7 @@ class HubItemState extends State<HubItem> {
                       Row(
                         spacing: 10,
                         children: [
-                          Switch(
+                          HapticSwitch(
                               value: showToken,
                               onChanged: (value) => setState(() {
                                     showToken = value;