Skip to content

Commit 26bfdd2

Browse files
pubiqqleticiarossi
authored andcommitted
[NavigationView] Fix subheader and divider insets and use relative listPreferredItemPaddings.
Resolves #4122 Resolves #4123 GIT_ORIGIN_REV_ID=911d1af88c0d10c6894bf38546b870430e86b6f9 PiperOrigin-RevId: 634517597
1 parent 9a39e22 commit 26bfdd2

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

lib/java/com/google/android/material/internal/NavigationMenuPresenter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
619619
NavigationMenuTextItem item = (NavigationMenuTextItem) items.get(position);
620620
subHeader.setText(item.getMenuItem().getTitle());
621621
TextViewCompat.setTextAppearance(subHeader, subheaderTextAppearance);
622-
subHeader.setPadding(
622+
subHeader.setPaddingRelative(
623623
subheaderInsetStart,
624624
subHeader.getPaddingTop(),
625625
subheaderInsetEnd,
@@ -634,7 +634,7 @@ public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
634634
case VIEW_TYPE_SEPARATOR:
635635
{
636636
NavigationMenuSeparatorItem item = (NavigationMenuSeparatorItem) items.get(position);
637-
holder.itemView.setPadding(
637+
holder.itemView.setPaddingRelative(
638638
dividerInsetStart,
639639
item.getPaddingTop(),
640640
dividerInsetEnd,

lib/java/com/google/android/material/internal/res/layout/design_navigation_item.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
android:layout_width="match_parent"
2121
android:layout_height="wrap_content"
2222
android:minHeight="?attr/listPreferredItemHeightSmall"
23-
android:paddingLeft="?attr/listPreferredItemPaddingLeft"
24-
android:paddingRight="?attr/listPreferredItemPaddingRight"
23+
android:paddingStart="?attr/listPreferredItemPaddingStart"
24+
android:paddingEnd="?attr/listPreferredItemPaddingEnd"
2525
android:focusable="true"
2626
android:foreground="?attr/selectableItemBackground"
2727
android:defaultFocusHighlightEnabled="false"

lib/java/com/google/android/material/internal/res/layout/design_navigation_item_subheader.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
1818
android:layout_width="match_parent"
1919
android:layout_height="?attr/listPreferredItemHeightSmall"
20-
android:paddingLeft="?attr/listPreferredItemPaddingLeft"
21-
android:paddingRight="?attr/listPreferredItemPaddingRight"
20+
android:paddingStart="?attr/listPreferredItemPaddingStart"
21+
android:paddingEnd="?attr/listPreferredItemPaddingEnd"
2222
android:gravity="center_vertical|start"
2323
android:maxLines="1"
2424
android:textAppearance="@style/TextAppearance.AppCompat.Body2"

lib/java/com/google/android/material/navigation/res/values/styles.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<item name="android:background">?android:attr/windowBackground</item>
2424
<item name="android:fitsSystemWindows">true</item>
2525
<item name="android:maxWidth">@dimen/design_navigation_max_width</item>
26-
<item name="subheaderInsetStart">?attr/listPreferredItemPaddingLeft</item>
27-
<item name="subheaderInsetEnd">?attr/listPreferredItemPaddingRight</item>
26+
<item name="subheaderInsetStart">?attr/listPreferredItemPaddingStart</item>
27+
<item name="subheaderInsetEnd">?attr/listPreferredItemPaddingEnd</item>
2828
<item name="drawerLayoutCornerSize">0dp</item>
2929
</style>
3030

0 commit comments

Comments
 (0)