|
1 | 1 | package com.haptics |
2 | 2 |
|
3 | 3 | import android.os.Build |
4 | | -import com.haptics.HapticsVibrationType |
5 | 4 | import android.view.HapticFeedbackConstants |
6 | 5 |
|
7 | 6 | object HapticsUtils { |
8 | 7 | private data class HapticInfo(val constant: Int, val requiredApi: Int) |
9 | 8 |
|
10 | 9 | private val notificationTypes = mapOf( |
11 | 10 | "success" to HapticsVibrationType( |
12 | | - timings = longArrayOf(0, 25, 80, 35), |
13 | | - amplitudes = intArrayOf(0, 120, 0, 180), |
14 | | - oldFallback = longArrayOf(0, 25, 80, 35) |
| 11 | + timings = longArrayOf(0, 40, 100, 50), |
| 12 | + amplitudes = intArrayOf(0, 140, 0, 200), |
| 13 | + oldFallback = longArrayOf(0, 40, 100, 50) |
15 | 14 | ), |
16 | 15 | "warning" to HapticsVibrationType( |
17 | | - timings = longArrayOf(0, 20, 100, 50), |
18 | | - amplitudes = intArrayOf(0, 200, 0, 255), |
19 | | - oldFallback = longArrayOf(0, 20, 100, 50) |
| 16 | + timings = longArrayOf(0, 45, 120, 60), |
| 17 | + amplitudes = intArrayOf(0, 180, 0, 255), |
| 18 | + oldFallback = longArrayOf(0, 45, 120, 60) |
20 | 19 | ), |
21 | 20 | "error" to HapticsVibrationType( |
22 | | - timings = longArrayOf(0, 20, 50, 20, 50, 20), |
23 | | - amplitudes = intArrayOf(0, 150, 0, 200, 0, 255), |
24 | | - oldFallback = longArrayOf(0, 20, 50, 20, 50, 20) |
| 21 | + timings = longArrayOf(0, 40, 70, 40, 70, 45), |
| 22 | + amplitudes = intArrayOf(0, 160, 0, 200, 0, 255), |
| 23 | + oldFallback = longArrayOf(0, 40, 70, 40, 70, 45) |
25 | 24 | ) |
26 | 25 | ) |
27 | 26 |
|
28 | 27 | private val impactTypes = mapOf( |
29 | 28 | "light" to HapticsVibrationType( |
30 | | - timings = longArrayOf(0, 20), |
31 | | - amplitudes = intArrayOf(0, 110), |
32 | | - oldFallback = longArrayOf(0, 20) |
| 29 | + timings = longArrayOf(0, 35), |
| 30 | + amplitudes = intArrayOf(0, 130), |
| 31 | + oldFallback = longArrayOf(0, 35) |
33 | 32 | ), |
34 | 33 | "soft" to HapticsVibrationType( |
35 | | - timings = longArrayOf(0, 50), |
36 | | - amplitudes = intArrayOf(0, 100), |
37 | | - oldFallback = longArrayOf(0, 50) |
| 34 | + timings = longArrayOf(0, 20, 0, 45), |
| 35 | + amplitudes = intArrayOf(0, 80, 0, 140), |
| 36 | + oldFallback = longArrayOf(0, 65) |
38 | 37 | ), |
39 | 38 | "medium" to HapticsVibrationType( |
40 | | - timings = longArrayOf(0, 40), |
| 39 | + timings = longArrayOf(0, 45), |
41 | 40 | amplitudes = intArrayOf(0, 180), |
42 | | - oldFallback = longArrayOf(0, 40) |
| 41 | + oldFallback = longArrayOf(0, 45) |
43 | 42 | ), |
44 | 43 | "rigid" to HapticsVibrationType( |
45 | | - timings = longArrayOf(0, 30), |
46 | | - amplitudes = intArrayOf(0, 220), |
47 | | - oldFallback = longArrayOf(0, 30) |
| 44 | + timings = longArrayOf(0, 35), |
| 45 | + amplitudes = intArrayOf(0, 240), |
| 46 | + oldFallback = longArrayOf(0, 35) |
48 | 47 | ), |
49 | 48 | "heavy" to HapticsVibrationType( |
50 | | - timings = longArrayOf(0, 60), |
51 | | - amplitudes = intArrayOf(0, 255), |
52 | | - oldFallback = longArrayOf(0, 60) |
| 49 | + timings = longArrayOf(0, 50, 0, 35), |
| 50 | + amplitudes = intArrayOf(0, 255, 0, 180), |
| 51 | + oldFallback = longArrayOf(0, 85) |
53 | 52 | ) |
54 | 53 | ) |
55 | 54 |
|
@@ -85,12 +84,12 @@ object HapticsUtils { |
85 | 84 |
|
86 | 85 | fun getSelectionType(): HapticsVibrationType = |
87 | 86 | HapticsVibrationType( |
88 | | - timings = longArrayOf(0, 10), |
89 | | - amplitudes = intArrayOf(0, 90), |
90 | | - oldFallback = longArrayOf(0, 10) |
| 87 | + timings = longArrayOf(0, 35), |
| 88 | + amplitudes = intArrayOf(0, 110), |
| 89 | + oldFallback = longArrayOf(0, 35) |
91 | 90 | ) |
92 | 91 |
|
93 | | - fun getAndroidHapticsType(type: String): Int { |
| 92 | + fun getAndroidHapticsType(type: String): Int { |
94 | 93 | val hapticInfo = ALL_HAPTIC_TYPES[type] |
95 | 94 | ?: throw IllegalArgumentException( |
96 | 95 | "'type' must be one of ${ALL_HAPTIC_TYPES.keys.joinToString()}. Obtained '$type'." |
|
0 commit comments