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

Convert the positioning enums and LayoutView to Proto #1774

Merged
merged 1 commit into from
Nov 14, 2024
Merged

Convert the positioning enums and LayoutView to Proto #1774

merged 1 commit into from
Nov 14, 2024
+628 −702

Conversation

timothyfroehlich
Copy link
Member

@timothyfroehlich timothyfroehlich commented Nov 5, 2024 •
edited
Loading

Tree of downstream PRs as of 2024-11-14

Fixes #1725
Fixes #1723

@timothyfroehlich timothyfroehlich self-assigned this Nov 5, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 5, 2024 •
edited
Loading

Snapshot diff report vs base branch: main
Last updated: Thu Nov 14 10:06:57 PST 2024, Sha: 96b48bb
No differences detected

@yiqunw700
Copy link
Contributor

Is this pr ready for review?
Looks like there are some shifts with the screenshots:

  1. vertical centered now aligns with bottom
  2. horizontal centered now aligns with end

@timothyfroehlich timothyfroehlich changed the base branch from main to wb/froeht/new-fetch-test November 7, 2024 19:01
@timothyfroehlich timothyfroehlich force-pushed the wb/froeht/protoconv-layout-positioning branch 2 times, most recently from 136bba8 to 460e637 Compare November 7, 2024 19:55
@timothyfroehlich
Copy link
Member Author

Is this pr ready for review? Looks like there are some shifts with the screenshots:

  1. vertical centered now aligns with bottom
  2. horizontal centered now aligns with end

It's not, it's still marked as draft.

@timothyfroehlich timothyfroehlich force-pushed the wb/froeht/protoconv-layout-positioning branch from 460e637 to 6bb5978 Compare November 7, 2024 20:18
@timothyfroehlich
Copy link
Member Author

@yiqunw700 I can't figure out what's causing the other diffs, do you have any ideas?

@timothyfroehlich timothyfroehlich force-pushed the wb/froeht/protoconv-layout-positioning branch from 6bb5978 to d2c4d90 Compare November 7, 2024 21:14
@timothyfroehlich timothyfroehlich force-pushed the wb/froeht/protoconv-layout-positioning branch from d2c4d90 to aebf987 Compare November 11, 2024 22:28
@timothyfroehlich timothyfroehlich force-pushed the wb/froeht/protoconv-layout-positioning branch from a0693bf to 3bc306a Compare November 12, 2024 17:36
This was referenced Nov 12, 2024
Open
Merged
@timothyfroehlich timothyfroehlich force-pushed the wb/froeht/protoconv-layout-positioning branch from 4941256 to 9baddf8 Compare November 12, 2024 18:47
@timothyfroehlich timothyfroehlich force-pushed the wb/froeht/protoconv-layout-positioning branch from 9baddf8 to ab2a727 Compare November 12, 2024 19:01
@timothyfroehlich timothyfroehlich marked this pull request as ready for review November 12, 2024 19:33
@timothyfroehlich timothyfroehlich force-pushed the wb/froeht/protoconv-layout-positioning branch from ab2a727 to 2b00867 Compare November 13, 2024 20:33
@timothyfroehlich timothyfroehlich force-pushed the wb/froeht/new-fetch-test branch 2 times, most recently from 0576fcb to f2c22b8 Compare November 13, 2024 23:09
@timothyfroehlich timothyfroehlich force-pushed the wb/froeht/protoconv-layout-positioning branch from 2b00867 to 46a1f74 Compare November 13, 2024 23:10
github-merge-queue bot pushed a commit that referenced this pull request Nov 14, 2024
@timothyfroehlich
Add new Cargo fetch tests and remove old mocked pseudo-test (#1776)
5e466a0 
<!-- start git-machete generated -->

## Tree of downstream PRs as of 2024-11-12

* **PR #1776 (THIS ONE)**:
  `main` ← `wb/froeht/new-fetch-test`

    * PR #1774:
`wb/froeht/new-fetch-test` ← `wb/froeht/protoconv-layout-positioning`

      * PR #1782:
`wb/froeht/protoconv-layout-positioning` ← `wb/froeht/1731-meter-data`

<!-- end git-machete generated -->

This adds a new Cargo fetch test to check that a doc can be fetched and
serialized. Because we don't want GitHub to be trying to fetch files,
it's locked behind a new feature, "test_fetches".

This also removes the figma_v1_mock file and feature. This was a pseudo
test that wasn't being executed by anything. It worked by using a
feature flag to mock the http fetch, which meant that if the feature
flag was included that no http queries would work, including the new
fetch test.
Base automatically changed from wb/froeht/new-fetch-test to main November 14, 2024 17:56
@timothyfroehlich
Convert the positioning enums and LayoutView to Proto
96b48bb 
Fixes #1725
Fixes #1723

# Conflicts:
#	crates/figma_import/src/tools/fetch_layout.rs
#	crates/figma_import/tests/layout-unit-tests.dcf
#	crates/layout/src/layout_style.rs
#	crates/layout/src/styles.rs
#	designcompose/src/main/assets/figma/DesignSwitcherDoc_Ljph4e3sC0lHcynfXpoh9f.dcf
#	integration-tests/validation/src/main/assets/figma/AlignmentTestDoc_JIjE9oKQbq8ipi66ab5UaK.dcf
#	integration-tests/validation/src/main/assets/figma/BattleshipDoc_RfGl9SWnBEvdg8T1Ex6ZAR.dcf
#	integration-tests/validation/src/main/assets/figma/BlendModeTestDoc_ZqX5i5g6inv9tANIwMMXUV.dcf
#	integration-tests/validation/src/main/assets/figma/ColorTintTestDoc_MCtUD3yjONxK6rQm65yqM5.dcf
#	integration-tests/validation/src/main/assets/figma/ComponentReplaceDoc_bQVVy2GSZJ8veYaJUrG6Ni.dcf
#	integration-tests/validation/src/main/assets/figma/ComponentReplaceRelayoutDoc_qIh0IOQTCtgeAWZFF5gYSk.dcf
#	integration-tests/validation/src/main/assets/figma/ConstraintsDoc_KuHLbsKA23DjZPhhgHqt71.dcf
#	integration-tests/validation/src/main/assets/figma/CrossAxisFillTestDoc_GPr1cx4n3zBPwLhqlSL1ba.dcf
#	integration-tests/validation/src/main/assets/figma/CustomBrushTestDoc_oetCBVw8gCAxmCNllXx7zO.dcf
#	integration-tests/validation/src/main/assets/figma/DialsGaugesTestDoc_lZj6E9GtIQQE4HNLpzgETw.dcf
#	integration-tests/validation/src/main/assets/figma/FancyFillTestDoc_xQ9cunHt8VUm6xqJJ2Pjb2.dcf
#	integration-tests/validation/src/main/assets/figma/FillTestDoc_dB3q96FkxkTO4czn5NqnxV.dcf
#	integration-tests/validation/src/main/assets/figma/GridLayoutDoc_MBNjjSbzzKeN7nBjVoewsl.dcf
#	integration-tests/validation/src/main/assets/figma/GridLayoutTestDoc_JOSOEvsrjvMqanyQa5OpNR.dcf
#	integration-tests/validation/src/main/assets/figma/GridWidgetTestDoc_OBhNItd9i9J2LwVYuLxEIx.dcf
#	integration-tests/validation/src/main/assets/figma/HelloByeDoc_MCHaMYcIEnRpbvU9Ms7a0o.dcf
#	integration-tests/validation/src/main/assets/figma/HelloVersionDoc_v62Vwlxa4Bb6nopJiAxQAQ_5668177823.dcf
#	integration-tests/validation/src/main/assets/figma/HelloWorldDoc_pxVlixodJqZL95zo2RzTHl.dcf
#	integration-tests/validation/src/main/assets/figma/HyperlinkValidationDoc_uBExbEg4lcRa0xN2yaLTX8.dcf
#	integration-tests/validation/src/main/assets/figma/IgnoreAutoLayoutTestDoc_vPNR6N02HfdcpC8wR5yBYP.dcf
#	integration-tests/validation/src/main/assets/figma/ImageUpdateTestDoc_oQw7kiy94fvdVouCYBC9T0.dcf
#	integration-tests/validation/src/main/assets/figma/InteractionTestDoc_8Zg9viyjYTnyN29pbkR1CE.dcf
#	integration-tests/validation/src/main/assets/figma/ItemSpacingTestDoc_YXrHBp6C6OaW5ShcCYeGJc.dcf
#	integration-tests/validation/src/main/assets/figma/LayoutReplacementTestDoc_dwk2GF7RiNvlbbAKPjqldx.dcf
#	integration-tests/validation/src/main/assets/figma/LayoutTestsDoc_Gv63fYTzpeH2ZtxP4go31E.dcf
#	integration-tests/validation/src/main/assets/figma/ListWidgetTestDoc_9ev0MBNHFrgTqJOrAGcEpV.dcf
#	integration-tests/validation/src/main/assets/figma/MaskTestDoc_mEmdUVEIjvBBbV0kELPy37.dcf
#	integration-tests/validation/src/main/assets/figma/ModuleExampleDoc_hPEGkrF0LUqNYEZObXqjXZ.dcf
#	integration-tests/validation/src/main/assets/figma/OnePxSeparatorDoc_EXjTHxfMNBtXDrz8hr6MFB.dcf
#	integration-tests/validation/src/main/assets/figma/OpenLinkTestDoc_r7m4tqyKv6y9DWcg7QBEDf.dcf
#	integration-tests/validation/src/main/assets/figma/RecursiveCustomizationsDoc_o0GWzcqdOWEgzj4kIeIlAu.dcf
#	integration-tests/validation/src/main/assets/figma/ShadowsTestDoc_OqK58Y46IqP4wIgKCWys48.dcf
#	integration-tests/validation/src/main/assets/figma/SmartAnimateTestDoc_RW3lFurXCoVDeqY2Y7bf4v.dcf
#	integration-tests/validation/src/main/assets/figma/StyledTextRunsDoc_mIYV4YsYYaMTsBMCVskA4N.dcf
#	integration-tests/validation/src/main/assets/figma/TelltaleTestDoc_TZgHrKWx8wvQM7UPTyEpmz.dcf
#	integration-tests/validation/src/main/assets/figma/TextElideTestDoc_oQ7nK49Ya5PJ3GpjI5iy8d.dcf
#	integration-tests/validation/src/main/assets/figma/TextResizingTestDoc_kAoYvgHkPzA4J4pALZ3Xhg.dcf
#	integration-tests/validation/src/main/assets/figma/VariableBorderTestDoc_MWnVAfW3FupV4VMLNR1m67.dcf
#	integration-tests/validation/src/main/assets/figma/VariantAnimationTestDoc_pghyUUhlzJNoxxSK86ngiw.dcf
#	integration-tests/validation/src/main/assets/figma/VariantAnimationTimelineTestDoc_vJRf4zxY4QX4zzSSUd1nJ5.dcf
#	integration-tests/validation/src/main/assets/figma/VariantAsteriskTestDoc_gQeYHGCSaBE4zYSFpBrhre.dcf
#	integration-tests/validation/src/main/assets/figma/VariantInteractionsTestDoc_WcsgoLR4aDRSkZHY29Qdhq.dcf
#	integration-tests/validation/src/main/assets/figma/VariantPropertiesTestDoc_4P7zDdrQxj7FZsKJoIQcx1.dcf
#	integration-tests/validation/src/main/assets/figma/VectorRenderingTestDoc_Z3ucY0wMAbIwZIa6mLEWIK.dcf
#	reference-apps/tutorial/app/src/main/assets/figma/TutorialDoc_3z4xExq0INrL9vxPhj9tl7.dcf
@timothyfroehlich timothyfroehlich force-pushed the wb/froeht/protoconv-layout-positioning branch from 46a1f74 to 96b48bb Compare November 14, 2024 17:57
@timothyfroehlich timothyfroehlich added this pull request to the merge queue Nov 14, 2024
Merged via the queue into main with commit c32c0b0 Nov 14, 2024
22 checks passed
@timothyfroehlich timothyfroehlich deleted the wb/froeht/protoconv-layout-positioning branch November 14, 2024 18:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rylin8 rylin8 rylin8 approved these changes

@iamralpht iamralpht Awaiting requested review from iamralpht

@yiqunw700 yiqunw700 Awaiting requested review from yiqunw700

Assignees

@timothyfroehlich timothyfroehlich

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

ProtoConv: Convert layout/layout_style ProtoConv: Convert layout/positioning
3 participants
@timothyfroehlich @yiqunw700 @rylin8