azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix overrides of the findViewById in android tests for platform 26

Browse Source
This commit is contained in:
Ilya Chernikov
2017-11-30 14:49:16 +01:00
committed by Vyacheslav Gerasimov
parent 587f76251e
commit 7120fe190a
13 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/0.kt
Vendored
+4 -4
View File
@@ -19,17 +19,17 @@ class MyActivity(): Activity() {
val containerWidget = object : FrameLayout(this) {
val loginWidget = Button(this@MyActivity)
override fun findViewById(id: Int): View? {
override fun <T : View> findViewById(id: Int): T? {
return when (id) {
R.id.login -> loginWidget
R.id.login -> loginWidget as T
else -> null
}
}
}
override fun findViewById(id: Int): View? {
override fun <T : View> findViewById(id: Int): T? {
return when (id) {
R.id.container -> containerWidget
R.id.container -> containerWidget as T
else -> null
}
}
plugins/android-extensions/android-extensions-compiler/testData/codegen/android/view/1.kt
Vendored
+2 -2
View File
@@ -20,9 +20,9 @@ class MyActivity(): Activity() {
val loginWidget = Button(this@MyActivity)
}
override fun findViewById(id: Int): View? {
override fun <T : View> findViewById(id: Int): T? {
return when (id) {
R.id.container -> containerWidget
R.id.container -> containerWidget as T
else -> null
}
}