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
Prev Previous commit
Next Next commit
Add CoordinatorLayout common layout params extensions 
New extension functions:
- appBarLParams(…)
- contentScrollingWithAppBarLParams(…)
  • Loading branch information
@LouisCAD
LouisCAD committed Mar 3, 2018
commit 68589d3d9f9a46c1247c59d19bd033a62281ca48
9 changes: 4 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 @@ -27,8 +27,9 @@ import splitties.resources.txt
import splitties.viewdsl.core.Ui
import splitties.viewdsl.core.add
import splitties.viewdsl.core.margin
import splitties.viewdsl.core.matchParent
import splitties.viewdsl.core.v
import splitties.viewdsl.design.appBarLParams
import splitties.viewdsl.design.contentScrollingWithAppBarLParams
import splitties.viewdsl.design.defaultLParams
import splitties.views.appcompat.Toolbar
import splitties.views.imageResource
Expand All @@ -49,7 +50,7 @@ class DemoUi(override val ctx: DemoActivity) : Ui {

override val root = v(::CoordinatorLayout) {
fitsSystemWindows = true
add(::AppBarLayout, R.id.app_bar, R.style.AppTheme_AppBarOverlay, defaultLParams(width = matchParent)) {
add(::AppBarLayout, R.id.app_bar, R.style.AppTheme_AppBarOverlay, appBarLParams()) {
add(::Toolbar, defaultLParams {
scrollFlags = SCROLL_FLAG_ENTER_ALWAYS
}) {
Expand All @@ -58,9 +59,7 @@ class DemoUi(override val ctx: DemoActivity) : Ui {
ctx.setSupportActionBar(this)
}
}
add(recyclerView, defaultLParams(width = matchParent, height = matchParent) {
behavior = AppBarLayout.ScrollingViewBehavior()
})
add(recyclerView, contentScrollingWithAppBarLParams())
add(fab, defaultLParams(gravity = Gravity.BOTTOM or Gravity.END) {
margin = dip(16)
})
Expand Down
9 changes: 4 additions & 5 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,6 +41,8 @@ import splitties.viewdsl.core.verticalLayout
import splitties.viewdsl.design.EXIT_UNTIL_COLLAPSED
import splitties.viewdsl.design.PIN
import splitties.viewdsl.design.SCROLL
import splitties.viewdsl.design.appBarLParams
import splitties.viewdsl.design.contentScrollingWithAppBarLParams
import splitties.viewdsl.design.defaultLParams
import splitties.views.appcompat.Toolbar
import splitties.views.imageResource
Expand Down Expand Up @@ -85,8 +87,7 @@ class MainUi(override val ctx: MainActivity) : Ui {

override val root = v(::CoordinatorLayout) {
fitsSystemWindows = true
add(::AppBarLayout, R.id.app_bar, R.style.AppTheme_AppBarOverlay,
defaultLParams(width = matchParent, height = dip(180))) {
add(::AppBarLayout, R.id.app_bar, R.style.AppTheme_AppBarOverlay, appBarLParams(dip(180))) {
add(::CollapsingToolbarLayout, defaultLParams(height = matchParent) {
scrollFlags = SCROLL or EXIT_UNTIL_COLLAPSED
}) {
Expand All @@ -99,9 +100,7 @@ class MainUi(override val ctx: MainActivity) : Ui {
}
}
}
add(content, defaultLParams(width = matchParent, height = matchParent) {
behavior = AppBarLayout.ScrollingViewBehavior()
})
add(content, contentScrollingWithAppBarLParams())
add(fab, defaultLParams {
anchorId = R.id.app_bar
anchorGravity = Gravity.BOTTOM or Gravity.END
Expand Down
20 changes: 20 additions & 0 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 @@ -18,8 +18,12 @@

package splitties.viewdsl.design

import android.support.design.widget.AppBarLayout
import android.support.design.widget.CoordinatorLayout
import android.view.Gravity
import android.view.ViewGroup.LayoutParams.MATCH_PARENT
import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
import splitties.viewdsl.core.matchParent
import splitties.viewdsl.core.wrapContent

inline fun CoordinatorLayout.defaultLParams(
Expand All @@ -39,3 +43,19 @@ inline fun CoordinatorLayout.defaultLParams(
width: Int = wrapContent,
height: Int = wrapContent
) = CoordinatorLayout.LayoutParams(width, height)

inline fun CoordinatorLayout.appBarLParams(
height: Int = wrapContent,
initParams: CoordinatorLayout.LayoutParams.() -> Unit = {}
) = defaultLParams(width = matchParent, height = height, initParams = initParams)

@Suppress("unused")
fun CoordinatorLayout.contentScrollingWithAppBarLParams() = scrollingContentLParams

private val appBarLParams = CoordinatorLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT).also {
it.behavior = AppBarLayout.ScrollingViewBehavior()
}

private val scrollingContentLParams = CoordinatorLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT).also {
it.behavior = AppBarLayout.ScrollingViewBehavior()
}