Merge branch 'DSY-1485-menu-with-tag' of https://github.com/natura-co…

…smeticos/natds-android into DSY-1485-menu-with-tag
natura-cosmeticos · Sep 21, 2020 · 2311af2 · 2311af2
2 parents a000e6b + aca7b32
commit 2311af2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/designsystem/src/main/kotlin/com/natura/android/navigationview/Navigation.kt b/designsystem/src/main/kotlin/com/natura/android/navigationview/Navigation.kt
@@ -15,7 +15,7 @@ data class NavigationItem(
     var menuState: MenuView.MenuState = MenuView.MenuState.NONE,
     val childItems: MutableList<NavigationItemChild> = mutableListOf(),
     val tagLabel: String = "",
-    val showTag: Boolean = false,
+    val showTag: Boolean = false
 ) : Navigation(id) {
     fun indexOfChildItemId(childId: String) = childItems.indexOfFirst { it.id == childId }
 }

diff --git a/designsystem/src/main/res/layout/ds_menu_view.xml b/designsystem/src/main/res/layout/ds_menu_view.xml
@@ -59,7 +59,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/ds_submenu_text_margin_top_bottom"
-        android:layout_marginEnd="@dimen/ds_spacin_tiny"
+        android:layout_marginEnd="?spacingTiny"
         android:layout_marginStart="?spacingTiny"
         android:layout_marginBottom="@dimen/ds_submenu_text_margin_top_bottom"
         app:layout_constrainedWidth="true"