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

[fluent2-tokens] Merging main -> fluent2-tokens branch #1416

Merged
merged 22 commits into from
Dec 1, 2022

Conversation

sophialee0416
Copy link
Contributor

@sophialee0416 sophialee0416 commented Nov 30, 2022

Platforms Impacted

  • iOS
  • macOS

Description of changes

Merging changes from main -> fluent2-tokens branch. Making up for last week's merge in this PR.

List of commits coming from main branch:

Verification

TestApp is running great!

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 22 commits November 11, 2022 17:04
* 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
* Make ShimmerLinesView inherit ShimmerView init

* move shimmer to fluent2 and add new api to demo
* 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
…crosoft#1372)

* Change from DemoController to UIViewController

* Revert "Change from DemoController to UIViewController"

This reverts commit 3b3aeb0.

* Fix bug
* 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
…soft#1357)" (microsoft#1383)

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

This reverts commit 4fad398.

* Fix whitespace error
Co-authored-by: edjamesmsft <edjamesmsft@users.noreply.github.com>
Co-authored-by: Harrie Shin <hyshin@microsoft.com>
Co-authored-by: markavitale <markavitale@users.noreply.github.com>
Co-authored-by: Harrie Shin <hyshin@microsoft.com>
Co-authored-by: markavitale <markavitale@users.noreply.github.com>
Co-authored-by: markavitale <markavitale@users.noreply.github.com>
…crosoft#1398)

* Change TVC updateAppearance to internal

* Fix PopupMenu token sink
* Fix unread dot anchor logic

* Update demo to have an unread icon
@sophialee0416 sophialee0416 requested a review from a team as a code owner November 30, 2022 22:52
@edjamesmsft
Copy link
Member

Nit: please list the commits that this merge covers.

@sophialee0416 sophialee0416 merged commit 9b45206 into microsoft:fluent2-tokens Dec 1, 2022
@sophialee0416 sophialee0416 deleted the sople/mergeMain branch December 1, 2022 05:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants