Convert NotificationsFragment and related code to Kotlin, use the Paging library (#3159)
* Unmodified output from "Convert Java to Kotlin" on NotificationsFragment.java
* Bare minimum changes to get this to compile and run
- Use `lateinit` for `eventhub`, `adapter`, `preferences`, and `scrolllistener`
- Removed override for accountManager, it can be used from the superclass
- Add `?.` where non-nullity could not (yet) be guaranteed
- Remove `?` from type lists where non-nullity is guaranteed
- Explicitly convert lists to mutable where necessary
- Delete unused function `findReplyPosition`
* Remove all unnecessary non-null (!!) assertions
The previous change meant some values are no longer nullable. Remove the
non-null assertions.
* Lint ListStatusAccessibilityDelegate call
- Remove redundant constructor
- Move block outside of `()`
* Use `let` when handling compose button visibility on scroll
* Replace a `requireNonNull` with `!!`
* Remove redundant return values
* Remove or rename unused lambda parameters
* Remove unnecessary type parameters
* Remove unnecessary null checks
* Replace cascading-if statement with `when`
* Simplify calculation of `topId`
* Use more appropriate list properties and methods
- Access the last value with `.last()`
- Access the last index with `.lastIndex`
- Replace logical-chain with `asRightOrNull` and `?.`
- `.isNotEmpty()`, not `!...isEmpty()`
* Inline unnecessary variable
* Use PrefKeys constants instead of bare strings
* Use `requireContext()` instead of `context!!`
* Replace deprecated `onActivityCreated()` with `onViewCreated()`
* Remove unnecessary variable setting
* Replace `size == 0` check with `isEmpty()`
* Format with ktlint, no functionality changes
* Convert NotifcationsAdapter to Kotlin
Does not compile, this is the unchanged output of the "Convert to Kotlin"
function
* Minimum changes to get NotificationsAdapter to compile
* Remove unnecessary visibility modifiers
* Use `isNotEmpty()`
* Remove unused lambda parameters
* Convert cascading-if to `when`
* Simplifiy assignment op
* Use explicit argument names with `copy()`
* Use `.firstOrNull()` instead of `if`
* Mark as lateinit to avoid unnecessary null checks
* Format with ktlint, whitespace changes only
* Bare minimum necessary to demonstrate paging in notifications
Create `NotificationsPagingSource`. This uses a new `notifications2()` API
call, which will exist until all the code has been adapted. Instead of
using placeholders,
Create `NotificationsPagingAdapter` (will replace `NotificationsAdapater`)
to consume this data.
Expose the paging source view a new `NotificationsViewModel` `flow`, and
submit new pages to the adapter as they are available in
`NotificationsFragment`.
Comment out any other code in `NotificationsFragment` that deals with
loading data from the network. This will be updated as necessary, either
here, or in the view model.
Lots of functionality is missing, including:
- Different views for different notification types
- Starting at the remembered notification position
- Interacting with notifications
- Adjusting the UI state to match the loading state
These will be added incrementally.
* Migrate StatusNotificationViewHolder impl. to NotificationsPagingAdapter
With this change `NotificationsPagingAdapter` shows notifications about a
status correctly.
- Introduce a `ViewHolder` abstract class that all Notification view holders
derive from. Modify the fallback view holder to use this.
- Implement `StatusNotificationViewHolder`. Much of the code is from the
existing implementation in the `NotificationAdapater`.
- The original code split the code that binds values to views between the
adapter's `bindViewHolder` method and the view holder's methods.
In this code, all of the binding code is in the view holder, in a `bind`
method. This is called by the adapter's `bindViewHolder` method. This keeps
all the binding logic in the view holder, where it belongs.
- The new `StatusNotificationViewHolder` uses view binding to access its views
instead of `findViewById`.
- Logically, information about whether to show sensitive media, or open
content warnings should be part of the `StatusDisplayOptions`. So add those
as fields, and populate them appropriately.
This affects code outside notification handling, which will be adjusted
later.
* Note some TODOs to complete before the PR is finished
* Extract StatusNotificationViewHolder to a new file
* Add TODO for NotificationViewData.Concrete
* Convert the adapter to take NotificationViewData.Concrete
* Add a view holder for regular status notifications
* Migrate Follow and FollowRequest notifications
* Migrate report notifications
* Convert onViewThread to use the adapter data
* Convert onViewMedia to use the adapter data
* Convert onMore to use the adapter data
* Convert onReply to use the adapter data
* Convert NotificationViewData to Kotlin
* Re-implement the reblog functionality
- Move reblogging in to the view model
- Update the UI via the adapter's `snapshot()` and `notifyItemChanged()`
methods
* Re-implement the favourite functionality
Same approach as reblog
* Re-implement the bookmark functionality
Same approach as reblog
* Add TODO re StatusActionListener interface
* Add TODO re event handling
* Re-implementing the voting functionality
* Re-implement viewing hidden content
- Hidden media
- Content behind a content warning
* Add a TODO re pinning
* Re-implement "Show more" / "Show less"
* Delete unused updateStatus() function
* Comment out the scroll listener for the moment
* Re-implement applying filters to notifications
Introduce `NotificationsRepository`, to provide access to the notifications
stream.
When changing the filters the flow is as follows:
- User clicks "Apply" in the fragment.
- Fragment calls `viewModel.accept()` with a `UiAction.ApplyFilter` (new
class).
- View model maintains a private flow of incoming UI actions. The new action
is emitted to that flow.
- In view model, `notificationFilter` waits for `.ApplyFilter` actions, and
ensures the filter is saved, then emits it.
- In view model, `pagingDataFlow` waits for new items from
`notificationsFilter` and fetches the notifications from the repository in
response. The repository provides `Notification`, so the model maps them to
`NotificationViewData.Concrete` for display by the adapter.
- In view model the UI state also waits for new items from
`notificationsFilter` and emits a new `UiState` every time the filter is
changed.
When opening the fragment for the first time:
- All of the above machinery, but `notificationFilter` also fetches the filter
from the active account and emits that first. This triggers the first fetch
and the first update of `uiState`.
Also:
- Add TODOs for functionality that is not implemented yet
- Delete a lot of dead code from NotificationsFragment
* Include important preference values in `uiState`
Listen to the flow of eventHub events, filtered to preference changes that
are relevant to the notification view.
When preferences change (or when the view model starts), fetch the current
values, and include them in `uiState`.
Remove preference handling from `NotificationsFragment`, and just use
the values from `uiState`.
Adjust how the `useAbsoluteTime` preference is handled. The previous code
loaded new content (via a diffutil) in to the adapter, which would trigger
a re-binding of the timestamp.
As the adapter content is immutable, the new code simply triggers a
re-binding of the views that are currently visible on screen.
* Update UI in response to different load states
Notifications can be loaded at the top and bottom of the timeline. Add a
new layout to show the progress of these loads, and any errors that can
occur.
Catch network errors in `NotificationsPagingSource` and convert to
`LoadState.Error`.
Add a header/footer to the notifications list to show the load state.
Collect the load state from the adapter, use this to drive the visibility
of different views.
* Save and restore the last read notification ID
Use this when fetching notifications, to centre the list around the
notification that was last read.
* Call notifyItemRangeChanged with the correct parameters
* Don't try and save list position if there are no items in the list
* Show/hide the "Nothing to see" view appropriately
* Update comments
* Handle the case where the notification key no longer exists
* Re-implement support for showMediaPreview and other settings
* Re-implement "hide FAB when scrolling" preference
* Delete dead code
* Delete Notifications Adapater and Placeholder types
* Remove NotificationViewData.Concrete subclass
Now there's no Placeholder, everything is a NotificationViewData.
* Improve how notification pages are loaded if the first notification is missing or filtered
* Re-implement clear notifications, show errors
* s/default/from/
* Add missing headers
* Don't process bookmarking via EventHub
- Initiating a bookmark is triggered by the fragment sending a
StatusUiAction.Bookmark
- View model receives this, makes API call, waits for response, emits either
a success or failure state
- Fragment collects success/failure states, updates the UI accordingly
* Don't process favourites via EventHub
* Don't process reblog via EventHub
* Don't process poll votes with EventHub
This removes EventHub from the fragment
* Respond to follow requests via the view model
* Docs and cleanup
* Typo and editing pass
* Minor edits for clarity
* Remove newline in diagram
* Reorder sequence diagram
* s/authorize/accept/
* s/pagingDataFlow/pagingData/
* Add brief KDoc
* Try and fetch a full first page of notifications
* Call the API method `notifications` again
* Log UI errors at the point of handling
* Remove unused variable
* Replace String.format() with interpolation
* Convert NotificationViewData to data class
* Rename copy() to make(), to avoid confusion with default copy() method
* Lint
* Update app/src/main/res/layout/simple_list_item_1.xml
* Update app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsPagingAdapter.kt
* Update app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsViewModel.kt
* Update app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.kt
* Update app/src/main/java/com/keylesspalace/tusky/viewdata/NotificationViewData.kt
* Initial NotificationsViewModel tests
* Add missing import
* More tests, some cleanup
* Comments, re-order some code
* Set StateRestorationPolicy.PREVENT_WHEN_EMPTY
* Mark clearNotifications() as "suspend"
* Catch exceptions from clearNotifications and emit
* Update TODOs with explanations
* Ensure initial fetch uses a null ID
* Stop/start collecting pagingData based on the lifecycle
* Don't hide the list while refreshing
* Refresh notifications on mutes and blocks
* Update tests now clearNotifications is a suspend fun
* Add "Refresh" menu to NotificationsFragment
* Use account.name over account.displayName
* Update app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.kt
Co-authored-by: Konrad Pozniak <connyduck@users.noreply.github.com>
* Mark layoutmanager as lateinit
* Mark layoutmanager as lateinit
* Refactor generating UI text
* Add Copyright header
* Correctly apply notification filters
* Show follow request header in notifications
* Wait for follow request actions to complete, so the reqeuest is sent
* Remove duplicate copyright header
* Revert copyright change in unmodified file
* Null check response body
* Move NotificationsFragment to component.notifications
* Use viewlifecycleowner.lifecyclescope
* Show notification filter as a dialog rather than a popup window
The popup window:
- Is inconsistent UI
- Requires a custom layout
- Didn't play nicely with viewbinding
* Refresh adapter on block/mute
* Scroll up slightly when new content is loaded
* Restore progressbar
* Lint
* Update app/src/main/res/layout/simple_list_item_1.xml
---------
Co-authored-by: Konrad Pozniak <connyduck@users.noreply.github.com>
2023-03-10 13:12:33 -06:00
<!--
~ Copyright 2023 Tusky Contributors
~
~ This file is a part of Tusky.
~
~ This program is free software; you can redistribute it and/or modify it under the terms of the
~ GNU General Public License as published by the Free Software Foundation; either version 3 of the
~ License, or (at your option) any later version.
~
~ Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
~ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
~ Public License for more details.
~
~ You should have received a copy of the GNU General Public License along with Tusky; if not,
~ see <http: / / w w w . g n u . o r g / l i c e n s e s > .
-->
2017-04-04 21:29:15 -05:00
<resources >
2017-01-02 17:30:27 -06:00
2017-04-06 02:09:49 -05:00
<string name= "error_generic" > An error occurred.</string>
2019-01-28 12:02:31 -06:00
<string name= "error_network" > A network error occurred! Please check your connection and try again!</string>
2017-04-16 23:29:47 -05:00
<string name= "error_empty" > This cannot be empty.</string>
2017-04-06 02:09:49 -05:00
<string name= "error_invalid_domain" > Invalid domain entered</string>
2023-01-25 12:26:29 -06:00
<string name= "error_failed_app_registration" > Failed authenticating with that instance. If this persists, try "Login in Browser" from the menu.</string>
2017-04-04 21:29:15 -05:00
<string name= "error_no_web_browser_found" > Couldn\'t find a web browser to use.</string>
2023-01-25 12:26:29 -06:00
<string name= "error_authorization_unknown" > An unidentified authorization error occurred. If this persists, try "Login in Browser" from the menu.</string>
<string name= "error_authorization_denied" > Authorization was denied. If you\'re sure that you supplied the correct credentials, try "Login in Browser" from the menu.</string>
<string name= "error_retrieving_oauth_token" > Failed getting a login token. If this persists, try "Login in Browser" from the menu.</string>
2022-06-30 13:49:48 -05:00
<string name= "error_loading_account_details" > Failed loading account details</string>
2022-05-03 12:14:55 -05:00
<string name= "error_could_not_load_login_page" > Could not load the login page.</string>
2022-03-27 05:23:25 -05:00
<string name= "error_compose_character_limit" > The post is too long!</string>
2022-08-05 11:55:13 -05:00
<string name= "error_multimedia_size_limit" > Video and audio files cannot exceed %s MB in size.</string>
2022-06-21 15:14:11 -05:00
<string name= "error_image_edit_failed" > The image could not be edited.</string>
2017-04-06 02:09:49 -05:00
<string name= "error_media_upload_type" > That type of file cannot be uploaded.</string>
2017-01-16 12:15:42 -06:00
<string name= "error_media_upload_opening" > That file could not be opened.</string>
2017-04-06 02:09:49 -05:00
<string name= "error_media_upload_permission" > Permission to read media is required.</string>
2017-04-07 06:11:31 -05:00
<string name= "error_media_download_permission" > Permission to store media is required.</string>
2022-03-27 05:23:25 -05:00
<string name= "error_media_upload_image_or_video" > Images and videos cannot both be attached to the same post.</string>
2017-04-06 02:09:49 -05:00
<string name= "error_media_upload_sending" > The upload failed.</string>
2022-03-20 14:21:42 -05:00
<string name= "error_sender_account_gone" > Error sending post.</string>
2022-08-07 12:09:26 -05:00
<string name= "error_following_hashtag_format" > Error following #%s</string>
<string name= "error_unfollowing_hashtag_format" > Error unfollowing #%s</string>
2022-12-01 12:24:27 -06:00
<string name= "error_following_hashtags_unsupported" > This instance does not support following hashtags.</string>
2022-12-05 07:36:30 -06:00
<string name= "error_muting_hashtag_format" > Error muting #%s</string>
<string name= "error_unmuting_hashtag_format" > Error unmuting #%s</string>
2022-12-08 03:18:12 -06:00
<string name= "error_status_source_load" > Failed to load the status source from the server.</string>
2017-01-07 16:24:02 -06:00
2022-04-28 13:38:51 -05:00
<string name= "title_login" > Login</string>
2017-01-07 16:24:02 -06:00
<string name= "title_home" > Home</string>
<string name= "title_notifications" > Notifications</string>
2017-03-30 21:31:17 -05:00
<string name= "title_public_local" > Local</string>
Add trending tags (#3149)
* Add initial feature for viewing trending graphs. Currently only views hash tag trends.
Contains API additions, tab additions and a set of trending components.
* Add clickable system through a LinkListener. Duplicates a little code from SFragment.
* Add accessibility description.
* The background for the graph should match the background for black theme too.
* Add error handling through a state flow system using existing code as an example.
* Graphing: Use a primary and a secondary line. Remove under line fill. Apply line thickness. Dotted end of line.
* Trending changes: New layout for trending: Cell. Use ViewBinding. Add padding to RecyclerView to stop the FAB from hiding content. Multiple bugs in GraphView resolved. Wide (landscape, for example) will show 4 columns, portrait will show 2. Remove unused base holder class. ViewModel invalidate scoping changed. Some renaming to variables made. For uses and accounts, use longs. These could be big numbers eventually. TagViewHolder renamed to TrendingTagViewHolder.
* Trending changes: Remove old layout. Update cell textsizes and use proper string. Remove bad comment.
* Trending changes: Refresh the main drawer when the tabs are edited. This will allow the trending item to toggle.
* Trending changes: Add a trending activity to be able to view the trending data from the main drawer.
* Trending changes: The title text should be changed to Trending Hashtags.
* Trending changes: Add meta color to draw axis etc. Draw the date boundaries on the graph. Remove dates from each cell and place them in the list as a header. Graphs should be proportional to the highest historical value. Add a new interface to control whether the FAB should be visible (important when switching tabs, the state is lost). Add header to the adapter and viewdata structures. Add QOL extensions for getting the dates from history.
* Trending changes: Refresh FAB through the main activity and FabFragment interface. Trending has no FAB.
* Trending changes: Make graph proportional to the highest usage value. Fixes to the graph ratio calculations.
* Trending changes: KtLintFix
* Trending changes: Remove accidental build gradle change. Remove trending cases. Remove unused progress. Set drawer button addition explicitly to false, leaving the code there for future issue #3010. Remove unnecessary arguments for intent. Remove media preview preferences, there is nothing to preview. No padding between hashtag symbol and text. Do not ellipsize hashtags.
* Trending changes: Use bottomsheet slide in animation helper for opening the hashtag intent. Remove explicit layout height from the XML and apply it to the view holder itself. The height was not being respected in XML.
* Use some platform standards for styling
- Align on an 8dp grid
- Use android:attr for paddingStart and paddingEnd
- Use textAppearanceListItem variants
- Adjust constraints to handle different size containers
* Correct lineWidth calculations
Previous code didn't convert the value to pixels, so it was always displaying
as a hairline stroke, irrespective of the value in the layout file.
While I'm here, rename from lineThickness to lineWidth, to be consistent
with parameters like strokeWidth.
* Does not need to inherit from FabFragment
* Rename to TrendingAdapter
"Paging" in the adapter name is a misnomer here
* Clean up comments, use full class name as tag
* Simplify TrendingViewModel
- Remove unncessary properties
- Fetch tags and map in invalidate()
- emptyList() instead of listOf() for clarity
* Remove line dividers, use X-axis to separate content
Experiment with UI -- instead of dividers between each item, draw an explicit
x-axis for each chart, and add a little more vertical padding, to see if that
provides a cleaner separation between the content
* Adjust date format
- Show day and year
- Use platform attributes for size
* Locale-aware format of numbers
Format numbers < 100,000 by inserting locale-aware separators. Numbers larger
are scaled and have K, M, G, ... etc suffix appended.
* Prevent a crash if viewData is empty
Don't access viewData without first checking if it's empty. This can be the
case if the server returned an empty list for some reason, or the data has
been filtered.
* Filter out tags the user has filtered from their home timeline
Invalidate the list if the user's preferences change, as that may indicate
they've changed their filters.
* Experiment with alternative layout
* Set chart height to 160dp to align to an 8dp grid
* Draw ticks that are 5% the height of the x-axis
* Legend adjustments
- Use tuskyblue for the ticks
- Wrap legend components in a layout so they can have a dedicated background
- Use a 60% transparent background for the legend to retain legibility
if lines go under it
* Bezier curves, shorter cell height
* More tweaks
- List tags in order of popularity, most popular first
- Make it clear that uses/accounts in the legend are totals, not current
- Show current values at end of the chart
* Hide FAB
* Fix crash, it's not always hosted in an ActionButtonActivity
* Arrange totals vertically in landscape layout
* Always add the Trending drawer menu if it's not a tab
* Revert unrelated whitespace changes
* One more whitespace revert
---------
Co-authored-by: Nik Clayton <nik@ngo.org.uk>
2023-02-14 12:52:11 -06:00
<string name= "title_public_trending_hashtags" > Trending hashtags</string>
2017-03-30 21:31:17 -05:00
<string name= "title_public_federated" > Federated</string>
2023-01-03 14:07:04 -06:00
<string name= "title_direct_messages" > Direct messages</string>
2019-02-12 12:22:37 -06:00
<string name= "title_tab_preferences" > Tabs</string>
2022-03-20 14:21:42 -05:00
<string name= "title_view_thread" > Thread</string>
2022-03-27 05:23:25 -05:00
<string name= "title_posts" > Posts</string>
<string name= "title_posts_with_replies" > With replies</string>
<string name= "title_posts_pinned" > Pinned</string>
2017-01-27 21:33:43 -06:00
<string name= "title_follows" > Follows</string>
<string name= "title_followers" > Followers</string>
2019-07-02 03:56:05 -05:00
<string name= "title_favourites" > Favorites</string>
2019-11-19 03:15:32 -06:00
<string name= "title_bookmarks" > Bookmarks</string>
2017-04-21 18:02:04 -05:00
<string name= "title_mutes" > Muted users</string>
2017-03-12 08:01:50 -05:00
<string name= "title_blocks" > Blocked users</string>
2019-06-11 08:56:27 -05:00
<string name= "title_domain_mutes" > Hidden domains</string>
2022-05-17 12:32:09 -05:00
<string name= "title_migration_relogin" > Re-login for push notifications</string>
2023-01-03 14:07:04 -06:00
<string name= "title_follow_requests" > Follow requests</string>
2017-04-30 14:57:15 -05:00
<string name= "title_edit_profile" > Edit your profile</string>
2021-01-21 11:57:09 -06:00
<string name= "title_drafts" > Drafts</string>
2022-03-20 14:21:42 -05:00
<string name= "title_scheduled_posts" > Scheduled posts</string>
2020-11-18 14:12:27 -06:00
<string name= "title_announcements" > Announcements</string>
2018-06-25 06:02:34 -05:00
<string name= "title_licenses" > Licenses</string>
2023-01-03 14:07:04 -06:00
<string name= "title_followed_hashtags" > Followed hashtags</string>
2023-01-02 07:09:18 -06:00
<string name= "title_edits" > Edits</string>
2018-06-25 06:02:34 -05:00
2023-02-20 13:14:16 -06:00
<string name= "dialog_follow_hashtag_title" > Follow hashtag</string>
<string name= "dialog_follow_hashtag_hint" > #hashtag</string>
2022-03-27 05:23:25 -05:00
<string name= "post_username_format" > \@%s</string>
<string name= "post_boosted_format" > %s boosted</string>
<string name= "post_sensitive_media_title" > Sensitive content</string>
<string name= "post_media_hidden_title" > Media hidden</string>
2022-12-18 09:50:30 -06:00
<string name= "post_media_alt" > ALT</string>
2022-03-27 05:23:25 -05:00
<string name= "post_sensitive_media_directions" > Click to view</string>
<string name= "post_content_warning_show_more" > Show More</string>
<string name= "post_content_warning_show_less" > Show Less</string>
<string name= "post_content_show_more" > Expand</string>
<string name= "post_content_show_less" > Collapse</string>
2022-12-03 05:15:54 -06:00
<string name= "post_edited" > Edited %s</string>
2017-01-02 17:30:27 -06:00
2019-01-28 12:02:31 -06:00
<string name= "message_empty" > Nothing here.</string>
2017-06-30 17:30:25 -05:00
<string name= "footer_empty" > Nothing here. Pull down to refresh!</string>
2017-01-18 12:35:07 -06:00
2022-03-20 14:21:42 -05:00
<string name= "notification_reblog_format" > %s boosted your post</string>
<string name= "notification_favourite_format" > %s favorited your post</string>
2017-01-07 16:24:02 -06:00
<string name= "notification_follow_format" > %s followed you</string>
2020-03-19 16:02:10 -05:00
<string name= "notification_follow_request_format" > %s requested to follow you</string>
2022-04-14 12:39:30 -05:00
<string name= "notification_sign_up_format" > %s signed up</string>
2020-12-23 05:52:39 -06:00
<string name= "notification_subscription_format" > %s just posted</string>
2022-04-19 04:10:13 -05:00
<string name= "notification_update_format" > %s edited their post</string>
2022-12-01 13:11:55 -06:00
<string name= "notification_report_format" > New report on %s</string>
<string name= "notification_header_report_format" > %s reported %s</string>
<string name= "notification_summary_report_format" > %s · %d posts attached</string>
2017-01-07 16:24:02 -06:00
2017-03-10 16:47:04 -06:00
<string name= "report_username_format" > Report @%s</string>
2017-03-09 12:31:15 -06:00
<string name= "report_comment_hint" > Additional comments?</string>
2017-02-26 23:21:46 -06:00
2018-05-06 04:07:10 -05:00
<string name= "action_quick_reply" > Quick Reply</string>
2017-04-11 23:21:52 -05:00
<string name= "action_reply" > Reply</string>
<string name= "action_reblog" > Boost</string>
2019-03-04 12:24:27 -06:00
<string name= "action_unreblog" > Remove boost</string>
2019-07-02 03:56:05 -05:00
<string name= "action_favourite" > Favorite</string>
<string name= "action_unfavourite" > Remove favorite</string>
2021-10-04 00:48:44 -05:00
<string name= "action_bookmark" > Bookmark</string>
<string name= "action_unbookmark" > Remove bookmark</string>
2017-04-11 23:21:52 -05:00
<string name= "action_more" > More</string>
2017-01-07 16:24:02 -06:00
<string name= "action_compose" > Compose</string>
2023-01-25 12:26:29 -06:00
<string name= "action_login" > Login with Tusky</string>
<string name= "action_browser_login" > Login with Browser</string>
2023-01-03 14:07:04 -06:00
<string name= "action_logout" > Log out</string>
2018-02-03 15:45:14 -06:00
<string name= "action_logout_confirm" > Are you sure you want to log out of the account %1$s?</string>
2023-01-27 13:50:45 -06:00
<string name= "action_post_failed" > Upload failed</string>
<string name= "action_post_failed_detail" > Your post failed to upload and has been saved to drafts.\n\nEither the server could not be contacted, or it rejected the post.</string>
<string name= "action_post_failed_detail_plural" > Your posts failed to upload and have been saved to drafts.\n\nEither the server could not be contacted, or it rejected the posts.</string>
<string name= "action_post_failed_show_drafts" > Show drafts</string>
<string name= "action_post_failed_do_nothing" > Dismiss</string>
2017-01-07 16:24:02 -06:00
<string name= "action_follow" > Follow</string>
2017-01-27 21:33:43 -06:00
<string name= "action_unfollow" > Unfollow</string>
2017-01-07 16:24:02 -06:00
<string name= "action_block" > Block</string>
2017-01-27 21:33:43 -06:00
<string name= "action_unblock" > Unblock</string>
2023-01-09 14:08:46 -06:00
<string name= "action_share_account_link" > Share link to account</string>
<string name= "action_share_account_username" > Share username of account</string>
2018-06-18 06:26:18 -05:00
<string name= "action_hide_reblogs" > Hide boosts</string>
<string name= "action_show_reblogs" > Show boosts</string>
2017-02-26 23:21:46 -06:00
<string name= "action_report" > Report</string>
2019-10-02 14:28:12 -05:00
<string name= "action_edit" > Edit</string>
2017-01-07 16:24:02 -06:00
<string name= "action_delete" > Delete</string>
2021-06-17 11:54:56 -05:00
<string name= "action_delete_conversation" > Delete conversation</string>
2019-04-21 08:16:39 -05:00
<string name= "action_delete_and_redraft" > Delete and re-draft</string>
Fix saving changes to statuses when editing (#3103)
* Fix saving changes to statuses when editing
With the previous code backing out of a status editing operation where changes
had been made (whether it was editing an existing status, a scheduled status,
or a draft) would prompt the user to save the changes as a new draft.
See https://github.com/tuskyapp/Tusky/issues/2704 and
https://github.com/tuskyapp/Tusky/issues/2705 for more detail.
The fix:
- Create an enum to represent the four different kinds of edits that can
happen
- Editing a new status (i.e., composing it for the first time)
- Editing a posted status
- Editing a draft
- Editing a scheduled status
- Store this in ComposeOptions, and set it appropriately everywhere
ComposeOptions is created.
- Check the edit kind when backing out of ComposeActivity, and use this to
show one of three different dialogs as appropriate so the user can:
- Save as new draft or discard changes
- Continue editing or discard changes
- Update existing draft or discard changes
Also fix ComposeViewModel.didChange(), which erroneously reported false if the
old text started with the new text (e.g., if the old text was "hello, world"
and it was edited to "hello", didChange() would not consider that to be a
change).
Fixes https://github.com/tuskyapp/Tusky/issues/2704,
https://github.com/tuskyapp/Tusky/issues/2705
* Use orEmpty extension function
2022-12-31 06:04:49 -06:00
<string name= "action_discard" > Discard changes</string>
<string name= "action_continue_edit" > Continue editing</string>
2017-01-16 12:15:42 -06:00
<string name= "action_send" > TOOT</string>
2017-03-26 17:26:47 -05:00
<string name= "action_send_public" > TOOT!</string>
2017-01-16 12:15:42 -06:00
<string name= "action_retry" > Retry</string>
2017-02-04 22:20:19 -06:00
<string name= "action_close" > Close</string>
2017-02-21 16:55:37 -06:00
<string name= "action_view_profile" > Profile</string>
<string name= "action_view_preferences" > Preferences</string>
2023-01-03 14:07:04 -06:00
<string name= "action_view_account_preferences" > Account preferences</string>
2019-07-02 03:56:05 -05:00
<string name= "action_view_favourites" > Favorites</string>
2019-11-19 03:15:32 -06:00
<string name= "action_view_bookmarks" > Bookmarks</string>
2017-04-21 18:02:04 -05:00
<string name= "action_view_mutes" > Muted users</string>
2017-03-09 12:31:15 -06:00
<string name= "action_view_blocks" > Blocked users</string>
2019-06-11 08:56:27 -05:00
<string name= "action_view_domain_mutes" > Hidden domains</string>
2023-01-03 14:07:04 -06:00
<string name= "action_view_follow_requests" > Follow requests</string>
2017-04-12 20:54:37 -05:00
<string name= "action_view_media" > Media</string>
2017-03-09 10:51:44 -06:00
<string name= "action_open_in_web" > Open in browser</string>
2018-04-13 15:37:21 -05:00
<string name= "action_add_media" > Add media</string>
2019-08-22 13:30:08 -05:00
<string name= "action_add_poll" > Add poll</string>
2017-04-15 10:43:26 -05:00
<string name= "action_photo_take" > Take photo</string>
2017-04-06 02:09:49 -05:00
<string name= "action_share" > Share</string>
<string name= "action_mute" > Mute</string>
<string name= "action_unmute" > Unmute</string>
2020-07-27 03:28:59 -05:00
<string name= "action_unmute_desc" > Unmute %s</string>
2019-06-11 08:56:27 -05:00
<string name= "action_mute_domain" > Mute %s</string>
2020-06-23 12:59:49 -05:00
<string name= "action_unmute_domain" > Unmute %s</string>
2020-03-24 15:06:04 -05:00
<string name= "action_mute_conversation" > Mute conversation</string>
<string name= "action_unmute_conversation" > Unmute conversation</string>
2017-04-06 02:09:49 -05:00
<string name= "action_mention" > Mention</string>
2017-06-20 13:16:03 -05:00
<string name= "action_hide_media" > Hide media</string>
2017-04-12 20:54:37 -05:00
<string name= "action_open_drawer" > Open drawer</string>
2017-04-16 17:51:09 -05:00
<string name= "action_save" > Save</string>
<string name= "action_edit_profile" > Edit profile</string>
2018-06-18 06:26:18 -05:00
<string name= "action_edit_own_profile" > Edit</string>
2017-04-22 01:06:19 -05:00
<string name= "action_undo" > Undo</string>
2017-04-28 22:52:14 -05:00
<string name= "action_accept" > Accept</string>
<string name= "action_reject" > Reject</string>
2017-06-19 03:18:39 -05:00
<string name= "action_search" > Search</string>
2021-05-16 12:17:56 -05:00
<string name= "action_access_drafts" > Drafts</string>
2022-03-20 14:21:42 -05:00
<string name= "action_access_scheduled_posts" > Scheduled posts</string>
<string name= "action_toggle_visibility" > Post visibility</string>
2018-04-13 15:37:21 -05:00
<string name= "action_content_warning" > Content warning</string>
<string name= "action_emoji_keyboard" > Emoji keyboard</string>
2022-03-20 14:21:42 -05:00
<string name= "action_schedule_post" > Schedule Post</string>
2019-10-02 14:28:12 -05:00
<string name= "action_reset_schedule" > Reset</string>
2019-02-12 12:22:37 -06:00
<string name= "action_add_tab" > Add Tab</string>
2019-03-04 12:24:27 -06:00
<string name= "action_links" > Links</string>
<string name= "action_mentions" > Mentions</string>
<string name= "action_hashtags" > Hashtags</string>
<string name= "action_open_reblogger" > Open boost author</string>
<string name= "action_open_reblogged_by" > Show boosts</string>
2019-07-02 03:56:05 -05:00
<string name= "action_open_faved_by" > Show favorites</string>
2022-05-17 12:32:09 -05:00
<string name= "action_dismiss" > Dismiss</string>
<string name= "action_details" > Details</string>
2022-11-16 12:04:12 -06:00
<string name= "action_add_reaction" > add reaction</string>
2019-03-04 12:24:27 -06:00
<string name= "title_hashtags_dialog" > Hashtags</string>
<string name= "title_mentions_dialog" > Mentions</string>
<string name= "title_links_dialog" > Links</string>
<string name= "action_open_media_n" > Open media #%d</string>
2017-04-06 02:09:49 -05:00
2017-09-24 13:53:03 -05:00
<string name= "download_image" > Downloading %1$s</string>
2017-04-06 02:09:49 -05:00
2017-10-16 16:31:39 -05:00
<string name= "action_copy_link" > Copy the link</string>
2019-01-16 13:50:09 -06:00
<string name= "action_open_as" > Open as %s</string>
2019-02-06 03:23:02 -06:00
<string name= "action_share_as" > Share as …</string>
2019-03-23 06:49:36 -05:00
<string name= "download_media" > Download media</string>
<string name= "downloading_media" > Downloading media</string>
2017-11-27 13:11:31 -06:00
2022-03-27 05:23:25 -05:00
<string name= "send_post_link_to" > Share post URL to…</string>
<string name= "send_post_content_to" > Share post to…</string>
2023-01-09 14:08:46 -06:00
<string name= "send_account_link_to" > Share account URL to…</string>
<string name= "send_account_username_to" > Share account username to…</string>
2018-10-01 04:50:17 -05:00
<string name= "send_media_to" > Share media to…</string>
2023-01-09 14:08:46 -06:00
<string name= "account_username_copied" > Username copied</string>
2017-04-06 02:09:49 -05:00
2017-02-26 23:21:46 -06:00
<string name= "confirmation_reported" > Sent!</string>
2017-04-22 01:06:19 -05:00
<string name= "confirmation_unblocked" > User unblocked</string>
<string name= "confirmation_unmuted" > User unmuted</string>
2019-06-11 08:56:27 -05:00
<string name= "confirmation_domain_unmuted" > %s unhidden</string>
2022-12-01 12:24:27 -06:00
<string name= "confirmation_hashtag_unfollowed" > #%s unfollowed</string>
2017-01-16 12:15:42 -06:00
2022-03-27 05:23:25 -05:00
<string name= "post_sent" > Sent!</string>
<string name= "post_sent_long" > Reply sent successfully.</string>
2018-05-06 04:07:10 -05:00
2017-03-07 08:03:41 -06:00
<string name= "hint_domain" > Which instance?</string>
2017-03-07 07:09:33 -06:00
<string name= "hint_compose" > What\'s happening?</string>
<string name= "hint_content_warning" > Content warning</string>
2017-04-16 17:51:09 -05:00
<string name= "hint_display_name" > Display name</string>
<string name= "hint_note" > Bio</string>
2017-06-30 01:31:58 -05:00
<string name= "hint_search" > Search…</string>
2022-12-06 12:28:44 -06:00
<string name= "hint_media_description_missing" > Media should have a description.</string>
2017-06-19 03:18:39 -05:00
<string name= "search_no_results" > No results</string>
2017-04-16 17:51:09 -05:00
2018-05-06 04:07:10 -05:00
<string name= "label_quick_reply" > Reply…</string>
2017-04-16 17:51:09 -05:00
<string name= "label_avatar" > Avatar</string>
<string name= "label_header" > Header</string>
2017-02-04 22:20:19 -06:00
2017-04-02 18:55:41 -05:00
<string name= "link_whats_an_instance" > What\'s an instance?</string>
2017-02-04 22:20:19 -06:00
2017-05-08 05:17:41 -05:00
<string name= "login_connection" > Connecting…</string>
2017-04-02 18:55:41 -05:00
<string name= "dialog_whats_an_instance" > The address or domain of any instance can be entered
here, such as mastodon.social, icosahedron.website, social.tchncs.de, and
2017-07-14 12:11:47 -05:00
<a href= "https://instances.social" > more!</a>
2017-04-02 18:55:41 -05:00
\n\nIf you don\'t yet have an account, you can enter the name of the instance you\'d like to
join and create an account there.\n\nAn instance is a single place where your account is
hosted, but you can easily communicate with and follow folks on other instances as though
you were on the same site.
2017-07-14 12:11:47 -05:00
\n\nMore info can be found at <a href= "https://joinmastodon.org" > joinmastodon.org</a> .
2017-02-04 22:20:19 -06:00
</string>
2017-02-07 01:05:50 -06:00
<string name= "dialog_title_finishing_media_upload" > Finishing Media Upload</string>
<string name= "dialog_message_uploading_media" > Uploading…</string>
2017-04-20 23:19:37 -05:00
<string name= "dialog_download_image" > Download</string>
2018-06-18 06:26:18 -05:00
<string name= "dialog_message_cancel_follow_request" > Revoke the follow request?</string>
2017-08-09 00:16:00 -05:00
<string name= "dialog_unfollow_warning" > Unfollow this account?</string>
2022-03-20 14:21:42 -05:00
<string name= "dialog_delete_post_warning" > Delete this post?</string>
<string name= "dialog_redraft_post_warning" > Delete and re-draft this post?</string>
2021-06-17 11:54:56 -05:00
<string name= "dialog_delete_conversation_warning" > Delete this conversation?</string>
2019-06-11 08:56:27 -05:00
<string name= "mute_domain_warning" > Are you sure you want to block all of %s? You will not see content from that domain in any public timelines or in your notifications. Your followers from that domain will be removed.</string>
<string name= "mute_domain_warning_dialog_ok" > Hide entire domain</string>
2020-03-30 14:03:27 -05:00
<string name= "dialog_block_warning" > Block @%s?</string>
<string name= "dialog_mute_warning" > Mute @%s?</string>
2020-07-27 03:28:59 -05:00
<string name= "dialog_mute_hide_notifications" > Hide notifications</string>
2017-01-07 16:24:02 -06:00
2017-04-18 05:59:42 -05:00
<string name= "visibility_public" > Public: Post to public timelines</string>
<string name= "visibility_unlisted" > Unlisted: Do not show in public timelines</string>
2017-05-02 17:17:54 -05:00
<string name= "visibility_private" > Followers-Only: Post to followers only</string>
2017-04-18 05:59:42 -05:00
<string name= "visibility_direct" > Direct: Post to mentioned users only</string>
2017-01-07 16:24:02 -06:00
2018-11-12 14:09:39 -06:00
<string name= "pref_title_edit_notification_settings" > Notifications</string>
2017-07-08 19:59:48 -05:00
<string name= "pref_title_notifications_enabled" > Notifications</string>
2017-03-28 14:39:29 -05:00
<string name= "pref_title_notification_alerts" > Alerts</string>
2017-02-05 01:34:55 -06:00
<string name= "pref_title_notification_alert_sound" > Notify with a sound</string>
2017-03-28 14:39:29 -05:00
<string name= "pref_title_notification_alert_vibrate" > Notify with vibration</string>
<string name= "pref_title_notification_alert_light" > Notify with light</string>
<string name= "pref_title_notification_filters" > Notify me when</string>
<string name= "pref_title_notification_filter_mentions" > mentioned</string>
<string name= "pref_title_notification_filter_follows" > followed</string>
2020-03-19 16:02:10 -05:00
<string name= "pref_title_notification_filter_follow_requests" > follow requested</string>
2017-03-28 14:39:29 -05:00
<string name= "pref_title_notification_filter_reblogs" > my posts are boosted</string>
2019-07-02 03:56:05 -05:00
<string name= "pref_title_notification_filter_favourites" > my posts are favorited</string>
2019-05-02 12:44:35 -05:00
<string name= "pref_title_notification_filter_poll" > polls have ended</string>
2022-03-20 14:21:42 -05:00
<string name= "pref_title_notification_filter_subscriptions" > somebody I\'m subscribed to published a new post</string>
2022-04-14 12:39:30 -05:00
<string name= "pref_title_notification_filter_sign_ups" > somebody signed up</string>
2022-04-19 04:10:13 -05:00
<string name= "pref_title_notification_filter_updates" > a post I\'ve interacted with is edited</string>
2022-12-01 13:11:55 -06:00
<string name= "pref_title_notification_filter_reports" > there\'s a new report</string>
2017-02-16 12:52:55 -06:00
<string name= "pref_title_appearance_settings" > Appearance</string>
2023-01-03 14:07:04 -06:00
<string name= "pref_title_app_theme" > App theme</string>
2018-11-12 14:09:39 -06:00
<string name= "pref_title_timelines" > Timelines</string>
2019-03-20 13:25:26 -05:00
<string name= "pref_title_timeline_filters" > Filters</string>
2018-01-20 06:39:01 -06:00
2019-04-29 13:17:50 -05:00
<string name= "app_them_dark" > Dark</string>
<string name= "app_theme_light" > Light</string>
<string name= "app_theme_black" > Black</string>
<string name= "app_theme_auto" > Automatic at sunset</string>
<string name= "app_theme_system" > Use System Design</string>
2018-01-20 06:39:01 -06:00
2017-04-06 21:25:54 -05:00
<string name= "pref_title_browser_settings" > Browser</string>
2017-04-11 23:21:52 -05:00
<string name= "pref_title_custom_tabs" > Use Chrome Custom Tabs</string>
2017-08-05 05:04:58 -05:00
<string name= "pref_title_hide_follow_button" > Hide compose button while scrolling</string>
2019-03-08 13:33:42 -06:00
<string name= "pref_title_language" > Language</string>
2019-05-26 01:46:08 -05:00
<string name= "pref_title_bot_overlay" > Show indicator for bots</string>
<string name= "pref_title_animate_gif_avatars" > Animate GIF avatars</string>
2020-06-08 02:21:12 -05:00
<string name= "pref_title_gradient_for_media" > Show colorful gradients for hidden media</string>
2021-02-06 01:14:51 -06:00
<string name= "pref_title_animate_custom_emojis" > Animate custom emojis</string>
2019-05-26 01:46:08 -05:00
2022-03-27 05:23:25 -05:00
<string name= "pref_title_post_filter" > Timeline filtering</string>
<string name= "pref_title_post_tabs" > Tabs</string>
2017-04-15 13:23:07 -05:00
<string name= "pref_title_show_boosts" > Show boosts</string>
<string name= "pref_title_show_replies" > Show replies</string>
2019-03-04 03:09:21 -06:00
<string name= "pref_title_show_media_preview" > Download media previews</string>
2017-12-26 14:45:08 -06:00
<string name= "pref_title_proxy_settings" > Proxy</string>
<string name= "pref_title_http_proxy_settings" > HTTP proxy</string>
<string name= "pref_title_http_proxy_enable" > Enable HTTP proxy</string>
<string name= "pref_title_http_proxy_server" > HTTP proxy server</string>
<string name= "pref_title_http_proxy_port" > HTTP proxy port</string>
2022-12-07 12:29:18 -06:00
<string name= "pref_title_http_proxy_port_message" > Port should be between %d and %d</string>
2023-01-13 12:28:46 -06:00
<string name= "pref_summary_http_proxy_disabled" > Disabled</string>
<string name= "pref_summary_http_proxy_missing" > < not set></string>
<string name= "pref_summary_http_proxy_invalid" > < invalid></string>
2017-04-06 02:09:49 -05:00
2017-11-27 13:11:31 -06:00
<string name= "pref_default_post_privacy" > Default post privacy</string>
2022-12-02 12:19:17 -06:00
<string name= "pref_default_post_language" > Default posting language</string>
2018-11-17 08:53:28 -06:00
<string name= "pref_default_media_sensitivity" > Always mark media as sensitive</string>
2018-11-12 14:09:39 -06:00
<string name= "pref_publishing" > Publishing (synced with server)</string>
<string name= "pref_failed_to_sync" > Failed to sync settings</string>
2017-11-27 13:11:31 -06:00
2020-06-18 04:04:53 -05:00
<string name= "pref_main_nav_position" > Main navigation position</string>
<string name= "pref_main_nav_position_option_top" > Top</string>
<string name= "pref_main_nav_position_option_bottom" > Bottom</string>
2019-04-29 13:17:50 -05:00
<string name= "post_privacy_public" > Public</string>
<string name= "post_privacy_unlisted" > Unlisted</string>
<string name= "post_privacy_followers_only" > Followers-only</string>
2017-11-27 13:11:31 -06:00
2022-03-27 05:23:25 -05:00
<string name= "pref_post_text_size" > Post text size</string>
2017-12-01 14:52:10 -06:00
2022-03-27 05:23:25 -05:00
<string name= "post_text_size_smallest" > Smallest</string>
<string name= "post_text_size_small" > Small</string>
<string name= "post_text_size_medium" > Medium</string>
<string name= "post_text_size_large" > Large</string>
<string name= "post_text_size_largest" > Largest</string>
2017-12-01 14:52:10 -06:00
2022-10-18 12:38:17 -05:00
<string name= "pref_show_self_username_always" > Always</string>
<string name= "pref_show_self_username_disambiguate" > When multiple accounts logged in</string>
<string name= "pref_show_self_username_never" > Never</string>
2023-02-04 13:19:23 -06:00
<string name= "notification_mention_name" > New mentions</string>
2019-05-02 12:44:35 -05:00
<string name= "notification_mention_descriptions" > Notifications about new mentions</string>
2023-02-04 13:19:23 -06:00
<string name= "notification_follow_name" > New followers</string>
2019-05-02 12:44:35 -05:00
<string name= "notification_follow_description" > Notifications about new followers</string>
2023-01-03 14:07:04 -06:00
<string name= "notification_follow_request_name" > Follow requests</string>
2020-03-19 16:02:10 -05:00
<string name= "notification_follow_request_description" > Notifications about follow requests</string>
2019-05-02 12:44:35 -05:00
<string name= "notification_boost_name" > Boosts</string>
2022-03-20 14:21:42 -05:00
<string name= "notification_boost_description" > Notifications when your posts get boosted</string>
2019-07-02 03:56:05 -05:00
<string name= "notification_favourite_name" > Favorites</string>
2022-03-27 05:23:25 -05:00
<string name= "notification_favourite_description" > Notifications when your posts get marked as favorite</string>
2019-05-02 12:44:35 -05:00
<string name= "notification_poll_name" > Polls</string>
<string name= "notification_poll_description" > Notifications about polls that have ended</string>
2022-03-20 14:21:42 -05:00
<string name= "notification_subscription_name" > New posts</string>
<string name= "notification_subscription_description" > Notifications when somebody you\'re subscribed to published a new post</string>
2022-04-14 12:39:30 -05:00
<string name= "notification_sign_up_name" > Sign ups</string>
<string name= "notification_sign_up_description" > Notifications about new users</string>
2022-04-19 04:10:13 -05:00
<string name= "notification_update_name" > Post edits</string>
<string name= "notification_update_description" > Notifications when posts you\'ve interacted with are edited</string>
2022-12-01 13:11:55 -06:00
<string name= "notification_report_name" > Reports</string>
<string name= "notification_report_description" > Notifications about moderation reports</string>
Convert NotificationsFragment and related code to Kotlin, use the Paging library (#3159)
* Unmodified output from "Convert Java to Kotlin" on NotificationsFragment.java
* Bare minimum changes to get this to compile and run
- Use `lateinit` for `eventhub`, `adapter`, `preferences`, and `scrolllistener`
- Removed override for accountManager, it can be used from the superclass
- Add `?.` where non-nullity could not (yet) be guaranteed
- Remove `?` from type lists where non-nullity is guaranteed
- Explicitly convert lists to mutable where necessary
- Delete unused function `findReplyPosition`
* Remove all unnecessary non-null (!!) assertions
The previous change meant some values are no longer nullable. Remove the
non-null assertions.
* Lint ListStatusAccessibilityDelegate call
- Remove redundant constructor
- Move block outside of `()`
* Use `let` when handling compose button visibility on scroll
* Replace a `requireNonNull` with `!!`
* Remove redundant return values
* Remove or rename unused lambda parameters
* Remove unnecessary type parameters
* Remove unnecessary null checks
* Replace cascading-if statement with `when`
* Simplify calculation of `topId`
* Use more appropriate list properties and methods
- Access the last value with `.last()`
- Access the last index with `.lastIndex`
- Replace logical-chain with `asRightOrNull` and `?.`
- `.isNotEmpty()`, not `!...isEmpty()`
* Inline unnecessary variable
* Use PrefKeys constants instead of bare strings
* Use `requireContext()` instead of `context!!`
* Replace deprecated `onActivityCreated()` with `onViewCreated()`
* Remove unnecessary variable setting
* Replace `size == 0` check with `isEmpty()`
* Format with ktlint, no functionality changes
* Convert NotifcationsAdapter to Kotlin
Does not compile, this is the unchanged output of the "Convert to Kotlin"
function
* Minimum changes to get NotificationsAdapter to compile
* Remove unnecessary visibility modifiers
* Use `isNotEmpty()`
* Remove unused lambda parameters
* Convert cascading-if to `when`
* Simplifiy assignment op
* Use explicit argument names with `copy()`
* Use `.firstOrNull()` instead of `if`
* Mark as lateinit to avoid unnecessary null checks
* Format with ktlint, whitespace changes only
* Bare minimum necessary to demonstrate paging in notifications
Create `NotificationsPagingSource`. This uses a new `notifications2()` API
call, which will exist until all the code has been adapted. Instead of
using placeholders,
Create `NotificationsPagingAdapter` (will replace `NotificationsAdapater`)
to consume this data.
Expose the paging source view a new `NotificationsViewModel` `flow`, and
submit new pages to the adapter as they are available in
`NotificationsFragment`.
Comment out any other code in `NotificationsFragment` that deals with
loading data from the network. This will be updated as necessary, either
here, or in the view model.
Lots of functionality is missing, including:
- Different views for different notification types
- Starting at the remembered notification position
- Interacting with notifications
- Adjusting the UI state to match the loading state
These will be added incrementally.
* Migrate StatusNotificationViewHolder impl. to NotificationsPagingAdapter
With this change `NotificationsPagingAdapter` shows notifications about a
status correctly.
- Introduce a `ViewHolder` abstract class that all Notification view holders
derive from. Modify the fallback view holder to use this.
- Implement `StatusNotificationViewHolder`. Much of the code is from the
existing implementation in the `NotificationAdapater`.
- The original code split the code that binds values to views between the
adapter's `bindViewHolder` method and the view holder's methods.
In this code, all of the binding code is in the view holder, in a `bind`
method. This is called by the adapter's `bindViewHolder` method. This keeps
all the binding logic in the view holder, where it belongs.
- The new `StatusNotificationViewHolder` uses view binding to access its views
instead of `findViewById`.
- Logically, information about whether to show sensitive media, or open
content warnings should be part of the `StatusDisplayOptions`. So add those
as fields, and populate them appropriately.
This affects code outside notification handling, which will be adjusted
later.
* Note some TODOs to complete before the PR is finished
* Extract StatusNotificationViewHolder to a new file
* Add TODO for NotificationViewData.Concrete
* Convert the adapter to take NotificationViewData.Concrete
* Add a view holder for regular status notifications
* Migrate Follow and FollowRequest notifications
* Migrate report notifications
* Convert onViewThread to use the adapter data
* Convert onViewMedia to use the adapter data
* Convert onMore to use the adapter data
* Convert onReply to use the adapter data
* Convert NotificationViewData to Kotlin
* Re-implement the reblog functionality
- Move reblogging in to the view model
- Update the UI via the adapter's `snapshot()` and `notifyItemChanged()`
methods
* Re-implement the favourite functionality
Same approach as reblog
* Re-implement the bookmark functionality
Same approach as reblog
* Add TODO re StatusActionListener interface
* Add TODO re event handling
* Re-implementing the voting functionality
* Re-implement viewing hidden content
- Hidden media
- Content behind a content warning
* Add a TODO re pinning
* Re-implement "Show more" / "Show less"
* Delete unused updateStatus() function
* Comment out the scroll listener for the moment
* Re-implement applying filters to notifications
Introduce `NotificationsRepository`, to provide access to the notifications
stream.
When changing the filters the flow is as follows:
- User clicks "Apply" in the fragment.
- Fragment calls `viewModel.accept()` with a `UiAction.ApplyFilter` (new
class).
- View model maintains a private flow of incoming UI actions. The new action
is emitted to that flow.
- In view model, `notificationFilter` waits for `.ApplyFilter` actions, and
ensures the filter is saved, then emits it.
- In view model, `pagingDataFlow` waits for new items from
`notificationsFilter` and fetches the notifications from the repository in
response. The repository provides `Notification`, so the model maps them to
`NotificationViewData.Concrete` for display by the adapter.
- In view model the UI state also waits for new items from
`notificationsFilter` and emits a new `UiState` every time the filter is
changed.
When opening the fragment for the first time:
- All of the above machinery, but `notificationFilter` also fetches the filter
from the active account and emits that first. This triggers the first fetch
and the first update of `uiState`.
Also:
- Add TODOs for functionality that is not implemented yet
- Delete a lot of dead code from NotificationsFragment
* Include important preference values in `uiState`
Listen to the flow of eventHub events, filtered to preference changes that
are relevant to the notification view.
When preferences change (or when the view model starts), fetch the current
values, and include them in `uiState`.
Remove preference handling from `NotificationsFragment`, and just use
the values from `uiState`.
Adjust how the `useAbsoluteTime` preference is handled. The previous code
loaded new content (via a diffutil) in to the adapter, which would trigger
a re-binding of the timestamp.
As the adapter content is immutable, the new code simply triggers a
re-binding of the views that are currently visible on screen.
* Update UI in response to different load states
Notifications can be loaded at the top and bottom of the timeline. Add a
new layout to show the progress of these loads, and any errors that can
occur.
Catch network errors in `NotificationsPagingSource` and convert to
`LoadState.Error`.
Add a header/footer to the notifications list to show the load state.
Collect the load state from the adapter, use this to drive the visibility
of different views.
* Save and restore the last read notification ID
Use this when fetching notifications, to centre the list around the
notification that was last read.
* Call notifyItemRangeChanged with the correct parameters
* Don't try and save list position if there are no items in the list
* Show/hide the "Nothing to see" view appropriately
* Update comments
* Handle the case where the notification key no longer exists
* Re-implement support for showMediaPreview and other settings
* Re-implement "hide FAB when scrolling" preference
* Delete dead code
* Delete Notifications Adapater and Placeholder types
* Remove NotificationViewData.Concrete subclass
Now there's no Placeholder, everything is a NotificationViewData.
* Improve how notification pages are loaded if the first notification is missing or filtered
* Re-implement clear notifications, show errors
* s/default/from/
* Add missing headers
* Don't process bookmarking via EventHub
- Initiating a bookmark is triggered by the fragment sending a
StatusUiAction.Bookmark
- View model receives this, makes API call, waits for response, emits either
a success or failure state
- Fragment collects success/failure states, updates the UI accordingly
* Don't process favourites via EventHub
* Don't process reblog via EventHub
* Don't process poll votes with EventHub
This removes EventHub from the fragment
* Respond to follow requests via the view model
* Docs and cleanup
* Typo and editing pass
* Minor edits for clarity
* Remove newline in diagram
* Reorder sequence diagram
* s/authorize/accept/
* s/pagingDataFlow/pagingData/
* Add brief KDoc
* Try and fetch a full first page of notifications
* Call the API method `notifications` again
* Log UI errors at the point of handling
* Remove unused variable
* Replace String.format() with interpolation
* Convert NotificationViewData to data class
* Rename copy() to make(), to avoid confusion with default copy() method
* Lint
* Update app/src/main/res/layout/simple_list_item_1.xml
* Update app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsPagingAdapter.kt
* Update app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsViewModel.kt
* Update app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.kt
* Update app/src/main/java/com/keylesspalace/tusky/viewdata/NotificationViewData.kt
* Initial NotificationsViewModel tests
* Add missing import
* More tests, some cleanup
* Comments, re-order some code
* Set StateRestorationPolicy.PREVENT_WHEN_EMPTY
* Mark clearNotifications() as "suspend"
* Catch exceptions from clearNotifications and emit
* Update TODOs with explanations
* Ensure initial fetch uses a null ID
* Stop/start collecting pagingData based on the lifecycle
* Don't hide the list while refreshing
* Refresh notifications on mutes and blocks
* Update tests now clearNotifications is a suspend fun
* Add "Refresh" menu to NotificationsFragment
* Use account.name over account.displayName
* Update app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.kt
Co-authored-by: Konrad Pozniak <connyduck@users.noreply.github.com>
* Mark layoutmanager as lateinit
* Mark layoutmanager as lateinit
* Refactor generating UI text
* Add Copyright header
* Correctly apply notification filters
* Show follow request header in notifications
* Wait for follow request actions to complete, so the reqeuest is sent
* Remove duplicate copyright header
* Revert copyright change in unmodified file
* Null check response body
* Move NotificationsFragment to component.notifications
* Use viewlifecycleowner.lifecyclescope
* Show notification filter as a dialog rather than a popup window
The popup window:
- Is inconsistent UI
- Requires a custom layout
- Didn't play nicely with viewbinding
* Refresh adapter on block/mute
* Scroll up slightly when new content is loaded
* Restore progressbar
* Lint
* Update app/src/main/res/layout/simple_list_item_1.xml
---------
Co-authored-by: Konrad Pozniak <connyduck@users.noreply.github.com>
2023-03-10 13:12:33 -06:00
<string name= "notification_unknown_name" > Unknown</string>
2017-10-18 15:18:07 -05:00
2017-03-12 01:31:20 -06:00
<string name= "notification_mention_format" > %s mentioned you</string>
2017-03-14 08:31:52 -05:00
<string name= "notification_summary_large" > %1$s, %2$s, %3$s and %4$d others</string>
<string name= "notification_summary_medium" > %1$s, %2$s, and %3$s</string>
<string name= "notification_summary_small" > %1$s and %2$s</string>
2021-03-07 12:43:25 -06:00
<plurals name= "notification_title_summary" >
<item quantity= "one" > %d new interaction</item>
<item quantity= "other" > %d new interactions</item>
</plurals>
2017-04-06 02:09:49 -05:00
2017-04-11 23:21:52 -05:00
<string name= "description_account_locked" > Locked Account</string>
2017-04-15 13:05:25 -05:00
<string name= "about_title_activity" > About</string>
2017-10-28 06:39:32 -05:00
<string name= "about_tusky_version" > Tusky %s</string>
2019-10-29 14:30:46 -05:00
<string name= "about_powered_by_tusky" > Powered by Tusky</string>
2017-10-28 06:39:32 -05:00
<string name= "about_tusky_license" > Tusky is free and open-source software.
It is licensed under the GNU General Public License Version 3.
You can view the license here: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
2018-04-20 10:21:52 -05:00
<!-- note to translators:
* you should think of “free” as in “free speech,” not as in “free beer”.
We sometimes call it “libre software,” borrowing the French or Spanish word for “free” as in freedom,
to show we do not mean the software is gratis. Source: https://www.gnu.org/philosophy/free-sw.html
* the url can be changed to link to the localized version of the license.
-->
2017-05-07 21:00:29 -05:00
<string name= "about_project_site" >
Project website:\n
2019-03-18 09:47:02 -05:00
https://tusky.app
2017-05-07 21:00:29 -05:00
</string>
<string name= "about_bug_feature_request_site" >
Bug reports & feature requests:\n
2018-02-25 07:51:06 -06:00
https://github.com/tuskyapp/Tusky/issues
2017-05-07 21:00:29 -05:00
</string>
2017-04-30 15:53:32 -05:00
<string name= "about_tusky_account" > Tusky\'s Profile</string>
2017-04-15 13:05:25 -05:00
2022-03-27 05:23:25 -05:00
<string name= "post_share_content" > Share content of post</string>
<string name= "post_share_link" > Share link to post</string>
<string name= "post_media_images" > Images</string>
<string name= "post_media_video" > Video</string>
<string name= "post_media_audio" > Audio</string>
<string name= "post_media_attachments" > Attachments</string>
2022-05-20 09:47:45 -05:00
<string name= "status_count_one_plus" > 1+</string>
2022-12-01 12:54:29 -06:00
<string name= "status_created_at_now" > now</string>
2017-04-30 20:55:33 -05:00
<string name= "state_follow_requested" > Follow requested</string>
2017-06-29 10:55:39 -05:00
2022-03-27 05:23:25 -05:00
<!-- These are for timestamps on posts. For example: "16s" or "2d" -->
2017-07-14 18:45:26 -05:00
<string name= "abbreviated_in_years" > in %dy</string>
<string name= "abbreviated_in_days" > in %dd</string>
<string name= "abbreviated_in_hours" > in %dh</string>
<string name= "abbreviated_in_minutes" > in %dm</string>
<string name= "abbreviated_in_seconds" > in %ds</string>
<string name= "abbreviated_years_ago" > %dy</string>
<string name= "abbreviated_days_ago" > %dd</string>
<string name= "abbreviated_hours_ago" > %dh</string>
<string name= "abbreviated_minutes_ago" > %dm</string>
<string name= "abbreviated_seconds_ago" > %ds</string>
2017-06-29 10:55:39 -05:00
2017-08-05 03:09:17 -05:00
<string name= "follows_you" > Follows you</string>
2018-08-29 12:16:41 -05:00
<string name= "pref_title_alway_show_sensitive_media" > Always show sensitive content</string>
2022-03-20 14:21:42 -05:00
<string name= "pref_title_alway_open_spoiler" > Always expand posts marked with content warnings</string>
2017-11-05 15:32:36 -06:00
<string name= "title_media" > Media</string>
2017-11-01 14:59:29 -05:00
<string name= "replying_to" > Replying to @%s</string>
2017-11-03 16:17:31 -05:00
<string name= "load_more_placeholder_text" > load more</string>
2018-02-03 15:45:14 -06:00
2019-03-20 13:25:26 -05:00
<string name= "pref_title_public_filter_keywords" > Public timelines</string>
<string name= "pref_title_thread_filter_keywords" > Conversations</string>
<string name= "filter_addition_dialog_title" > Add filter</string>
<string name= "filter_edit_dialog_title" > Edit filter</string>
<string name= "filter_dialog_remove_button" > Remove</string>
<string name= "filter_dialog_update_button" > Update</string>
2019-06-24 03:11:25 -05:00
<string name= "filter_dialog_whole_word" > Whole word</string>
<string name= "filter_dialog_whole_word_description" > When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word</string>
2019-03-20 13:25:26 -05:00
<string name= "filter_add_description" > Phrase to filter</string>
2022-08-17 10:50:34 -05:00
<string name= "filter_expiration_format" > %s (%s)</string>
2019-03-20 13:25:26 -05:00
2018-02-03 15:45:14 -06:00
<string name= "add_account_name" > Add Account</string>
<string name= "add_account_description" > Add new Mastodon Account</string>
2018-01-06 12:01:37 -06:00
<string name= "action_lists" > Lists</string>
<string name= "title_lists" > Lists</string>
2019-03-16 07:36:16 -05:00
<string name= "error_create_list" > Could not create list</string>
<string name= "error_rename_list" > Could not rename list</string>
<string name= "error_delete_list" > Could not delete list</string>
<string name= "action_create_list" > Create a list</string>
<string name= "action_rename_list" > Rename the list</string>
<string name= "action_delete_list" > Delete the list</string>
<string name= "action_edit_list" > Edit the list</string>
<string name= "hint_search_people_list" > Search for people you follow</string>
<string name= "action_add_to_list" > Add account to the list</string>
<string name= "action_remove_from_list" > Remove account from the list</string>
2022-11-12 15:05:55 -06:00
<string name= "action_add_or_remove_from_list" > Add or remove from list</string>
<string name= "failed_to_add_to_list" > Failed to add the account to the list</string>
<string name= "failed_to_remove_from_list" > Failed to remove the account from the list</string>
2018-02-03 15:45:14 -06:00
2022-09-17 12:05:56 -05:00
<string name= "compose_active_account_description" > Posting as %1$s</string>
2018-02-03 15:45:14 -06:00
2018-01-08 16:16:21 -06:00
<string name= "error_failed_set_caption" > Failed to set caption</string>
Add UI for image-attachment "focus" (#2620)
* Attempt-zero implementation of a "focus" feature for image attachments. Choose "Set focus" in the attachment menu, tap once to select focus point (no visual feedback currently), tap "OK". Works in tests.
* Remove code duplication between 'update description' and 'update focus'
* Fix ktlint/bitrise failures
* Make updateMediaItem private
* When focus is set on a post attachment the preview focuses correctly. ProgressImageView now inherits from MediaPreviewImageView.
* Replace use of PointF for Focus where focus is represented, fix ktlint
* Substitute 'focus' for 'focus point' in strings
* First attempt draw focus point. Only updates on initial load. Modeled on code from RoundedCorners builtin from Glide
* Redraw focus after each tap
* Dark curtain where focus isn't (now looks like mastosoc)
* Correct ktlint for FocusDialog
* draft: switch to overlay for focus indicator
* Draw focus circle, but ImageView and FocusIndicatorView seem to share a single canvas
* Switch focus circle to path approach
* Correctly scale, save and load focuses. Clamp to visible area. Focus editor looks and feels right
* ktlint fixes and comments
* Focus indicator drawing should use device-independent pixels
* Shrink focus window when it gets unattractively tall (no linting, misbehaves on wide aspect ratio screens)
* Correct max-height behavior for screens in landscape mode
* Focus attachment result is are flipped on x axis; fix this
* Correctly thread focus through on scheduled posts, redrafted posts, and drafts (but draft focus is lost on post)
* More focus ktlint fixes
* Fix specific case where a draft is given a focus, then deleted, then posted in that order
* Fix accidental file change in focus PR
* ktLint fix
* Fix property style warnings in focus
* Fix remaining style warnings from focus PR
Co-authored-by: Conny Duck <k.pozniak@gmx.at>
2022-09-21 13:28:06 -05:00
<string name= "error_failed_set_focus" > Failed to set focus point</string>
2021-03-07 12:43:25 -06:00
<plurals name= "hint_describe_for_visually_impaired" >
<item quantity= "other" > Describe for visually impaired\n(%d character limit)</item>
</plurals>
2022-10-15 12:04:27 -05:00
<string name= "set_focus_description" > Tap or drag the circle to choose the focal point which will always be visible in thumbnails.</string>
2018-01-08 16:16:21 -06:00
<string name= "action_set_caption" > Set caption</string>
Add UI for image-attachment "focus" (#2620)
* Attempt-zero implementation of a "focus" feature for image attachments. Choose "Set focus" in the attachment menu, tap once to select focus point (no visual feedback currently), tap "OK". Works in tests.
* Remove code duplication between 'update description' and 'update focus'
* Fix ktlint/bitrise failures
* Make updateMediaItem private
* When focus is set on a post attachment the preview focuses correctly. ProgressImageView now inherits from MediaPreviewImageView.
* Replace use of PointF for Focus where focus is represented, fix ktlint
* Substitute 'focus' for 'focus point' in strings
* First attempt draw focus point. Only updates on initial load. Modeled on code from RoundedCorners builtin from Glide
* Redraw focus after each tap
* Dark curtain where focus isn't (now looks like mastosoc)
* Correct ktlint for FocusDialog
* draft: switch to overlay for focus indicator
* Draw focus circle, but ImageView and FocusIndicatorView seem to share a single canvas
* Switch focus circle to path approach
* Correctly scale, save and load focuses. Clamp to visible area. Focus editor looks and feels right
* ktlint fixes and comments
* Focus indicator drawing should use device-independent pixels
* Shrink focus window when it gets unattractively tall (no linting, misbehaves on wide aspect ratio screens)
* Correct max-height behavior for screens in landscape mode
* Focus attachment result is are flipped on x axis; fix this
* Correctly thread focus through on scheduled posts, redrafted posts, and drafts (but draft focus is lost on post)
* More focus ktlint fixes
* Fix specific case where a draft is given a focus, then deleted, then posted in that order
* Fix accidental file change in focus PR
* ktLint fix
* Fix property style warnings in focus
* Fix remaining style warnings from focus PR
Co-authored-by: Conny Duck <k.pozniak@gmx.at>
2022-09-21 13:28:06 -05:00
<string name= "action_set_focus" > Set focus point</string>
2022-05-22 14:01:14 -05:00
<string name= "action_edit_image" > Edit image</string>
2019-08-22 13:30:08 -05:00
<string name= "action_remove" > Remove</string>
2018-03-27 13:46:53 -05:00
<string name= "lock_account_label" > Lock account</string>
<string name= "lock_account_label_description" > Requires you to manually approve followers</string>
2018-04-13 15:37:21 -05:00
<string name= "compose_save_draft" > Save draft?</string>
2022-11-09 12:33:48 -06:00
<string name= "compose_save_draft_loses_media" > Save draft? (Attachments will be uploaded again when you restore the draft.)</string>
Fix saving changes to statuses when editing (#3103)
* Fix saving changes to statuses when editing
With the previous code backing out of a status editing operation where changes
had been made (whether it was editing an existing status, a scheduled status,
or a draft) would prompt the user to save the changes as a new draft.
See https://github.com/tuskyapp/Tusky/issues/2704 and
https://github.com/tuskyapp/Tusky/issues/2705 for more detail.
The fix:
- Create an enum to represent the four different kinds of edits that can
happen
- Editing a new status (i.e., composing it for the first time)
- Editing a posted status
- Editing a draft
- Editing a scheduled status
- Store this in ComposeOptions, and set it appropriately everywhere
ComposeOptions is created.
- Check the edit kind when backing out of ComposeActivity, and use this to
show one of three different dialogs as appropriate so the user can:
- Save as new draft or discard changes
- Continue editing or discard changes
- Update existing draft or discard changes
Also fix ComposeViewModel.didChange(), which erroneously reported false if the
old text started with the new text (e.g., if the old text was "hello, world"
and it was edited to "hello", didChange() would not consider that to be a
change).
Fixes https://github.com/tuskyapp/Tusky/issues/2704,
https://github.com/tuskyapp/Tusky/issues/2705
* Use orEmpty extension function
2022-12-31 06:04:49 -06:00
<string name= "compose_unsaved_changes" > You have unsaved changes.</string>
2022-03-20 14:21:42 -05:00
<string name= "send_post_notification_title" > Sending post…</string>
<string name= "send_post_notification_error_title" > Error sending post</string>
<string name= "send_post_notification_channel_name" > Sending Posts</string>
<string name= "send_post_notification_cancel_title" > Sending cancelled</string>
<string name= "send_post_notification_saved_content" > A copy of the post has been saved to your drafts</string>
2018-05-06 04:07:10 -05:00
<string name= "action_compose_shortcut" > Compose</string>
2017-08-05 03:09:17 -05:00
2018-04-17 15:39:55 -05:00
<string name= "error_no_custom_emojis" > Your instance %s does not have any custom emojis</string>
2018-05-10 04:16:56 -05:00
<string name= "emoji_style" > Emoji style</string>
<string name= "system_default" > System default</string>
<string name= "download_fonts" > You\'ll need to download these emoji sets first</string>
2018-12-12 13:28:05 -06:00
<string name= "performing_lookup_title" > Performing lookup…</string>
2022-03-27 05:23:25 -05:00
<string name= "expand_collapse_all_posts" > Expand/Collapse all posts</string>
2022-03-20 14:21:42 -05:00
<string name= "action_open_post" > Open post</string>
2018-05-10 04:16:56 -05:00
<string name= "restart_required" > App restart required</string>
<string name= "restart_emoji" > You\'ll need to restart Tusky in order to apply these changes</string>
<string name= "later" > Later</string>
<string name= "restart" > Restart</string>
<string name= "caption_systememoji" > Your device\'s default emoji set</string>
2018-06-25 09:23:43 -05:00
<string name= "caption_blobmoji" > The Blob emojis known from Android 4.4– </string>
2018-05-10 04:16:56 -05:00
<string name= "caption_twemoji" > Mastodon\'s standard emoji set</string>
2019-06-06 14:51:56 -05:00
<string name= "caption_notoemoji" > Google\'s current emoji set</string>
2018-06-25 06:02:34 -05:00
2018-05-10 04:16:56 -05:00
<string name= "download_failed" > Download failed</string>
2018-06-18 06:26:18 -05:00
<string name= "profile_badge_bot_text" > Bot</string>
<string name= "account_moved_description" > %1$s has moved to:</string>
2018-05-28 14:29:06 -05:00
<string name= "reblog_private" > Boost to original audience</string>
<string name= "unreblog_private" > Unboost</string>
2018-04-17 15:39:55 -05:00
2018-06-25 06:02:34 -05:00
<string name= "license_description" > Tusky contains code and assets from the following open source projects:</string>
<string name= "license_apache_2" > Licensed under the Apache License (copy below)</string>
<string name= "license_cc_by_4" > CC-BY 4.0</string>
2018-08-15 13:51:35 -05:00
<string name= "license_cc_by_sa_4" > CC-BY-SA 4.0</string>
2018-08-15 13:47:09 -05:00
<string name= "profile_metadata_label" > Profile metadata</string>
<string name= "profile_metadata_add" > add data</string>
<string name= "profile_metadata_label_label" > Label</string>
<string name= "profile_metadata_content_label" > Content</string>
2018-06-25 06:02:34 -05:00
2018-08-16 08:51:23 -05:00
<string name= "pref_title_absolute_time" > Use absolute time</string>
2018-10-03 14:53:31 -05:00
<string name= "label_remote_account" > Information below may reflect the user\'s profile incompletely. Press to open full profile in browser.</string>
2018-10-03 14:27:52 -05:00
<string name= "unpin_action" > Unpin</string>
<string name= "pin_action" > Pin</string>
2022-11-09 12:30:50 -06:00
<string name= "failed_to_pin" > Failed to Pin</string>
<string name= "failed_to_unpin" > Failed to Unpin</string>
2018-08-16 08:51:23 -05:00
2018-12-27 02:48:24 -06:00
<plurals name= "favs" >
2019-07-02 03:56:05 -05:00
<item quantity= "one" > < b>%1$s< /b> Favorite</item>
<item quantity= "other" > < b>%1$s< /b> Favorites</item>
2018-12-27 02:48:24 -06:00
</plurals>
<plurals name= "reblogs" >
<item quantity= "one" > < b>%s< /b> Boost</item>
<item quantity= "other" > < b>%s< /b> Boosts</item>
</plurals>
<string name= "title_reblogged_by" > Boosted by</string>
2019-07-02 03:56:05 -05:00
<string name= "title_favourited_by" > Favorited by</string>
2018-12-27 02:48:24 -06:00
2019-02-12 12:22:37 -06:00
<string name= "conversation_1_recipients" > %1$s</string>
<string name= "conversation_2_recipients" > %1$s and %2$s</string>
<string name= "conversation_more_recipients" > %1$s, %2$s and %3$d more</string>
2021-03-07 12:43:25 -06:00
<plurals name= "max_tab_number_reached" >
<item quantity= "one" > maximum of %1$d tab reached</item>
<item quantity= "other" > maximum of %1$d tabs reached</item>
</plurals>
2019-02-12 12:22:37 -06:00
2022-03-27 05:23:25 -05:00
<string name= "description_post_media" >
2019-03-04 12:24:27 -06:00
Media: %s
</string>
2022-03-27 05:23:25 -05:00
<string name= "description_post_cw" >
2019-03-04 12:24:27 -06:00
Content warning: %s
</string>
2022-03-27 05:23:25 -05:00
<string name= "description_post_media_no_description_placeholder" >
2019-03-04 12:24:27 -06:00
No description
</string>
2022-12-03 05:15:54 -06:00
<string name= "description_post_edited" >
Edited
</string>
2022-03-27 05:23:25 -05:00
<string name= "description_post_reblogged" >
2019-03-04 12:24:27 -06:00
Reblogged
</string>
2022-03-27 05:23:25 -05:00
<string name= "description_post_favourited" >
2019-07-02 03:56:05 -05:00
Favorited
2019-03-04 12:24:27 -06:00
</string>
2022-03-27 05:23:25 -05:00
<string name= "description_post_bookmarked" >
2019-11-19 03:15:32 -06:00
Bookmarked
</string>
2022-11-09 12:32:39 -06:00
<string name= "description_visibility_public" >
2019-03-04 12:24:27 -06:00
Public
</string>
2022-11-09 12:32:39 -06:00
<string name= "description_visibility_unlisted" >
2019-03-04 12:24:27 -06:00
Unlisted
</string>
2022-11-09 12:32:39 -06:00
<string name= "description_visibility_private" >
2019-03-04 12:24:27 -06:00
Followers
</string>
2022-11-09 12:32:39 -06:00
<string name= "description_visibility_direct" >
2019-03-04 12:24:27 -06:00
Direct
</string>
2019-05-26 08:56:26 -05:00
<string name= "description_poll" >
2019-06-24 15:15:31 -05:00
Poll with choices: %1$s, %2$s, %3$s, %4$s; %5$s
2019-03-04 12:24:27 -06:00
</string>
2022-08-31 11:53:57 -05:00
<string name= "description_post_language" > Post language</string>
2023-01-25 12:26:29 -06:00
<string name= "description_login" > Works in most cases. No data is leaked to other apps.</string>
<string name= "description_browser_login" > May support additional authentication methods, but requires a supported browser.</string>
2019-03-04 12:24:27 -06:00
2019-03-16 07:36:16 -05:00
<string name= "hint_list_name" > List name</string>
2020-05-15 15:10:29 -05:00
<string name= "add_hashtag_title" > Add hashtag</string>
2019-03-24 02:59:55 -05:00
<string name= "edit_hashtag_hint" > Hashtag without #</string>
2020-05-15 15:10:29 -05:00
<string name= "hashtags" > Hashtags</string>
2019-12-02 09:53:24 -06:00
<string name= "select_list_title" > Select list</string>
<string name= "list" > List</string>
2019-04-09 12:13:54 -05:00
<string name= "notifications_clear" > Clear</string>
<string name= "notifications_apply_filter" > Filter</string>
<string name= "filter_apply" > Apply</string>
2019-03-24 02:59:55 -05:00
2022-03-20 14:21:42 -05:00
<string name= "compose_shortcut_long_label" > Compose post</string>
2019-03-30 09:19:02 -05:00
<string name= "compose_shortcut_short_label" > Compose</string>
2019-03-24 02:59:55 -05:00
2019-04-11 17:13:06 -05:00
<string name= "notification_clear_text" > Are you sure you want to permanently clear all your notifications?</string>
2019-05-09 13:25:45 -05:00
<string name= "compose_preview_image_description" > Actions for image %s</string>
2019-04-11 17:13:06 -05:00
2019-04-22 03:11:00 -05:00
<string name= "poll_info_format" >
<!-- 15 votes • 1 hour left -->
%1$s • %2$s</string>
<plurals name= "poll_info_votes" >
<item quantity= "one" > %s vote</item>
<item quantity= "other" > %s votes</item>
</plurals>
2020-03-24 15:06:58 -05:00
<plurals name= "poll_info_people" >
<item quantity= "one" > %s person</item>
<item quantity= "other" > %s people</item>
</plurals>
2019-04-22 03:11:00 -05:00
<string name= "poll_info_time_absolute" > ends at %s</string>
<string name= "poll_info_closed" > closed</string>
<string name= "poll_vote" > Vote</string>
2019-05-02 12:44:35 -05:00
<string name= "poll_ended_voted" > A poll you have voted in has ended</string>
<string name= "poll_ended_created" > A poll you created has ended</string>
2019-05-06 02:59:06 -05:00
<!-- These are for timestamps on polls -->
<plurals name= "poll_timespan_days" >
2020-10-02 10:11:48 -05:00
<item quantity= "one" > %d day left</item>
<item quantity= "other" > %d days left</item>
2019-05-06 02:59:06 -05:00
</plurals>
<plurals name= "poll_timespan_hours" >
2020-10-02 10:11:48 -05:00
<item quantity= "one" > %d hour left</item>
<item quantity= "other" > %d hours left</item>
2019-05-06 02:59:06 -05:00
</plurals>
<plurals name= "poll_timespan_minutes" >
2020-10-02 10:11:48 -05:00
<item quantity= "one" > %d minute left</item>
<item quantity= "other" > %d minutes left</item>
2019-05-06 02:59:06 -05:00
</plurals>
<plurals name= "poll_timespan_seconds" >
2020-10-02 10:11:48 -05:00
<item quantity= "one" > %d second left</item>
<item quantity= "other" > %d seconds left</item>
2019-05-06 02:59:06 -05:00
</plurals>
2019-04-22 03:11:00 -05:00
2019-06-09 09:55:34 -05:00
<string name= "button_continue" > Continue</string>
<string name= "button_back" > Back</string>
<string name= "button_done" > Done</string>
<string name= "report_sent_success" > Successfully reported @%s</string>
<string name= "hint_additional_info" > Additional comments</string>
<string name= "report_remote_instance" > Forward to %s</string>
<string name= "failed_report" > Failed to report</string>
2022-03-27 05:23:25 -05:00
<string name= "failed_fetch_posts" > Failed to fetch posts</string>
2019-06-09 09:55:34 -05:00
<string name= "report_description_1" > The report will be sent to your server moderator. You can provide an explanation of why you are reporting this account below:</string>
<string name= "report_description_remote_instance" > The account is from another server. Send an anonymized copy of the report there as well?</string>
2019-07-19 13:10:20 -05:00
<string name= "title_accounts" > Accounts</string>
<string name= "failed_search" > Failed to search</string>
2019-06-09 09:55:34 -05:00
2019-06-11 09:41:15 -05:00
<string name= "pref_title_show_notifications_filter" > Show Notifications filter</string>
2020-04-27 14:41:43 -05:00
<string name= "pref_title_enable_swipe_for_tabs" > Enable swipe gesture to switch between tabs</string>
2019-08-22 13:30:08 -05:00
<string name= "create_poll_title" > Poll</string>
2021-01-15 14:05:36 -06:00
<string name= "label_duration" > Duration</string>
<string name= "duration_indefinite" > Indefinite</string>
<string name= "duration_5_min" > 5 minutes</string>
<string name= "duration_30_min" > 30 minutes</string>
<string name= "duration_1_hour" > 1 hour</string>
<string name= "duration_6_hours" > 6 hours</string>
<string name= "duration_1_day" > 1 day</string>
<string name= "duration_3_days" > 3 days</string>
<string name= "duration_7_days" > 7 days</string>
2022-03-01 12:43:36 -06:00
<string name= "duration_14_days" > 14 days</string>
<string name= "duration_30_days" > 30 days</string>
<string name= "duration_60_days" > 60 days</string>
<string name= "duration_90_days" > 90 days</string>
<string name= "duration_180_days" > 180 days</string>
<string name= "duration_365_days" > 365 days</string>
2022-08-17 10:50:34 -05:00
<string name= "duration_no_change" > (No change)</string>
2019-08-22 13:30:08 -05:00
<string name= "add_poll_choice" > Add choice</string>
<string name= "poll_allow_multiple_choices" > Multiple choices</string>
<string name= "poll_new_choice_hint" > Choice %d</string>
<string name= "edit_poll" > Edit</string>
2019-10-11 10:51:47 -05:00
<string name= "post_lookup_error_format" > Error looking up post %s</string>
2019-08-22 13:30:08 -05:00
2021-05-16 12:17:56 -05:00
<string name= "no_drafts" > You don\'t have any drafts.</string>
2022-03-27 05:23:25 -05:00
<string name= "no_scheduled_posts" > You don\'t have any scheduled posts.</string>
2020-11-18 14:12:27 -06:00
<string name= "no_announcements" > There are no announcements.</string>
2022-11-12 15:05:55 -06:00
<string name= "no_lists" > You don\'t have any lists.</string>
2020-02-25 11:33:25 -06:00
<string name= "warning_scheduling_interval" > Mastodon has a minimum scheduling interval of 5 minutes.</string>
2022-10-18 12:38:17 -05:00
<string name= "pref_title_show_self_username" > Show username in toolbars</string>
2020-03-02 12:34:31 -06:00
<string name= "pref_title_show_cards_in_timelines" > Show link previews in timelines</string>
2020-03-03 14:27:26 -06:00
<string name= "pref_title_confirm_reblogs" > Show confirmation dialog before boosting</string>
2021-10-04 00:48:44 -05:00
<string name= "pref_title_confirm_favourites" > Show confirmation dialog before favoriting</string>
2020-08-16 03:01:51 -05:00
<string name= "pref_title_hide_top_toolbar" > Hide the title of the top toolbar</string>
2020-12-23 12:13:37 -06:00
<string name= "pref_title_wellbeing_mode" > Wellbeing</string>
2020-11-17 13:10:54 -06:00
<string name= "account_note_hint" > Your private note about this account</string>
<string name= "account_note_saved" > Saved!</string>
2021-01-21 11:57:09 -06:00
2020-12-23 12:13:37 -06:00
<string name= "wellbeing_mode_notice" > Some information that might affect your mental wellbeing will be hidden. This includes:\n\n
- Favorite/Boost/Follow notifications\n
2022-03-20 14:21:42 -05:00
- Favorite/Boost count on posts\n
2020-12-23 12:13:37 -06:00
- Follower/Post stats on profiles\n\n
Push-notifications will not be affected, but you can review your notification preferences manually.
</string>
<string name= "review_notifications" > Review Notifications</string>
<string name= "limit_notifications" > Limit timeline notifications</string>
<string name= "wellbeing_hide_stats_posts" > Hide quantitative stats on posts</string>
<string name= "wellbeing_hide_stats_profile" > Hide quantitative stats on profiles</string>
2021-03-07 12:43:25 -06:00
<plurals name= "error_upload_max_media_reached" >
<item quantity= "one" > You cannot upload more than %1$d media attachment.</item>
<item quantity= "other" > You cannot upload more than %1$d media attachments.</item>
</plurals>
2021-01-18 04:40:13 -06:00
<string name= "dialog_delete_list_warning" > Do you really want to delete the list %s?</string>
2022-03-20 14:21:42 -05:00
<string name= "drafts_post_failed_to_send" > This post failed to send!</string>
2021-01-21 11:57:09 -06:00
<string name= "drafts_failed_loading_reply" > Failed loading Reply information</string>
<string name= "draft_deleted" > Draft deleted</string>
2022-03-20 14:21:42 -05:00
<string name= "drafts_post_reply_removed" > The post you drafted a reply to has been removed</string>
2021-02-18 12:26:25 -06:00
2021-04-10 13:30:44 -05:00
<string name= "follow_requests_info" > Even though your account is not locked, the %1$s staff thought you might want to review follow requests from these accounts manually.</string>
2021-02-18 12:26:25 -06:00
<string name= "action_subscribe_account" > Subscribe</string>
<string name= "action_unsubscribe_account" > Unsubscribe</string>
2021-04-10 13:30:44 -05:00
2022-03-20 14:21:42 -05:00
<string name= "tusky_compose_post_quicksetting_label" > Compose Post</string>
2022-05-17 12:49:42 -05:00
<string name= "account_date_joined" > Joined %1$s</string>
2022-05-09 12:39:43 -05:00
<string name= "saving_draft" > Saving draft…</string>
2022-03-20 14:21:42 -05:00
2022-05-17 12:32:09 -05:00
<string name= "tips_push_notification_migration" > Re-login all accounts to enable push notification support.</string>
2023-01-03 14:07:04 -06:00
<string name= "dialog_push_notification_migration" > In order to use push notifications via UnifiedPush, Tusky needs permission to subscribe to notifications on your Mastodon server. This requires a re-login to change the OAuth scopes granted to Tusky. Using the re-login option here or in "Account preferences" will preserve all of your local drafts and cache.</string>
2022-05-17 12:32:09 -05:00
<string name= "dialog_push_notification_migration_other_accounts" > You have re-logged into your current account to grant push subscription permission to Tusky. However, you still have other accounts that have not been migrated this way. Switch to them and re-login one by one in order to enable UnifiedPush notifications support.</string>
2022-09-17 12:06:07 -05:00
<string name= "url_domain_notifier" > %s (🔗 %s)</string>
2022-05-17 12:32:09 -05:00
2022-10-28 09:46:38 -05:00
<string name= "delete_scheduled_post_warning" > Delete this scheduled post?</string>
2022-05-17 12:49:42 -05:00
2022-11-05 11:37:20 -05:00
<string name= "instance_rule_info" > By logging in you agree to the rules of %s.</string>
<string name= "instance_rule_title" > %s rules</string>
2022-12-02 12:19:17 -06:00
<string name= "language_display_name_format" > %s (%s)</string>
2022-12-01 13:11:55 -06:00
<string name= "report_category_violation" > Rule violation</string>
<string name= "report_category_spam" > Spam</string>
<string name= "report_category_other" > Other</string>
2022-12-01 12:24:27 -06:00
<string name= "action_unfollow_hashtag_format" > Unfollow #%s?</string>
Add "Refresh" accessibility menu (#3121)
* Add "Refresh" accessibility menu to TimelineFragment
Per https://developer.android.com/reference/androidx/swiperefreshlayout/widget/SwipeRefreshLayout
the layout does not provide accessibility events, and a menu item should be
provided as an alternative method for refreshing the content.
In `TimelineFragment`:
- Implement the `MenuProvider` interface so it can populate the action bar
menu in activities that host the fragment
- Create a "Refresh" menu item, and refresh the state when it is selected
`MainActivity` has to change how the menu is created, so that fragments
can add items to it.
In `MainActivity`:
- Call `setSupportActionBar` so `mainToolbar` participates in menus
- Implement the `MenuProvider` interface, and move menu creation there
- Set the title via supportActionBar
* Never show the refresh item as a menubar action
Per guidelines in https://developer.android.com/develop/ui/views/touch-and-input/swipe/add-swipe-interface#AddRefreshAction
* Add "Refresh" menu item for AccountMediaFragment
Also, fix the colour of the refresh progress indicator
* Implement "Refresh" for AnnouncementsActivity
* Add "Refresh" menu for ConversationsFragment
* Keep the tabs adapter over the life of the viewpager
Make `tabs` `var` instead of `val` in `MainPagerAdapter` so it can be updated
when tabs change.
Then detach the `tabLayoutMediator`, update the tabs, and call
`notifyItemRangeChanged` in `setupTabs()`.
This fixes a bug (not sure if it's this code, or in ViewPager2) where
assigning a new adapter to the view pager seemed to result in a leak of one
or more fragments. This wasn't user-visible, but it's a leak, and it becomes
user-visible when fragments want to display menus.
This also fixes two other bugs:
1. Be on the left-most tab. Scroll down a bit. Then modify the tabs at
"Account preferences > tabs", but keep the left-most tab as-is.
Then go back to MainActivity. Your reading position in the left-most
tab has been jumped to the top.
2. Be on any non-left-most tab. Then modify the tab list by reordering tabs
(adding/removing tabs is also OK).
Then go back to MainActivity. Your tab selection has been overridden,
and the left-most tab has been selected.
Because the fragments are not destroyed unnecessarily your reading position
is retained. And it remembers the tab you had selected, and as long as that
tab is still present you will be returned to it, even if it's changed
position in the list.
Fixes https://github.com/tuskyapp/Tusky/issues/3251
* Add "Refresh" menu for ScheduledStatusActivity
* Lint
* Add "Refresh" menu for SearchFragment / SearchActivity
* Explicitly set the searchview width
Using "collapseActionView" requires the user to press "Back" twice to exit
the activity, which is not acceptable.
* Move toolbar handling in to ViewThreadActivity
Previous code had the toolbar in the fragment's layout. Refactor to make
consistent with other activities, and move the toolbar in to the activity
layout.
Implement MenuProvider in ViewThreadFragment to adjust the menu in the
activity.
* Add "Refresh" menu to ViewThreadFragment
* Implement "Refresh" for ViewEditsFragment
* Lint
* Add "Refresh" menu to ReportStatusesFragment
* Add "Refresh" menu to NotificationsFragment
* Rename menu resource files
Be consistent with the layout resource files, which have an activity/fragment
prefix, then the lower_snake_case name of the activity or fragment it's for.
* Only enable refresh menu if swiptorefresh is enabled
Some timelines don't have swipetorefresh enabled (e.g., those shown on
AccountActivity). In those cases don't add the refresh menu, rely on the
hosting activity to provide it.
Update AccountActivity to provide the refresh menu item.
2023-03-01 12:58:18 -06:00
<string name= "action_refresh" > Refresh</string>
2023-01-02 07:09:40 -06:00
<string name= "mute_notifications_switch" > Mute notifications</string>
Add trending tags (#3149)
* Add initial feature for viewing trending graphs. Currently only views hash tag trends.
Contains API additions, tab additions and a set of trending components.
* Add clickable system through a LinkListener. Duplicates a little code from SFragment.
* Add accessibility description.
* The background for the graph should match the background for black theme too.
* Add error handling through a state flow system using existing code as an example.
* Graphing: Use a primary and a secondary line. Remove under line fill. Apply line thickness. Dotted end of line.
* Trending changes: New layout for trending: Cell. Use ViewBinding. Add padding to RecyclerView to stop the FAB from hiding content. Multiple bugs in GraphView resolved. Wide (landscape, for example) will show 4 columns, portrait will show 2. Remove unused base holder class. ViewModel invalidate scoping changed. Some renaming to variables made. For uses and accounts, use longs. These could be big numbers eventually. TagViewHolder renamed to TrendingTagViewHolder.
* Trending changes: Remove old layout. Update cell textsizes and use proper string. Remove bad comment.
* Trending changes: Refresh the main drawer when the tabs are edited. This will allow the trending item to toggle.
* Trending changes: Add a trending activity to be able to view the trending data from the main drawer.
* Trending changes: The title text should be changed to Trending Hashtags.
* Trending changes: Add meta color to draw axis etc. Draw the date boundaries on the graph. Remove dates from each cell and place them in the list as a header. Graphs should be proportional to the highest historical value. Add a new interface to control whether the FAB should be visible (important when switching tabs, the state is lost). Add header to the adapter and viewdata structures. Add QOL extensions for getting the dates from history.
* Trending changes: Refresh FAB through the main activity and FabFragment interface. Trending has no FAB.
* Trending changes: Make graph proportional to the highest usage value. Fixes to the graph ratio calculations.
* Trending changes: KtLintFix
* Trending changes: Remove accidental build gradle change. Remove trending cases. Remove unused progress. Set drawer button addition explicitly to false, leaving the code there for future issue #3010. Remove unnecessary arguments for intent. Remove media preview preferences, there is nothing to preview. No padding between hashtag symbol and text. Do not ellipsize hashtags.
* Trending changes: Use bottomsheet slide in animation helper for opening the hashtag intent. Remove explicit layout height from the XML and apply it to the view holder itself. The height was not being respected in XML.
* Use some platform standards for styling
- Align on an 8dp grid
- Use android:attr for paddingStart and paddingEnd
- Use textAppearanceListItem variants
- Adjust constraints to handle different size containers
* Correct lineWidth calculations
Previous code didn't convert the value to pixels, so it was always displaying
as a hairline stroke, irrespective of the value in the layout file.
While I'm here, rename from lineThickness to lineWidth, to be consistent
with parameters like strokeWidth.
* Does not need to inherit from FabFragment
* Rename to TrendingAdapter
"Paging" in the adapter name is a misnomer here
* Clean up comments, use full class name as tag
* Simplify TrendingViewModel
- Remove unncessary properties
- Fetch tags and map in invalidate()
- emptyList() instead of listOf() for clarity
* Remove line dividers, use X-axis to separate content
Experiment with UI -- instead of dividers between each item, draw an explicit
x-axis for each chart, and add a little more vertical padding, to see if that
provides a cleaner separation between the content
* Adjust date format
- Show day and year
- Use platform attributes for size
* Locale-aware format of numbers
Format numbers < 100,000 by inserting locale-aware separators. Numbers larger
are scaled and have K, M, G, ... etc suffix appended.
* Prevent a crash if viewData is empty
Don't access viewData without first checking if it's empty. This can be the
case if the server returned an empty list for some reason, or the data has
been filtered.
* Filter out tags the user has filtered from their home timeline
Invalidate the list if the user's preferences change, as that may indicate
they've changed their filters.
* Experiment with alternative layout
* Set chart height to 160dp to align to an 8dp grid
* Draw ticks that are 5% the height of the x-axis
* Legend adjustments
- Use tuskyblue for the ticks
- Wrap legend components in a layout so they can have a dedicated background
- Use a 60% transparent background for the legend to retain legibility
if lines go under it
* Bezier curves, shorter cell height
* More tweaks
- List tags in order of popularity, most popular first
- Make it clear that uses/accounts in the legend are totals, not current
- Show current values at end of the chart
* Hide FAB
* Fix crash, it's not always hosted in an ActionButtonActivity
* Arrange totals vertically in landscape layout
* Always add the Trending drawer menu if it's not a tab
* Revert unrelated whitespace changes
* One more whitespace revert
---------
Co-authored-by: Nik Clayton <nik@ngo.org.uk>
2023-02-14 12:52:11 -06:00
Keep scroll position when loading missing statuses (#3000)
* Change "Load more" to load oldest statuses first in home timeline
Previous behaviour loaded missing statuses by using "since_id" and "max_id".
This loads the most recent N statuses, looking backwards from "max_id".
Change to load the oldest statuses first, assuming the user is scrolling
up through the timeline and will want to load statuses in reverse
chronological order.
* Scroll to the bottom of new entries added by "Load more"
- Remember the position of the "Load more" placeholder
- Check the position of inserted entries
- If they match, scroll to the bottom
* Change "Load more" to load oldest statuses first in home timeline
Previous behaviour loaded missing statuses by using "since_id" and "max_id".
This loads the most recent N statuses, looking backwards from "max_id".
Change to load the oldest statuses first, assuming the user is scrolling
up through the timeline and will want to load statuses in reverse
chronological order.
* Scroll to the bottom of new entries added by "Load more"
- Remember the position of the "Load more" placeholder
- Check the position of inserted entries
- If they match, scroll to the bottom
* Ensure the user can't have two simultaneous "Load more" coroutines
Having two simultanous coroutines would break the calculation used to figure
out which item in the list to scroll to after a "Load more" in the timeline.
Do this by:
- Creating a TimelineUiState and associated flow that tracks the "Load more"
state
- Updating this in the (Cached|Network)TimelineViewModel
- Listening for changes to it in TimelineFragment, and notifying the adapter
- The adapter will disable any placeholder views while "Load more" is active
* Revert changes that loaded the oldest statuses instead of the newest
* Be more robust about locating the status to scroll to
Weirdness with the PagingData library meant that positionStart could still be
wrong after "Load more" was clicked.
Instead, remember the position of the "Load more" item and the ID of the
status immediately after it.
When new items are added, search for the remembered status at the position of
the "Load more" item. This is quick, testing at most LOAD_AT_ONCE items in
the adapter.
If the remembered status is not visible on screen then scroll to it.
* Lint
* Add a preference to specify the reading order
Default behaviour (oldest first) is for "load more" to load statuses and
stay at the oldest of the new statuses.
Alternative behaviour (if the user is reading from top to bottom) is to
stay at the newest of the new statuses.
* Move ReadingOrder enum construction logic in to the enum
* Jump to top if swipe/refresh while preferring newest-first order
* Show a circular progress spinner during "Load more" operations
Remove a dedicated view, and use an icon on the button instead.
Adjust the placeholder attributes and styles accordingly.
* Remove the "loadMoreActive" property
Complicates the code and doesn't really achieve the desired effect. If the
user wants to tap multiple "Load more" buttons they can.
* Update comments in TimelineFragment
* Respect the user's reading order preference if it changes
* Add developer tools
This is for functionality that makes it easier for developers to interact
with the app, or get it in to a known-state.
These features are for use by users, so are only visible in debug builds.
* Adjust how content is loaded based on preferred reading order
- Add the readingOrder to TimelineViewModel so derived classes can use it.
- Update the homeTimeline API to support the `minId` parameter and update
calls in NetworkTimelineViewModel
In CachedTimelineViewModel:
- Set the bounds of the load to be the status IDs on either side of the
placeholder ID (update TimelineDao with a new query for this)
- Load statuses using either minId or sinceId depending on the reading order
- Is there was no overlap then insert the new placeholder at the start/end
of the list depending on reading order
* Lint
* Rename unused dialog parameter to _
* Update API arguments in tests
* Simplify ReadingOrder preference handling
* Fix bug with Placeholder and the "expanded" property
If a status is a Placeholder the "expanded" propery is used to indicate
whether or not it is loading.
replaceStatusRange() set this property based on the old value, and the user's
alwaysOpenSpoiler preference setting.
This shouldn't have been used if the status is a Placeholder, as it can lead
to incorrect loading states.
Fix this.
While I'm here, introduce an explicit computed property for whether a
TimelineStatusEntity is a placeholder, and use that for code clarity.
* Set the "Load more" button background to transparent
* Fix typo.
* Inline spec, update comment
* Revert 1480c6aa3ac5c0c2d362fb271f47ea2259ab14e2
Turns out the behaviour is not desired.
* Remove unnecessary Log call
* Extract function
* Change default to newest first
2023-01-13 12:26:24 -06:00
<!-- Reading order preference -->
<string name= "pref_title_reading_order" > Reading order</string>
<string name= "pref_reading_order_oldest_first" > Oldest first</string>
<string name= "pref_reading_order_newest_first" > Newest first</string>
2022-11-05 11:37:20 -05:00
2023-01-02 07:09:18 -06:00
<!-- @Tusky edited 19th December 2022 13:37 -->
<string name= "status_edit_info" > %1$s edited %2$s</string>
<!-- @Tusky created 19th December 2022 13:12 -->
<string name= "status_created_info" > %1$s created %2$s</string>
Improve the actual and perceived speed of thread loading (#3118)
* Improve the actual and perceived speed of thread loading
To improve the actual speed, note that if the user has opened a thread from
their home timeline then the initial status is cached in the database. Other
statuses in the same thread may be cached as well.
So try and load the initial status from the database, falling back to the
network if it's not present (e.g., the user has opened a thread from the
local or federated timelines, or a search).
Introduce a new loading state to deal with this case.
In typical cases this allows the UI to display the initial status immediately
with no need to show a progress indicator.
To improve the perceived speed, delay showing the initial loading circular
progress indicators by 500ms. If loading the initial status completes within
that time no spinner is shown and the user will perceive the action as
close-to-immediate
(https://www.nngroup.com/articles/response-times-3-important-limits/).
Additionally, introduce an extra indeterminate progress indicator.
The new indicator is linear, anchored to the bottom of the screen, and shows
progress loading ancestor/descendant statuses. Like the other indicator is
also delayed 500ms from when ancestor/descendant status information is
fetched, and if the fetch completes in that time it will not be shown.
* Mark `getStatus` as suspend so it doesn't run on the main thread
* Save an allocation, use an isDetailed parameter to TimelineStatusWithAccount.toViewData
Rename Status.toViewData's "detailed" parameter to "isDetailed" for
consistency with other uses.
* Ensure suspend functions run to completion when testing
* Delay-load the status from the network even if it's cached
This speeds up the UI while ensuring it will eventually contain accurate data
from the remote.
* Load the network status before updating the list
Avoids excess animations if the network copy has changes
* Fix UI flicker when loading reblogged statuses
* Lint
* Fixup tests
2023-01-09 14:31:31 -06:00
<string name= "a11y_label_loading_thread" > Loading thread</string>
Add trending tags (#3149)
* Add initial feature for viewing trending graphs. Currently only views hash tag trends.
Contains API additions, tab additions and a set of trending components.
* Add clickable system through a LinkListener. Duplicates a little code from SFragment.
* Add accessibility description.
* The background for the graph should match the background for black theme too.
* Add error handling through a state flow system using existing code as an example.
* Graphing: Use a primary and a secondary line. Remove under line fill. Apply line thickness. Dotted end of line.
* Trending changes: New layout for trending: Cell. Use ViewBinding. Add padding to RecyclerView to stop the FAB from hiding content. Multiple bugs in GraphView resolved. Wide (landscape, for example) will show 4 columns, portrait will show 2. Remove unused base holder class. ViewModel invalidate scoping changed. Some renaming to variables made. For uses and accounts, use longs. These could be big numbers eventually. TagViewHolder renamed to TrendingTagViewHolder.
* Trending changes: Remove old layout. Update cell textsizes and use proper string. Remove bad comment.
* Trending changes: Refresh the main drawer when the tabs are edited. This will allow the trending item to toggle.
* Trending changes: Add a trending activity to be able to view the trending data from the main drawer.
* Trending changes: The title text should be changed to Trending Hashtags.
* Trending changes: Add meta color to draw axis etc. Draw the date boundaries on the graph. Remove dates from each cell and place them in the list as a header. Graphs should be proportional to the highest historical value. Add a new interface to control whether the FAB should be visible (important when switching tabs, the state is lost). Add header to the adapter and viewdata structures. Add QOL extensions for getting the dates from history.
* Trending changes: Refresh FAB through the main activity and FabFragment interface. Trending has no FAB.
* Trending changes: Make graph proportional to the highest usage value. Fixes to the graph ratio calculations.
* Trending changes: KtLintFix
* Trending changes: Remove accidental build gradle change. Remove trending cases. Remove unused progress. Set drawer button addition explicitly to false, leaving the code there for future issue #3010. Remove unnecessary arguments for intent. Remove media preview preferences, there is nothing to preview. No padding between hashtag symbol and text. Do not ellipsize hashtags.
* Trending changes: Use bottomsheet slide in animation helper for opening the hashtag intent. Remove explicit layout height from the XML and apply it to the view holder itself. The height was not being respected in XML.
* Use some platform standards for styling
- Align on an 8dp grid
- Use android:attr for paddingStart and paddingEnd
- Use textAppearanceListItem variants
- Adjust constraints to handle different size containers
* Correct lineWidth calculations
Previous code didn't convert the value to pixels, so it was always displaying
as a hairline stroke, irrespective of the value in the layout file.
While I'm here, rename from lineThickness to lineWidth, to be consistent
with parameters like strokeWidth.
* Does not need to inherit from FabFragment
* Rename to TrendingAdapter
"Paging" in the adapter name is a misnomer here
* Clean up comments, use full class name as tag
* Simplify TrendingViewModel
- Remove unncessary properties
- Fetch tags and map in invalidate()
- emptyList() instead of listOf() for clarity
* Remove line dividers, use X-axis to separate content
Experiment with UI -- instead of dividers between each item, draw an explicit
x-axis for each chart, and add a little more vertical padding, to see if that
provides a cleaner separation between the content
* Adjust date format
- Show day and year
- Use platform attributes for size
* Locale-aware format of numbers
Format numbers < 100,000 by inserting locale-aware separators. Numbers larger
are scaled and have K, M, G, ... etc suffix appended.
* Prevent a crash if viewData is empty
Don't access viewData without first checking if it's empty. This can be the
case if the server returned an empty list for some reason, or the data has
been filtered.
* Filter out tags the user has filtered from their home timeline
Invalidate the list if the user's preferences change, as that may indicate
they've changed their filters.
* Experiment with alternative layout
* Set chart height to 160dp to align to an 8dp grid
* Draw ticks that are 5% the height of the x-axis
* Legend adjustments
- Use tuskyblue for the ticks
- Wrap legend components in a layout so they can have a dedicated background
- Use a 60% transparent background for the legend to retain legibility
if lines go under it
* Bezier curves, shorter cell height
* More tweaks
- List tags in order of popularity, most popular first
- Make it clear that uses/accounts in the legend are totals, not current
- Show current values at end of the chart
* Hide FAB
* Fix crash, it's not always hosted in an ActionButtonActivity
* Arrange totals vertically in landscape layout
* Always add the Trending drawer menu if it's not a tab
* Revert unrelated whitespace changes
* One more whitespace revert
---------
Co-authored-by: Nik Clayton <nik@ngo.org.uk>
2023-02-14 12:52:11 -06:00
<!-- @knossos@fosstodon.org created 2023 - 01 - 07 -->
<string name= "accessibility_talking_about_tag" > %1$d people are talking about hashtag %2$s</string>
<string name= "total_usage" > Total usage</string>
<string name= "total_accounts" > Total accounts</string>
Convert NotificationsFragment and related code to Kotlin, use the Paging library (#3159)
* Unmodified output from "Convert Java to Kotlin" on NotificationsFragment.java
* Bare minimum changes to get this to compile and run
- Use `lateinit` for `eventhub`, `adapter`, `preferences`, and `scrolllistener`
- Removed override for accountManager, it can be used from the superclass
- Add `?.` where non-nullity could not (yet) be guaranteed
- Remove `?` from type lists where non-nullity is guaranteed
- Explicitly convert lists to mutable where necessary
- Delete unused function `findReplyPosition`
* Remove all unnecessary non-null (!!) assertions
The previous change meant some values are no longer nullable. Remove the
non-null assertions.
* Lint ListStatusAccessibilityDelegate call
- Remove redundant constructor
- Move block outside of `()`
* Use `let` when handling compose button visibility on scroll
* Replace a `requireNonNull` with `!!`
* Remove redundant return values
* Remove or rename unused lambda parameters
* Remove unnecessary type parameters
* Remove unnecessary null checks
* Replace cascading-if statement with `when`
* Simplify calculation of `topId`
* Use more appropriate list properties and methods
- Access the last value with `.last()`
- Access the last index with `.lastIndex`
- Replace logical-chain with `asRightOrNull` and `?.`
- `.isNotEmpty()`, not `!...isEmpty()`
* Inline unnecessary variable
* Use PrefKeys constants instead of bare strings
* Use `requireContext()` instead of `context!!`
* Replace deprecated `onActivityCreated()` with `onViewCreated()`
* Remove unnecessary variable setting
* Replace `size == 0` check with `isEmpty()`
* Format with ktlint, no functionality changes
* Convert NotifcationsAdapter to Kotlin
Does not compile, this is the unchanged output of the "Convert to Kotlin"
function
* Minimum changes to get NotificationsAdapter to compile
* Remove unnecessary visibility modifiers
* Use `isNotEmpty()`
* Remove unused lambda parameters
* Convert cascading-if to `when`
* Simplifiy assignment op
* Use explicit argument names with `copy()`
* Use `.firstOrNull()` instead of `if`
* Mark as lateinit to avoid unnecessary null checks
* Format with ktlint, whitespace changes only
* Bare minimum necessary to demonstrate paging in notifications
Create `NotificationsPagingSource`. This uses a new `notifications2()` API
call, which will exist until all the code has been adapted. Instead of
using placeholders,
Create `NotificationsPagingAdapter` (will replace `NotificationsAdapater`)
to consume this data.
Expose the paging source view a new `NotificationsViewModel` `flow`, and
submit new pages to the adapter as they are available in
`NotificationsFragment`.
Comment out any other code in `NotificationsFragment` that deals with
loading data from the network. This will be updated as necessary, either
here, or in the view model.
Lots of functionality is missing, including:
- Different views for different notification types
- Starting at the remembered notification position
- Interacting with notifications
- Adjusting the UI state to match the loading state
These will be added incrementally.
* Migrate StatusNotificationViewHolder impl. to NotificationsPagingAdapter
With this change `NotificationsPagingAdapter` shows notifications about a
status correctly.
- Introduce a `ViewHolder` abstract class that all Notification view holders
derive from. Modify the fallback view holder to use this.
- Implement `StatusNotificationViewHolder`. Much of the code is from the
existing implementation in the `NotificationAdapater`.
- The original code split the code that binds values to views between the
adapter's `bindViewHolder` method and the view holder's methods.
In this code, all of the binding code is in the view holder, in a `bind`
method. This is called by the adapter's `bindViewHolder` method. This keeps
all the binding logic in the view holder, where it belongs.
- The new `StatusNotificationViewHolder` uses view binding to access its views
instead of `findViewById`.
- Logically, information about whether to show sensitive media, or open
content warnings should be part of the `StatusDisplayOptions`. So add those
as fields, and populate them appropriately.
This affects code outside notification handling, which will be adjusted
later.
* Note some TODOs to complete before the PR is finished
* Extract StatusNotificationViewHolder to a new file
* Add TODO for NotificationViewData.Concrete
* Convert the adapter to take NotificationViewData.Concrete
* Add a view holder for regular status notifications
* Migrate Follow and FollowRequest notifications
* Migrate report notifications
* Convert onViewThread to use the adapter data
* Convert onViewMedia to use the adapter data
* Convert onMore to use the adapter data
* Convert onReply to use the adapter data
* Convert NotificationViewData to Kotlin
* Re-implement the reblog functionality
- Move reblogging in to the view model
- Update the UI via the adapter's `snapshot()` and `notifyItemChanged()`
methods
* Re-implement the favourite functionality
Same approach as reblog
* Re-implement the bookmark functionality
Same approach as reblog
* Add TODO re StatusActionListener interface
* Add TODO re event handling
* Re-implementing the voting functionality
* Re-implement viewing hidden content
- Hidden media
- Content behind a content warning
* Add a TODO re pinning
* Re-implement "Show more" / "Show less"
* Delete unused updateStatus() function
* Comment out the scroll listener for the moment
* Re-implement applying filters to notifications
Introduce `NotificationsRepository`, to provide access to the notifications
stream.
When changing the filters the flow is as follows:
- User clicks "Apply" in the fragment.
- Fragment calls `viewModel.accept()` with a `UiAction.ApplyFilter` (new
class).
- View model maintains a private flow of incoming UI actions. The new action
is emitted to that flow.
- In view model, `notificationFilter` waits for `.ApplyFilter` actions, and
ensures the filter is saved, then emits it.
- In view model, `pagingDataFlow` waits for new items from
`notificationsFilter` and fetches the notifications from the repository in
response. The repository provides `Notification`, so the model maps them to
`NotificationViewData.Concrete` for display by the adapter.
- In view model the UI state also waits for new items from
`notificationsFilter` and emits a new `UiState` every time the filter is
changed.
When opening the fragment for the first time:
- All of the above machinery, but `notificationFilter` also fetches the filter
from the active account and emits that first. This triggers the first fetch
and the first update of `uiState`.
Also:
- Add TODOs for functionality that is not implemented yet
- Delete a lot of dead code from NotificationsFragment
* Include important preference values in `uiState`
Listen to the flow of eventHub events, filtered to preference changes that
are relevant to the notification view.
When preferences change (or when the view model starts), fetch the current
values, and include them in `uiState`.
Remove preference handling from `NotificationsFragment`, and just use
the values from `uiState`.
Adjust how the `useAbsoluteTime` preference is handled. The previous code
loaded new content (via a diffutil) in to the adapter, which would trigger
a re-binding of the timestamp.
As the adapter content is immutable, the new code simply triggers a
re-binding of the views that are currently visible on screen.
* Update UI in response to different load states
Notifications can be loaded at the top and bottom of the timeline. Add a
new layout to show the progress of these loads, and any errors that can
occur.
Catch network errors in `NotificationsPagingSource` and convert to
`LoadState.Error`.
Add a header/footer to the notifications list to show the load state.
Collect the load state from the adapter, use this to drive the visibility
of different views.
* Save and restore the last read notification ID
Use this when fetching notifications, to centre the list around the
notification that was last read.
* Call notifyItemRangeChanged with the correct parameters
* Don't try and save list position if there are no items in the list
* Show/hide the "Nothing to see" view appropriately
* Update comments
* Handle the case where the notification key no longer exists
* Re-implement support for showMediaPreview and other settings
* Re-implement "hide FAB when scrolling" preference
* Delete dead code
* Delete Notifications Adapater and Placeholder types
* Remove NotificationViewData.Concrete subclass
Now there's no Placeholder, everything is a NotificationViewData.
* Improve how notification pages are loaded if the first notification is missing or filtered
* Re-implement clear notifications, show errors
* s/default/from/
* Add missing headers
* Don't process bookmarking via EventHub
- Initiating a bookmark is triggered by the fragment sending a
StatusUiAction.Bookmark
- View model receives this, makes API call, waits for response, emits either
a success or failure state
- Fragment collects success/failure states, updates the UI accordingly
* Don't process favourites via EventHub
* Don't process reblog via EventHub
* Don't process poll votes with EventHub
This removes EventHub from the fragment
* Respond to follow requests via the view model
* Docs and cleanup
* Typo and editing pass
* Minor edits for clarity
* Remove newline in diagram
* Reorder sequence diagram
* s/authorize/accept/
* s/pagingDataFlow/pagingData/
* Add brief KDoc
* Try and fetch a full first page of notifications
* Call the API method `notifications` again
* Log UI errors at the point of handling
* Remove unused variable
* Replace String.format() with interpolation
* Convert NotificationViewData to data class
* Rename copy() to make(), to avoid confusion with default copy() method
* Lint
* Update app/src/main/res/layout/simple_list_item_1.xml
* Update app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsPagingAdapter.kt
* Update app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsViewModel.kt
* Update app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.kt
* Update app/src/main/java/com/keylesspalace/tusky/viewdata/NotificationViewData.kt
* Initial NotificationsViewModel tests
* Add missing import
* More tests, some cleanup
* Comments, re-order some code
* Set StateRestorationPolicy.PREVENT_WHEN_EMPTY
* Mark clearNotifications() as "suspend"
* Catch exceptions from clearNotifications and emit
* Update TODOs with explanations
* Ensure initial fetch uses a null ID
* Stop/start collecting pagingData based on the lifecycle
* Don't hide the list while refreshing
* Refresh notifications on mutes and blocks
* Update tests now clearNotifications is a suspend fun
* Add "Refresh" menu to NotificationsFragment
* Use account.name over account.displayName
* Update app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.kt
Co-authored-by: Konrad Pozniak <connyduck@users.noreply.github.com>
* Mark layoutmanager as lateinit
* Mark layoutmanager as lateinit
* Refactor generating UI text
* Add Copyright header
* Correctly apply notification filters
* Show follow request header in notifications
* Wait for follow request actions to complete, so the reqeuest is sent
* Remove duplicate copyright header
* Revert copyright change in unmodified file
* Null check response body
* Move NotificationsFragment to component.notifications
* Use viewlifecycleowner.lifecyclescope
* Show notification filter as a dialog rather than a popup window
The popup window:
- Is inconsistent UI
- Requires a custom layout
- Didn't play nicely with viewbinding
* Refresh adapter on block/mute
* Scroll up slightly when new content is loaded
* Restore progressbar
* Lint
* Update app/src/main/res/layout/simple_list_item_1.xml
---------
Co-authored-by: Konrad Pozniak <connyduck@users.noreply.github.com>
2023-03-10 13:12:33 -06:00
<!-- User friendly error messages for different network errors -->
<string name= "socket_timeout_exception" > Contacting your server took too long</string>
<!-- Error messages, displayed in snackbars, when something failed -->
<string name= "ui_error_unknown" > unknown reason</string>
<string name= "ui_error_bookmark" > Bookmarking post failed: %s</string>
<string name= "ui_error_clear_notifications" > Clearing notifications failed: %s</string>
<string name= "ui_error_favourite" > Favoriting post failed: %s</string>
<string name= "ui_error_reblog" > Boosting post failed: %s</string>
<string name= "ui_error_vote" > Voting in poll failed: %s</string>
<string name= "ui_error_accept_follow_request" > Accepting follow request failed: %s</string>
<string name= "ui_error_reject_follow_request" > Rejecting follow request failed: %s</string>
<!-- Success messages, displayed in snackbars, when an action succeeded -->
<string name= "ui_success_accepted_follow_request" > Follow request accepted</string>
<string name= "ui_success_rejected_follow_request" > Follow request blocked</string>
2017-01-02 17:30:27 -06:00
</resources>
