Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.Sign up
Merge develop to master auto upload #10524
This PR merges
Somewhat tricky conflicts
Since this is just a merge PR, we don't need to test anything specific here except for making sure the build works fine. We'll be running a full set of tests in the
Update release notes:
This flag will determine if dialog will be dismissed after confirm is clicked. It's default behavior is to dismiss after confirm since the existing implementations utilize this.
…ality can be shared. The class now has the common functionality that will be needed in the sign-up and the account settings flow. The behaviour that differs with the header & analytics will be implemented in the respective classes that extend it.
…d Injector method since it makes it easier to test. The FragmentInjector can be replaced during tests. The older method requires modification to the TestComponents/TestModules etc. Also corrected how injections were taking place by moving injection to the subtype instead of the base type since the best practice is to inject subtypes.
Verifies that the suggestions functionality is still intact even though the implementation has been modified. Created an environment where the fragment could be tested in isolation utilizing Mockito,Dagger's Android Injection and a fragment container.
As part of merging `develop` into `master-auto-upload` branch, we need to fix a conflict for `PostListButtonType` by changing the `R.color.warning_dark` to an attr. This attr didn't exist yet in `develop` but was already added in #10496. As a temporary workaround it was suggested to add the necessary attr.
shiki left a comment
@oguzkocer Thank you for the detailed description of the conflicts and how you resolved them. I reviewed this by going through the merge myself and comparing