Implement redraft feature. #1190
Merged
Conversation
This file contains 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
connyduck
requested changes
Apr 20, 2019
| if (preview != null) { | ||
| view.setImageBitmap(preview); | ||
| } else { | ||
| Picasso.with(this) |
There was a problem hiding this comment.
on master we switched to Glide.
Suggested change
| Picasso.with(this) | |
| Glide.with(this) |
| @@ -1880,6 +1939,10 @@ public Intent build(Context context) { | |||
| if (replyingStatusAuthor != null) { | |||
| intent.putExtra(REPLYING_STATUS_AUTHOR_USERNAME_EXTRA, replyingStatusAuthor); | |||
| } | |||
| if (jsonMediaAttachments != null) { | |||
| intent.putExtra(JSON_MEDIA_ATTACHMENTS_EXTRA, jsonMediaAttachments); | |||
There was a problem hiding this comment.
I would rather use intent.putParcelableArrayListExtra( and put in the list of attachments. Shorter and probably faster than de/serializing with Gson.
app/src/main/res/values/strings.xml
Outdated
| @@ -83,6 +83,7 @@ | |||
| <string name="action_show_reblogs">Show boosts</string> | |||
| <string name="action_report">Report</string> | |||
| <string name="action_delete">Delete</string> | |||
| <string name="delete_and_edit">Delete and Edit</string> | |||
There was a problem hiding this comment.
I would call it Delete and re-draft to be consistent with web mastodon
Support for uploaded medias, sensitive option. Fix typo. Change names of some extra keys.
|
@connyduck Fixed all! Please check them. |
|
Looks good, but now the tests are failing, you have to change them from |
|
@connyduck Fixed and test was passed. |
connyduck
approved these changes
Apr 21, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Close #705
Cherry-picked some changes to ComposeActivity from #1004 because it's needed for uploaded media support.
As I mentioned at #1171, this PR contains supports for uploaded medias and mentions to remote instances.