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

Fix Android layout widget redeclarations

Browse Source
This commit is contained in:
Yan Zhulanow
2015-03-20 21:24:43 +03:00
parent c40598b3e9
commit a4dc6870dc
17 changed files with 224 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/AndroidManifest.xml
+33
View File
@@ -0,0 +1,33 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.myapp"
android:versionCode="1"
android:versionName="1.0" >
<uses-permission android:name="android.permission.READ_CONTACTS"/>
<uses-sdk
android:minSdkVersion="18"
android:targetSdkVersion="18" />
<permission android:name="android"></permission>
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/Theme.Sample" >
<activity
android:name="com.example.android.basiccontactables.MainActivity"
android:label="@string/app_name"
android:launchMode="singleTop">
<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable" />
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/layout.kt
+14
View File
@@ -0,0 +1,14 @@
package kotlinx.android.synthetic.layout
import android.app.Activity
import android.app.Fragment
import android.view.View
import android.widget.*
import kotlin.internal.flexible.ft
val Activity.button: ft<View, View?>
get() = findViewById(0) : View
val Fragment.button: ft<View, View?>
get() = getView().findViewById(0) : View
plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/layout1.kt
+11
View File
@@ -0,0 +1,11 @@
package kotlinx.android.synthetic.layout.view
import android.app.Activity
import android.app.Fragment
import android.view.View
import android.widget.*
import kotlin.internal.flexible.ft
val View.button: ft<View, View?>
get() = findViewById(0) : View
plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/res/layout-hdpi/layout.xml
+10
View File
@@ -0,0 +1,10 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<FrameLayout
android:id="@+id/button"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</FrameLayout>
plugins/android-compiler-plugin/testData/android/converter/simple/layoutVariants/res/layout/layout.xml
+10
View File
@@ -0,0 +1,10 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<Button
android:id="@+id/button"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</FrameLayout>
plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/AndroidManifest.xml
+33
View File
@@ -0,0 +1,33 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.myapp"
android:versionCode="1"
android:versionName="1.0" >
<uses-permission android:name="android.permission.READ_CONTACTS"/>
<uses-sdk
android:minSdkVersion="18"
android:targetSdkVersion="18" />
<permission android:name="android"></permission>
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/Theme.Sample" >
<activity
android:name="com.example.android.basiccontactables.MainActivity"
android:label="@string/app_name"
android:launchMode="singleTop">
<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable" />
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>
plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/layout.kt
+20
View File
@@ -0,0 +1,20 @@
package kotlinx.android.synthetic.layout
import android.app.Activity
import android.app.Fragment
import android.view.View
import android.widget.*
import kotlin.internal.flexible.ft
val Activity.textView1: ft<View, View?>
get() = findViewById(0) : View
val Fragment.textView1: ft<View, View?>
get() = getView().findViewById(0) : View
val Activity.textView2: ft<TextView, TextView?>
get() = findViewById(0) as TextView
val Fragment.textView2: ft<TextView, TextView?>
get() = getView().findViewById(0) as TextView
plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/layout1.kt
+14
View File
@@ -0,0 +1,14 @@
package kotlinx.android.synthetic.layout.view
import android.app.Activity
import android.app.Fragment
import android.view.View
import android.widget.*
import kotlin.internal.flexible.ft
val View.textView1: ft<View, View?>
get() = findViewById(0) : View
val View.textView2: ft<TextView, TextView?>
get() = findViewById(0) as TextView
plugins/android-compiler-plugin/testData/android/converter/simple/sameIds/res/layout/layout.xml
+25
View File
@@ -0,0 +1,25 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<Button
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</FrameLayout>