[pull] master from microsoft:master

FluentUI.Demo/build.gradle

@@ -11,10 +11,10 @@ android {
     compileSdkVersion constants.compileSdkVersion
     defaultConfig {
         applicationId 'com.microsoft.fluentuidemo'
-        minSdkVersion 21
+        minSdkVersion 23
         targetSdkVersion 34
-        versionCode 1012
-        versionName '0.2.12'
+        versionCode 2008
+        versionName '0.3.8'
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     kotlinOptions {
@@ -33,6 +33,7 @@ android {
     }
     lintOptions {
         lintConfig = file("lint.xml")
+        abortOnError false
     }
     buildTypes {
         release {
@@ -89,7 +90,6 @@ dependencies {
     implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
     implementation 'com.squareup.picasso:picasso:2.71828'
     implementation 'com.github.bumptech.glide:glide:4.8.0'
-    implementation 'com.jakewharton.threetenabp:threetenabp:1.1.0'
 
     //Compose BOM
     implementation platform("androidx.compose:compose-bom:$composeBomVersion")

FluentUI.Demo/src/main/AndroidManifest.xml

@@ -22,7 +22,8 @@
         </activity>
 
         <!-- Demo activities -->
-
+        <activity android:name="com.microsoft.fluentuidemo.demos.V2AcrylicPaneActivity" />
+        <activity android:name="com.microsoft.fluentuidemo.demos.V2ActionBarActivity" />
         <activity android:name="com.microsoft.fluentuidemo.demos.V2AppBarActivity" />
         <activity android:name="com.microsoft.fluentuidemo.demos.V2AvatarActivity" />
         <activity android:name="com.microsoft.fluentuidemo.demos.V2AvatarCarouselActivity" />
@@ -33,7 +34,7 @@
         <activity android:name="com.microsoft.fluentuidemo.demos.V2BasicChipActivity" />
         <activity android:name="com.microsoft.fluentuidemo.demos.V2BasicControlsActivity" />
         <activity android:name="com.microsoft.fluentuidemo.demos.V2BottomDrawerActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"/>
+            android:enableOnBackInvokedCallback="true"/>
         <activity android:name="com.microsoft.fluentuidemo.demos.V2BottomSheetActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"/>
         <activity android:name="com.microsoft.fluentuidemo.demos.V2CardActivity" />
@@ -44,8 +45,7 @@
             android:windowSoftInputMode="adjustResize" />
         <activity android:name="com.microsoft.fluentuidemo.demos.V2DialogActivity" />
         <activity android:name="com.microsoft.fluentuidemo.V2DesignTokensActivity" />
-        <activity android:name="com.microsoft.fluentuidemo.demos.V2DrawerActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"/>
+        <activity android:name="com.microsoft.fluentuidemo.demos.V2DrawerActivity"/>
         <activity android:name="com.microsoft.fluentuidemo.demos.V2LabelActivity" />
         <activity android:name="com.microsoft.fluentuidemo.demos.V2ListItemActivity" />
         <activity android:name="com.microsoft.fluentuidemo.demos.V2MenuActivity"
@@ -81,6 +81,7 @@
         <activity android:name="com.microsoft.fluentuidemo.demos.DateTimePickerActivity" />
         <activity android:name="com.microsoft.fluentuidemo.demos.DrawerActivity" />
         <activity android:name="com.microsoft.fluentuidemo.demos.ListItemViewActivity" />
+        <activity android:name="com.microsoft.fluentuidemo.demos.actionbar.V2ActionBarDemoActivity" />
         <activity
             android:name="com.microsoft.fluentuidemo.demos.PeoplePickerViewActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"

FluentUI.Demo/src/main/assets/dogfood-release-notes.txt

@@ -1,13 +1,10 @@
-Release Version 0.2.12:
-
-What's New:
-Fluent V2:
-        Fix/Enhancement:
-
-           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)
+Release version 0.3.8
+What's new
+Fluent v2:
+Fix/enhancement:
+    1. Restored Shimmer Tokens for 'delay' and 'orientation' in the Shimmer component
+    2. Fixed V2 Bottomsheet not appearing when content loading was delayed
+    3. Fixed large title truncates post title icons in V2 AppBar
+
+Note: Fluent versions 0.2.x will support compose version 1.5.1 (BOM 2023.09.00) .
+Fluent version 0.3.x will support compose foundation version 1.6.0 .

FluentUI.Demo/src/main/java/com/microsoft/fluentuidemo/CustomizedTokens.kt

@@ -1,12 +1,20 @@
 package com.microsoft.fluentuidemo
 
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.unit.Dp
 import com.microsoft.fluentui.theme.FluentTheme
+import com.microsoft.fluentui.theme.ThemeMode
 import com.microsoft.fluentui.theme.token.FluentAliasTokens
+import com.microsoft.fluentui.theme.token.FluentColor
+import com.microsoft.fluentui.theme.token.FluentGlobalTokens
+import com.microsoft.fluentui.theme.token.FluentStyle
 import com.microsoft.fluentui.theme.token.StateBrush
 import com.microsoft.fluentui.theme.token.controlTokens.ListItemInfo
 import com.microsoft.fluentui.theme.token.controlTokens.ListItemTokens
+import com.microsoft.fluentui.theme.token.controlTokens.SearchBarInfo
+import com.microsoft.fluentui.theme.token.controlTokens.SearchBarTokens
 
 object CustomizedTokens {
     val listItemTokens = object : ListItemTokens() {
@@ -18,4 +26,45 @@ object CustomizedTokens {
             )
         }
     }
+}
+
+object CustomizedSearchBarTokens: SearchBarTokens() {
+    @Composable
+    override fun height(searchBarInfo: SearchBarInfo): Dp {
+        return FluentGlobalTokens.SizeTokens.Size480.value
+    }
+
+    @Composable
+    override fun elevation(searchBarInfo: SearchBarInfo): Dp =
+        FluentGlobalTokens.ShadowTokens.Shadow16.value
+
+    @Composable
+    override fun cornerRadius(searchBarInfo: SearchBarInfo): Dp =
+        FluentGlobalTokens.CornerRadiusTokens.CornerRadius160.value
+
+    @Composable
+    override fun borderWidth(searchBarInfo: SearchBarInfo): Dp =
+        FluentGlobalTokens.StrokeWidthTokens.StrokeWidth10.value
+
+    @Composable
+    override fun inputBackgroundBrush(searchBarInfo: SearchBarInfo): Brush {
+        return SolidColor(
+            when (searchBarInfo.style) {
+                FluentStyle.Neutral ->
+                    FluentTheme.aliasTokens.neutralBackgroundColor[FluentAliasTokens.NeutralBackgroundColorTokens.Background3].value(
+                        themeMode = FluentTheme.themeMode
+                    )
+
+                FluentStyle.Brand ->
+                    FluentColor(
+                        light = FluentTheme.aliasTokens.brandBackgroundColor[FluentAliasTokens.BrandBackgroundColorTokens.BrandBackground2].value(
+                            ThemeMode.Light
+                        ),
+                        dark = FluentTheme.aliasTokens.neutralBackgroundColor[FluentAliasTokens.NeutralBackgroundColorTokens.Background5].value(
+                            ThemeMode.Dark
+                        )
+                    ).value(themeMode = FluentTheme.themeMode)
+            }
+        )
+    }
 }

FluentUI.Demo/src/main/java/com/microsoft/fluentuidemo/DemoActivity.kt

@@ -10,7 +10,6 @@ import android.os.Bundle
 import android.view.MenuItem
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import com.microsoft.fluentui.util.DuoSupportUtils
 import com.microsoft.fluentuidemo.databinding.ActivityDemoDetailBinding
 import java.util.UUID
 
@@ -37,11 +36,7 @@ abstract class DemoActivity : AppCompatActivity() {
 
         // Set demo title
         val demoID = intent.getSerializableExtra(DEMO_ID) as UUID
-        val demo: Demo? = if (DuoSupportUtils.isDualScreenMode(this)) {
-            DUO_DEMOS.find { it.id == demoID }
-        } else {
-            V1DEMO.find { it.id == demoID }
-        }
+        val demo: Demo? = V1DEMO.find { it.id == demoID }
         if (demo != null)
             title = demo.title
 

FluentUI.Demo/src/main/java/com/microsoft/fluentuidemo/Demos.kt

@@ -30,6 +30,8 @@ import com.microsoft.fluentuidemo.demos.TabLayoutActivity
 import com.microsoft.fluentuidemo.demos.TemplateViewActivity
 import com.microsoft.fluentuidemo.demos.TooltipActivity
 import com.microsoft.fluentuidemo.demos.TypographyActivity
+import com.microsoft.fluentuidemo.demos.V2AcrylicPaneActivity
+import com.microsoft.fluentuidemo.demos.V2ActionBarActivity
 import com.microsoft.fluentuidemo.demos.V2AppBarActivity
 import com.microsoft.fluentuidemo.demos.V2AvatarActivity
 import com.microsoft.fluentuidemo.demos.V2AvatarCarouselActivity
@@ -74,6 +76,8 @@ enum class Badge {
     APIBreak
 }
 
+const val V2ACRYLICPANE = "V2 Acrylic Pane"
+const val V2ACTION_BAR = "V2 ActionBar"
 const val V2AVATAR = "V2 Avatar"
 const val V2AVATAR_CAROUSEL = "V2 Avatar Carousel"
 const val V2AVATAR_GROUP = "V2 Avatar Group"
@@ -146,7 +150,7 @@ val V1DEMO = arrayListOf(
     Demo(DATE_TIME_PICKER, DateTimePickerActivity::class),
     Demo(DRAWER, DrawerActivity::class),
     Demo(LIST_ITEM_VIEW, ListItemViewActivity::class),
-    Demo(PEOPLE_PICKER_VIEW, PeoplePickerViewActivity::class),
+    Demo(PEOPLE_PICKER_VIEW, PeoplePickerViewActivity::class, Badge.Modified),
     Demo(PERSISTENT_BOTTOM_SHEET, PersistentBottomSheetActivity::class),
     Demo(PERSONA_CHIP_VIEW, PersonaChipViewActivity::class),
     Demo(PERSONA_LIST_VIEW, PersonaListViewActivity::class),
@@ -161,7 +165,9 @@ val V1DEMO = arrayListOf(
 )
 
 val V2DEMO = arrayListOf(
-    Demo(V2APP_BAR_LAYOUT, V2AppBarActivity::class),
+    Demo(V2ACRYLICPANE, V2AcrylicPaneActivity::class, Badge.Modified),
+    Demo(V2ACTION_BAR, V2ActionBarActivity::class),
+    Demo(V2APP_BAR_LAYOUT, V2AppBarActivity::class, Badge.Modified),
     Demo(V2AVATAR, V2AvatarActivity::class),
     Demo(V2AVATAR_CAROUSEL, V2AvatarCarouselActivity::class),
     Demo(V2AVATAR_GROUP, V2AvatarGroupActivity::class),
@@ -170,28 +176,28 @@ val V2DEMO = arrayListOf(
     Demo(V2BASIC_CHIP, V2BasicChipActivity::class),
     Demo(V2BASIC_CONTROLS, V2BasicControlsActivity::class),
     Demo(V2BOTTOM_DRAWER, V2BottomDrawerActivity::class),
-    Demo(V2BOTTOM_SHEET, V2BottomSheetActivity::class),
-    Demo(V2BUTTON, V2ButtonsActivity::class),
+    Demo(V2BOTTOM_SHEET, V2BottomSheetActivity::class, Badge.Modified),
+    Demo(V2BUTTON, V2ButtonsActivity::class, Badge.Modified),
     Demo(V2CARD, V2CardActivity::class),
     Demo(V2CARD_NUDGE, V2CardNudgeActivity::class),
     Demo(V2CITATION, V2CitationActivity::class),
     Demo(V2CONTEXTUAL_COMMAND_BAR, V2ContextualCommandBarActivity::class),
     Demo(V2DIALOG, V2DialogActivity::class),
-    Demo(V2DRAWER, V2DrawerActivity::class),
-    Demo(V2LABEL, V2LabelActivity::class, Badge.Modified),
-    Demo(V2LIST_ITEM, V2ListItemActivity::class),
+    Demo(V2DRAWER, V2DrawerActivity::class, Badge.Modified),
+    Demo(V2LABEL, V2LabelActivity::class),
+    Demo(V2LIST_ITEM, V2ListItemActivity::class, Badge.Modified),
     Demo(V2MENU, V2MenuActivity::class),
     Demo(V2PEOPLE_PICKER, V2PeoplePickerActivity::class),
     Demo(V2PERSONA, V2PersonaActivity::class),
     Demo(V2PERSONA_CHIP, V2PersonaChipActivity::class),
     Demo(V2PERSONA_LIST, V2PersonaListActivity::class),
     Demo(V2PROGRESS, V2ProgressActivity::class),
     Demo(V2SCAFFOLD, V2ScaffoldActivity::class),
-    Demo(V2SEARCHBAR, V2SearchBarActivity::class),
-    Demo(V2SEGMENTED_CONTROL, V2SegmentedControlActivity::class, Badge.Modified),
-    Demo(V2SHIMMER, V2ShimmerActivity::class),
+    Demo(V2SEARCHBAR, V2SearchBarActivity::class, Badge.Modified),
+    Demo(V2SEGMENTED_CONTROL, V2SegmentedControlActivity::class),
+    Demo(V2SHIMMER, V2ShimmerActivity::class, Badge.Modified),
     Demo(V2SIDE_RAIL, V2SideRailActivity::class),
-    Demo(V2SNACKBAR, V2SnackbarActivity::class),
+    Demo(V2SNACKBAR, V2SnackbarActivity::class, Badge.Modified),
     Demo(V2TAB_BAR, V2TabBarActivity::class),
     Demo(V2TEXT_FIELD, V2TextFieldActivity::class),
     Demo(V2TOOL_TIP, V2ToolTipActivity::class),

FluentUI.Demo/src/main/java/com/microsoft/fluentuidemo/demos/BottomSheetActivity.kt

@@ -7,6 +7,7 @@ package com.microsoft.fluentuidemo.demos
 
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.widget.Switch
 import android.widget.TextView
 import com.microsoft.fluentui.bottomsheet.BottomSheet
 import com.microsoft.fluentui.bottomsheet.BottomSheetDialog
@@ -67,6 +68,12 @@ class BottomSheetActivity : DemoActivity(), BottomSheetItem.OnClickListener {
                         R.id.bottom_sheet_item_delete,
                         R.drawable.ic_delete_24_regular,
                         getString(R.string.bottom_sheet_item_delete_title)
+                    ),
+                    BottomSheetItem(
+                        R.id.bottom_sheet_item_toggle,
+                        R.drawable.ic_fluent_toggle_multiple_24_regular,
+                        getString(R.string.bottom_sheet_item_toggle_title),
+                        customAccessoryView = Switch(this)
                     )
                 )
             )
@@ -218,6 +225,7 @@ class BottomSheetActivity : DemoActivity(), BottomSheetItem.OnClickListener {
             R.id.bottom_sheet_item_reply -> showSnackbar(resources.getString(R.string.bottom_sheet_item_reply_toast))
             R.id.bottom_sheet_item_forward -> showSnackbar(resources.getString(R.string.bottom_sheet_item_forward_toast))
             R.id.bottom_sheet_item_delete -> showSnackbar(resources.getString(R.string.bottom_sheet_item_delete_toast))
+            R.id.bottom_sheet_item_toggle -> showSnackbar(resources.getString(R.string.bottom_sheet_item_toggle_toast))
 
             // Double line items
             R.id.bottom_sheet_item_camera -> showSnackbar(resources.getString(R.string.bottom_sheet_item_camera_toast))

FluentUI.Demo/src/main/java/com/microsoft/fluentuidemo/demos/CalendarViewActivity.kt

@@ -8,16 +8,13 @@ package com.microsoft.fluentuidemo.demos
 import android.os.Bundle
 import android.view.KeyEvent
 import android.view.LayoutInflater
-import android.view.View
 import android.view.View.TEXT_ALIGNMENT_TEXT_START
 import com.microsoft.fluentui.calendar.OnDateSelectedListener
 import com.microsoft.fluentui.util.DateStringUtils
-import com.microsoft.fluentui.util.DuoSupportUtils
 import com.microsoft.fluentuidemo.DemoActivity
-import com.microsoft.fluentuidemo.R
 import com.microsoft.fluentuidemo.databinding.ActivityCalendarViewBinding
-import org.threeten.bp.Duration
-import org.threeten.bp.ZonedDateTime
+import java.time.Duration
+import java.time.ZonedDateTime
 
 class CalendarViewActivity : DemoActivity() {
     companion object {
@@ -41,9 +38,6 @@ class CalendarViewActivity : DemoActivity() {
             true
         )
 
-        if (DuoSupportUtils.isDualScreenMode(this)) {
-            calenderBinding.exampleDateTitle.textAlignment = TEXT_ALIGNMENT_TEXT_START
-        }
         calenderBinding.calendarView.onDateSelectedListener = object : OnDateSelectedListener {
             override fun onDateSelected(date: ZonedDateTime) {
                 setExampleDate(date)

FluentUI.Demo/src/main/java/com/microsoft/fluentuidemo/demos/DateTimePickerActivity.kt

@@ -9,7 +9,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.Button
-import com.jakewharton.threetenabp.AndroidThreeTen
 import com.microsoft.fluentui.datetimepicker.DateTimePicker
 import com.microsoft.fluentui.datetimepicker.DateTimePickerDialog
 import com.microsoft.fluentui.datetimepicker.DateTimePickerDialog.DateRangeMode
@@ -20,8 +19,8 @@ import com.microsoft.fluentui.util.isAccessibilityEnabled
 import com.microsoft.fluentuidemo.DemoActivity
 import com.microsoft.fluentuidemo.R
 import com.microsoft.fluentuidemo.databinding.ActivityDateTimePickerBinding
-import org.threeten.bp.Duration
-import org.threeten.bp.ZonedDateTime
+import java.time.Duration
+import java.time.ZonedDateTime
 
 class DateTimePickerActivity : DemoActivity(), DateTimePickerDialog.OnDateTimePickedListener {
     companion object {
@@ -161,11 +160,6 @@ class DateTimePickerActivity : DemoActivity(), DateTimePickerDialog.OnDateTimePi
 
     private var dialogMode: Mode? = null
 
-    init {
-        // Initialization of ThreeTenABP required for ZoneDateTime
-        AndroidThreeTen.init(this)
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
 
         super.onCreate(savedInstanceState)

FluentUI.Demo/src/main/java/com/microsoft/fluentuidemo/demos/PersistentBottomSheetActivity.kt

@@ -240,7 +240,7 @@ class PersistentBottomSheetActivity : DemoActivity(), SheetItem.OnClickListener,
                     ContextCompat.getColor(this, R.color.bottomsheet_horizontal_icon_tint),
                     disabled = true
                 )
-            ), 0, marginBetweenView
+            ), 0, marginBetweenView, drawerTint = ContextCompat.getColor(this, R.color.bottomsheet_horizontal_icon_tint).toInt()
         )
         horizontalListAdapter.mOnSheetItemClickListener = this
         persistentSheetContentBinding.sheetHorizontalItemList3.layoutManager =