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

Revert #6275 (switch back to using a local DesignKit package). #6586

Merged
merged 2 commits into from
Aug 19, 2022

Conversation

pixlwave
Copy link
Member

@pixlwave pixlwave commented Aug 18, 2022

Reverts #6275 with the exception of:

  • Leaves the SwiftUI userInterfaceStyle change on VectorHostingController.
  • Continues to track Package.resolved in git.
  • Leaves the confetti colour conversion code unchanged.

The second commit make some small changes to code introduced after #6275 in order to compile successfully, updates the customisation doc and adds a change log.

@pixlwave pixlwave marked this pull request as ready for review August 18, 2022 11:13
@pixlwave pixlwave requested review from a team and gileluard and removed request for a team August 18, 2022 11:13
@github-actions
Copy link

github-actions bot commented Aug 18, 2022

📱 Scan the QR code below to install the build for this PR.
🔒 This build is for internal testing purpose. Only devices listed in the ad-hoc provisioning profile can install Element Alpha.

QR code

If you can't scan the QR code you can install the build via this link: https://i.diawi.com/W6X2rr

@codecov-commenter
Copy link

Codecov Report

Merging #6586 (74b4318) into develop (2643298) will increase coverage by 0.00%.
The diff coverage is 12.19%.

@@           Coverage Diff            @@
##           develop    #6586   +/-   ##
========================================
  Coverage     6.28%    6.28%           
========================================
  Files         1458     1455    -3     
  Lines       153943   153907   -36     
  Branches     61880    61873    -7     
========================================
- Hits          9672     9670    -2     
+ Misses      143864   143829   -35     
- Partials       407      408    +1     
Impacted Files Coverage Δ
Riot/Managers/Theme/Themes/DarkTheme.swift 0.00% <0.00%> (ø)
...iftUI/Modules/Common/Avatar/View/AvatarImage.swift 0.00% <0.00%> (ø)
...es/Common/Avatar/View/PlaceholderAvatarImage.swift 0.00% <0.00%> (ø)
.../Modules/Common/Avatar/View/SpaceAvatarImage.swift 0.00% <0.00%> (ø)
...tUI/Modules/Common/EffectsScene/EffectsScene.swift 0.00% <0.00%> (ø)
...dules/Common/Theme/ThemeUsersColorsExtension.swift 0.00% <0.00%> (ø)
...Modules/Common/Theme/Themes/DarkThemeSwiftUI.swift 0.00% <0.00%> (ø)
.../Modules/Common/Util/BorderedInputFieldStyle.swift 0.00% <0.00%> (ø)
...wiftUI/Modules/Common/Util/ClearViewModifier.swift 0.00% <0.00%> (ø)
...iftUI/Modules/Common/Util/MultilineTextField.swift 0.00% <0.00%> (ø)
... and 23 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Copy link
Contributor

@gileluard gileluard left a comment

Choose a reason for hiding this comment

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

lgtm 👍

@pixlwave
Copy link
Member Author

(Force pushed a re-worded commit message)

@pixlwave pixlwave merged commit c94631e into develop Aug 19, 2022
@pixlwave pixlwave deleted the doug/revert-6275 branch August 19, 2022 10:06
@sonarcloud
Copy link

sonarcloud bot commented Aug 19, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

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.

3 participants