[go: nahoru, domu]

Rename InputField to TextField

Also rename EditorState to EditorModel since it is not an state
of anything.

Bug: 113819017
Test: ./gradlew test
Change-Id: Iaf48092e0c85cf26e20e937098d3d09fa928d184
diff --git a/ui/ui-platform/src/main/java/androidx/ui/core/input/TextInputServiceAndroid.kt b/ui/ui-platform/src/main/java/androidx/ui/core/input/TextInputServiceAndroid.kt
index 0989de0..e77e070 100644
--- a/ui/ui-platform/src/main/java/androidx/ui/core/input/TextInputServiceAndroid.kt
+++ b/ui/ui-platform/src/main/java/androidx/ui/core/input/TextInputServiceAndroid.kt
@@ -24,7 +24,7 @@
 import android.view.inputmethod.InputMethodManager
 import androidx.ui.engine.geometry.Rect
 import androidx.ui.input.EditOperation
-import androidx.ui.input.EditorState
+import androidx.ui.input.EditorModel
 import androidx.ui.input.ImeAction
 import androidx.ui.input.InputEventListener
 import androidx.ui.input.KeyboardType
@@ -86,14 +86,14 @@
     fun isEditorFocused(): Boolean = editorHasFocus
 
     override fun startInput(
-        initState: EditorState,
+        initModel: EditorModel,
         keyboardType: KeyboardType,
         imeAction: ImeAction,
         onEditCommand: (List<EditOperation>) -> Unit,
         onImeActionPerformed: (ImeAction) -> Unit
     ) {
         editorHasFocus = true
-        state = initState.toInputState()
+        state = initModel.toInputState()
         this.keyboardType = keyboardType
         this.imeAction = imeAction
         this.>
@@ -118,8 +118,8 @@
         imm.showSoftInput(view, 0)
     }
 
-    override fun onStateUpdated(state: EditorState) {
-        this.state = state.toInputState()
+    override fun onStateUpdated(model: EditorModel) {
+        this.state = model.toInputState()
         ic?.updateInputState(this.state, imm, view)
     }
 
@@ -178,7 +178,7 @@
     }
 }
 
-private fun EditorState.toInputState(): InputState =
+private fun EditorModel.toInputState(): InputState =
     InputState(
         text = text, // TODO(nona): call toString once AnnotatedString is in use.
         selection = selection,