Merge branch 'ulope-feature/haptics'

lichess-org · Apr 14, 2022 · 5eb9c08 · 5eb9c08
2 parents a329d58 + 120423c
commit 5eb9c08
Show file tree

Hide file tree

Showing 2 changed files with 82 additions and 11 deletions.
diff --git a/src/ui/shared/round/OnlineRound.ts b/src/ui/shared/round/OnlineRound.ts
@@ -414,7 +414,7 @@ export default class OnlineRound implements OnlineRoundInterface {
         this.vm.submitFeedback = undefined
         if (playing) {
           sound.confirmation()
-          vibrate.quick()
+          vibrate.tap()
         }
         redraw()
       }, feebackDuration)
@@ -434,15 +434,19 @@ export default class OnlineRound implements OnlineRoundInterface {
       d.game.winner = o.winner
     }
 
+    if (o.check) {
+      vibrate.doubleTap()
+    }
+
     const wDraw = white.offeringDraw
     const bDraw = black.offeringDraw
     if (!wDraw && o.wDraw) {
       sound.dong()
-      vibrate.quick()
+      vibrate.warn()
     }
     if (!bDraw && o.bDraw) {
       sound.dong()
-      vibrate.quick()
+      vibrate.warn()
     }
     white.offeringDraw = o.wDraw
     black.offeringDraw = o.bDraw
@@ -631,7 +635,11 @@ export default class OnlineRound implements OnlineRoundInterface {
 
     if (d.game.turns > 1) {
       sound.dong()
-      vibrate.quick()
+      if (d.player.color === d.game.winner) {
+        vibrate.good()
+      } else {
+        vibrate.bad()
+      }
     }
     if (!this.data.player.spectator) {
       session.backgroundRefresh()
@@ -742,12 +750,14 @@ export default class OnlineRound implements OnlineRoundInterface {
       else {
         sound.capture()
       }
+      if (!this.data.player.spectator) {
+        vibrate.heavy()
+      }
     } else {
       sound.move()
-    }
-
-    if (!this.data.player.spectator) {
-      vibrate.quick()
+      if (!this.data.player.spectator) {
+        vibrate.tap()
+      }
     }
   }
 

diff --git a/src/vibrate.ts b/src/vibrate.ts
@@ -1,13 +1,74 @@
-import { Haptics } from '@capacitor/haptics'
+import { Haptics, ImpactStyle, NotificationType } from '@capacitor/haptics'
 import settings from './settings'
 
 let shouldVibrate: boolean = settings.general.vibrateOnGameEvents()
 
 export default {
   quick() {
     if (shouldVibrate) {
-      if (window.navigator.vibrate) window.navigator.vibrate(150)
-      else Haptics.vibrate()
+      if (window.navigator.vibrate) {
+        window.navigator.vibrate(150)
+      } else {
+          void Haptics.vibrate({ duration: 150 })
+      }
+    }
+  },
+  tap() {
+    if (shouldVibrate) {
+      if (window.navigator.vibrate) {
+        window.navigator.vibrate(50)
+      } else {
+        void Haptics.impact({ style: ImpactStyle.Medium })
+      }
+    }
+  },
+  heavy() {
+    if (shouldVibrate) {
+      if (window.navigator.vibrate) {
+        window.navigator.vibrate(100)
+      } else {
+        void Haptics.impact({ style: ImpactStyle.Heavy })
+      }
+    }
+  },
+  doubleTap() {
+    if (shouldVibrate) {
+      if (window.navigator.vibrate) {
+        window.navigator.vibrate(50)
+      } else {
+        void Haptics.impact({ style: ImpactStyle.Medium }).then(() => {
+          void new Promise(r => setTimeout(r, 150)).then(() => {
+            void Haptics.impact({ style: ImpactStyle.Medium })
+          })
+        })
+      }
+    }
+  },
+  warn() {
+    if (shouldVibrate) {
+      if (window.navigator.vibrate) {
+        window.navigator.vibrate(50)
+      } else {
+        void Haptics.notification({ type: NotificationType.Warning })
+      }
+    }
+  },
+  bad() {
+    if (shouldVibrate) {
+      if (window.navigator.vibrate) {
+        window.navigator.vibrate(50)
+      } else {
+        void Haptics.notification({ type: NotificationType.Error })
+      }
+    }
+  },
+  good() {
+    if (shouldVibrate) {
+      if (window.navigator.vibrate) {
+          window.navigator.vibrate(50)
+      } else {
+        void Haptics.notification({ type: NotificationType.Success })
+      }
     }
   },
   onSettingChange(v: boolean) {