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): tabgroup badge number #11659
Conversation
Tests:
|
added the missing |
@m1ga Hope you don't mind - I've rebased this PR on master, fixed the merge conflicts, cleaned up the commits and added tests. |
@sgtcoolguy 👍 no problem, glad it is not forgotten or closed 😄 |
@m1ga , PR #11921 changes Titanium default app theme to If we merge my PR first, then we don't need to change the unit test suite's app theme. We should still document that the material theme is required by this feature since many (or most?) Titanium developers tend to set up their own app theme which typically derives from an AppCompat theme. |
@jquick-axway I already have |
@m1ga, yes, your api doc changes are fine. Once my PR is merged, we can remove the following unit test files from this PR since my PR already makes MaterialComponents the default theme. (Sorry for not being clear.)
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@m1ga , can you remove the following files from this PR please?
(Or we can do it if you're too busy.)
build/lib/test/test.js
tests/platform/android/res/values/styles.xml
PR #11921 makes Titanium use the material theme by default and it has now been merged. We want your unit tests to verify that tab badges work with the default theme.
@jquick-axway I've removed the two files but it is still complaining about a merge conflict with edit: found the solution 😄 |
...modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIBottomNavigationTabGroup.java
Outdated
Show resolved
Hide resolved
...modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIBottomNavigationTabGroup.java
Outdated
Show resolved
Hide resolved
android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUITabLayoutTabGroup.java
Outdated
Show resolved
Hide resolved
Added the changes and tested it with your test code. Added a timeout to reset and set it again. Updated the code in the first post |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CR: Pass
Thanks @m1ga . Your final changes look great! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FR Passed, Tested using the test case mentioned in the description.
Test Environment
MacOS Big Sur: 11.0 Beta 8
Xcode: 12.2 Beta
Java Version: 1.8.0_242
Android NDK: 21.3.6528147
Node.js: 12.18.1
""NPM":"5.0.0","CLI":"8.1.1""
Pixel XL (10.0)
JIRA: https://jira.appcelerator.org/browse/TIMOB-27859