Fix conflicts after merging Browse commons via app with master #1737
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ked via api call and notifying the user if they are blocked via snackbar
…just if an expiration time exists. Updated tests accordingly
…ked via api call and notifying the user if they are blocked via snackbar
…just if an expiration time exists. Updated tests accordingly
…pps-android-commons into show-block-status
…being checked within AuthenticatedActivity refers to the Wikimedia Commons block status of the user
…nto 2.8-release-fork
…nto 2.8-release-fork
As we don't want to clutter up the gist with a lot of information. Move the link to the informative blog post to the new further reading section.
* Added logs to debug wikidata edits * Minor changes in logs
…tion Remove current location retrieval from upload process entirely
Show Block Status if use is blocked
Introducing a brief exp of Image License
…log-link CONTRIBUTING: link to a blog about good commit messages
It's better to give a useful label that would indicate what would happen when sharing using the app rather than letting it default to the app name.
* Try to get the localized version of the wikipedia article before defaulting to the English version. Tested with Spanish on physical Android device. Other notes: Difficulties building with gradle due to dexcount plugin: KeepSafe/dexcount-gradle-plugin#234. In testing, disabled the plugin. * Update article fetch to not include unnecessary SERVICE line * Add checks for local file, check for string length
…being truncated (commons-app#1671) * Added preference classes that allow for titles with multiple lines for settings with long titles * Added null checks to ensure the title TextView isn't null
…android-commons into browse-commons-via-app
Collaborator
|
@ujjwalagrawal17 I couldn't understand how come there are conflicts in strings files? Unless you edit a file manually (I assumed you didn't edited string files from several languages) there is no posibliity to have conflicts. How this happened? Did you solved them manually? I think this can be a problem. |
Codecov Report
@@ Coverage Diff @@
## browse-commons-via-app #1737 +/- ##
=========================================================
+ Coverage 3.56% 3.89% +0.33%
=========================================================
Files 165 172 +7
Lines 8381 8491 +110
Branches 769 774 +5
=========================================================
+ Hits 299 331 +32
- Misses 8065 8138 +73
- Partials 17 22 +5
Continue to review full report at Codecov.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
13 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description (required)