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 AppBarLayout scrollFlags extensions 
This commit also uppers the case of CollapsingToolbarLayout collapseMode
extensions.
  • Loading branch information
@LouisCAD
LouisCAD committed Mar 3, 2018
commit 731bbdd264f81363653fd302c12dcdca82195667
10 changes: 5 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 @@ -18,8 +18,6 @@ package xyz.louiscad.splittiessample.main

import android.os.Build.VERSION.SDK_INT
import android.support.design.widget.AppBarLayout
import android.support.design.widget.AppBarLayout.LayoutParams.SCROLL_FLAG_EXIT_UNTIL_COLLAPSED
import android.support.design.widget.AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL
import android.support.design.widget.CollapsingToolbarLayout
import android.support.design.widget.CoordinatorLayout
import android.support.design.widget.FloatingActionButton
Expand All @@ -40,8 +38,10 @@ import splitties.viewdsl.core.margin
import splitties.viewdsl.core.matchParent
import splitties.viewdsl.core.v
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.defaultLParams
import splitties.viewdsl.design.pin
import splitties.views.appcompat.Toolbar
import splitties.views.imageResource
import splitties.views.setCompoundDrawables
Expand Down Expand Up @@ -88,12 +88,12 @@ class MainUi(override val ctx: MainActivity) : Ui {
add(::AppBarLayout, R.id.app_bar, R.style.AppTheme_AppBarOverlay,
defaultLParams(width = matchParent, height = dip(180))) {
add(::CollapsingToolbarLayout, defaultLParams(height = matchParent) {
scrollFlags = SCROLL_FLAG_SCROLL or SCROLL_FLAG_EXIT_UNTIL_COLLAPSED
scrollFlags = SCROLL or EXIT_UNTIL_COLLAPSED
}) {
fitsSystemWindows = true
setContentScrimColor(styledColor(R.attr.colorPrimary))
val actionBarSize = styledDimenPxSize(R.attr.actionBarSize)
add(::Toolbar, defaultLParams(height = actionBarSize, collapseMode = pin)) {
add(::Toolbar, defaultLParams(height = actionBarSize, collapseMode = PIN)) {
ctx.setSupportActionBar(this)
popupTheme = R.style.AppTheme_PopupOverlay
}
Expand Down
18 changes: 14 additions & 4 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 @@ -21,14 +21,24 @@ package splitties.viewdsl.design
import android.support.design.widget.AppBarLayout
import splitties.viewdsl.core.matchParent
import splitties.viewdsl.core.wrapContent
import android.support.design.widget.AppBarLayout.LayoutParams as LP

@Suppress("unused") val AppBarLayout.SCROLL get() = LP.SCROLL_FLAG_SCROLL
@Suppress("unused") val AppBarLayout.EXIT_UNTIL_COLLAPSED get() = LP.SCROLL_FLAG_EXIT_UNTIL_COLLAPSED
@Suppress("unused") val AppBarLayout.ENTER_ALWAYS get() = LP.SCROLL_FLAG_ENTER_ALWAYS
@Suppress("unused") val AppBarLayout.ENTER_ALWAYS_COLLAPSED: Int
get() = LP.SCROLL_FLAG_ENTER_ALWAYS_COLLAPSED
@Suppress("unused") val AppBarLayout.SNAP get() = LP.SCROLL_FLAG_SNAP

inline fun AppBarLayout.defaultLParams(
width: Int = matchParent,
height: Int = wrapContent,
initParams: AppBarLayout.LayoutParams.() -> Unit
) = AppBarLayout.LayoutParams(width, height).apply(initParams)
scrollFlags: Int = ENTER_ALWAYS,
initParams: LP.() -> Unit
) = LP(width, height).also { it.scrollFlags = scrollFlags }.apply(initParams)

inline fun AppBarLayout.defaultLParams(
width: Int = matchParent,
height: Int = wrapContent
) = AppBarLayout.LayoutParams(width, height)
height: Int = wrapContent,
scrollFlags: Int = ENTER_ALWAYS
) = LP(width, height).also { it.scrollFlags = scrollFlags }
4 changes: 2 additions & 2 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 @@ -23,8 +23,8 @@ import splitties.viewdsl.core.matchParent
import splitties.viewdsl.core.wrapContent
import android.support.design.widget.CollapsingToolbarLayout.LayoutParams as LP

@Suppress("unused") val CollapsingToolbarLayout.pin get() = LP.COLLAPSE_MODE_PIN
@Suppress("unused") val CollapsingToolbarLayout.parallax get() = LP.COLLAPSE_MODE_PARALLAX
@Suppress("unused") val CollapsingToolbarLayout.PIN get() = LP.COLLAPSE_MODE_PIN
@Suppress("unused") val CollapsingToolbarLayout.PARALLAX get() = LP.COLLAPSE_MODE_PARALLAX

inline fun CollapsingToolbarLayout.defaultLParams(
width: Int = matchParent,
Expand Down