diff --git a/anko/library/generated/cardview-v7/src/Layouts.kt b/anko/library/generated/cardview-v7/src/Layouts.kt index b8c3a515..ecc2852d 100644 --- a/anko/library/generated/cardview-v7/src/Layouts.kt +++ b/anko/library/generated/cardview-v7/src/Layouts.kt @@ -2,5 +2,130 @@ package org.jetbrains.anko.cardview.v7 -private val defaultInit: Any.() -> Unit = {} +import android.content.Context +import android.util.AttributeSet +import android.view.ViewGroup +import android.widget.FrameLayout +import android.support.v7.widget.CardView +import android.view.View + +open class _CardView(ctx: Context): CardView(ctx) { + + inline fun T.lparams( + c: Context?, + attrs: AttributeSet?, + init: FrameLayout.LayoutParams.() -> Unit + ): T { + val layoutParams = FrameLayout.LayoutParams(c!!, attrs!!) + layoutParams.init() + this@lparams.layoutParams = layoutParams + return this + } + + inline fun T.lparams( + c: Context?, + attrs: AttributeSet? + ): T { + val layoutParams = FrameLayout.LayoutParams(c!!, attrs!!) + this@lparams.layoutParams = layoutParams + return this + } + + inline fun T.lparams( + width: Int = android.view.ViewGroup.LayoutParams.WRAP_CONTENT, + height: Int = android.view.ViewGroup.LayoutParams.WRAP_CONTENT, + init: FrameLayout.LayoutParams.() -> Unit + ): T { + val layoutParams = FrameLayout.LayoutParams(width, height) + layoutParams.init() + this@lparams.layoutParams = layoutParams + return this + } + + inline fun T.lparams( + width: Int = android.view.ViewGroup.LayoutParams.WRAP_CONTENT, + height: Int = android.view.ViewGroup.LayoutParams.WRAP_CONTENT + ): T { + val layoutParams = FrameLayout.LayoutParams(width, height) + this@lparams.layoutParams = layoutParams + return this + } + + inline fun T.lparams( + width: Int = android.view.ViewGroup.LayoutParams.WRAP_CONTENT, + height: Int = android.view.ViewGroup.LayoutParams.WRAP_CONTENT, + gravity: Int, + init: FrameLayout.LayoutParams.() -> Unit + ): T { + val layoutParams = FrameLayout.LayoutParams(width, height, gravity) + layoutParams.init() + this@lparams.layoutParams = layoutParams + return this + } + + inline fun T.lparams( + width: Int = android.view.ViewGroup.LayoutParams.WRAP_CONTENT, + height: Int = android.view.ViewGroup.LayoutParams.WRAP_CONTENT, + gravity: Int + ): T { + val layoutParams = FrameLayout.LayoutParams(width, height, gravity) + this@lparams.layoutParams = layoutParams + return this + } + + inline fun T.lparams( + source: ViewGroup.LayoutParams?, + init: FrameLayout.LayoutParams.() -> Unit + ): T { + val layoutParams = FrameLayout.LayoutParams(source!!) + layoutParams.init() + this@lparams.layoutParams = layoutParams + return this + } + + inline fun T.lparams( + source: ViewGroup.LayoutParams? + ): T { + val layoutParams = FrameLayout.LayoutParams(source!!) + this@lparams.layoutParams = layoutParams + return this + } + + inline fun T.lparams( + source: ViewGroup.MarginLayoutParams?, + init: FrameLayout.LayoutParams.() -> Unit + ): T { + val layoutParams = FrameLayout.LayoutParams(source!!) + layoutParams.init() + this@lparams.layoutParams = layoutParams + return this + } + + inline fun T.lparams( + source: ViewGroup.MarginLayoutParams? + ): T { + val layoutParams = FrameLayout.LayoutParams(source!!) + this@lparams.layoutParams = layoutParams + return this + } + + inline fun T.lparams( + source: FrameLayout.LayoutParams?, + init: FrameLayout.LayoutParams.() -> Unit + ): T { + val layoutParams = FrameLayout.LayoutParams(source!!) + layoutParams.init() + this@lparams.layoutParams = layoutParams + return this + } + + inline fun T.lparams( + source: FrameLayout.LayoutParams? + ): T { + val layoutParams = FrameLayout.LayoutParams(source!!) + this@lparams.layoutParams = layoutParams + return this + } + +} diff --git a/anko/library/generated/cardview-v7/src/Views.kt b/anko/library/generated/cardview-v7/src/Views.kt index c4214abc..a9e211d2 100644 --- a/anko/library/generated/cardview-v7/src/Views.kt +++ b/anko/library/generated/cardview-v7/src/Views.kt @@ -12,37 +12,37 @@ import android.os.Build import android.widget.* @PublishedApi -internal object `$$Anko$Factories$CardviewV7View` { - val CARD_VIEW = { ctx: Context -> android.support.v7.widget.CardView(ctx) } +internal object `$$Anko$Factories$CardviewV7ViewGroup` { + val CARD_VIEW = { ctx: Context -> _CardView(ctx) } } inline fun ViewManager.cardView(): android.support.v7.widget.CardView = cardView() {} -inline fun ViewManager.cardView(init: (@AnkoViewDslMarker android.support.v7.widget.CardView).() -> Unit): android.support.v7.widget.CardView { - return ankoView(`$$Anko$Factories$CardviewV7View`.CARD_VIEW, theme = 0) { init() } +inline fun ViewManager.cardView(init: (@AnkoViewDslMarker _CardView).() -> Unit): android.support.v7.widget.CardView { + return ankoView(`$$Anko$Factories$CardviewV7ViewGroup`.CARD_VIEW, theme = 0) { init() } } inline fun ViewManager.themedCardView(theme: Int = 0): android.support.v7.widget.CardView = themedCardView(theme) {} -inline fun ViewManager.themedCardView(theme: Int = 0, init: (@AnkoViewDslMarker android.support.v7.widget.CardView).() -> Unit): android.support.v7.widget.CardView { -return ankoView(`$$Anko$Factories$CardviewV7View`.CARD_VIEW, theme) { init() } +inline fun ViewManager.themedCardView(theme: Int = 0, init: (@AnkoViewDslMarker _CardView).() -> Unit): android.support.v7.widget.CardView { +return ankoView(`$$Anko$Factories$CardviewV7ViewGroup`.CARD_VIEW, theme) { init() } } inline fun Context.cardView(): android.support.v7.widget.CardView = cardView() {} -inline fun Context.cardView(init: (@AnkoViewDslMarker android.support.v7.widget.CardView).() -> Unit): android.support.v7.widget.CardView { - return ankoView(`$$Anko$Factories$CardviewV7View`.CARD_VIEW, theme = 0) { init() } +inline fun Context.cardView(init: (@AnkoViewDslMarker _CardView).() -> Unit): android.support.v7.widget.CardView { + return ankoView(`$$Anko$Factories$CardviewV7ViewGroup`.CARD_VIEW, theme = 0) { init() } } inline fun Context.themedCardView(theme: Int = 0): android.support.v7.widget.CardView = themedCardView(theme) {} -inline fun Context.themedCardView(theme: Int = 0, init: (@AnkoViewDslMarker android.support.v7.widget.CardView).() -> Unit): android.support.v7.widget.CardView { -return ankoView(`$$Anko$Factories$CardviewV7View`.CARD_VIEW, theme) { init() } +inline fun Context.themedCardView(theme: Int = 0, init: (@AnkoViewDslMarker _CardView).() -> Unit): android.support.v7.widget.CardView { +return ankoView(`$$Anko$Factories$CardviewV7ViewGroup`.CARD_VIEW, theme) { init() } } inline fun Activity.cardView(): android.support.v7.widget.CardView = cardView() {} -inline fun Activity.cardView(init: (@AnkoViewDslMarker android.support.v7.widget.CardView).() -> Unit): android.support.v7.widget.CardView { - return ankoView(`$$Anko$Factories$CardviewV7View`.CARD_VIEW, theme = 0) { init() } +inline fun Activity.cardView(init: (@AnkoViewDslMarker _CardView).() -> Unit): android.support.v7.widget.CardView { + return ankoView(`$$Anko$Factories$CardviewV7ViewGroup`.CARD_VIEW, theme = 0) { init() } } inline fun Activity.themedCardView(theme: Int = 0): android.support.v7.widget.CardView = themedCardView(theme) {} -inline fun Activity.themedCardView(theme: Int = 0, init: (@AnkoViewDslMarker android.support.v7.widget.CardView).() -> Unit): android.support.v7.widget.CardView { -return ankoView(`$$Anko$Factories$CardviewV7View`.CARD_VIEW, theme) { init() } +inline fun Activity.themedCardView(theme: Int = 0, init: (@AnkoViewDslMarker _CardView).() -> Unit): android.support.v7.widget.CardView { +return ankoView(`$$Anko$Factories$CardviewV7ViewGroup`.CARD_VIEW, theme) { init() } } diff --git a/anko/props/annotations/android/support/v7/widget/annotations.xml b/anko/props/annotations/android/support/v7/widget/annotations.xml index 97d21d66..69b4d946 100644 --- a/anko/props/annotations/android/support/v7/widget/annotations.xml +++ b/anko/props/annotations/android/support/v7/widget/annotations.xml @@ -2,4 +2,7 @@ + + + \ No newline at end of file