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

Android synthetic properties are now properties with flexible type

Browse Source
This commit is contained in:
Yan Zhulanow
2015-03-16 20:33:52 +03:00
parent 01c79c6d00
commit e56d67f4b8
11 changed files with 65 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/layout.kt
+9 -8
View File
@@ -4,28 +4,29 @@ import android.app.Activity
import android.app.Fragment
import android.view.View
import android.widget.*
import kotlin.internal.flexible.ft
val Activity.item_detail_container: FrameLayout
val Activity.item_detail_container: ft<FrameLayout, FrameLayout?>
get() = findViewById(0) as FrameLayout
val Fragment.item_detail_container: FrameLayout
val Fragment.item_detail_container: ft<FrameLayout, FrameLayout?>
get() = getView().findViewById(0) as FrameLayout
val Activity.textView1: TextView
val Activity.textView1: ft<TextView, TextView?>
get() = findViewById(0) as TextView
val Fragment.textView1: TextView
val Fragment.textView1: ft<TextView, TextView?>
get() = getView().findViewById(0) as TextView
val Activity.password: EditText
val Activity.password: ft<EditText, EditText?>
get() = findViewById(0) as EditText
val Fragment.password: EditText
val Fragment.password: ft<EditText, EditText?>
get() = getView().findViewById(0) as EditText
val Activity.login: Button
val Activity.login: ft<Button, Button?>
get() = findViewById(0) as Button
val Fragment.login: Button
val Fragment.login: ft<Button, Button?>
get() = getView().findViewById(0) as Button
plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/layout1.kt
+5 -4
View File
@@ -4,16 +4,17 @@ import android.app.Activity
import android.app.Fragment
import android.view.View
import android.widget.*
import kotlin.internal.flexible.ft
val View.item_detail_container: FrameLayout
val View.item_detail_container: ft<FrameLayout, FrameLayout?>
get() = findViewById(0) as FrameLayout
val View.textView1: TextView
val View.textView1: ft<TextView, TextView?>
get() = findViewById(0) as TextView
val View.password: EditText
val View.password: ft<EditText, EditText?>
get() = findViewById(0) as EditText
val View.login: Button
val View.login: ft<Button, Button?>
get() = findViewById(0) as Button
plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/layout2.kt
+9 -8
View File
@@ -4,28 +4,29 @@ import android.app.Activity
import android.app.Fragment
import android.view.View
import android.widget.*
import kotlin.internal.flexible.ft
val Activity.frameLayout: FrameLayout
val Activity.frameLayout: ft<FrameLayout, FrameLayout?>
get() = findViewById(0) as FrameLayout
val Fragment.frameLayout: FrameLayout
val Fragment.frameLayout: ft<FrameLayout, FrameLayout?>
get() = getView().findViewById(0) as FrameLayout
val Activity.passwordField: TextView
val Activity.passwordField: ft<TextView, TextView?>
get() = findViewById(0) as TextView
val Fragment.passwordField: TextView
val Fragment.passwordField: ft<TextView, TextView?>
get() = getView().findViewById(0) as TextView
val Activity.passwordCaption: EditText
val Activity.passwordCaption: ft<EditText, EditText?>
get() = findViewById(0) as EditText
val Fragment.passwordCaption: EditText
val Fragment.passwordCaption: ft<EditText, EditText?>
get() = getView().findViewById(0) as EditText
val Activity.loginButton: Button
val Activity.loginButton: ft<Button, Button?>
get() = findViewById(0) as Button
val Fragment.loginButton: Button
val Fragment.loginButton: ft<Button, Button?>
get() = getView().findViewById(0) as Button
plugins/android-compiler-plugin/testData/android/converter/simple/multiFile/layout3.kt
+5 -4
View File
@@ -4,16 +4,17 @@ import android.app.Activity
import android.app.Fragment
import android.view.View
import android.widget.*
import kotlin.internal.flexible.ft
val View.frameLayout: FrameLayout
val View.frameLayout: ft<FrameLayout, FrameLayout?>
get() = findViewById(0) as FrameLayout
val View.passwordField: TextView
val View.passwordField: ft<TextView, TextView?>
get() = findViewById(0) as TextView
val View.passwordCaption: EditText
val View.passwordCaption: ft<EditText, EditText?>
get() = findViewById(0) as EditText
val View.loginButton: Button
val View.loginButton: ft<Button, Button?>
get() = findViewById(0) as Button