Merge upstream #20
Merged
Merge upstream #20
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
Currently translated at 100.0% (327 of 327 strings) Translation: Tusky/Tusky Translate-URL: http://weblate.tusky.app/projects/tusky/tusky/oc/
Update from Weblate
* Update Deps * Update Deps * Update Deps * Update build.gradle * Update build.gradle
…skyapp#1146) * Issue: tuskyapp#1078 Add ability to scroll to top by tab click at the Account activity * Fix issue with scroll tabs other than current * Update scroll on click behavior * Update code formatting * Remove unused code * Move tab click listener from Fragments to Activities
# Conflicts: # app/build.gradle # app/src/main/java/tech/bigfig/roma/AccountActivity.kt # app/src/main/java/tech/bigfig/roma/FiltersActivity.kt # app/src/main/java/tech/bigfig/roma/MainActivity.java # app/src/main/java/tech/bigfig/roma/components/conversation/ConversationsFragment.kt # app/src/main/java/tech/bigfig/roma/fragment/NotificationsFragment.java # app/src/main/java/tech/bigfig/roma/fragment/TimelineFragment.java # app/src/main/java/tech/bigfig/roma/pager/AccountPagerAdapter.java # app/src/main/res/values-nb-rNO/strings.xml
* Issue tuskyapp#762 add clear notifications button to the top of the Notifications adapter * Issue tuskyapp#764 add the notifications filter * Update notifications top bar buttons * Replace PopupMenu with PopupWindow. Save notifications filter to the account table * Disable hide top bar on empty content at the notification screen * Add app bar behavior to the sw640 notification layout * Fix issue with click on top notification tab
* Add bot indicator overlay to avatars * Add bot overlay to account list in search view * Add preference for bot avatar overlay
* confirm delete notificaitons * Use same strings as website * Cleanup
# Conflicts: # app/src/main/java/tech/bigfig/roma/fragment/NotificationsFragment.java # app/src/main/res/layout/item_conversation.xml # app/src/main/res/layout/item_status.xml
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.
No description provided.