forked from androidx/androidx
-
Notifications
You must be signed in to change notification settings - Fork 70
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support
HapticFeedback
on iOS (#1255)
## Proposed Changes Bridge `HapticFeedback` interface with `UIFeedbackGenerator`s, provide the constructed bridge as static composition local. ## Testing Test: APIs that request a haptic feedback should trigger one on iOS (text selection, on-demand, etc) ## Issues Fixed Fixes: JetBrains/compose-multiplatform#4598
- Loading branch information
1 parent
7f4929c
commit fb98098
Showing
17 changed files
with
147 additions
and
24 deletions.
There are no files selected for viewing
54 changes: 54 additions & 0 deletions
54
...ose/mpp/demo/src/uikitMain/kotlin/androidx/compose/mpp/demo/IosSpecificFeaturesExample.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
/* | ||
* Copyright 2024 The Android Open Source Project | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package androidx.compose.mpp.demo | ||
|
||
import androidx.compose.foundation.layout.Column | ||
import androidx.compose.foundation.layout.Spacer | ||
import androidx.compose.foundation.layout.height | ||
import androidx.compose.foundation.layout.padding | ||
import androidx.compose.material.Button | ||
import androidx.compose.material.Text | ||
import androidx.compose.ui.Modifier | ||
import androidx.compose.ui.hapticfeedback.HapticFeedbackType | ||
import androidx.compose.ui.platform.LocalHapticFeedback | ||
import androidx.compose.ui.unit.dp | ||
|
||
val HapticFeedbackExample = Screen.Example("Haptic feedback") { | ||
val feedback = LocalHapticFeedback.current | ||
|
||
Column(modifier = Modifier.padding(16.dp)) { | ||
Button(onClick = { | ||
feedback.performHapticFeedback(HapticFeedbackType.TextHandleMove) | ||
}) { | ||
Text("TextHandleMove") | ||
} | ||
|
||
Spacer(Modifier.height(16.dp)) | ||
|
||
Button(onClick = { | ||
feedback.performHapticFeedback(HapticFeedbackType.LongPress) | ||
}) { | ||
Text("LongPress") | ||
} | ||
} | ||
} | ||
|
||
val IosSpecificFeatures = Screen.Selection( | ||
"iOS-specific features", | ||
NativeModalWithNaviationExample, | ||
HapticFeedbackExample, | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
...uikitMain/kotlin/SwiftUIInteropExample.kt → ...compose/mpp/demo/SwiftUIInteropExample.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
...ose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/hapticfeedback/HapticFeedback.uikit.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
/* | ||
* Copyright 2024 The Android Open Source Project | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package androidx.compose.ui.hapticfeedback | ||
|
||
import platform.UIKit.UIImpactFeedbackGenerator | ||
import platform.UIKit.UISelectionFeedbackGenerator | ||
|
||
// TODO: minor UX improvement, add `prepare()` calls when internal APIs are likely to use HapticFeedback | ||
// (e.g. pan started during the text selection) to reduce haptic feedback latency | ||
// see https://developer.apple.com/documentation/uikit/uifeedbackgenerator | ||
internal class CupertinoHapticFeedback : HapticFeedback { | ||
private val impactGenerator = UIImpactFeedbackGenerator() | ||
private val selectionGenerator = UISelectionFeedbackGenerator() | ||
|
||
override fun performHapticFeedback(hapticFeedbackType: HapticFeedbackType) { | ||
when (hapticFeedbackType) { | ||
HapticFeedbackType.LongPress -> impactGenerator.impactOccurred() | ||
HapticFeedbackType.TextHandleMove -> selectionGenerator.selectionChanged() | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters