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

feat(android): add collapseToolbar support #1360

Merged
merged 7 commits into from
Mar 11, 2023
Merged

Conversation

m1ga
Copy link
Contributor

@m1ga m1ga commented Mar 4, 2023

  • Add CollapseToolbar to Alloy (copied over from DrawerLayout)

needed for tidev/titanium-sdk#13760

<Alloy>
	<Window>

		<CollapseToolbar platform="android">

			<ContentView>
				<View backgroundColor="red" height="Ti.UI.SIZE">
					<Label>test</Label>
				</View>
			</ContentView>
		</CollapseToolbar>

	</Window>
</Alloy>

@m1ga
Copy link
Contributor Author

m1ga commented Mar 8, 2023

my local tests are failing for the the (ios, testing/ALOY-983/) popover test. It always says

[ERROR] Error with <ContentView> at line 3
[ERROR] Parent element must one of the following: [Ti.UI.Android.CollapseToolbar]

but I've added both in:

https://github.com/tidev/alloy/pull/1360/files#diff-2275f483800363596424aa8298ec1149ebb373c05b008848a397f859745e75a8R4-R8

Edit:
the test here work, very strange 🤔 Maybe something is cached on my side 🤷

@ewanharris
Copy link
Contributor

Hmm yeah it works for me too, are you running the tests on Linux? CI runs on mac and so do I so maybe there's something there?

@m1ga
Copy link
Contributor Author

m1ga commented Mar 11, 2023

Sorry for the late reply.
Yes, I'm running the test on Linux. PopOver is iOS only and CollapseToolbar is Android only so the error won't happen in real apps anyway. Even though about adding platform="ios" to the xml to trick the test 😄

I'll put it on my todo list to fix the test. Just don't understand why it doesn't list both parents for me 🤷

@m1ga
Copy link
Contributor Author

m1ga commented Mar 11, 2023

🤦

fixed my tests!
It used the installed parser files and not the changed one in the project. Had to do a npm i -g alloy/ to have them in the right folder!

All green 👍

@ewanharris
Copy link
Contributor

Ahh that explains why it worked for me as I tend to have alloy installed via npm link, I think I just realised a bug in the way the tests add the alloy executable in this project to the path so I'll push a fix for that!

@ewanharris ewanharris changed the title feat(android): collapseToolbar feat(android): add collapseToolbar support Mar 11, 2023
@ewanharris ewanharris merged commit c3f5e95 into master Mar 11, 2023
@m1ga m1ga deleted the collapseToolbar branch March 11, 2023 22:19
github-actions bot pushed a commit that referenced this pull request Jan 9, 2024
# [2.1.0](2.0.2...2.1.0) (2024-01-09)

### Bug Fixes

* **all:** remove getter in PickerColumn parser ([f916130](f916130))
* missing includes ([819d114](819d114))

### Features

* **all:** update packages ([1837254](1837254))
* **android:** add collapseToolbar support ([#1360](#1360)) ([c3f5e95](c3f5e95))
* update momentjs ([#1358](#1358)) ([100ff29](100ff29))
* update underscore to version 1.13.6 ([36b2fc8](36b2fc8))
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.

2 participants