Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fluent 2 iOS] Merge Main #1258

Merged
merged 41 commits into from
Sep 27, 2022

Conversation

edjamesmsft
Copy link
Member

@edjamesmsft edjamesmsft commented Sep 15, 2022

Platforms Impacted

  • iOS
  • macOS

Description of changes

Merging main into fluent2-colors. This includes the following changes:

Verification

Built and ran simulator app, running through each major conflict's demo app (ActivityIndicator, Avatar, HUD, IndeterminateProgressBar, Notification, PersonaButtonCarousel, TableViewTokens), ensuring functionality did not regress.

(screenshots are incoming - there are many)

Main fluent2-colors before fluent2-colors after
HUD light HUD light fluent2 colors Simulator Screen Shot - iPhone 13 Pro Max - 2022-09-14 at 16 39 42
HUD dark HUD dark fluent2 colors Simulator Screen Shot - iPhone 13 Pro Max - 2022-09-14 at 16 42 03
ActivityIndicator light ActivityIndicator light fluent2 colors Simulator Screen Shot - iPhone 13 Pro Max - 2022-09-14 at 16 36 51
ActivityIndicator dark ActivityIndicator dark fluent2 colors Simulator Screen Shot - iPhone 13 Pro Max - 2022-09-14 at 16 41 10
Avatar light Avatar light fluent2 colors Simulator Screen Shot - iPhone 13 Pro Max - 2022-09-14 at 16 37 00
Avatar dark Avatar dark fluent2 colors Simulator Screen Shot - iPhone 13 Pro Max - 2022-09-14 at 16 41 18
IndeterminateProgressBar light IndeterminateProgressBar light fluent2 colors Simulator Screen Shot - iPhone 13 Pro Max - 2022-09-14 at 16 37 10
nateProgressBar
IndeterminateProgressBar dark IndeterminateProgressBar dark fluent2 colors Simulator Screen Shot - iPhone 13 Pro Max - 2022-09-14 at 16 41 30
NotifcationTokens light NotifcationTokens light fluent2 colors Simulator Screen Shot - iPhone 13 Pro Max - 2022-09-14 at 16 37 22
NotifcationTokens dark NotifcationTokens dark fluent2 colors Simulator Screen Shot - iPhone 13 Pro Max - 2022-09-16 at 15 07 25
PersonaButton light PersonaButton light fluent2 colors Simulator Screen Shot - iPhone 13 Pro Max - 2022-09-14 at 16 37 57
PersonaButton dark PersonaButton dark fluent2 colors Simulator Screen Shot - iPhone 13 Pro Max - 2022-09-14 at 16 41 40
TableViewTokens light TableViewTokens light fluent2 colors Simulator Screen Shot - iPhone 13 Pro Max - 2022-09-14 at 16 38 11
TableViewTokens dark TableViewTokens dark fluent2 colors Simulator Screen Shot - iPhone 13 Pro Max - 2022-09-14 at 16 41 55

Pull request checklist

This PR has considered:

  • Light and Dark appearances
  • iOS supported versions (all major versions greater than or equal current target deployment version)
  • VoiceOver and Keyboard Accessibility
  • Internationalization and Right to Left layouts
  • Different resolutions (1x, 2x, 3x)
  • Size classes and window sizes (iPhone vs iPad, notched devices, multitasking, different window sizes, etc)
  • iPad Pointer interaction
  • SwiftUI consumption (validation or new demo scenarios needed)
  • Objective-C exposure (provide it only if needed)
Microsoft Reviewers: Open in CodeFlow

harrieshin and others added 30 commits August 29, 2022 08:44
-new private var to bookkeep when the colors are meant to be custom vs default
-remove unnecessary initialsTextField background coloring. It should be just handled by the initailsView itself.
-add a test case in TestAvatarController to have avatar hosted by NSPopover
microsoft#1197)

ISSUE

When Voice Over accessibility is enabled, the TableViewHeaderFooterView title
has a wrong selection when presented in a popover on iPad.

The title in this header/footer is a UITextView and in the existing implementation we override the default accessibility behavior by making the UITextView an accessibility element.
This implementation leads to a wrong text selection for title in popover on iPad.

FIX

The fix is to remove the accessibility element assignment from UITextView and keep the accessibility trait insertion as .header when TableViewHeaderFooterView is used as header and remove the accessibility trait insertion when the view is used as footer. This implementation already exists but it was followed by a 'Bug in iOS - ...' implementation where accessibility element for UITextView was set up to 'false' and then back to 'true'. That implementation broke the VO selection for multi-line of text title for both header and footer scenarios. Removing that logic fixed the issue properly.
* Add Objective C demo for PopupMenu

* Move setup to loadVIew

* Set stack alignment to top to resize button

* Remove comments

* Add selected image for Toronto so it isn't a blue square

* Fix indentation

* Fix whitespace

* Move ObjC to middle of name
* Merging ControlTokenSet from fluent2-tokens

* Delete accidental file merge
* Align Notification with Figma

* Revert naming and token change

* Align Notification with Figma

* Revert naming and token change

* Rebase onto main

* Delete dupe edge border

* Revert removing default bool
…microsoft#1210)

Implement functionality to show a custom view within a CommandBarItem
Co-authored-by: Sophia Lee <sophia.lee0416@gmail.com>
UIScreen.main is deprecated in iOS 16 (https://developer.apple.com/documentation/uikit/uiscreen/1617815-main).

Most of the usage of UIScreen main is legacy code that tries to figure out device pixel. But, in reality, in order to avoid anti-aliasing we should be just making sure we draw on integer points.
If we are trying to draw border, let's just draw on half point for now.

* update demo windowscene

* demo app only: tableviewcell accessory adhering to 1pt borderwidth and 2pt corner radius which are closer to fluent 2 design tokens

* remove usage of UIScreen.middleOrigin

* remove usage of roundDownToDevicePixels

* remove usuage of deviceLineHeight. just use UIFont's lineheight

* delete UIFont extension.

* remove usage of roundToDevicePixels

* remove UIScreen+extension

* Separator height to be half a point

* remove UITableViewCell+extension

* remove uiscreen.main.bounds usage

* remove file reference that doesn't exist

* use guard let to figure out the window for drawercontroller
* Update documentation to be explicit about linear

* Add Linear to name of GradientInfo
* Remove UIEdgeInsets from SegmentedPillButton

* Add TODO
* Move `fluentTheme` from window to view

* Add logic to only refresh if view is a descendent of the newly themed view
Currently we always render the toast image as template. If the client team pass in image that is set "renderAsOriginal" respect that mode.
…t currently grows to fit the image size within it
)

use FluentUI as a clang module in objc, we want to publish module.modulemap next to the fluentui-swift.h
* First set of controls without spacing tokens

* Complete the rest of the controls

* Restoring in-use values

* Move layout constants to TokenSets
…microsoft#1229)

* Decrease CommandBar item group spacing to 8. Change received approval from the Fluent Design team.
* Enable LargeContentViewer for the CommandBar
amoggo and others added 8 commits September 12, 2022 14:42
…uent-Button

introduced a Medium Fluent Button Size
It was discovered that the RTL behavior for the pinned items in CommandBar was off. The leading and trailing groups were switching sides as expected, but the additional transform being applied `configureHierarchy` is causing the views inside the group to be shown in LTR order.

Fix: Remove the transform for the leading and trailing groups inside `configureHierarchy` and let the default behavior from the UIStackView handle the transition.
* Renamed avatar sizes

* Added avatar size 20 and size 56

* Added new sizes in demo controllers

* Removed unused variable in AvatarGroupDemoController

* Moved changes to token sets

* Moved size tokens outside of AvatarTokenSet to fix conflicts
@edjamesmsft edjamesmsft requested review from a team as code owners September 15, 2022 21:54
@sophialee0416
Copy link
Contributor

Nit: Could you put the list of PRs into a bulleted list? I think it automatically shows the title for the PR as well in that format so it'll be easier to read

@edjamesmsft edjamesmsft changed the title Edjames/merge main [Fluent 2 iOS] Merge Main Sep 16, 2022
@edjamesmsft edjamesmsft added the fluent2-colors 🎨 Changes targeting the fluent2-colors branch. label Sep 16, 2022
@edjamesmsft edjamesmsft merged commit e32b512 into microsoft:fluent2-colors Sep 27, 2022
@edjamesmsft edjamesmsft deleted the edjames/mergeMain branch September 29, 2022 21:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
fluent2-colors 🎨 Changes targeting the fluent2-colors branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet