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

Make ShimmerLinesView inherit ShimmerView init #1362

Merged
merged 2 commits into from
Nov 15, 2022
Merged

Make ShimmerLinesView inherit ShimmerView init #1362

merged 2 commits into from
Nov 15, 2022

Conversation

jeaniehuynh
Copy link
Contributor

@jeaniehuynh jeaniehuynh commented Nov 15, 2022 •
edited
Loading

Platforms Impacted

  • iOS
  • macOS

Description of changes

According to Apple docs, "superclass initializers are automatically inherited if certain conditions are met." A couple things were wrong with the implementation done during tokenization that didn't meet those conditions and thus would break API upon going into devmain:

  1. lineCount, firstLineFillPercent, and lastLineFillPercent need to be properties so that they can have a default value
  2. ShimmerLinesView cannot have its own init

Verification

Tested init of ShimmerLinesView

Before After
image simulator_screenshot_0C7244D1-C7D7-495D-92DC-F9FE5A37262C

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

@jeaniehuynh jeaniehuynh requested a review from a team as a code owner November 15, 2022 05:36
@harrieshin
Copy link
Contributor

can we also add test cases in the demo app calling these apis and properties, please?

harrieshin
harrieshin approved these changes Nov 15, 2022
View reviewed changes
Copy link
Contributor

@harrieshin harrieshin left a comment

Choose a reason for hiding this comment

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

thanks for the quick turn around

@jeaniehuynh jeaniehuynh enabled auto-merge (squash) November 15, 2022 06:08
@jeaniehuynh jeaniehuynh merged commit e0b09a5 into microsoft:main Nov 15, 2022
@jeaniehuynh jeaniehuynh deleted the shimmerLinesViewInit branch November 15, 2022 06:13
@jeaniehuynh jeaniehuynh mentioned this pull request Nov 16, 2022
Merged
11 tasks
@edjamesmsft edjamesmsft mentioned this pull request Nov 19, 2022
Merged
11 tasks
edjamesmsft added a commit that referenced this pull request Nov 21, 2022
@edjamesmsft @huwilkes
@jeaniehuynh @laminesm @mischreiber @harrieshin
[Fluent 2 Tokens] Merge main (#1384)
9dd6669 
* Drop support for iOS 14 and remove availability checks (#1357)

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

* Make ShimmerLinesView inherit ShimmerView init

* move shimmer to fluent2 and add new api to demo

* Bring fluent2-tokens Segmented Control to main (#1363)

* 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

* Add demo to show notification bar from top (#1364)

* Update PR Template to include binary change (#1368)

* Fix PersonaListViewDemoController navigation bar transparency bug (#1372)

* Change from DemoController to UIViewController

* Revert "Change from DemoController to UIViewController"

This reverts commit 3b3aeb0.

* Fix bug

* Remove retain cycles (#1374)

* update xcode version to 14.1 for ci (#1371) (#1378)

* Implement the Unread Dot for TabBar and SideTabBar (#1349)

* 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

* Add isViewLoaded check (#1379)

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

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

This reverts commit 4fad398.

* Fix whitespace error

* Resolving merge conflicts

* Reverting Package.resolved to main

* Whitespace in Package.resolved

Co-authored-by: huwilkes <67026548+huwilkes@users.noreply.github.com>
Co-authored-by: Jeanie Huynh <31874971+jeaniehuynh@users.noreply.github.com>
Co-authored-by: Lamine Male <106181067+laminesm@users.noreply.github.com>
Co-authored-by: Mike Schreiber <mischreiber@microsoft.com>
Co-authored-by: Harrie Shin <hyshin@microsoft.com>
sophialee0416 added a commit that referenced this pull request Dec 1, 2022
@sophialee0416 @huwilkes
@jeaniehuynh @laminesm @mischreiber @harrieshin @edjamesmsft @lcapkovic @github-actions @markavitale
Merge pull request #1416 from sophialee0416/sople/mergeMain
9b45206 
* Drop support for iOS 14 and remove availability checks (#1357)

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

* Make ShimmerLinesView inherit ShimmerView init

* move shimmer to fluent2 and add new api to demo

* Bring fluent2-tokens Segmented Control to main (#1363)

* 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

* Add demo to show notification bar from top (#1364)

* Update PR Template to include binary change (#1368)

* Fix PersonaListViewDemoController navigation bar transparency bug (#1372)

* Change from DemoController to UIViewController

* Revert "Change from DemoController to UIViewController"

This reverts commit 3b3aeb0.

* Fix bug

* Remove retain cycles (#1374)

* update xcode version to 14.1 for ci (#1371) (#1378)

* Implement the Unread Dot for TabBar and SideTabBar (#1349)

* 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

* Add isViewLoaded check (#1379)

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

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

This reverts commit 4fad398.

* Fix whitespace error

* Defensive fixes for a UIViewPropertyAnimator crash (#1385)

* Latest localized resource files from Touchdown Build (#1388)

Co-authored-by: edjamesmsft <edjamesmsft@users.noreply.github.com>
Co-authored-by: Harrie Shin <hyshin@microsoft.com>

* Fix linting issue (#1393)

* Latest localized resource files from Touchdown Build (#1391)

Co-authored-by: markavitale <markavitale@users.noreply.github.com>
Co-authored-by: Harrie Shin <hyshin@microsoft.com>

* Update demo page cell style (#1389)

* Fix bottom sheet host height change detection (#1396)

* Latest localized resource files from Touchdown Build (#1400)

Co-authored-by: markavitale <markavitale@users.noreply.github.com>

* Latest localized resource files from Touchdown Build (#1401)

Co-authored-by: markavitale <markavitale@users.noreply.github.com>

* Fix PopupMenuItemCell's token sink to not overwrite custom colors (#1398)

* Change TVC updateAppearance to internal

* Fix PopupMenu token sink

* Fix Segmented Control unread dot for icons (#1408)

* Fix unread dot anchor logic

* Update demo to have an unread icon

Co-authored-by: huwilkes <67026548+huwilkes@users.noreply.github.com>
Co-authored-by: Jeanie Huynh <31874971+jeaniehuynh@users.noreply.github.com>
Co-authored-by: Lamine Male <106181067+laminesm@users.noreply.github.com>
Co-authored-by: Mike Schreiber <mischreiber@microsoft.com>
Co-authored-by: Harrie Shin <hyshin@microsoft.com>
Co-authored-by: James Edwards <edjamesmsft@outlook.com>
Co-authored-by: Lukas Capkovic <3610850+lcapkovic@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: edjamesmsft <edjamesmsft@users.noreply.github.com>
Co-authored-by: markavitale <markavitale@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 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
2 participants
@jeaniehuynh @harrieshin