diff options
Diffstat (limited to 'current/support/design/res/values')
| -rw-r--r-- | current/support/design/res/values/attrs.xml | 64 | ||||
| -rw-r--r-- | current/support/design/res/values/dimens.xml | 15 | ||||
| -rw-r--r-- | current/support/design/res/values/styles.xml | 6 |
3 files changed, 72 insertions, 13 deletions
diff --git a/current/support/design/res/values/attrs.xml b/current/support/design/res/values/attrs.xml index 23f618c..7a5582e 100644 --- a/current/support/design/res/values/attrs.xml +++ b/current/support/design/res/values/attrs.xml @@ -39,11 +39,13 @@ <attr name="insetForeground" format="color|reference" /> </declare-styleable> - <declare-styleable name="NavigationDrawerView"> + <declare-styleable name="NavigationView"> <attr name="android:elevation" /> <attr name="android:background" /> <attr name="android:fitsSystemWindows" /> <attr name="android:maxWidth" /> + <attr name="itemTint" format="color|reference" /> + <attr name="itemBackground" format="reference" /> </declare-styleable> <declare-styleable name="TabLayout"> @@ -79,5 +81,65 @@ <attr name="tabPadding" format="dimension" /> </declare-styleable> + <declare-styleable name="CoordinatorLayout"> + <!-- A reference to an array of integers representing the + locations of horizontal keylines in dp from the starting edge. + Child views can refer to these keylines for alignment using + layout_keyline="index" where index is a 0-based index into + this array. --> + <attr name="keylines" format="reference" /> + </declare-styleable> + + <declare-styleable name="CoordinatorLayout_LayoutParams"> + <attr name="android:layout_gravity" /> + <!-- The class name of a Behavior class defining special runtime behavior + for this child view. --> + <attr name="layout_behavior" format="string" /> + <!-- The id of an anchor view that this view should position relative to. --> + <attr name="layout_anchor" format="reference" /> + <!-- The index of a keyline this view should position relative to. + android:layout_gravity will affect how the view aligns to the + specified keyline. --> + <attr name="layout_keyline" format="integer" /> + + <!-- Specifies how an object should position relative to an anchor, on both the X and Y axes, + within its parent's bounds. --> + <attr name="layout_anchorGravity"> + <!-- Push object to the top of its container, not changing its size. --> + <flag name="top" value="0x30" /> + <!-- Push object to the bottom of its container, not changing its size. --> + <flag name="bottom" value="0x50" /> + <!-- Push object to the left of its container, not changing its size. --> + <flag name="left" value="0x03" /> + <!-- Push object to the right of its container, not changing its size. --> + <flag name="right" value="0x05" /> + <!-- Place object in the vertical center of its container, not changing its size. --> + <flag name="center_vertical" value="0x10" /> + <!-- Grow the vertical size of the object if needed so it completely fills its container. --> + <flag name="fill_vertical" value="0x70" /> + <!-- Place object in the horizontal center of its container, not changing its size. --> + <flag name="center_horizontal" value="0x01" /> + <!-- Grow the horizontal size of the object if needed so it completely fills its container. --> + <flag name="fill_horizontal" value="0x07" /> + <!-- Place the object in the center of its container in both the vertical and horizontal axis, not changing its size. --> + <flag name="center" value="0x11" /> + <!-- Grow the horizontal and vertical size of the object if needed so it completely fills its container. --> + <flag name="fill" value="0x77" /> + <!-- Additional option that can be set to have the top and/or bottom edges of + the child clipped to its container's bounds. + The clip will be based on the vertical gravity: a top gravity will clip the bottom + edge, a bottom gravity will clip the top edge, and neither will clip both edges. --> + <flag name="clip_vertical" value="0x80" /> + <!-- Additional option that can be set to have the left and/or right edges of + the child clipped to its container's bounds. + The clip will be based on the horizontal gravity: a left gravity will clip the right + edge, a right gravity will clip the left edge, and neither will clip both edges. --> + <flag name="clip_horizontal" value="0x08" /> + <!-- Push object to the beginning of its container, not changing its size. --> + <flag name="start" value="0x00800003" /> + <!-- Push object to the end of its container, not changing its size. --> + <flag name="end" value="0x00800005" /> + </attr> + </declare-styleable> </resources> diff --git a/current/support/design/res/values/dimens.xml b/current/support/design/res/values/dimens.xml index f7ef4a4..bb96119 100644 --- a/current/support/design/res/values/dimens.xml +++ b/current/support/design/res/values/dimens.xml @@ -22,17 +22,14 @@ <dimen name="fab_size_normal">56dp</dimen> <dimen name="fab_size_mini">40dp</dimen> - <dimen name="drawer_max_width">320dp</dimen> - <dimen name="drawer_elevation">12dp</dimen> - <dimen name="drawer_icon_padding">32dp</dimen> - <dimen name="drawer_icon_size">24dp</dimen> + <dimen name="navigation_max_width">320dp</dimen> + <dimen name="navigation_elevation">12dp</dimen> + <dimen name="navigation_icon_padding">32dp</dimen> + <dimen name="navigation_icon_size">24dp</dimen> + <dimen name="navigation_separator_vertical_padding">8dp</dimen> + <dimen name="navigation_padding_top_default">0dp</dimen> <dimen name="tab_min_width">72dp</dimen> <dimen name="tab_max_width">264dp</dimen> - <dimen name="drawer_separator_vertical_margin">8dp</dimen> - <!-- This needs to be drawer_separator_vertical_margin * 2 + 1 --> - <dimen name="drawer_separator_overall_height">17dp</dimen> - <dimen name="drawer_padding_top_default">0dp</dimen> - </resources> diff --git a/current/support/design/res/values/styles.xml b/current/support/design/res/values/styles.xml index ecfaab4..f00293b 100644 --- a/current/support/design/res/values/styles.xml +++ b/current/support/design/res/values/styles.xml @@ -30,11 +30,11 @@ <item name="insetForeground">#4000</item> </style> - <style name="Widget.Design.NavigationDrawerView" parent=""> - <item name="android:elevation">@dimen/drawer_elevation</item> + <style name="Widget.Design.NavigationView" parent=""> + <item name="android:elevation">@dimen/navigation_elevation</item> <item name="android:background">?android:attr/windowBackground</item> <item name="android:fitsSystemWindows">true</item> - <item name="android:maxWidth">@dimen/drawer_max_width</item> + <item name="android:maxWidth">@dimen/navigation_max_width</item> </style> <style name="Widget.Design.TabLayout" parent="Base.Widget.Design.TabLayout"> |