Replace MATCH_PARENT and WRAP_CONTENT with Anko propertiers

mansonir · Mar 15, 2017 · e323750 · e323750
1 parent 2409e73
commit e323750
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/app/src/main/java/com/antonioleiva/bandhookkotlin/ui/adapter/ImageTitleAdapter.kt b/app/src/main/java/com/antonioleiva/bandhookkotlin/ui/adapter/ImageTitleAdapter.kt
@@ -61,9 +61,9 @@ class ImageTitleAdapter(listener: (ImageTitle) -> Unit)
                         setTextAppearanceC(R.style.TextAppearance_AppCompat_Subhead_Inverse)
                         maxLines = 1
                         ellipsize = TextUtils.TruncateAt.END
-                    }.lparams(width = MATCH_PARENT)
+                    }.lparams(width = matchParent)
 
-                }.lparams(width = MATCH_PARENT)
+                }.lparams(width = matchParent)
 
             }
         }

diff --git a/app/src/main/java/com/antonioleiva/bandhookkotlin/ui/screens/album/AlbumLayout.kt b/app/src/main/java/com/antonioleiva/bandhookkotlin/ui/screens/album/AlbumLayout.kt
@@ -28,10 +28,10 @@ class AlbumLayout : ActivityAnkoComponent<AlbumActivity> {
             image = squareImageView {
                 id = View.generateViewId()
                 backgroundResource = android.R.color.darker_gray
-            }.lparams(width = MATCH_PARENT)
+            }.lparams(width = matchParent)
 
             toolbar = toolbar(R.style.ThemeOverlay_AppCompat_Dark_ActionBar)
-                    .lparams(width = MATCH_PARENT) {
+                    .lparams(width = matchParent) {
                         topMargin = dimen(R.dimen.statusbar_height)
                     }
 

diff --git a/app/src/main/java/com/antonioleiva/bandhookkotlin/ui/screens/detail/ArtistLayout.kt b/app/src/main/java/com/antonioleiva/bandhookkotlin/ui/screens/detail/ArtistLayout.kt
@@ -12,8 +12,6 @@ import android.support.v4.view.ViewPager
 import android.support.v7.widget.Toolbar
 import android.view.Gravity
 import android.view.View
-import android.view.ViewGroup.LayoutParams.MATCH_PARENT
-import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
 import android.widget.ImageView
 import com.antonioleiva.bandhookkotlin.R
 import com.antonioleiva.bandhookkotlin.ui.activity.ActivityAnkoComponent
@@ -25,7 +23,9 @@ import org.jetbrains.anko.design.collapsingToolbarLayout
 import org.jetbrains.anko.design.coordinatorLayout
 import org.jetbrains.anko.design.tabLayout
 import org.jetbrains.anko.dip
+import org.jetbrains.anko.matchParent
 import org.jetbrains.anko.support.v4.viewPager
+import org.jetbrains.anko.wrapContent
 
 class ArtistLayout : ActivityAnkoComponent<ArtistActivity> {
 
@@ -51,29 +51,29 @@ class ArtistLayout : ActivityAnkoComponent<ArtistActivity> {
 
                     image = squareImageView {
                         fitsSystemWindows = true
-                    }.lparamsC(MATCH_PARENT) {
+                    }.lparamsC(matchParent) {
                         collapseMode = COLLAPSE_MODE_PARALLAX
                     }
 
                     toolbar = toolbar {
                         popupTheme = R.style.ThemeOverlay_AppCompat_Light
                         gravity = Gravity.TOP
                         titleMarginTop = dip(16)
-                    }.lparamsC(width = MATCH_PARENT, height = dip(88)) {
+                    }.lparamsC(width = matchParent, height = dip(88)) {
                         collapseMode = COLLAPSE_MODE_PIN
                     }
 
                     tabLayout = tabLayout {
                         setSelectedTabIndicatorColor(Color.WHITE)
-                    }.lparamsC(width = MATCH_PARENT) {
+                    }.lparamsC(width = matchParent) {
                         gravity = Gravity.BOTTOM
                     }
 
-                }.lparams(width = MATCH_PARENT) {
+                }.lparams(width = matchParent) {
                     scrollFlags = SCROLL_FLAG_SCROLL or SCROLL_FLAG_EXIT_UNTIL_COLLAPSED
                 }
 
-            }.lparams(width = MATCH_PARENT)
+            }.lparams(width = matchParent)
 
             viewPager = viewPager {
                 id = View.generateViewId()
@@ -88,7 +88,7 @@ class ArtistLayout : ActivityAnkoComponent<ArtistActivity> {
  * For some reason, the regular lparams is returning FrameLayout LayoutParams, instead of the ones
  * for CollapsingToolbarLayout. This fixes it.
  */
-private fun <T : android.view.View> T.lparamsC(width: kotlin.Int = WRAP_CONTENT, height: kotlin.Int = WRAP_CONTENT, init: CollapsingToolbarLayout.LayoutParams.() -> kotlin.Unit = {}): T {
+private fun <T : android.view.View> T.lparamsC(width: kotlin.Int = wrapContent, height: kotlin.Int = wrapContent, init: CollapsingToolbarLayout.LayoutParams.() -> kotlin.Unit = {}): T {
     val params = CollapsingToolbarLayout.LayoutParams(width, height)
     params.init()
     layoutParams = params

diff --git a/app/src/main/java/com/antonioleiva/bandhookkotlin/ui/screens/main/MainLayout.kt b/app/src/main/java/com/antonioleiva/bandhookkotlin/ui/screens/main/MainLayout.kt
@@ -4,7 +4,6 @@ import android.support.design.widget.AppBarLayout
 import android.support.design.widget.AppBarLayout.LayoutParams.*
 import android.support.v7.widget.RecyclerView
 import android.support.v7.widget.Toolbar
-import android.view.ViewGroup.LayoutParams.MATCH_PARENT
 import com.antonioleiva.bandhookkotlin.R
 import com.antonioleiva.bandhookkotlin.ui.activity.ActivityAnkoComponent
 import com.antonioleiva.bandhookkotlin.ui.custom.AutofitRecyclerView
@@ -15,6 +14,7 @@ import org.jetbrains.anko.appcompat.v7.toolbar
 import org.jetbrains.anko.backgroundResource
 import org.jetbrains.anko.design.appBarLayout
 import org.jetbrains.anko.design.coordinatorLayout
+import org.jetbrains.anko.matchParent
 
 class MainLayout : ActivityAnkoComponent<MainActivity> {
 
@@ -28,14 +28,14 @@ class MainLayout : ActivityAnkoComponent<MainActivity> {
             appBarLayout {
                 toolbar = toolbar(R.style.ThemeOverlay_AppCompat_Dark_ActionBar) {
                     backgroundResource = R.color.primary
-                }.lparams(width = MATCH_PARENT) {
+                }.lparams(width = matchParent) {
                     scrollFlags = SCROLL_FLAG_SNAP or SCROLL_FLAG_SCROLL or SCROLL_FLAG_ENTER_ALWAYS
                 }
-            }.lparams(width = MATCH_PARENT)
+            }.lparams(width = matchParent)
 
             recycler = autoFitRecycler()
                     .apply(AutofitRecyclerView::style)
-                    .lparams(MATCH_PARENT, MATCH_PARENT) {
+                    .lparams(matchParent, matchParent) {
                         behavior = AppBarLayout.ScrollingViewBehavior()
                     }
         }