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

SegmentedControl code clean up #1432

Merged
merged 7 commits into from Dec 15, 2022
Merged

SegmentedControl code clean up #1432

merged 7 commits into from Dec 15, 2022

Conversation

huwilkes
Copy link
Collaborator

@huwilkes huwilkes commented Dec 5, 2022 •
edited

Platforms Impacted

  • iOS
  • macOS

Description of changes

  • fix rotation bug on segmented control #1411
    The current SegmentedControl doesn't have this rotation issue due to the buttons being contained in a stackView, but there are some other logic improvements to pull from this commit to main.

Validation

Before After
SegmentedControl_SelectionResize_Before SegmentedControl_SelectionResize_After

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 huwilkes requested a review from a team as a code owner December 5, 2022 23:10
@harrieshin
Copy link
Contributor

nit the title of this PR should be different because it isn't really about rotation

@huwilkes huwilkes changed the title fix rotation bug on segmented control (#1411) SegmentedControl code clean up Dec 14, 2022
@huwilkes
Copy link
Collaborator Author

nit the title of this PR should be different because it isn't really about rotation

The title of the PR was because it was just a cherry pick of that fix, but I've updated it now that I'm also doing some other clean up.

@huwilkes huwilkes merged commit 9cc9773 into microsoft:main Dec 15, 2022
@huwilkes huwilkes mentioned this pull request Dec 15, 2022
Merged
11 tasks
@edjamesmsft edjamesmsft mentioned this pull request Jan 25, 2023
Merged
11 tasks
edjamesmsft added a commit that referenced this pull request Jan 25, 2023
@edjamesmsft @huwilkes
@harrieshin @sophialee0416 @jeaniehuynh @joannaquu @laminesm
[Fluent 2 iOS] Merge main (#1513)
e42fb1c 
* SegmentedControl code clean up (#1432)

* fix rotation bug on segmented control (#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>

* Update to checkout v3 (#1459)

* Adding additional leading view to TableViewCell (#1446)

* Merge tokenized Tooltip into main (#1434)

* Bring Tooltip to main

* remove extra space

* Bring changes from theming fix

* [XCUITests] Launch tests for all controls (#1461)

* 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 (#1469)

* add documentation for avatar

* add swiftui usage example

* Add documentation for Button (#1471)

* 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

* fix tooltip png filenames (#1473)

* Update Date Picker test to start from `now` to fix test failure (#1477)

* Update Date Picker test to start from today

* Add explicit type interface

* Create a Readme section for demo app controls (#1268)

* 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

* Change unavailable to unavailable (#1475)

* Centralize missing readme string (#1479)

* [XCUITests] Add macOS launch tests (#1484)

* add macos launch tests

* try adding to ci

* remove other build commands

* change arch

* change macOS version

* add back build commands

* Resolving height issue (#1485)

* [XCUITests] Add iOS XCUITests to CI (#1480)

* 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

* Skip failing date picker tests (#1495)

* Fix BadgeField space bug (#1497)

* attempt to fix space bug

* add comment

* [XCUITests] Activity Indicator tests (#1493)

* 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

* [XCUITests] Indeterminate Progress Bar tests (#1503)

* add indeterminate progress bar tests

* update SwiftUI to inherit from UIKit

* remove super

* resolve comments

* Resolving demo conflicts

* Resolving TableViewCell merge conflicts

* Taking tokenized tooltip from main - no fluent2

* Getting TVC building again

* Updating tooltip tokens

* Fixing TVC sample data and demo project

* Fixing token values

Co-authored-by: huwilkes <67026548+huwilkes@users.noreply.github.com>
Co-authored-by: Harrie Shin <hyshin@microsoft.com>
Co-authored-by: Sophia Lee <sophia.lee0416@gmail.com>
Co-authored-by: Jeanie Huynh <31874971+jeaniehuynh@users.noreply.github.com>
Co-authored-by: Joanna Qu <55368679+joannaquu@users.noreply.github.com>
Co-authored-by: Lamine Male <106181067+laminesm@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@harrieshin harrieshin harrieshin left review comments

@edjamesmsft edjamesmsft edjamesmsft approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@huwilkes @harrieshin @edjamesmsft