Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve View DSL Design layout parameters extensions #38

Merged
merged 5 commits into from
Mar 3, 2018
Merged

Improve View DSL Design layout parameters extensions #38

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a21e08
Rename lParams to defaultLParams in View DSL Design
LouisCAD Mar 3, 2018
70e1928
Improve CollapsingToolbarLayout lParams extensions
LouisCAD Mar 3, 2018
731bbdd
Add AppBarLayout scrollFlags extensions
LouisCAD Mar 3, 2018
68589d3
Add CoordinatorLayout common layout params extensions
LouisCAD Mar 3, 2018
2def91d
Remove unused appBarLParams private property
LouisCAD Mar 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Rename lParams to defaultLParams in View DSL Design
  • Loading branch information
@LouisCAD
LouisCAD committed Mar 3, 2018
commit 8a21e086a4ad7a4c2866f2f798c8db5493d5938e
10 changes: 5 additions & 5 deletions sample/src/main/java/xyz/louiscad/splittiessample/demo/DemoUi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import splitties.viewdsl.core.add
import splitties.viewdsl.core.margin
import splitties.viewdsl.core.matchParent
import splitties.viewdsl.core.v
import splitties.viewdsl.design.lParams
import splitties.viewdsl.design.defaultLParams
import splitties.views.appcompat.Toolbar
import splitties.views.imageResource
import splitties.views.setPaddingDp
Expand All @@ -49,19 +49,19 @@ class DemoUi(override val ctx: DemoActivity) : Ui {

override val root = v(::CoordinatorLayout) {
fitsSystemWindows = true
add(::AppBarLayout, R.id.app_bar, R.style.AppTheme_AppBarOverlay, lParams(width = matchParent)) {
add(::Toolbar, lParams {
add(::AppBarLayout, R.id.app_bar, R.style.AppTheme_AppBarOverlay, defaultLParams(width = matchParent)) {
add(::Toolbar, defaultLParams {
scrollFlags = SCROLL_FLAG_ENTER_ALWAYS
}) {
subtitle = txt(R.string.subtitle_items_count_hint)
popupTheme = R.style.AppTheme_PopupOverlay
ctx.setSupportActionBar(this)
}
}
add(recyclerView, lParams(width = matchParent, height = matchParent) {
add(recyclerView, defaultLParams(width = matchParent, height = matchParent) {
behavior = AppBarLayout.ScrollingViewBehavior()
})
add(fab, lParams(gravity = Gravity.BOTTOM or Gravity.END) {
add(fab, defaultLParams(gravity = Gravity.BOTTOM or Gravity.END) {
margin = dip(16)
})
}
Expand Down
12 changes: 6 additions & 6 deletions sample/src/main/java/xyz/louiscad/splittiessample/main/MainUi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ import splitties.viewdsl.core.margin
import splitties.viewdsl.core.matchParent
import splitties.viewdsl.core.v
import splitties.viewdsl.core.verticalLayout
import splitties.viewdsl.design.defaultLParams
import splitties.views.appcompat.Toolbar
import splitties.views.imageResource
import splitties.views.setCompoundDrawables
import splitties.views.textResource
import xyz.louiscad.splittiessample.R
import splitties.viewdsl.design.lParams as dLParams

class MainUi(override val ctx: MainActivity) : Ui {

Expand Down Expand Up @@ -86,24 +86,24 @@ class MainUi(override val ctx: MainActivity) : Ui {
override val root = v(::CoordinatorLayout) {
fitsSystemWindows = true
add(::AppBarLayout, R.id.app_bar, R.style.AppTheme_AppBarOverlay,
dLParams(width = matchParent, height = dip(180))) {
add(::CollapsingToolbarLayout, dLParams(height = matchParent) {
defaultLParams(width = matchParent, height = dip(180))) {
add(::CollapsingToolbarLayout, defaultLParams(height = matchParent) {
scrollFlags = SCROLL_FLAG_SCROLL or SCROLL_FLAG_EXIT_UNTIL_COLLAPSED
}) {
fitsSystemWindows = true
setContentScrimColor(styledColor(R.attr.colorPrimary))
add(::Toolbar, dLParams(height = styledDimenPxSize(R.attr.actionBarSize)) {
add(::Toolbar, defaultLParams(height = styledDimenPxSize(R.attr.actionBarSize)) {
collapseMode = COLLAPSE_MODE_PIN
}) {
ctx.setSupportActionBar(this)
popupTheme = R.style.AppTheme_PopupOverlay
}
}
}
add(content, dLParams(width = matchParent, height = matchParent) {
add(content, defaultLParams(width = matchParent, height = matchParent) {
behavior = AppBarLayout.ScrollingViewBehavior()
})
add(fab, dLParams {
add(fab, defaultLParams {
anchorId = R.id.app_bar
anchorGravity = Gravity.BOTTOM or Gravity.END
margin = dip(16)
Expand Down
4 changes: 2 additions & 2 deletions viewdsl-design/src/main/java/splitties/viewdsl/design/AppBarLayout.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ import android.support.design.widget.AppBarLayout
import splitties.viewdsl.core.matchParent
import splitties.viewdsl.core.wrapContent

inline fun AppBarLayout.lParams(
inline fun AppBarLayout.defaultLParams(
width: Int = matchParent,
height: Int = wrapContent,
initParams: AppBarLayout.LayoutParams.() -> Unit
) = AppBarLayout.LayoutParams(width, height).apply(initParams)

inline fun AppBarLayout.lParams(
inline fun AppBarLayout.defaultLParams(
width: Int = matchParent,
height: Int = wrapContent
) = AppBarLayout.LayoutParams(width, height)
6 changes: 3 additions & 3 deletions viewdsl-design/src/main/java/splitties/viewdsl/design/CollapsingToolbarLayout.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ import android.support.design.widget.CollapsingToolbarLayout
import splitties.viewdsl.core.matchParent
import splitties.viewdsl.core.wrapContent

inline fun CollapsingToolbarLayout.lParams(
inline fun CollapsingToolbarLayout.defaultLParams(
width: Int = matchParent,
height: Int = wrapContent,
initParams: CollapsingToolbarLayout.LayoutParams.() -> Unit
) = CollapsingToolbarLayout.LayoutParams(width, height).apply(initParams)

inline fun CollapsingToolbarLayout.lParams(
inline fun CollapsingToolbarLayout.defaultLParams(
width: Int = matchParent,
height: Int = wrapContent,
collapseMode: Int
) = CollapsingToolbarLayout.LayoutParams(width, height).also { it.collapseMode = collapseMode }

inline fun CollapsingToolbarLayout.lParams(
inline fun CollapsingToolbarLayout.defaultLParams(
width: Int = matchParent,
height: Int = wrapContent
) = CollapsingToolbarLayout.LayoutParams(width, height)
6 changes: 3 additions & 3 deletions viewdsl-design/src/main/java/splitties/viewdsl/design/CoordinatorLayout.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@ import android.support.design.widget.CoordinatorLayout
import android.view.Gravity
import splitties.viewdsl.core.wrapContent

inline fun CoordinatorLayout.lParams(
inline fun CoordinatorLayout.defaultLParams(
width: Int = wrapContent,
height: Int = wrapContent,
gravity: Int = Gravity.NO_GRAVITY,
initParams: CoordinatorLayout.LayoutParams.() -> Unit
) = CoordinatorLayout.LayoutParams(width, height).also { it.gravity = gravity }.apply(initParams)

inline fun CoordinatorLayout.lParams(
inline fun CoordinatorLayout.defaultLParams(
width: Int = wrapContent,
height: Int = wrapContent,
gravity: Int = Gravity.NO_GRAVITY
) = CoordinatorLayout.LayoutParams(width, height).also { it.gravity = gravity }

inline fun CoordinatorLayout.lParams(
inline fun CoordinatorLayout.defaultLParams(
width: Int = wrapContent,
height: Int = wrapContent
) = CoordinatorLayout.LayoutParams(width, height)