Skip to content

Commit 7b670ff

Browse files
committed
Use updated platform ime options API in SkikoUITextInputTraits
1 parent 1aa60cb commit 7b670ff

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

compose/ui/ui/src/uikitMain/kotlin/androidx/compose/ui/platform/SkikoUITextInputTraits.uikit.kt

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,20 @@
1616

1717
package androidx.compose.ui.platform
1818

19+
import androidx.compose.ui.text.input.DefaultPlatformImeOptions
1920
import androidx.compose.ui.text.input.ImeAction
2021
import androidx.compose.ui.text.input.ImeOptions
2122
import androidx.compose.ui.text.input.KeyboardCapitalization
2223
import androidx.compose.ui.text.input.KeyboardType
23-
import androidx.compose.ui.text.input.PlatformImeOptions
24+
import androidx.compose.ui.text.input.autocapitalizationType
25+
import androidx.compose.ui.text.input.autocorrectionType
26+
import androidx.compose.ui.text.input.enablesReturnKeyAutomatically
27+
import androidx.compose.ui.text.input.hasExplicitTextContentType
28+
import androidx.compose.ui.text.input.isSecureTextEntry
29+
import androidx.compose.ui.text.input.keyboardAppearance
30+
import androidx.compose.ui.text.input.keyboardType
31+
import androidx.compose.ui.text.input.returnKeyType
32+
import androidx.compose.ui.text.input.textContentType
2433
import platform.UIKit.UIKeyboardAppearance
2534
import platform.UIKit.UIKeyboardAppearanceDefault
2635
import platform.UIKit.UIKeyboardType
@@ -38,10 +47,6 @@ import platform.UIKit.UITextContentType
3847
import platform.UIKit.UITextContentTypeEmailAddress
3948
import platform.UIKit.UITextContentTypePassword
4049
import platform.UIKit.UITextContentTypeTelephoneNumber
41-
import platform.UIKit.UITextSmartDashesType
42-
import platform.UIKit.UITextSmartInsertDeleteType
43-
import platform.UIKit.UITextSmartQuotesType
44-
import platform.UIKit.UITextSpellCheckingType
4550

4651
internal interface SkikoUITextInputTraits {
4752
fun keyboardType(): UIKeyboardType =
@@ -93,7 +98,7 @@ internal fun getUITextInputTraits(currentImeOptions: ImeOptions?) =
9398
}
9499

95100
override fun keyboardAppearance(): UIKeyboardAppearance {
96-
return currentImeOptions?.platformImeOptions?.keyboardAppearance ?: PlatformImeOptions.Default.keyboardAppearance
101+
return currentImeOptions?.platformImeOptions?.keyboardAppearance ?: DefaultPlatformImeOptions.keyboardAppearance
97102
}
98103

99104
override fun returnKeyType(): UIReturnKeyType {
@@ -141,7 +146,7 @@ internal fun getUITextInputTraits(currentImeOptions: ImeOptions?) =
141146
}
142147

143148
override fun enablesReturnKeyAutomatically(): Boolean {
144-
return currentImeOptions?.platformImeOptions?.enablesReturnKeyAutomatically ?: PlatformImeOptions.Default.enablesReturnKeyAutomatically
149+
return currentImeOptions?.platformImeOptions?.enablesReturnKeyAutomatically ?: DefaultPlatformImeOptions.enablesReturnKeyAutomatically
145150
}
146151

147152
override fun autocapitalizationType(): UITextAutocapitalizationType {

0 commit comments

Comments
 (0)