diff --git a/FluentUI.Demo/src/main/res/layout/activity_demo_detail.xml b/FluentUI.Demo/src/main/res/layout/activity_demo_detail.xml index 916a15ac..0d040c50 100644 --- a/FluentUI.Demo/src/main/res/layout/activity_demo_detail.xml +++ b/FluentUI.Demo/src/main/res/layout/activity_demo_detail.xml @@ -18,7 +18,7 @@ android:id="@+id/app_bar" android:layout_width="match_parent" android:layout_height="wrap_content" - app:scrollBehavior="pin" /> + app:fluentui_scrollBehavior="pin" /> +<<<<<<< HEAD @@ -146,4 +147,13 @@ +||||||| parent of 2dc6d10 (Moved the declare-styleable attributes to fluentui_core attrs.xml & enum attributes to fluentui_topappbars attrs.xml to reuse at module level. Attributes also prefixed with 'fluentui_' to avoid conflict with other UI library attributes) +======= + + + + + + +>>>>>>> 2dc6d10 (Moved the declare-styleable attributes to fluentui_core attrs.xml & enum attributes to fluentui_topappbars attrs.xml to reuse at module level. Attributes also prefixed with 'fluentui_' to avoid conflict with other UI library attributes) \ No newline at end of file diff --git a/fluentui_topappbars/src/main/java/com/microsoft/fluentui/appbarlayout/AppBarLayout.kt b/fluentui_topappbars/src/main/java/com/microsoft/fluentui/appbarlayout/AppBarLayout.kt index ede9f0bd..424b8011 100644 --- a/fluentui_topappbars/src/main/java/com/microsoft/fluentui/appbarlayout/AppBarLayout.kt +++ b/fluentui_topappbars/src/main/java/com/microsoft/fluentui/appbarlayout/AppBarLayout.kt @@ -126,8 +126,8 @@ class AppBarLayout : AppBarLayout { setBackgroundColor(ThemeUtil.getThemeAttrColor(context, R.attr.fluentuiAppBarLayoutBackgroundColor)) val styledAttributes = context.obtainStyledAttributes(attrs, R.styleable.AppBarLayout) - scrollTargetViewId = styledAttributes.getResourceId(R.styleable.AppBarLayout_scrollTargetViewId, View.NO_ID) - val scrollBehaviorOrdinal = styledAttributes.getInt(R.styleable.AppBarLayout_scrollBehavior, DEFAULT_SCROLL_BEHAVIOR.ordinal) + scrollTargetViewId = styledAttributes.getResourceId(R.styleable.AppBarLayout_fluentui_scrollTargetViewId, View.NO_ID) + val scrollBehaviorOrdinal = styledAttributes.getInt(R.styleable.AppBarLayout_fluentui_scrollBehavior, DEFAULT_SCROLL_BEHAVIOR.ordinal) scrollBehavior = ScrollBehavior.values()[scrollBehaviorOrdinal] styledAttributes.recycle() } diff --git a/fluentui_topappbars/src/main/res/values/attrs.xml b/fluentui_topappbars/src/main/res/values/attrs.xml index a9ce27ba..4652484d 100644 --- a/fluentui_topappbars/src/main/res/values/attrs.xml +++ b/fluentui_topappbars/src/main/res/values/attrs.xml @@ -28,4 +28,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/fluentui_topappbars/src/main/res/values/attrs_app_bar_layout.xml b/fluentui_topappbars/src/main/res/values/attrs_app_bar_layout.xml index 931d1145..b64665dc 100644 --- a/fluentui_topappbars/src/main/res/values/attrs_app_bar_layout.xml +++ b/fluentui_topappbars/src/main/res/values/attrs_app_bar_layout.xml @@ -6,11 +6,7 @@ - - - - - - + + \ No newline at end of file