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 Tokens] Merge main #1384

Merged
merged 15 commits into from
Nov 21, 2022
Merged

[Fluent 2 Tokens] Merge main #1384

merged 15 commits into from
Nov 21, 2022

Conversation

edjamesmsft
Copy link
Member

@edjamesmsft edjamesmsft commented Nov 19, 2022 •
edited
Loading

Platforms Impacted

  • iOS
  • macOS

Description of changes

Binary change:

Before After
29,250,452 29,276,969

Verification

Built and ran simulator, verifying behavior is as expected.

Before After
Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 37 20 Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 19 31
Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 37 26 Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 19 35
Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 37 04 Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 20 23
Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 37 09 Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 20 31
Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 36 47 Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 20 55
Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 36 52 Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 21 00
Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 36 26 Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 21 36
Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 36 30 Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 21 41
Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 36 01 Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 21 55
Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 36 09 Simulator Screen Shot - iPhone 14 Pro - 2022-11-18 at 17 22 02

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

huwilkes and others added 13 commits November 11, 2022 17:04
@huwilkes
Drop support for iOS 14 and remove availability checks (microsoft#1357)
4fad398 
* Update FluentUI project

* Update FluentUI xcconfig

* Update FluentUI.Demo project

* Update MicrosoftFluentUI.podspec

* Clean up Button

* Clean up CommandBarButton

* Clean up CommandBarButtonGroupView

* Clean up LargeContentViewerModifier

* Clean up Drawer

* Clean up NavigationBar

* Clean up BadgeLabelButton

* Clean up PillButton

* Clean up PillButtonBar

* Clean up SegmentedPillButton

* Clean up SideTabBar

* Clean up TabBarView

* Clean up PillButton v2

* Clean up PillButton v3

* Revert "Update FluentUI project"

This reverts commit 1c97631.

* Update README.md

* Update Package.swift
@jeaniehuynh
Make ShimmerLinesView inherit ShimmerView init (microsoft#1362)
e0b09a5 
* Make ShimmerLinesView inherit ShimmerView init

* move shimmer to fluent2 and add new api to demo
@huwilkes
Bring fluent2-tokens Segmented Control to main (microsoft#1363)
42700d7 
* Bring in fluent2-token control

* Add token set to project

* Update dependent controls

* Add colored background for demo

* Update demos

* Update demo order

* Fix whitespace error
@jeaniehuynh
Add demo to show notification bar from top (microsoft#1364)
595c7e7
@huwilkes
Update PR Template to include binary change (microsoft#1368)
67f385a
@laminesm
Fix PersonaListViewDemoController navigation bar transparency bug (mi…
7b969ee 
…crosoft#1372)

* Change from DemoController to UIViewController

* Revert "Change from DemoController to UIViewController"

This reverts commit 3b3aeb0.

* Fix bug
@mischreiber
Remove retain cycles (microsoft#1374)
4d8816c
@harrieshin
update xcode version to 14.1 for ci (microsoft#1371) (microsoft#1378)
b61434f
@edjamesmsft
Implement the Unread Dot for TabBar and SideTabBar (microsoft#1349)
b72f51e 
* Implementing the unread dot on TabBarView

* Better naming for variables and events

* Updating SideTabBar demo to show the unread dot

* Pr feedback - reorganizing, renaming, better documentation

* Updating variable names and locations to follow guidance

* Added accessibility string for unread dot

* Switching to using a badge label for the unread dot

* Cleaning up commented out code

* Simplifying logic, using a single view for both the badge and the unreadDot

* PR cleanup
@laminesm
Add isViewLoaded check (microsoft#1379)
242ba39
@huwilkes
Revert "Drop support for iOS 14 and remove availability checks (micro…
3222188 
…soft#1357)" (microsoft#1383)

* Revert "Drop support for iOS 14 and remove availability checks (microsoft#1357)"

This reverts commit 4fad398.

* Fix whitespace error
@edjamesmsft
Merge main - maintain merge conflicts
e8a8b63
@edjamesmsft
Resolving merge conflicts
d2b1246
@edjamesmsft edjamesmsft added the fluent2-tokens Changes meant to be merged to the fluent2-tokens branch. label Nov 19, 2022
@edjamesmsft edjamesmsft requested review from a team as code owners November 19, 2022 01:27
laminesm
laminesm reviewed Nov 19, 2022
View reviewed changes
Copy link
Contributor

@laminesm laminesm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are the changes to Package.resolved supposed to come through as well?
Screenshot 2022-11-18 at 6 50 41 PM

@edjamesmsft
Copy link
Member Author

Are the changes to Package.resolved supposed to come through as well?

Not intentional, good catch, I will revert this change!

@edjamesmsft edjamesmsft merged commit 9dd6669 into microsoft:fluent2-tokens Nov 21, 2022
@edjamesmsft edjamesmsft deleted the edjames/mergeMainFluentTokens branch November 24, 2022 00:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@harrieshin harrieshin harrieshin approved these changes

@laminesm laminesm laminesm approved these changes

Assignees
No one assigned
Labels
fluent2-tokens Changes meant to be merged to the fluent2-tokens branch.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@edjamesmsft @harrieshin @laminesm @huwilkes @jeaniehuynh @mischreiber