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.

Sign up for GitHub

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

Jump to bottom

[Fluent 2 iOS] Merge main #1435

Closed
wants to merge 12 commits into from
Closed

[Fluent 2 iOS] Merge main #1435

wants to merge 12 commits into from

Conversation

edjamesmsft
Copy link
Contributor

@edjamesmsft edjamesmsft commented Dec 6, 2022 •
edited by ghost
Loading

Platforms Impacted

  • iOS
  • macOS

Description of changes

Binary change:

Before After
27,430,673 27,432,240

Merge main into fluent2-colors.

Verification

Built and ran simulator, ensuring behavior of BottomSheet and PopupMenu are consistent

Before Main Before fluent2-colors After
Simulator Screen Shot - iPhone 14 Pro - 2022-12-06 at 15 14 38 Simulator Screen Shot - iPhone 14 Pro - 2022-12-06 at 15 07 32 Simulator Screen Shot - iPhone 14 Pro - 2022-12-06 at 15 03 14
Simulator Screen Shot - iPhone 14 Pro - 2022-12-06 at 15 14 48 Simulator Screen Shot - iPhone 14 Pro - 2022-12-06 at 15 07 41 Simulator Screen Shot - iPhone 14 Pro - 2022-12-06 at 15 03 29
Simulator Screen Shot - iPhone 14 Pro - 2022-12-06 at 15 15 03 Simulator Screen Shot - iPhone 14 Pro - 2022-12-06 at 15 07 52 Simulator Screen Shot - iPhone 14 Pro - 2022-12-06 at 15 03 51
Simulator Screen Shot - iPhone 14 Pro - 2022-12-06 at 15 15 14 Simulator Screen Shot - iPhone 14 Pro - 2022-12-06 at 15 08 03 Simulator Screen Shot - iPhone 14 Pro - 2022-12-06 at 15 04 04

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

lukas-cap and others added 12 commits November 21, 2022 11:56
@lukas-cap
Defensive fixes for a UIViewPropertyAnimator crash (microsoft#1385)
c92abb7
@github-actions @edjamesmsft @harrieshin
Latest localized resource files from Touchdown Build (microsoft#1388)
c710b95 
Co-authored-by: edjamesmsft <edjamesmsft@users.noreply.github.com>
Co-authored-by: Harrie Shin <hyshin@microsoft.com>
@laminesm
Fix linting issue (microsoft#1393)
e6f220c
@github-actions @markavitale @harrieshin
Latest localized resource files from Touchdown Build (microsoft#1391)
f4e3435 
Co-authored-by: markavitale <markavitale@users.noreply.github.com>
Co-authored-by: Harrie Shin <hyshin@microsoft.com>
@laminesm
Update demo page cell style (microsoft#1389)
16d1da2
@lukas-cap
Fix bottom sheet host height change detection (microsoft#1396)
d211055
@github-actions @markavitale
Latest localized resource files from Touchdown Build (microsoft#1400)
6dac60b 
Co-authored-by: markavitale <markavitale@users.noreply.github.com>
@github-actions @markavitale
Latest localized resource files from Touchdown Build (microsoft#1401)
ae56f02 
Co-authored-by: markavitale <markavitale@users.noreply.github.com>
@huwilkes
Fix PopupMenuItemCell's token sink to not overwrite custom colors (mi…
2e5cff7 
…crosoft#1398)

* Change TVC updateAppearance to internal

* Fix PopupMenu token sink
@huwilkes
Fix Segmented Control unread dot for icons (microsoft#1408)
5c1f841 
* Fix unread dot anchor logic

* Update demo to have an unread icon
@edjamesmsft
Merge main preserving merge conflicts
04d1943
@edjamesmsft
Fix merge conflicts
86eb1d3
@edjamesmsft edjamesmsft added the fluent2-colors 🎨 Changes targeting the fluent2-colors branch. label Dec 6, 2022
@edjamesmsft edjamesmsft requested a review from a team as a code owner December 6, 2022 23:23
@edjamesmsft
Copy link
Contributor Author

This was done incorrectly. Closing and re-doing.

@edjamesmsft edjamesmsft closed this Dec 6, 2022
@edjamesmsft edjamesmsft deleted the edjames/updateFluent2Colors branch December 6, 2022 23:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
fluent2-colors 🎨 Changes targeting the fluent2-colors branch.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@edjamesmsft @lukas-cap @laminesm @huwilkes