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 #1513

Merged

Conversation

edjamesmsft
Copy link
Contributor

@edjamesmsft edjamesmsft commented Jan 25, 2023

Platforms Impacted

  • iOS
  • macOS

Description of changes

Binary change:

File Before After Delta
libFluentUI.a 28,298,208 28,677,424 +379,216

Merging main to fluent2-colors.

#1432
#1459
#1446
#1434
#1461
#1469
#1471
#1473
#1477
#1479
#1484
#1480
#1495
#1497
#1493
#1503

Verification

Built and ran simulator, testing the demos that had merge conflicts.

Main Fluent2 colors After Green
notificationMainLight notificationColorsLight notificationAfterLight
notificationMainDark notificationColorsDark notificationAfterDark notificationAfterGreen
tvcMainLight tvcColorsLight tvcAfterLight
tvcMainDark tvcColorsDark tvcAfterDark tvcAfterGreen
tooltipMainLight tooltipColorsLight tooltipAfterLight
tooltipMainDark tooltipColorsDark tooltipAfterDark tooltipAfterGreen

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 27 commits December 15, 2022 14:44
* fix rotation bug on segmented control (microsoft#1411)

* Fix pillMaskedLabelContainerView comment

* Fix update logic

* Make tokenSink and animation duration private

* Update selectionView on token update

Co-authored-by: Harrie Shin <hyshin@microsoft.com>
* Bring Tooltip to main

* remove extra space

* Bring changes from theming fix
* add launch tests

* remove test template

* update to use base class + resolve comments

* change back to swift + use extension

* change back to base class with overridden control name

* resolve comments
* add documentation for avatar

* add swiftui usage example
* Added button documentation

* Fix table in documentation

* Fix table

* Rename table sections + fix path and typo

* Resized documentation images

* Cleanup

* More cleanup

* Added names to documentation
…osoft#1477)

* Update Date Picker test to start from today

* Add explicit type interface
* Added new readme icon

* Added a vc for the readme

* Created scroll view and labels

* Added a ReadmeStrings class

* Removing title + polishing readme class

* Added a few more readmes

* Revert "Added new readme icon"

This reverts commit c73665f.

* Moving constant values into a struct

* Moved strings to their respective demo controllers

* Change from readme button text to icon

* Added todo to change color to fluent 2 ramp

* Moved constants struct to top of the file

* Use NSLayourConstraint.activate

* Added tvc readme section

* Removed unnecessary function

* Make fields private

* Refactor + added a few readmes

* Added more readmes

* Cleanup

* Move constraints logic to viewDidLoad

* Moved private properties to bottom of file
* add macos launch tests

* try adding to ci

* remove other build commands

* change arch

* change macOS version

* add back build commands
* test adding ios tests to ci

* remove -ios

* try changing to Demo.Development

* add new scheme

* add executable to run

* check run

* uncheck run

* change back to Demo.Development

* remove scheme

* change to just test

* add back scheme

* remove other build commands

* add back debug build

* add test retries

* comment out non tokenized tests

* remove retries + turn off parallelism

* add back other tests

* test if all are going to command bar

* change tests back to controlName

* add tear down that deletes app

* remove setup logic

* add timeouts

* change timeout to 1

* add back other build commands

* remove scheme

* whitespace change

* update tearDown to use isFirstLaunch

* fix linting issue

* remove isFirstLaunch from UserDefaults and add #if DEBUG

* try moving navigation back to setUpWithError

* whitespace change
* attempt to fix space bug

* add comment
* initial activity indicator tests

* add transition to dark mode

* whitespace change

* add dark mode color assert

* add default color to identifier

* update comment

* add dark mode + update to use .*

* add #if DEBUG

* add #if DEBUG to SceneDelegate

* add constants

* add type

* change to hex code

* removing color tests

* Revert "removing color tests"

This reverts commit 79c20c0.

* removing color tests again

* remove SceneDelegate change

* small change

* make code more readable + have SwiftUI inherit from UIKit

* remove super
* add indeterminate progress bar tests

* update SwiftUI to inherit from UIKit

* remove super

* resolve comments
@edjamesmsft edjamesmsft requested review from a team as code owners January 25, 2023 20:46
@edjamesmsft edjamesmsft changed the title Edjames/fully update main [Fluent 2 iOS] Merge main Jan 25, 2023
@edjamesmsft edjamesmsft added the fluent2-colors 🎨 Changes targeting the fluent2-colors branch. label Jan 25, 2023
@edjamesmsft edjamesmsft merged commit e42fb1c into microsoft:fluent2-colors Jan 25, 2023
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

8 participants