a66f7bb515
Merge tag 'v28.0' into develop
...
# Conflicts:
# README.md
# app/build.gradle
# app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt
# app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
# app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/account/media/AccountMediaFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/accountlist/AccountListFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.kt
# app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/filters/FiltersActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/login/LoginActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledStatusActivity.kt
# app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/trending/TrendingTagsFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/viewthread/edits/ViewEditsFragment.kt
# app/src/main/java/com/keylesspalace/tusky/view/GraphView.kt
# app/src/main/res/color/compound_button_color.xml
# app/src/main/res/color/text_input_layout_box_stroke_color.xml
# app/src/main/res/drawable/ic_check_circle.xml
# app/src/main/res/drawable/ic_flag_24dp.xml
# app/src/main/res/drawable/ic_person_add_24dp.xml
# app/src/main/res/drawable/ic_play_indicator.xml
# app/src/main/res/drawable/ic_poll_24dp.xml
# app/src/main/res/drawable/ic_reblog_active_24dp.xml
# app/src/main/res/drawable/ic_reblog_private_active_24dp.xml
# app/src/main/res/drawable/report_success_background.xml
# app/src/main/res/layout-land/item_trending_cell.xml
# app/src/main/res/layout/activity_account.xml
# app/src/main/res/layout/activity_edit_filter.xml
# app/src/main/res/layout/card_license.xml
# app/src/main/res/layout/item_announcement.xml
# app/src/main/res/layout/item_status.xml
# app/src/main/res/layout/item_status_detailed.xml
# app/src/main/res/layout/item_tab_preference.xml
# app/src/main/res/layout/item_trending_cell.xml
# app/src/main/res/values-cs/strings.xml
# app/src/main/res/values-de/strings.xml
# app/src/main/res/values-es/strings.xml
# app/src/main/res/values-eu/strings.xml
# app/src/main/res/values-fr/strings.xml
# app/src/main/res/values-kab/strings.xml
# app/src/main/res/values-lv/strings.xml
# app/src/main/res/values-nb-rNO/strings.xml
# app/src/main/res/values-night/theme_colors.xml
# app/src/main/res/values/colors.xml
# app/src/main/res/values/strings.xml
# app/src/main/res/values/styles.xml
# app/src/main/res/values/theme_colors.xml
2026-01-03 09:57:39 +11:00
875013e47f
Merge tag 'v25.2' into develop
...
# Conflicts:
# README.md
# app/build.gradle
# app/lint-baseline.xml
# app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusNotificationViewHolder.kt
# app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt
# app/src/main/java/com/keylesspalace/tusky/util/ThemeUtils.kt
# app/src/main/res/layout/activity_about.xml
# app/src/main/res/layout/item_emoji_pref.xml
# app/src/main/res/values-ar/strings.xml
# app/src/main/res/values-bg/strings.xml
# app/src/main/res/values-cy/strings.xml
# app/src/main/res/values-de/strings.xml
# app/src/main/res/values-fa/strings.xml
# app/src/main/res/values-gd/strings.xml
# app/src/main/res/values-gl/strings.xml
# app/src/main/res/values-hu/strings.xml
# app/src/main/res/values-is/strings.xml
# app/src/main/res/values-it/strings.xml
# app/src/main/res/values-ja/strings.xml
# app/src/main/res/values-nl/strings.xml
# app/src/main/res/values-oc/strings.xml
# app/src/main/res/values-pt-rBR/strings.xml
# app/src/main/res/values-pt-rPT/strings.xml
# app/src/main/res/values-ru/strings.xml
# app/src/main/res/values-si/strings.xml
# app/src/main/res/values-sv/strings.xml
# app/src/main/res/values-tr/strings.xml
# app/src/main/res/values-uk/strings.xml
# app/src/main/res/values-vi/strings.xml
# app/src/main/res/values-zh-rCN/strings.xml
# app/src/main/res/values/strings.xml
# fastlane/metadata/android/ru/full_description.txt
# fastlane/metadata/android/zh-Hans/full_description.txt
2026-01-02 18:27:41 +11:00
Konrad Pozniak
321d17f5de
Remove Rx from EventHub and TimelineCases ( #3446 )
...
* remove Rx from EventHub and TimelineCases
* fix tests
* fix AccountViewModel.unblockDomain
* remove debug logging
2023-03-18 10:11:47 +01:00
Konrad Pozniak
d839f18267
update ktlint plugin to 11.3.1, format code ( #3442 )
2023-03-13 13:16:39 +01:00
Levi Bard
ff8dd37855
Support the mastodon 4 filter api ( #3188 )
...
* Replace "warn"-filtered posts in timelines and thread view with placeholders
* Adapt hashtag muting interface
* Rework filter UI
* Add icon for account preferences
* Clean up UI
* WIP: Use chips instead of a list. Adjust padding
* Scroll the filter edit activity
Nested scrolling views (e.g., an activity that scrolls with an embedded list
that also scrolls) can be difficult UI.
Since the list of contexts is fixed, replace it with a fixed collection of
switches, so there's no need to scroll the list.
Since the list of actions is only two (warn, hide), and are mutually
exclusive, replace the spinner with two radio buttons.
Use the accent colour and title styles on the different heading titles in
the layout, to match the presentation in Preferences.
Add an explicit "Cancel" button.
The layout is a straightforward LinearLayout, so use that instead of
ConstraintLayout, and remove some unncessary IDs.
Update EditFilterActivity to handle the new layout.
* Cleanup
* Add more information to the filter list view
* First pass on code review comments
* Add view model to filters activity
* Add view model to edit filters activity
* Only use the status wrapper for filtered statuses
* Relint
---------
Co-authored-by: Nik Clayton <nik@ngo.org.uk>
2023-03-11 13:12:50 +01:00
fruyek
d823052862
Status: Display indicators of edited posts ( #2935 )
...
* Add editedAt field to Status
* Status: Display indicators of edited posts
* Annotate edited posts in the Status description
* Cache info that post has been edited
2022-12-03 12:15:54 +01:00
Eva Tatarka
be96aa576e
Show toast if pin fails ( #2755 )
...
* Show toast if pin fails
Fixes #2229
* Swtich to snackbar
* Show generic error message if no server error is available
* Fix pin error logging
2022-11-09 19:30:50 +01:00
