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

chore!: migrate yaru.dart and yaru_icons.dart into yaru_widgets #836

Merged
merged 556 commits into from Feb 25, 2024

Conversation

Feichtmeier
Copy link
Member

@Feichtmeier Feichtmeier commented Feb 22, 2024

⚠️ ⚠️ ⚠️ ⚠️ ⚠️ ⚠️ ⚠️

BREAKING CHANGE

This migrates yaru.dart and yaru_icons.dart into this repository, but all commits are kept 🤞

Bildschirmfoto 2024-02-22 um 17 31 19 Bildschirmfoto 2024-02-22 um 17 47 26

To merge this we need to check very precicly if everything is correctly merged

TODO

  • Check if the icons work correcty @Jupi007 (I moved your example to "YaruIcons" page in the example)
  • Check if the theme works correctly @Feichtmeier
  • Double check if I didn't make any mistake @spydon and/or @d-loose

Ref #835

⚠️ ⚠️ ⚠️ ⚠️ ⚠️ ⚠️ ⚠️

ymauray and others added 30 commits November 11, 2022 13:48
Now that yaru_colors.dart has the Ubuntu Butterfly Pink, we can have the variant in yaru.dart
Example: improve variant selector and show all
* Add source code </> icon
Fixes #78

* Better icon
* Text inputs: change cursor color to onSurface

* Change inputs icon color to onSurface
* Rename toggle-button folder into toogle

- Checkbox-button -> checkbox
- Radio-button -> radio
- Switch-button -> switch

* Rename arrow icons

- Arrow-*-simple -> arrow
- Arrow -> arrow-filled

* Rename audio -> music_note

* Rename addon -> puzzle_piece

* Rename arrow -> arrow-outlined

* Optimize bettery naming

- Battery-10 -> battery-full
- Divide by 10 battery level
- Remove level prefix

* Simplify weather icon names
Add new showers icon

* Symlink online-accounts to could

* Rename edit-*icons

* Add folder-new icon

* Improve media and text icon names

* Optimize object icon names

* Optimize object icon names

* Sync printer-network with folder-network

* Radio -> radiobox

* Optimize speaker icon names

* Revert example.dart

* Optimize fullscreen icon names

* Better computer-legacy icon

* Simplify all other icon names

* Add screen icon

* Improve a few last icon names

* Remove new icons (for next PR)

* Fix battery empty name

* Build font

* Update example
* Add binding enum of freedesktop compliant icon names

Fixes #104

* Add shortcut to all icons
* YaruTheme widget: build empty during accent color initialiation

Fixes: #231

* Use mocked GSettings in all widget tests
@Feichtmeier Feichtmeier marked this pull request as ready for review February 22, 2024 16:50
@Feichtmeier
Copy link
Member Author

Bildschirmaufnahme_2024-02-23_um_14.14.07.mov

The goldens pass locally after clean/upgrade and regeneration
So they will prbly need the nightly CI to pass again here, so you can ignore those failed golden tests

Copy link
Member

@Jupi007 Jupi007 left a comment

Choose a reason for hiding this comment

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

I think we can improve and simplify some files placements:

  • colors.dart could be moved to the foundation/ folder ;
  • icons_foundation/ could be merged with foundation ;
  • text/font/ should be moved to assets/, and text/text_theme.dart to themes/ ;
  • icons_widgets/ to widgets ;
  • and I'm not sure, but theme_widgets/inherited_theme.dart can maybe be moved to widgets/ (or themes/) ?

Except that, this looks great. I didn't noticed any problem with icons :D

pubspec.yaml Outdated Show resolved Hide resolved
@Feichtmeier
Copy link
Member Author

Feichtmeier commented Feb 24, 2024

I think we can improve and simplify some files placements:

* `colors.dart` could be moved to the `foundation/` folder ;

* `icons_foundation/` could be merged with `foundation` ;

* `text/font/` should be moved to `assets/`, and `text/text_theme.dart` to `themes/` ;

* `icons_widgets/` to `widgets` ;

* and I'm not sure, but `theme_widgets/inherited_theme.dart` can maybe be moved to `widgets/` (or `themes/`) ?

Except that, this looks great. I didn't noticed any problem with icons :D

I kept the sub structure for this PR to make a first atempt where everything works. Maybe I could do this in a second PR? then I change from Fix to Ref in the PR desc
And thank you very much for catching the font!

@Jupi007
Copy link
Member

Jupi007 commented Feb 24, 2024

Maybe I could do this in a second PR?

Ofc, sounds good 👍

Copy link
Member

@Jupi007 Jupi007 left a comment

Choose a reason for hiding this comment

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

LGTM 👍

Copy link
Collaborator

@spydon spydon left a comment

Choose a reason for hiding this comment

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

Lgtm!

README.md Outdated Show resolved Hide resolved
@Feichtmeier Feichtmeier merged commit 92a0f66 into main Feb 25, 2024
7 of 8 checks passed
@Feichtmeier Feichtmeier deleted the monorepo-prep branch February 25, 2024 14:59
@github-actions github-actions bot mentioned this pull request Feb 25, 2024
@Feichtmeier Feichtmeier restored the monorepo-prep branch February 25, 2024 15:03
@Feichtmeier Feichtmeier deleted the monorepo-prep branch February 25, 2024 15:28
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