Skip to content

Commit

Permalink
Release Version 0.0.26
Browse files Browse the repository at this point in the history 
1) Moved the declare-styleable attributes to fluentui_core attrs.xml to reuse at the module level.
Moved enum declare-styleable attributes to module's attrs.xml.
Moved attributes are also prefixed with 'fluentui_' to avoid conflict with other UI library attributes

2) Version bump-up to 0.0.26
  • Loading branch information
@mishramayank1
mishramayank1 authored Feb 17, 2022
2 parents 341ed2c + 80895da commit 3abc89a
Show file tree
Hide file tree
Showing 62 changed files with 543 additions and 386 deletions.
4 changes: 2 additions & 2 deletions FluentUI.Demo/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ android {
applicationId 'com.microsoft.fluentuidemo'
minSdkVersion 21
targetSdkVersion 30
versionCode 25
versionName '0.0.25'
versionCode 26
versionName '0.0.26'
}
buildTypes {
release {
Expand Down
2 changes: 1 addition & 1 deletion FluentUI.Demo/src/main/java/com/microsoft/fluentuidemo/demos/views/Cell.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class Cell : TemplateView {
constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : super(context, attrs, defStyleAttr) {
if (attrs != null) {
val styledAttrs = context.obtainStyledAttributes(attrs, R.styleable.Cell)
title = styledAttrs.getString(R.styleable.Cell_title)
title = styledAttrs.getString(R.styleable.Cell_fluentui_title)
description = styledAttrs.getString(R.styleable.Cell_description)
val orientationOrdinal = styledAttrs.getInt(R.styleable.Cell_orientation, DEFAULT_ORIENTATION.ordinal)
orientation = CellOrientation.values()[orientationOrdinal]
Expand Down
66 changes: 33 additions & 33 deletions FluentUI.Demo/src/main/res/layout/activity_avatar_group_view.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
android:id="@+id/avatar_face_stack_example_xxlarge_photo"
android:layout_gravity="start"
android:layout_marginEnd="@dimen/default_layout_margin"
app:avatarGroupStyle="stack"
app:maxDisplayedAvatars="4"
app:avatarSize="xxlarge" />
app:fluentui_avatarGroupStyle="stack"
app:fluentui_maxDisplayedAvatars="4"
app:fluentui_avatarSize="xxlarge" />
</LinearLayout>

<LinearLayout
Expand All @@ -88,9 +88,9 @@
android:id="@+id/avatar_face_stack_example_xlarge_photo"
android:layout_gravity="start"
android:layout_marginEnd="@dimen/default_layout_margin"
app:avatarGroupStyle="stack"
app:maxDisplayedAvatars="4"
app:avatarSize="xlarge" />
app:fluentui_avatarGroupStyle="stack"
app:fluentui_maxDisplayedAvatars="4"
app:fluentui_avatarSize="xlarge" />
</LinearLayout>

<LinearLayout
Expand All @@ -114,9 +114,9 @@
android:id="@+id/avatar_face_stack_example_large_photo"
android:layout_gravity="start"
android:layout_marginEnd="@dimen/default_layout_margin"
app:avatarGroupStyle="stack"
app:maxDisplayedAvatars="4"
app:avatarSize="large" />
app:fluentui_avatarGroupStyle="stack"
app:fluentui_maxDisplayedAvatars="4"
app:fluentui_avatarSize="large" />
</LinearLayout>

<LinearLayout
Expand All @@ -140,9 +140,9 @@
android:id="@+id/avatar_face_stack_example_medium_photo"
android:layout_gravity="start"
android:layout_marginEnd="@dimen/default_layout_margin"
app:avatarGroupStyle="stack"
app:maxDisplayedAvatars="4"
app:avatarSize="medium" />
app:fluentui_avatarGroupStyle="stack"
app:fluentui_maxDisplayedAvatars="4"
app:fluentui_avatarSize="medium" />
</LinearLayout>


Expand Down Expand Up @@ -190,9 +190,9 @@
android:id="@+id/avatar_face_stack_example_xsmall_photo"
android:layout_gravity="start"
android:layout_marginEnd="@dimen/default_layout_margin"
app:avatarGroupStyle="stack"
app:maxDisplayedAvatars="4"
app:avatarSize="xsmall" />
app:fluentui_avatarGroupStyle="stack"
app:fluentui_maxDisplayedAvatars="4"
app:fluentui_avatarSize="xsmall" />
</LinearLayout>

<!--Square-->
Expand Down Expand Up @@ -225,9 +225,9 @@
android:id="@+id/avatar_face_pile_example_xxlarge_photo"
android:layout_gravity="start"
android:layout_marginEnd="@dimen/default_layout_margin"
app:avatarGroupStyle="pile"
app:maxDisplayedAvatars="4"
app:avatarSize="xxlarge" />
app:fluentui_avatarGroupStyle="pile"
app:fluentui_maxDisplayedAvatars="4"
app:fluentui_avatarSize="xxlarge" />
</LinearLayout>

<LinearLayout
Expand All @@ -251,9 +251,9 @@
android:id="@+id/avatar_face_pile_example_xlarge_photo"
android:layout_gravity="start"
android:layout_marginEnd="@dimen/default_layout_margin"
app:avatarGroupStyle="pile"
app:maxDisplayedAvatars="4"
app:avatarSize="xlarge" />
app:fluentui_avatarGroupStyle="pile"
app:fluentui_maxDisplayedAvatars="4"
app:fluentui_avatarSize="xlarge" />
</LinearLayout>

<LinearLayout
Expand All @@ -277,9 +277,9 @@
android:id="@+id/avatar_face_pile_example_large_photo"
android:layout_gravity="start"
android:layout_marginEnd="@dimen/default_layout_margin"
app:avatarGroupStyle="pile"
app:maxDisplayedAvatars="4"
app:avatarSize="large" />
app:fluentui_avatarGroupStyle="pile"
app:fluentui_maxDisplayedAvatars="4"
app:fluentui_avatarSize="large" />
</LinearLayout>

<LinearLayout
Expand All @@ -303,9 +303,9 @@
android:id="@+id/avatar_face_pile_example_medium_photo"
android:layout_gravity="start"
android:layout_marginEnd="@dimen/default_layout_margin"
app:avatarGroupStyle="pile"
app:maxDisplayedAvatars="4"
app:avatarSize="medium" />
app:fluentui_avatarGroupStyle="pile"
app:fluentui_maxDisplayedAvatars="4"
app:fluentui_avatarSize="medium" />
</LinearLayout>


Expand All @@ -330,9 +330,9 @@
android:id="@+id/avatar_face_pile_example_small_photo"
android:layout_gravity="start"
android:layout_marginEnd="@dimen/default_layout_margin"
app:avatarGroupStyle="pile"
app:maxDisplayedAvatars="4"
app:avatarSize="small" />
app:fluentui_avatarGroupStyle="pile"
app:fluentui_maxDisplayedAvatars="4"
app:fluentui_avatarSize="small" />
</LinearLayout>

<LinearLayout
Expand All @@ -356,9 +356,9 @@
android:id="@+id/avatar_face_pile_example_xsmall_photo"
android:layout_gravity="start"
android:layout_marginEnd="@dimen/default_layout_margin"
app:avatarGroupStyle="pile"
app:maxDisplayedAvatars="4"
app:avatarSize="xsmall" />
app:fluentui_avatarGroupStyle="pile"
app:fluentui_maxDisplayedAvatars="4"
app:fluentui_avatarSize="xsmall" />
</LinearLayout>

</LinearLayout>
Loading

0 comments on commit 3abc89a

Please sign in to comment.