diff --git a/FluentUI.Demo/build.gradle b/FluentUI.Demo/build.gradle index 98aba3873..f089ecacd 100644 --- a/FluentUI.Demo/build.gradle +++ b/FluentUI.Demo/build.gradle @@ -13,8 +13,8 @@ android { applicationId 'com.microsoft.fluentuidemo' minSdkVersion 21 targetSdkVersion 34 - versionCode 1011 - versionName '0.2.11' + versionCode 1012 + versionName '0.2.12' testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } kotlinOptions { diff --git a/FluentUI.Demo/src/main/assets/dogfood-release-notes.txt b/FluentUI.Demo/src/main/assets/dogfood-release-notes.txt index 5ae09dbb0..d93852e18 100644 --- a/FluentUI.Demo/src/main/assets/dogfood-release-notes.txt +++ b/FluentUI.Demo/src/main/assets/dogfood-release-notes.txt @@ -1,17 +1,13 @@ -Release Version 0.2.11: +Release Version 0.2.12: What's New: - Fluent UI Android library is now compiled against SDK 34. - -Fluent V1: - Fix/Enhancement: - - 1. Date-Time Picker Dialog now handles orientation changes gracefully. Fluent V2: Fix/Enhancement: - 1. CCB now supports customizing the border stroke of selected buttons. - 2. In landscape mode, the Bottom Drawer's width can now be adjusted to a specific fraction of the total screen width. + 1. Pill Buttons have been updated to support both icons and text simultaneously, with added spacing tokens for customizable padding around the pill content. + 2. Basic Card now features a Brush type border Color token, enabling more styling options. + 3. In deo app, bottom drawer's disappearance on orientation change has been fixed. + Note: Fluent version 0.1.x (from 0.1.48) supports compose version 0.1.43 (BOM 2023.06.01). Fluent versions 0.2.x will support compose version 1.5.1 (BOM 2023.09.00) \ No newline at end of file diff --git a/FluentUI.Demo/src/main/java/com/microsoft/fluentuidemo/Demos.kt b/FluentUI.Demo/src/main/java/com/microsoft/fluentuidemo/Demos.kt index 8de5e8c6a..fc2695227 100644 --- a/FluentUI.Demo/src/main/java/com/microsoft/fluentuidemo/Demos.kt +++ b/FluentUI.Demo/src/main/java/com/microsoft/fluentuidemo/Demos.kt @@ -188,7 +188,7 @@ val V2DEMO = arrayListOf( Demo(V2PROGRESS, V2ProgressActivity::class), Demo(V2SCAFFOLD, V2ScaffoldActivity::class), Demo(V2SEARCHBAR, V2SearchBarActivity::class), - Demo(V2SEGMENTED_CONTROL, V2SegmentedControlActivity::class), + Demo(V2SEGMENTED_CONTROL, V2SegmentedControlActivity::class, Badge.Modified), Demo(V2SHIMMER, V2ShimmerActivity::class), Demo(V2SIDE_RAIL, V2SideRailActivity::class), Demo(V2SNACKBAR, V2SnackbarActivity::class), diff --git a/config.gradle b/config.gradle index aee5ea00a..a66eb86e4 100644 --- a/config.gradle +++ b/config.gradle @@ -12,10 +12,10 @@ * fluentui_drawer and FluentUI should increment their respective version ids */ project.ext.fluentui_calendar_versionid = '0.2.1' -project.ext.fluentui_controls_versionid = '0.2.6' -project.ext.fluentui_core_versionid = '0.2.7' +project.ext.fluentui_controls_versionid = '0.2.7' +project.ext.fluentui_core_versionid = '0.2.8' project.ext.fluentui_listitem_versionid = '0.2.3' -project.ext.fluentui_tablayout_versionid = '0.2.2' +project.ext.fluentui_tablayout_versionid = '0.2.3' project.ext.fluentui_drawer_versionid = '0.2.8' project.ext.fluentui_ccb_versionid = '0.2.1' project.ext.fluentui_others_versionid = '0.2.1' @@ -27,12 +27,12 @@ project.ext.fluentui_persona_versionid = '0.2.2' project.ext.fluentui_progress_versionid = '0.2.1' project.ext.fluentui_icons_versionid = '0.2.1' project.ext.fluentui_notification_versionid = '0.2.3' -project.ext.FluentUI_versionid = '0.2.11' +project.ext.FluentUI_versionid = '0.2.12' project.ext.fluentui_calendar_version_code = 1001 -project.ext.fluentui_controls_version_code = 1006 -project.ext.fluentui_core_version_code = 1007 +project.ext.fluentui_controls_version_code = 1007 +project.ext.fluentui_core_version_code = 1008 project.ext.fluentui_listitem_version_code = 1003 -project.ext.fluentui_tablayout_version_code = 1002 +project.ext.fluentui_tablayout_version_code = 1003 project.ext.fluentui_drawer_version_code = 1008 project.ext.fluentui_ccb_version_code = 1001 project.ext.fluentui_others_version_code = 1001 @@ -44,7 +44,7 @@ project.ext.fluentui_persona_version_code = 1002 project.ext.fluentui_progress_version_code = 1001 project.ext.fluentui_icons_version_code = 1001 project.ext.fluentui_notification_version_code = 1003 -project.ext.FluentUI_version_code = 1011 +project.ext.FluentUI_version_code = 1012 project.ext.license_type = 'MIT License' project.ext.license_url = 'https://github.com/microsoft/fluentui-android/blob/master/LICENSE' project.ext.github_url = 'https://github.com/microsoft/fluentui-android' diff --git a/fluentui-office-build-universal-publish-1espt.yml b/fluentui-office-build-universal-publish-1espt.yml index 1be280e39..b67cec018 100644 --- a/fluentui-office-build-universal-publish-1espt.yml +++ b/fluentui-office-build-universal-publish-1espt.yml @@ -62,6 +62,6 @@ extends: vstsFeedPublish: 'Office' vstsFeedPackagePublish: 'fluentuiandroid' versionOption: 'custom' - versionPublish: '0.2.11' + versionPublish: '0.2.12' packagePublishDescription: 'Fluent Universal Package' publishedPackageVar: 'fluent package' \ No newline at end of file